GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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
This commit is contained in:
Ronald G. Minnich 2003-06-25 03:20:22 +00:00
parent ed27a5e547
commit 0f28460efb
3 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/mainboard/arima/hdama/Config.lb
View File

@ -34,6 +34,7 @@ ldscript /cpu/i386/entry32.lds
### Build our reset vector (This is where linuxBIOS is entered) ### Build our reset vector (This is where linuxBIOS is entered)
### ###
if USE_FALLBACK_IMAGE if USE_FALLBACK_IMAGE
print "Use fallback!"
mainboardinit cpu/i386/reset16.inc mainboardinit cpu/i386/reset16.inc
ldscript /cpu/i386/reset16.lds ldscript /cpu/i386/reset16.lds
end end

19
targets/arima/hdama/Config.lb
View File

@ -42,6 +42,7 @@ uses SIO_SYSTEM_CLK_INPUT
uses STACK_SIZE uses STACK_SIZE
uses USE_ELF_BOOT uses USE_ELF_BOOT
uses USE_FALLBACK_IMAGE uses USE_FALLBACK_IMAGE
uses USE_NORMAL_IMAGE
uses USE_OPTION_TABLE uses USE_OPTION_TABLE
uses HAVE_OPTION_TABLE uses HAVE_OPTION_TABLE
@ -64,7 +65,9 @@ option SIO_SYSTEM_CLK_INPUT=0
### ###
### Build code for the fallback boot ### 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=1
option USE_NORMAL_IMAGE=0
# #
### ###
### Build code to export a programmable irq routing table ### 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 ### Compute the location and size of where this firmware image
### (linuxBIOS plus bootloader) will live in the boot rom chip. ### (linuxBIOS plus bootloader) will live in the boot rom chip.
### ###
#if USE_FALLBACK_IMAGE if USE_FALLBACK_IMAGE
# option ROM_SECTION_SIZE = FALLBACK_SIZE option ROM_SECTION_SIZE = FALLBACK_SIZE
# option ROM_SECTION_OFFSET= (ROM_SIZE - FALLBACK_SIZE) option ROM_SECTION_OFFSET= (ROM_SIZE - FALLBACK_SIZE)
#end end
#if USE_NORMAL_IMAGE if USE_NORMAL_IMAGE
# option ROM_SECTION_SIZE = (ROM_SIZE - FALLBACK_SIZE) option ROM_SECTION_SIZE = (ROM_SIZE - FALLBACK_SIZE)
# option ROM_SECTION_OFFSET= 0 option ROM_SECTION_OFFSET= 0
#end end
### ###
### Compute where this copy of linuxBIOS will start in the boot rom ### Compute where this copy of linuxBIOS will start in the boot rom
### ###

4
util/newconfig/config.g
View File

@ -955,6 +955,7 @@ parser Config:
token OPTION: 'option' token OPTION: 'option'
token PAYLOAD: 'payload' token PAYLOAD: 'payload'
token PMC: 'pmc' token PMC: 'pmc'
token PRINT: 'print'
token REGISTER: 'register' token REGISTER: 'register'
token SOUTHBRIDGE: 'southbridge' token SOUTHBRIDGE: 'southbridge'
token SUPERIO: 'superio' token SUPERIO: 'superio'
@ -1084,6 +1085,7 @@ parser Config:
| dir<<C>> {{ return dir}} | dir<<C>> {{ return dir}}
| ldscript<<C>> {{ return ldscript}} | ldscript<<C>> {{ return ldscript}}
| payload<<C>> {{ return payload}} | payload<<C>> {{ return payload}}
| pprint<<C>> {{ return pprint}}
# ENTRY for parsing Config.lb file # ENTRY for parsing Config.lb file
rule cfgfile: (uses<<1>>)* (stmt<<1>>)* rule cfgfile: (uses<<1>>)* (stmt<<1>>)*
@ -1104,6 +1106,8 @@ parser Config:
rule opstmt: option<<1>> rule opstmt: option<<1>>
| opif | opif
# print clashes with a python keyword
rule pprint<<C>>: PRINT STR {{ if (C): print "%s\n"%STR}}
# ENTRY for parsing a delayed value # ENTRY for parsing a delayed value
rule delexpr: "{" expr "}" {{ return expr }} rule delexpr: "{" expr "}" {{ return expr }}