From db59928fd93080e5376e45f7dcf7ddee0262e336 Mon Sep 17 00:00:00 2001
From: "Ronald G. Minnich" <rminnich@gmail.com>
Date: Thu, 26 Jun 2003 04:05:37 +0000
Subject: OK, now builds fallback for arima/hdama!

git-svn-id: svn://svn.coreboot.org/coreboot/trunk@917 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
---
 src/mainboard/amd/solo/Config.lb    |  4 +++-
 src/mainboard/arima/hdama/Config.lb |  8 ++++++--
 targets/arima/hdama/Config.lb       | 16 +++++-----------
 util/newconfig/config.g             |  2 +-
 4 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/src/mainboard/amd/solo/Config.lb b/src/mainboard/amd/solo/Config.lb
index 107e6ad4aa..f237a5cbea 100644
--- a/src/mainboard/amd/solo/Config.lb
+++ b/src/mainboard/amd/solo/Config.lb
@@ -241,7 +241,9 @@ ldscript /arch/i386/lib/id.lds
 #### failover to another image.
 ####
 option MAX_REBOOT_CNT=2
-##ldscript arch/i386/lib/failover.lds USE_FALLBACK_IMAGE
+if USE_FALLBACK_IMAGE
+  ldscript /arch/i386/lib/failover.lds 
+end
 #
 ###
 ### Setup our mtrrs
diff --git a/src/mainboard/arima/hdama/Config.lb b/src/mainboard/arima/hdama/Config.lb
index 95abddd0c0..38827109e6 100644
--- a/src/mainboard/arima/hdama/Config.lb
+++ b/src/mainboard/arima/hdama/Config.lb
@@ -37,6 +37,8 @@ if USE_FALLBACK_IMAGE
   print "Use fallback!"
   mainboardinit cpu/i386/reset16.inc 
   ldscript /cpu/i386/reset16.lds 
+else
+  print "NO FALLBACK USED!"
 end
 
 if USE_NORMAL_IMAGE
@@ -45,7 +47,7 @@ if USE_NORMAL_IMAGE
 end
 #
 #### Should this be in the northbridge code?
-#mainboardinit archi386/lib/cpu_reset.inc
+mainboardinit arch/i386/lib/cpu_reset.inc
 #
 ###
 ### Include an id string (For safe flashing)
@@ -59,7 +61,9 @@ ldscript /arch/i386/lib/id.lds
 #### failover to another image.
 ####
 #option MAX_REBOOT_CNT=2
-##ldscript arch/i386/lib/failover.lds USE_FALLBACK_IMAGE
+if USE_FALLBACK_IMAGE
+  ldscript /arch/i386/lib/failover.lds 
+end
 #
 ###
 ### Setup our mtrrs
diff --git a/targets/arima/hdama/Config.lb b/targets/arima/hdama/Config.lb
index e819cfa64e..1571d42acf 100644
--- a/targets/arima/hdama/Config.lb
+++ b/targets/arima/hdama/Config.lb
@@ -55,7 +55,7 @@ option i586=1
 option INTEL_PPRO_MTRR=1
 option k7=1
 option k8=1
-
+option ROM_SIZE=524288
 
 ### Customize our winbond superio chip for this motherboard
 ###
@@ -66,7 +66,7 @@ option SIO_SYSTEM_CLK_INPUT=0
 ### Build code for the fallback boot
 ###
 # at some point it will be possible to set both of these to 1.
-option HAVE_FALLBACK_BOOT=1
+option HAVE_FALLBACK_BOOT=0
 option USE_NORMAL_IMAGE=0
 #
 ###
@@ -117,7 +117,7 @@ option ENABLE_FIXED_AND_VARIABLE_MTRRS=1
 ### Call the final_mainboard_fixup function
 ###
 option FINAL_MAINBOARD_FIXUP=1
-option USE_FALLBACK_IMAGE=0
+option USE_FALLBACK_IMAGE=1
 
 ###
 ### Only use the option table in a normal image
@@ -128,7 +128,9 @@ option USE_OPTION_TABLE=!USE_FALLBACK_IMAGE
 ### Compute the location and size of where this firmware image
 ### (linuxBIOS plus bootloader) will live in the boot rom chip.
 ###
+#option FALLBACK_SIZE=524288
 if USE_FALLBACK_IMAGE 
+  print "Using fallback ROM setup"
   option ROM_SECTION_SIZE  = FALLBACK_SIZE
   option ROM_SECTION_OFFSET= (ROM_SIZE - FALLBACK_SIZE)
 end
@@ -158,8 +160,6 @@ option CONFIG_COMPRESS=0
 
 option USE_ELF_BOOT=1
 
-option ROM_SIZE=524288
-
 ## ROM_IMAGE_SIZE is the amount of space to allow linuxBIOS to occupy.
 option ROM_IMAGE_SIZE=49152
 
@@ -176,12 +176,6 @@ option STACK_SIZE=0x10000
 ##
 option HEAP_SIZE=0x10000
 
-## Compute the location and size of where this firmware image
-## (linuxBIOS plus bootloader) will live in the boot rom chip.
-##       
-option ROM_SECTION_SIZE=ROM_SIZE
-option ROM_SECTION_OFFSET=0
-
 #
 ###
 ### Compute the start location and size size of
diff --git a/util/newconfig/config.g b/util/newconfig/config.g
index 41e0726e9f..4b82eba356 100644
--- a/util/newconfig/config.g
+++ b/util/newconfig/config.g
@@ -282,7 +282,7 @@ class partobj:
 		o.setused()
 		setvalue(self.options, name, o)
 		if (debug):
-			print "option %s used in %s" % (name, self)
+			print "option %s used in %s " % (name, self)
 
 class partsstack:
 	def __init__ (self):
-- 
cgit v1.2.3