Author: wmb Date: 2007-05-16 10:50:49 +0200 (Wed, 16 May 2007) New Revision: 386
Modified: cpu/x86/pc/olpc/linux.fth cpu/x86/pc/olpc/loaddropins.fth cpu/x86/pc/olpc/usb.fth Log: OLPC - Fixed some problems with auto-booting from ethernet and wireless network interfaces.
Modified: cpu/x86/pc/olpc/linux.fth =================================================================== --- cpu/x86/pc/olpc/linux.fth 2007-05-16 08:37:18 UTC (rev 385) +++ cpu/x86/pc/olpc/linux.fth 2007-05-16 08:50:49 UTC (rev 386) @@ -11,7 +11,7 @@
\needs ramdisk " " d# 128 config-string ramdisk " " ' boot-file set-config-string-default \ Let the olpcboot.fth file set the cmdline -" sd:\boot\olpc.fth disk:\boot\olpc.fth nand:zip,\olpc.fth nand:\boot\olpc.fth" ' boot-device set-config-string-default +" sd:\boot\olpc.fth disk:\boot\olpc.fth nand:\boot\olpc.fth /prober /usb/ethernet /usb/wlan" ' boot-device set-config-string-default
0 value ramdisk-adr 0 value /ramdisk
Modified: cpu/x86/pc/olpc/loaddropins.fth =================================================================== --- cpu/x86/pc/olpc/loaddropins.fth 2007-05-16 08:37:18 UTC (rev 385) +++ cpu/x86/pc/olpc/loaddropins.fth 2007-05-16 08:50:49 UTC (rev 386) @@ -33,9 +33,9 @@ \ " ${BP}/ofw/linux/logom16c.bmp" " timeout.bmp" $add-deflated-dropin " ${BP}/cpu/x86/pc/olpc/images/olpclogo.565" " olpc.565" $add-deflated-dropin " ${BP}/cpu/x86/pc/olpc/images/laptop.565" " nandflash.565" $add-deflated-dropin - " ${BP}/cpu/x86/pc/olpc/images/network.565" " network.565" $add-deflated-dropin + " ${BP}/cpu/x86/pc/olpc/images/network.565" " ethernet.565" $add-deflated-dropin " ${BP}/cpu/x86/pc/olpc/images/usbkey.565" " disk.565" $add-deflated-dropin - " ${BP}/cpu/x86/pc/olpc/images/wireless.565" " wireless.565" $add-deflated-dropin + " ${BP}/cpu/x86/pc/olpc/images/wireless.565" " wlan.565" $add-deflated-dropin " ${BP}/cpu/x86/pc/olpc/images/xo.565" " xo.565" $add-deflated-dropin
" ${BP}/ofw/termemu/gallant.obf" " font" $add-deflated-dropin
Modified: cpu/x86/pc/olpc/usb.fth =================================================================== --- cpu/x86/pc/olpc/usb.fth 2007-05-16 08:37:18 UTC (rev 385) +++ cpu/x86/pc/olpc/usb.fth 2007-05-16 08:50:49 UTC (rev 386) @@ -3,8 +3,8 @@
devalias usb1 /usb@f,4 devalias usb2 /usb@f,5 -devalias u /usb/disk -devalias net /wlan +devalias u /usb/disk +devalias net /usb/wlan
\ If there is a USB ethernet adapter, use it as the default net device. : report-net ( -- ) @@ -89,6 +89,19 @@ ; ' usb-quiet to go-hook
+0 0 " " " /" begin-package + " prober" device-name + : open + " /usb@f,5" open-dev ?dup if close-dev then + " /usb@f,4" open-dev ?dup if close-dev then + report-disk + report-net + report-keyboard + false + ; + : close ; +end-package + stand-init: USB setup \ Set up an address routing to the USB Option Controller h# efc00000.efc00001. h# 5100.0029 wrmsr