[OpenBIOS] r383 - in cpu/x86/pc: biosload lxdevel olpc

[svn at openbios.org]

Author: wmb
Date: 2007-05-16 10:34:28 +0200 (Wed, 16 May 2007)
New Revision: 383

Modified:
   cpu/x86/pc/biosload/config.fth
   cpu/x86/pc/biosload/ofw.bth
   cpu/x86/pc/lxdevel/config.fth
   cpu/x86/pc/olpc/config.fth
   cpu/x86/pc/olpc/devices.fth
Log:
OLPC - removed some unnecessary configuration options - just cleanup.




Modified: cpu/x86/pc/biosload/config.fth
===================================================================
--- cpu/x86/pc/biosload/config.fth	2007-05-16 08:32:24 UTC (rev 382)
+++ cpu/x86/pc/biosload/config.fth	2007-05-16 08:34:28 UTC (rev 383)
@@ -60,7 +60,6 @@
 create use-elf
 create use-ne2000
 create use-watch-all
-create usb-support
 create use-null-nvram
 create no-floppy-node
 [then]

Modified: cpu/x86/pc/biosload/ofw.bth
===================================================================
--- cpu/x86/pc/biosload/ofw.bth	2007-05-16 08:32:24 UTC (rev 382)
+++ cpu/x86/pc/biosload/ofw.bth	2007-05-16 08:34:28 UTC (rev 383)
@@ -72,7 +72,6 @@
    " fw.img"                                    " firmware"        $add-deflated-dropin
    " ${BP}/dev/pci/build/pcibridg.fc"           " class060400"     $add-deflated-dropin
 
-[ifdef] usb-support
    " ${BP}/dev/usb2/hcd/uhci/build/uhci.fc"	" class0c0300"     $add-deflated-dropin
    " ${BP}/dev/usb2/hcd/ohci/build/ohci.fc"	" class0c0310"     $add-deflated-dropin
    " ${BP}/dev/usb2/hcd/ehci/build/ehci.fc"	" class0c0320"     $add-deflated-dropin
@@ -82,7 +81,6 @@
 \  " ${BP}/dev/usb2/device/net/build/usbnet.fc"         " usbnet"      $add-deflated-dropin
    " ${BP}/dev/usb2/device/serial/build/usbserial.fc"   " usbserial"   $add-deflated-dropin
    " ${BP}/dev/usb2/device/storage/build/usbstorage.fc" " usbstorage"  $add-deflated-dropin
-[then]
 
    " builton.fth"                       " probe-"          $add-dropin
 [ifndef] resident-packages

Modified: cpu/x86/pc/lxdevel/config.fth
===================================================================
--- cpu/x86/pc/lxdevel/config.fth	2007-05-16 08:32:24 UTC (rev 382)
+++ cpu/x86/pc/lxdevel/config.fth	2007-05-16 08:34:28 UTC (rev 383)
@@ -32,9 +32,6 @@
 create jffs2-support
 create use-elf
 
-create cafe-support
-create usb-support
-
 \ create use-timestamp-counter \ Use CPU's timestamp counter for timing ...
 			\ ... this is worthwhile if your CPU has one.
 

Modified: cpu/x86/pc/olpc/config.fth
===================================================================
--- cpu/x86/pc/olpc/config.fth	2007-05-16 08:32:24 UTC (rev 382)
+++ cpu/x86/pc/olpc/config.fth	2007-05-16 08:34:28 UTC (rev 383)
@@ -30,10 +30,6 @@
 create jffs2-support
 create use-elf
 
-create cafe-support
-create usb-support
-create spi-flash-support
-
 \ create use-timestamp-counter \ Use CPU's timestamp counter for timing ...
 			\ ... this is worthwhile if your CPU has one.
 

Modified: cpu/x86/pc/olpc/devices.fth
===================================================================
--- cpu/x86/pc/olpc/devices.fth	2007-05-16 08:32:24 UTC (rev 382)
+++ cpu/x86/pc/olpc/devices.fth	2007-05-16 08:34:28 UTC (rev 383)
@@ -222,7 +222,6 @@
 
 \needs md5init  fload ${BP}/ofw/ppp/md5.fth                \ MD5 hash
 
-[ifdef] spi-flash-support
 fload ${BP}/dev/olpc/kb3700/ecspi.fth      \ EC chip SPI FLASH access
 
 warning @ warning off
@@ -286,8 +285,6 @@
 
 fload ${BP}/dev/geode/lpcflash.fth           \ Reflasher for PLCC FLASH on A-test
 
-[then]
-
 : +i encode-int encode+  ;  : 0+i  0 +i  ;
 
 fload ${BP}/cpu/x86/fb16-ops.fth