Changeset 2790


Ignore:
Timestamp:
Dec 31, 2011, 9:01:51 PM (3 years 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:
3 edited

Legend:

Unmodified
Added
Removed
  • cpu/arm/olpc/1.75/usb.fth

    r2715 r2790  
    125125;
    126126
     127: usb-quiet  ( -- )
     128   detach-usb-keyboard
     129   " /usb" " reset-usb" execute-device-method drop
     130;
     131
    127132: suspend-usb  ( -- )
    128133   detach-usb-keyboard
  • cpu/arm/olpc/3.0/usb.fth

    r2746 r2790  
    163163      add-input
    164164   then
     165;
     166
     167: usb-quiet  ( -- )
     168   detach-usb-keyboard
     169   " /usb@f0003000" " reset-usb" execute-device-method drop
     170   " /usb@d4208000" " reset-usb" execute-device-method drop
    165171;
    166172
  • cpu/arm/olpc/build-fw.fth

    r2786 r2790  
    362362fload ${BP}/cpu/arm/marvell/utmiphy.fth
    363363
     364fload ${BP}/cpu/arm/linux.fth
     365
    364366\+ olpc-cl2 fload ${BP}/cpu/arm/olpc/1.75/usb.fth
    365367\+ olpc-cl3 fload ${BP}/cpu/arm/mmp2/ulpiphy.fth
     
    425427[then]
    426428
    427 fload ${BP}/cpu/arm/linux.fth
    428 
    429429\ The bottom of extra-mem is the top of DMA memory.
    430430\ We give everything up to that address to Linux.
    431431: olpc-memory-limit  ( -- adr )  extra-mem-va >physical  ;
    432432' olpc-memory-limit to memory-limit
    433 
    434 : usb-quiet  ( -- )
    435    [ ' linux-hook behavior compile, ]    \ Chain to old behavior
    436    unload-crypto
    437    " /usb" " reset-usb" execute-device-method drop
    438 ;
    439433
    440434\+ olpc-cl2 d#  9999 to arm-linux-machine-type  \ XO-1.75
     
    600594;
    601595: quiesce  ( -- )
     596   usb-quiet
    602597   teardown-mux-io
    603598   timers-off
    604    usb-quiet
     599   unload-crypto
    605600   close-ec
    606601   \ Change the sleep state of EC_SPI_ACK from 1 (OFW value) to 0 (Linux value)
Note: See TracChangeset for help on using the changeset viewer.