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

allow default settings in the mainboard file 

git-svn-id: svn://svn.coreboot.org/coreboot/trunk@1137 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
This commit is contained in:
Ronald G. Minnich 2003-09-25 23:03:18 +00:00
parent 3ff7bdaad7
commit 10941401e8
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
util/newconfig/config.g
View File

@ -1135,7 +1135,10 @@ def part(type, path, file, name):
if (type == 'cpu'): if (type == 'cpu'):
cpudir(path) cpudir(path)
else: else:
doconfigfile(srcdir, partdir, file) if (type == 'mainboard'):
doconfigfile(srcdir, partdir, file, 'mainboard_cfgfile')
else:
doconfigfile(srcdir, partdir, file, 'cfgfile')
def partpop(): def partpop():
global dirstack, partstack global dirstack, partstack
@ -1163,7 +1166,7 @@ def dodir(path, file):
fullpath = dirstack.tos() fullpath = dirstack.tos()
debug.info(debug.statement, "DODIR: path %s, fullpath %s" % (path, fullpath)) debug.info(debug.statement, "DODIR: path %s, fullpath %s" % (path, fullpath))
dirstack.push(os.path.join(fullpath, path)) dirstack.push(os.path.join(fullpath, path))
doconfigfile(fullpath, path, file) doconfigfile(fullpath, path, file, 'cfgfile')
dirstack.pop() dirstack.pop()
def lookup(name): def lookup(name):
@ -1195,12 +1198,12 @@ def setarch(my_arch):
setoption('ARCH', my_arch) setoption('ARCH', my_arch)
part('arch', my_arch, 'Config.lb', 0) part('arch', my_arch, 'Config.lb', 0)
def doconfigfile(path, confdir, file): def doconfigfile(path, confdir, file, rule):
rname = os.path.join(confdir, file) rname = os.path.join(confdir, file)
loc.push(rname) loc.push(rname)
fullpath = os.path.join(path, rname) fullpath = os.path.join(path, rname)
fp = safe_open(fullpath, 'r') fp = safe_open(fullpath, 'r')
if (not parse('cfgfile', fp.read())): if (not parse(rule, fp.read())):
fatal("Could not parse file") fatal("Could not parse file")
exitiferrors() exitiferrors()
loc.pop() loc.pop()
@ -1482,6 +1485,12 @@ parser Config:
rule cfgfile: (uses<<1>>)* rule cfgfile: (uses<<1>>)*
(stmt<<1>>)* (stmt<<1>>)*
EOF {{ return 1 }} EOF {{ return 1 }}
#mainboard config files are special, in that they can also have
# default values.
rule mainboard_cfgfile: (uses<<1>>)*
(defstmts<<1>>)*
(stmt<<1>>)*
EOF {{ return 1 }}
rule usesid<<C>>: ID {{ if (C): usesoption(ID) }} rule usesid<<C>>: ID {{ if (C): usesoption(ID) }}