Fixes to problems with the config tool.

This commit is contained in:
Ronald G. Minnich 2001-01-11 04:03:42 +00:00
parent ede94585e0
commit c3b0e127ed
2 changed files with 19 additions and 9 deletions

View file

@ -160,6 +160,10 @@ o You now need to figure out where you want to put your build images.
# Kernel command line parameters # Kernel command line parameters
commandline root=/dev/hda1 commandline root=/dev/hda1
# We're using disk on chip. Tell it where to find the docipl code
docipl northsouthbridge/sis/630
The target command names the build directory. The mainboard command The target command names the build directory. The mainboard command
names the mainboard. We have set options for a serial console which names the mainboard. We have set options for a serial console which

View file

@ -146,14 +146,14 @@ def makerule(dir, rule):
cmd = "([^" + wspc + "]*)" cmd = "([^" + wspc + "]*)"
namepat = "(.*)" namepat = "(.*)"
pat = cmd + w + ":" + w + namepat + w + ";" + w + rest + w pat = cmd + w + ":" + w + namepat + w + ";" + w + rest + w
print "pat :", pat, ":", rule # print "pat :", pat, ":", rule
command_re = re.compile(pat) command_re = re.compile(pat)
m = command_re.match(rule) m = command_re.match(rule)
rulename = m.group(1) rulename = m.group(1)
dependencies = m.group(2) dependencies = m.group(2)
actions = m.group(3) actions = m.group(3)
print "rulename :", rulename, ": deps:", dependencies,":" # print "rulename :", rulename, ": deps:", dependencies,":"
print " actions ", actions # print " actions ", actions
makebaserules[rulename] = [dependencies] makebaserules[rulename] = [dependencies]
makebaserules[rulename].append(actions) makebaserules[rulename].append(actions)
@ -164,13 +164,13 @@ def addaction(dir, rule):
namepat = "(.*)" namepat = "(.*)"
cmd = "([^" + wspc + "]*)" cmd = "([^" + wspc + "]*)"
pat = cmd + w + rest + w pat = cmd + w + rest + w
print "pat :", pat, ":", rule # print "pat :", pat, ":", rule
command_re = re.compile(pat) command_re = re.compile(pat)
m = command_re.match(rule) m = command_re.match(rule)
rulename = m.group(1) rulename = m.group(1)
actions = m.group(2) actions = m.group(2)
print "rulename :", rulename # print "rulename :", rulename
print " actions ", actions # print " actions ", actions
makebaserules[rulename].append(actions) makebaserules[rulename].append(actions)
# add a dependency # add a dependency
@ -181,13 +181,13 @@ def adddepend(dir, rule):
namepat = "(.*)" namepat = "(.*)"
cmd = "([^" + wspc + "]*)" cmd = "([^" + wspc + "]*)"
pat = cmd + w + rest + w pat = cmd + w + rest + w
print "pat :", pat, ":", rule # print "pat :", pat, ":", rule
command_re = re.compile(pat) command_re = re.compile(pat)
m = command_re.match(rule) m = command_re.match(rule)
rulename = m.group(1) rulename = m.group(1)
depend = m.group(2) depend = m.group(2)
print "rulename :", rulename # print "rulename :", rulename
print " depend ", depend # print " depend ", depend
makebaserules[rulename][0] = makebaserules[rulename][0] + " " + depend makebaserules[rulename][0] = makebaserules[rulename][0] + " " + depend
def makedefine(dir, rule): def makedefine(dir, rule):
@ -205,6 +205,7 @@ def commandline(dir, command):
# we do all these rules by hand because docipl will always be special # we do all these rules by hand because docipl will always be special
# it's more or less a stand-alone bootstrap # it's more or less a stand-alone bootstrap
def docipl(dir, ipl_name): def docipl(dir, ipl_name):
global data, bss, stack, linuxbiosbase
mainboard = command_vals['mainboard'] mainboard = command_vals['mainboard']
mainboard_dir = os.path.join(treetop, 'src', mainboard) mainboard_dir = os.path.join(treetop, 'src', mainboard)
# add the docipl rule # add the docipl rule
@ -216,6 +217,11 @@ def docipl(dir, ipl_name):
userrules.append("ipl.o: " + iplpath) userrules.append("ipl.o: " + iplpath)
# Now we need a mainboard-specific include path # Now we need a mainboard-specific include path
userrules.append("\tcc $(CPUFLAGS) -I%s -c $<" % mainboard_dir) userrules.append("\tcc $(CPUFLAGS) -I%s -c $<" % mainboard_dir)
# now set new values for the ldscript.ld. Should be a script?
data = 0x4000
bss = 0x5000
stack = 0x90000
linuxbiosbase = 0x80000
def linux(dir, linux_name): def linux(dir, linux_name):
linuxrule = 'LINUX=' + linux_name linuxrule = 'LINUX=' + linux_name