From 0f28460efbf4548c8bcfc2b20419f8375cd231c7 Mon Sep 17 00:00:00 2001
From: "Ronald G. Minnich" <rminnich@gmail.com>
Date: Wed, 25 Jun 2003 03:20:22 +0000
Subject: more fixes but it appears that options are not picking up the right
 values.

I set USE_FALLBACK_IMAGE to 1 in the top-level Config, but when it is tested
in arima/hdama/Config.lb, it is acting as though it is zero.

Also added a print command so it is easier to trace 'if' behavior.

Usage:
print "string"


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

diff --git a/src/mainboard/arima/hdama/Config.lb b/src/mainboard/arima/hdama/Config.lb
index a7ae2dea93..95abddd0c0 100644
--- a/src/mainboard/arima/hdama/Config.lb
+++ b/src/mainboard/arima/hdama/Config.lb
@@ -34,6 +34,7 @@ ldscript /cpu/i386/entry32.lds
 ### Build our reset vector (This is where linuxBIOS is entered)
 ###
 if USE_FALLBACK_IMAGE 
+  print "Use fallback!"
   mainboardinit cpu/i386/reset16.inc 
   ldscript /cpu/i386/reset16.lds 
 end
diff --git a/targets/arima/hdama/Config.lb b/targets/arima/hdama/Config.lb
index bd20788f1f..e819cfa64e 100644
--- a/targets/arima/hdama/Config.lb
+++ b/targets/arima/hdama/Config.lb
@@ -42,6 +42,7 @@ uses SIO_SYSTEM_CLK_INPUT
 uses STACK_SIZE
 uses USE_ELF_BOOT
 uses USE_FALLBACK_IMAGE
+uses USE_NORMAL_IMAGE
 uses USE_OPTION_TABLE
 uses HAVE_OPTION_TABLE
 
@@ -64,7 +65,9 @@ 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 USE_NORMAL_IMAGE=0
 #
 ###
 ### Build code to export a programmable irq routing table
@@ -125,14 +128,14 @@ 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.
 ###
-#if USE_FALLBACK_IMAGE 
-#  option ROM_SECTION_SIZE  = FALLBACK_SIZE
-#  option ROM_SECTION_OFFSET= (ROM_SIZE - FALLBACK_SIZE)
-#end
-#if USE_NORMAL_IMAGE
-#  option ROM_SECTION_SIZE  = (ROM_SIZE - FALLBACK_SIZE)
-#  option ROM_SECTION_OFFSET= 0
-#end
+if USE_FALLBACK_IMAGE 
+  option ROM_SECTION_SIZE  = FALLBACK_SIZE
+  option ROM_SECTION_OFFSET= (ROM_SIZE - FALLBACK_SIZE)
+end
+if USE_NORMAL_IMAGE
+  option ROM_SECTION_SIZE  = (ROM_SIZE - FALLBACK_SIZE)
+  option ROM_SECTION_OFFSET= 0
+end
 ###
 ### Compute where this copy of linuxBIOS will start in the boot rom
 ###
diff --git a/util/newconfig/config.g b/util/newconfig/config.g
index 0b96569889..e6a3787f62 100644
--- a/util/newconfig/config.g
+++ b/util/newconfig/config.g
@@ -955,6 +955,7 @@ parser Config:
     token OPTION:		'option'
     token PAYLOAD:		'payload'
     token PMC:			'pmc'
+    token PRINT:		'print'
     token REGISTER:		'register'
     token SOUTHBRIDGE:		'southbridge'
     token SUPERIO:		'superio'
@@ -1084,6 +1085,7 @@ parser Config:
 		|	dir<<C>>		{{ return dir}}
 		|	ldscript<<C>>		{{ return ldscript}}
 		|	payload<<C>>		{{ return payload}}
+		| 	pprint<<C>>		{{ return pprint}}
 
     # ENTRY for parsing Config.lb file
     rule cfgfile:	(uses<<1>>)* (stmt<<1>>)*
@@ -1104,6 +1106,8 @@ parser Config:
 
     rule opstmt:	option<<1>>
 		|	opif
+    # print clashes with a python keyword
+    rule pprint<<C>>:   PRINT STR		{{ if (C): print "%s\n"%STR}}
 
     # ENTRY for parsing a delayed value
     rule delexpr:	"{" expr "}"		{{ return expr }}
-- 
cgit v1.2.3