Changeset 2790

Timestamp:

Dec 31, 2011 9:01:51 PM (17 months ago)

Author:

wmb

Message:

OLPC XO-1.75 and XO-3 - trac #11547 - Fixed problem with Linux not booting when a USB keyboard is attached.

Location:

cpu/arm/olpc

Files:

• 1.75/usb.fth (modified) (1 diff)
• 3.0/usb.fth (modified) (1 diff)
• build-fw.fth (modified) (3 diffs)

cpu/arm/olpc/1.75/usb.fth

@@ -125 +125 @@
 ;
 
+: usb-quiet  ( -- )
+   detach-usb-keyboard
+   " /usb" " reset-usb" execute-device-method drop
+;
+
 : suspend-usb  ( -- )
    detach-usb-keyboard

cpu/arm/olpc/3.0/usb.fth

@@ -163 +163 @@
       add-input
    then
+;
+
+: usb-quiet  ( -- )
+   detach-usb-keyboard
+   " /usb@f0003000" " reset-usb" execute-device-method drop
+   " /usb@d4208000" " reset-usb" execute-device-method drop
 ;
 

cpu/arm/olpc/build-fw.fth

@@ -362 +362 @@
 fload ${BP}/cpu/arm/marvell/utmiphy.fth
 
+fload ${BP}/cpu/arm/linux.fth
+
 \+ olpc-cl2 fload ${BP}/cpu/arm/olpc/1.75/usb.fth
 \+ olpc-cl3 fload ${BP}/cpu/arm/mmp2/ulpiphy.fth
@@ -425 +427 @@
 [then]
 
-fload ${BP}/cpu/arm/linux.fth
-
 \ The bottom of extra-mem is the top of DMA memory.
 \ We give everything up to that address to Linux.
 : olpc-memory-limit  ( -- adr )  extra-mem-va >physical  ;
 ' olpc-memory-limit to memory-limit
-
-: usb-quiet  ( -- )
-   [ ' linux-hook behavior compile, ]    \ Chain to old behavior
-   unload-crypto
-   " /usb" " reset-usb" execute-device-method drop
-;
 
 \+ olpc-cl2 d#  9999 to arm-linux-machine-type  \ XO-1.75
@@ -600 +594 @@
 ;
 : quiesce  ( -- )
+   usb-quiet
    teardown-mux-io
    timers-off
-   usb-quiet
+   unload-crypto
    close-ec
    \ Change the sleep state of EC_SPI_ACK from 1 (OFW value) to 0 (Linux value)