[openfirmware] r1355 - cpu/x86/pc/olpc/via

[svn at openfirmware.info]

Author: wmb
Date: 2009-09-10 10:04:30 +0200 (Thu, 10 Sep 2009)
New Revision: 1355

Modified:
   cpu/x86/pc/olpc/via/devices.fth
   cpu/x86/pc/olpc/via/fw.bth
Log:
Via - fixed fsdisk and net aliases for use with fs-update


Modified: cpu/x86/pc/olpc/via/devices.fth
===================================================================
--- cpu/x86/pc/olpc/via/devices.fth	2009-09-10 08:02:28 UTC (rev 1354)
+++ cpu/x86/pc/olpc/via/devices.fth	2009-09-10 08:04:30 UTC (rev 1355)
@@ -364,6 +364,18 @@
    " usb-keyboard"  " /usb at 10,4/keyboard" ?report-device  \ USB 2   (keyboard behind a hub)
 ;
 
+\ If there is a USB ethernet adapter, use it as the default net device.
+\ We can't use ?report-device here because we already have net aliased
+\ to /usb/wlan, and ?report-device won't override an existing alias.
+: report-net  ( -- )
+   " /usb/ethernet" 2dup locate-device  0=  if  ( name$ phandle )
+      drop                                      ( name$ )
+     " net" 2swap $devalias                     ( )
+   else                                         ( name$ )
+      2drop                                     ( )
+   then
+;
+
 [ifdef] Later
 \ Add support for DC-couple microphone input
 [then]

Modified: cpu/x86/pc/olpc/via/fw.bth
===================================================================
--- cpu/x86/pc/olpc/via/fw.bth	2009-09-10 08:02:28 UTC (rev 1354)
+++ cpu/x86/pc/olpc/via/fw.bth	2009-09-10 08:04:30 UTC (rev 1355)
@@ -470,7 +470,7 @@
 fload ${BP}/cpu/x86/pc/olpc/wifichannel.fth
 [then]
 fload ${BP}/cpu/x86/pc/olpc/via/fsupdate.fth
-devalias fsdisk /sd/disk:0
+devalias fsdisk int:0
 
 fload ${BP}/ofw/inet/sntp.fth
 : olpc-ntp-servers  ( -- )
@@ -641,8 +641,6 @@
    ['] false to interrupt-auto-boot?
    probe-usb
    " probe+" do-drop-in
-   report-disk
-   report-keyboard
 
    setup-smbios  \ Must be done after build-date is defined via do-drop-in