[commit] r2301 - in cpu/arm: mmp2 olpc/1.75

[repository service]

Author: quozl
Date: Tue Jun 21 05:24:00 2011
New Revision: 2301
URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2301

Log:
OLPC trac #11009, reinstate -r2294

Modified:
   cpu/arm/mmp2/irq.fth
   cpu/arm/olpc/1.75/devices.fth

Modified: cpu/arm/mmp2/irq.fth
==============================================================================
--- cpu/arm/mmp2/irq.fth	Tue Jun 21 05:02:27 2011	(r2300)
+++ cpu/arm/mmp2/irq.fth	Tue Jun 21 05:24:00 2011	(r2301)
@@ -33,8 +33,9 @@

: open  ( -- flag )
    my-space to base-adr
-   block-irqs
-   d# 64 0  do  i disable-irq  loop
+\ Leave the IRQ table alone so as not to steal interrupts from the SP
+\   block-irqs
+\   d# 64 0  do  i disable-irq  loop
    unblock-irqs
    true
 ;

Modified: cpu/arm/olpc/1.75/devices.fth
==============================================================================
--- cpu/arm/olpc/1.75/devices.fth	Tue Jun 21 05:02:27 2011	(r2300)
+++ cpu/arm/olpc/1.75/devices.fth	Tue Jun 21 05:24:00 2011	(r2301)
@@ -274,6 +274,8 @@

devalias keyboard /ec-spi/keyboard

+fload ${BP}/cpu/arm/olpc/spcmd.fth
+
 : wlan-reset  ( -- )  d# 58 gpio-clr  d# 20 ms  d# 58 gpio-set  ;

\ Create the alias unless it already exists