[coreboot] r140 - in buildrom-devel/packages/filo: . conf patches

[svn at coreboot.org]

Author: ward
Date: 2008-03-29 19:22:02 +0100 (Sat, 29 Mar 2008)
New Revision: 140

Removed:
   buildrom-devel/packages/filo/patches/sata-spinup-delay.patch
Modified:
   buildrom-devel/packages/filo/conf/m57sli-Config
   buildrom-devel/packages/filo/filo.mk
Log:
This patch updates buildrom to use the latest filo revision, which includes the
SLOW_SATA option. It also modifies the m57sli filo config file to set that
flag, and removes the filo sata patch we were applying to achieve the same
thing.

Tested on real hardware.

Signed-off-by: Ward Vandewege <ward at gnu.org>
Acked-by: Jordan Crouse <jordan.crouse at amd.com>



Modified: buildrom-devel/packages/filo/conf/m57sli-Config
===================================================================
--- buildrom-devel/packages/filo/conf/m57sli-Config	2008-03-17 17:42:24 UTC (rev 139)
+++ buildrom-devel/packages/filo/conf/m57sli-Config	2008-03-29 18:22:02 UTC (rev 140)
@@ -7,6 +7,8 @@
 # Add a short delay when polling status registers
 # (required on some broken SATA controllers)
 IDE_DISK_POLL_DELAY = 1
+# Wait 5 seconds to allow the sata disks to spin up
+SLOW_SATA = 1
 # Driver for USB Storage
 USB_DISK = 1
 # VGA text console

Modified: buildrom-devel/packages/filo/filo.mk
===================================================================
--- buildrom-devel/packages/filo/filo.mk	2008-03-17 17:42:24 UTC (rev 139)
+++ buildrom-devel/packages/filo/filo.mk	2008-03-29 18:22:02 UTC (rev 140)
@@ -1,5 +1,5 @@
 FILO_URL=svn://coreboot.org/filo/trunk/filo-0.5
-FILO_TAG=42
+FILO_TAG=44
 
 FILO_DIR=$(BUILD_DIR)/filo
 FILO_SRC_DIR=$(FILO_DIR)/svn
@@ -8,11 +8,6 @@
 
 FILO_PATCHES=$(PACKAGE_DIR)/filo/patches/make.patch
 
-ifeq ($(CONFIG_PLATFORM_GA_M57SLI_S4),y)
-	FILO_PATCHES += $(PACKAGE_DIR)/filo/patches/sata-spinup-delay.patch
-endif
-
-
 ifeq ($(CONFIG_VERBOSE),y)
 FILO_FETCH_LOG=/dev/stdout
 FILO_BUILD_LOG=/dev/stdout

Deleted: buildrom-devel/packages/filo/patches/sata-spinup-delay.patch
===================================================================
--- buildrom-devel/packages/filo/patches/sata-spinup-delay.patch	2008-03-17 17:42:24 UTC (rev 139)
+++ buildrom-devel/packages/filo/patches/sata-spinup-delay.patch	2008-03-29 18:22:02 UTC (rev 140)
@@ -1,12 +0,0 @@
-Index: main/filo.c
-===================================================================
---- svn/main/filo.c (revision 34)
-+++ svn/main/filo.c (working copy)
-@@ -60,6 +60,7 @@
-     
-     /* Initialize */
-     init();
-+    delay (5);
-     grub_main();
-     return 0;   
- }