[coreboot] r56 - in trunk/filo: . configs main

[svn at coreboot.org]

Author: stepan
Date: 2008-08-29 15:43:47 +0200 (Fri, 29 Aug 2008)
New Revision: 56

Modified:
   trunk/filo/
   trunk/filo/configs/defconfig
   trunk/filo/main/filo.c
Log:
* get libpayload via svn:externals for now
* disable libpayload based usb for now



Property changes on: trunk/filo
___________________________________________________________________
Added: svn:externals
   + libpayload svn://coreboot.org/repos/trunk/payloads/libpayload


Modified: trunk/filo/configs/defconfig
===================================================================
--- trunk/filo/configs/defconfig	2008-08-29 13:36:25 UTC (rev 55)
+++ trunk/filo/configs/defconfig	2008-08-29 13:43:47 UTC (rev 56)
@@ -22,7 +22,7 @@
 CONFIG_IDE_DISK_POLL_DELAY=0
 # CONFIG_SLOW_SATA is not set
 # CONFIG_PCMCIA_CF is not set
-CONFIG_USB_NEW_DISK=y
+# CONFIG_USB_NEW_DISK is not set
 # CONFIG_USB_DISK is not set
 # CONFIG_FLASH_DISK is not set
 CONFIG_SUPPORT_PCI=y

Modified: trunk/filo/main/filo.c
===================================================================
--- trunk/filo/main/filo.c	2008-08-29 13:36:25 UTC (rev 55)
+++ trunk/filo/main/filo.c	2008-08-29 13:43:47 UTC (rev 56)
@@ -57,7 +57,10 @@
     printf("%s version %s\n", program_name, program_version);
     collect_sys_info(&sys_info);
     relocate();
+
+#if defined(CONFIG_USB_DISK) || defined(CONFIG_USB_NEW_DISK)
     usb_initialize();
+#endif
 
 #ifdef CONFIG_SUPPORT_SOUND
     sound_init();