diff --git a/src/arch/i386/Config.lb b/src/arch/i386/Config.lb index 5cf75803f9..1e0631243f 100644 --- a/src/arch/i386/Config.lb +++ b/src/arch/i386/Config.lb @@ -1,3 +1,45 @@ +init config/crt0.base +ldscript config/ldscript.lb + +makerule all + depends "romimage" +end + +makerule floppy + depends "all" + action "mcopy -o romimage a:" +end + +makerule romimage + depends "linuxbios.rom payload.block" + action "cat payload.block linuxbios.rom > romimage" +end + +makerule nrv2b + depends "$(TOP)/util/nrv2b/nrv2b.c" + action "$(HOSTCC) -O2 -DENCODE -DDECODE -DMAIN -DVERBOSE -DNDEBUG -DBITSIZE=32 -DENDIAN=0 $< -o $@" +end + +makerule linuxbios.rom + depends "linuxbios.strip buildrom" + action "./buildrom $< $@ $(PAYLOAD) $(ROM_IMAGE_SIZE) $(ROM_SIZE)" + #action "export size=`ls -l linuxbios.strip | (read p c u g size r ; echo $$size)` ; \\" + #action "echo $$size ; \\" + #action "dd if=linuxbios.strip of=linuxbios.rom bs=1 seek=`expr $(ROM_IMAGE_SIZE) - $$size`" +end + +#makerule payload.block +# depends "$(if $(PAYLOAD),$(PAYLOAD), /dev/null)" +# action "perl -e '@stats=stat(\"$<\"); $$sz=$$stats[7]; print "\xff" x ($(PAYLOAD_SIZE) - $$sz);' | cat $< - > $@" +#end + +makerule crt0.S + depends "$(CRT0)" + action "cp $< $@" +end + +addaction clean "rm -f romimage payload.*" + dir lib dir boot dir smp diff --git a/src/config/Config.lb b/src/config/Config.lb index b1881dd9c1..9e780027b9 100644 --- a/src/config/Config.lb +++ b/src/config/Config.lb @@ -12,18 +12,36 @@ makedefine CFLAGS := $(CPU_OPT) $(CPPFLAGS) -Os -nostdinc -nostdlib -fno-builtin makedefine HOSTCFLAGS:= -Os -Wall -makerule ldscript.ld dep "ldoptions $(LDSUBSCRIPTS-1)" act " echo \"INCLUDE ldoptions\" > $@ ; for file in $(LDSUBSCRIPTS-1) ; do echo \"INCLUDE $$file\" >> $@ ; done" +makerule ldscript.ld + depends "ldoptions $(LDSUBSCRIPTS-1)" + action "echo \"INCLUDE ldoptions\" > $@ ; for file in $(LDSUBSCRIPTS-1) ; do echo \"INCLUDE $$file\" >> $@ ; done" +end -makerule cpuflags dep "Makefile.settings" act " perl -e 'print \"CPUFLAGS :=\n\"; foreach $$var (split(\" \", $$ENV{VARIABLES})) { if (exists($$ENV{$$var})) { print \"CPUFLAGS += -D$$var\" . (length($$ENV{$$var})?\"=\x27$$ENV{$$var}\x27\":\"\") .\"\n\"} else { print \"CPUFLAGS += -U$$var\n\"} }' > $@" +#makerule cpuflags +# depends "Makefile.settings" +# action "perl -e 'print \"CPUFLAGS :=\n\"; foreach $$var (split(\" \", $$ENV{VARIABLES})) { if (exists($$ENV{$$var})) { print \"CPUFLAGS += -D$$var\" . (length($$ENV{$$var})?\"=\x27$$ENV{$$var}\x27\":\"\") .\"\n\"} else { print \"CPUFLAGS += -U$$var\n\"} }' > $@" +#end -makerule ldoptions dep "Makefile.settings" act " perl -e 'foreach $$var (split(\" \", $$ENV{VARIABLES})) { if ($$ENV{$$var} =~ m/^(0x[0-9a-fA-F]+|0[0-7]+|[0-9]+)$$/) { print \"$$var = $$ENV{$$var};\n\"; }}' > $@" +#makerule ldoptions +# depends "Makefile.settings" +# action "perl -e 'foreach $$var (split(\" \", $$ENV{VARIABLES})) { if ($$ENV{$$var} =~ m/^(0x[0-9a-fA-F]+|0[0-7]+|[0-9]+)$$/) { print \"$$var = $$ENV{$$var};\n\"; }}' > $@" +#end -makerule linuxbios.strip dep "linuxbios" act " $(OBJCOPY) -O binary linuxbios linuxbios.strip" +makerule linuxbios.strip + depends "linuxbios" + action "$(OBJCOPY) -O binary linuxbios linuxbios.strip" +end +makerule linuxbios_c.o + depends "$(DRIVER) linuxbios.a $(LIBGCC_FILE_NAME)" + action "$(CC) -nostdlib -r -o $@ c_start.o $(DRIVER) linuxbios.a $(LIBGCC_FILE_NAME)" +end -makerule linuxbios_c.o dep "$(DRIVER) linuxbios.a $(LIBGCC_FILE_NAME)" act " $(CC) -nostdlib -r -o $@ c_start.o $(DRIVER) linuxbios.a $(LIBGCC_FILE_NAME)" - -makerule linuxbios_c dep "linuxbios_c.o $(TOP)/src/config/linuxbios_c.ld ldoptions" act " $(CC) -nostdlib -nostartfiles -static -o $@ -T $(TOP)/src/config/linuxbios_c.ld linuxbios_c.o" +makerule linuxbios_c + depends "linuxbios_c.o $(TOP)/src/config/linuxbios_c.ld ldoptions" + action "$(CC) -nostdlib -nostartfiles -static -o $@ -T $(TOP)/src/config/linuxbios_c.ld linuxbios_c.o" + action "$(CROSS_COMPILE)nm -n linuxbios_c | sort > linuxbios_c.map" +end ## ## By default compress the C part of linuxbios @@ -31,53 +49,110 @@ makerule linuxbios_c dep "linuxbios_c.o $(TOP)/src/config/linuxbios_c.ld ldopti makedefine LINUXBIOS_PAYLOAD-$(CONFIG_COMPRESS):=linuxbios_payload.nrv2b makedefine LINUXBIOS_PAYLOAD-$(CONFIG_UNCOMPRESSED):=linuxbios_payload.bin -addaction linuxbios_c "$(CROSS_COMPILE)nm -n linuxbios_c | sort > linuxbios_c.map" -makerule linuxbios_payload.bin dep "linuxbios_c" act " $(OBJCOPY) -O binary $< $@" -makerule linuxbios_payload.nrv2b dep " linuxbios_payload.bin nrv2b" act " ./nrv2b e $< $@" -makerule linuxbios_payload dep "$(LINUXBIOS_PAYLOAD-1) " act "cp $(LINUXBIOS_PAYLOAD-1) linuxbios_payload" -makerule linuxbios dep "crt0.o linuxbios_payload ldscript.ld " act "$(CC) -nostdlib -nostartfiles -static -o $@ -T ldscript.ld crt0.o" -addaction linuxbios "$(CROSS_COMPILE)nm -n linuxbios | sort > linuxbios.map" +makerule linuxbios_payload.bin + depends "linuxbios_c" + action "$(OBJCOPY) -O binary $< $@" +end -makerule linuxbios.a dep "$(OBJECTS-1) " act "rm -f linuxbios.a" -addaction linuxbios.a "ar cr linuxbios.a $(OBJECTS-1)" +makerule linuxbios_payload.nrv2b + depends "linuxbios_payload.bin nrv2b" + action "./nrv2b e $< $@" +end -makerule crt0.S dep "$(CRT0) " act "cp $< $@" +makerule linuxbios_payload + depends "$(LINUXBIOS_PAYLOAD-1)" + action "cp $(LINUXBIOS_PAYLOAD-1) linuxbios_payload" +end + +makerule linuxbios + depends "crt0.o linuxbios_payload ldscript.ld" + action "$(CC) -nostdlib -nostartfiles -static -o $@ -T ldscript.ld crt0.o" + action "$(CROSS_COMPILE)nm -n linuxbios | sort > linuxbios.map" +end + +makerule linuxbios.a + depends "$(OBJECTS-1)" + action "rm -f linuxbios.a" + action "ar cr linuxbios.a $(OBJECTS-1)" +end + +#makerule crt0.S +# depends "$(CRT0)" +# action "cp $< $@" +#end # the buildrom tool -makerule buildrom dep "$(TOP)/util/buildrom/buildrom.c" act "$(CC) -o $@ $<" +makerule buildrom + depends "$(TOP)/util/buildrom/buildrom.c" + action "$(HOSTCC) -o $@ $<" +end + # Force crt0.s (which has build time version code in it to rebuild every time) makedefine .PHONY : crt0.s -makerule crt0.s dep "crt0.S crt0_includes.h $(CRT0_INCLUDES) " act "@echo \"$(CPP) ... $< > $@ \"" -addaction crt0.s "$(CPP) $(CPPFLAGS) -I. -I$(TOP)/src $< > $@.new && mv $@.new $@ " +makerule crt0.s + depends "crt0.S $(CRT0_INCLUDES)" + action "@echo \"$(CPP) ... $< > $@ \"" + action "$(CPP) $(CPPFLAGS) -I. -I$(TOP)/src $< > $@.new && mv $@.new $@" +end -makerule crt0.o dep "crt0.s " act "@echo $(CC) ... -o $@ $<" -addaction crt0.o "@$(CC) -c $(CPU_OPT) -o $@ $<" +makerule crt0.o + depends "crt0.s $(INIT-OBJECTS)" + action "@echo $(CC) ... -o $@ $<" + action "@$(CC) -c $(CPU_OPT) -o $@ $< $(INIT-OBJECTS)" +end +makerule etags + depends "$(SOURCES)" + action "etags $(SOURCES)" +end +makerule tags + depends "$(SOURCES)" + action "ctags $(SOURCES)" +end +makerule documentation + depends "$(SOURCES)" + action "doxygen LinuxBIOSDoc.config" +end -makerule etags dep "$(SOURCES) " act "etags $(SOURCES)" -makerule tags dep "$(SOURCES) " act "ctags $(SOURCES)" -makerule documentation dep "$(SOURCES) " act "doxygen LinuxBIOSDoc.config " +makerule ./romcc + depends "$(TOP)/util/romcc/romcc.c" + action "$(HOSTCC) -g $(HOSTCFLAGS) -DVERSION='\"0.21\"' -DRELEASE_DATE='\"7 april 2003\"' $< -o $@" +end -makerule ./romcc dep "$(TOP)/util/romcc/romcc.c " act "$(HOSTCC) -g $(HOSTCFLAGS) -DVERSION='\"0.21\"' -DRELEASE_DATE='\"7 april 2003\"' $< -o $@" -makerule build_opt_tbl dep "$(TOP)/util/options/build_opt_tbl.c $(TOP)/src/include/pc80/mc146818rtc.h $(TOP)/src/include/boot/linuxbios_tables.h " act "$(HOSTCC) $(HOSTCFLAGS) $< -o $@" +makerule build_opt_tbl + depends "$(TOP)/util/options/build_opt_tbl.c $(TOP)/src/include/pc80/mc146818rtc.h $(TOP)/src/include/boot/linuxbios_tables.h" + action "$(HOSTCC) $(HOSTCFLAGS) $< -o $@" +end -#makerule /$(TARGET_DIR)/option_table.c dep "build_opt_tbl $(MAINBOARD)/cmos.layout " act "./build_opt_tbl -b --config $(MAINBOARD)/cmos.layout " -makerule option_table.c dep "build_opt_tbl $(MAINBOARD)/cmos.layout " act "./build_opt_tbl -b --config $(MAINBOARD)/cmos.layout " +#makerule /$(TARGET_DIR)/option_table.c +# depends "build_opt_tbl $(MAINBOARD)/cmos.layout" +# action "./build_opt_tbl -b --config $(MAINBOARD)/cmos.layout" +#end + +makerule option_table.c + depends "build_opt_tbl $(MAINBOARD)/cmos.layout" + action "./build_opt_tbl -b --config $(MAINBOARD)/cmos.layout" +end if HAVE_OPTION_TABLE object ./option_table.o #special rule -#makerule option_table.o dep "option_table.c" act "$(CC) -c $(CFLAGS) -o $@ $<" +#makerule option_table.o +# depends "option_table.c" +# action "$(CC) -c $(CFLAGS) -o $@ $<" +#end # object option_table.o end -makerule clean act "rm -f linuxbios.* *~" -addaction clean "rm -f linuxbios " -addaction clean "rm -f ldoptions cpuflags ldscript.ld" -addaction clean "rm -f a.out *.s *.l *.o" -addaction clean "rm -f TAGS tags" -addaction clean "rm -f docipl" -addaction clean "rm -f build_opt_tbl option_table.c crt0.S" +makerule clean + action "rm -f linuxbios.* *~" + action "rm -f linuxbios" + action "rm -f ldscript.ld" + action "rm -f a.out *.s *.l *.o" + action "rm -f TAGS tags" + action "rm -f docipl" + action "rm -f build_opt_tbl option_table.c crt0.S" +end # do standard config files that the user need not specify # for now, this is just 'lib', but it may be more later. diff --git a/src/config/Options.lb b/src/config/Options.lb index a9753473fc..8c2c4c6b99 100644 --- a/src/config/Options.lb +++ b/src/config/Options.lb @@ -102,7 +102,7 @@ define CC comment "Target C Compiler" end define HOSTCC - default "$(CROSS_COMPILE)gcc" + default "gcc" export always comment "Host C Compiler" end diff --git a/src/mainboard/arima/hdama/Config.lb b/src/mainboard/arima/hdama/Config.lb index 6ef3dcb4ff..76cec53210 100644 --- a/src/mainboard/arima/hdama/Config.lb +++ b/src/mainboard/arima/hdama/Config.lb @@ -107,8 +107,14 @@ if USE_FALLBACK_IMAGE mainboardinit arch/i386/lib/noop_failover.inc end #makerule ./failover.E dep "$(MAINBOARD)/failover.c" act "$(CPP) -I$(TOP)/src $(CPPFLAGS) $(MAINBOARD)/failover.c > ./failever.E" #makerule ./failover.inc dep "./romcc ./failover.E" act "./romcc -O ./failover.E > failover.inc" #mainboardinit .failover.inc -makerule ./auto.E dep "$(MAINBOARD)/auto.c" act "$(CPP) -I$(TOP)/src -$(ROMCCPPFLAGS) $(CPPFLAGS) $(MAINBOARD)/auto.c > ./auto.E" -makerule ./auto.inc dep "./romcc ./auto.E" act "./romcc -O ./auto.E > auto.inc" +makerule ./auto.E + depends "$(MAINBOARD)/auto.c" + action "$(CPP) -I$(TOP)/src -$(ROMCCPPFLAGS) $(CPPFLAGS) $(MAINBOARD)/auto.c > ./auto.E" +end +makerule ./auto.inc + depends "./romcc ./auto.E" + action "./romcc -O ./auto.E > auto.inc" +end mainboardinit ./auto.inc # ### diff --git a/src/superio/NSC/pc97307/superio.c b/src/superio/NSC/pc97307/superio.c index 621ad9045a..8dc2ca8661 100644 --- a/src/superio/NSC/pc97307/superio.c +++ b/src/superio/NSC/pc97307/superio.c @@ -1,9 +1,6 @@ /* Copyright 2000 AG Electronics Ltd. */ /* This code is distributed without warranty under the GPL v2 (see COPYING) */ -#include -#include -#include #include #ifndef PNP_INDEX_REG diff --git a/util/newconfig/config.g b/util/newconfig/config.g index 2e2f4352df..3cb2a4a0ed 100644 --- a/util/newconfig/config.g +++ b/util/newconfig/config.g @@ -10,6 +10,7 @@ errors = 0 arch = '' ldscriptbase = '' payloadfile = '' +initfile = '' # Key is the rule name. Value is a mkrule object. makebaserules = {} @@ -22,6 +23,7 @@ target_dir = '' #sources = {} objectrules = {} +initobjectrules = {} # make these a hash so they will be unique. driverrules = {} ldscripts = [] @@ -37,12 +39,15 @@ options = {} # for options. options_by_order = [] crt0includes = [] +initincludes = {} +useinitincludes = 0 # transitional partinstance = 0 curdir = '' dirstack = [] config_file_list = [] local_path = re.compile(r'^\.') +include_pattern = re.compile(r'%%([^%]+)%%') # ----------------------------------------------------------------------------- # Error Handling @@ -80,6 +85,17 @@ class location: return self.stack[-1].at() loc = location() +class initinclude: + def __init__ (self, str, path): + self.string = str + self.path = path + + def getstring(self): + return self.string + + def getpath(self): + return self.path + class makerule: def __init__ (self, target): self.target = target @@ -310,9 +326,10 @@ class partobj: if (o == 0): fatal("Error: can't use undefined option %s" % name) o.setused() + o1 = getvalue(self.options, name) + if (o1): + return setvalue(self.options, name, o) - if (debug): - print "option %s used in %s " % (name, self) class partsstack: def __init__ (self): @@ -551,20 +568,30 @@ def loadoptions(): fatal("Error: Could not parse file") loc.pop_file() +def addinit(path): + global initfile + if (path[0] == '/'): + initfile = treetop + '/src/' + path + else: + initfile = curdir + '/' + path + print "Adding init file: %s" % path + # we do the crt0include as a dictionary, so that if needed we # can trace who added what when. Also it makes the keys # nice and unique. def addcrt0include(path): global crt0includes - #fullpath = os.path.join(curdir, path) - #fullpath = path - #setvalue(crt0includes, fullpath, loc) - # oh shoot. Order matters. All right, we'll worry about this - # later. - fullpath = path if (debug > 2): - print "ADDCRT0: %s" % fullpath - crt0includes.append(fullpath) + print "ADDCRT0: %s" % path + crt0includes.append(path) + +def addinitinclude(str, path): + global initincludes, useinitincludes + useinitincludes = 1 + if (debug > 2): + print "ADDCRT0: %s -> %s" % str, path + o = initinclude(dequote(str), path) + setvalue(initincludes, path, o) def addldscript(path): global ldscripts @@ -604,6 +631,9 @@ def addobjectdriver(dict, object_name): print "add object %s source %s" % (object_name, source) setvalue(dict, base, [object, source]) +def addinitobject(object_name): + addobjectdriver(initobjectrules, object_name) + def addobject(object_name): addobjectdriver(objectrules, object_name) @@ -628,7 +658,7 @@ def part(name, path, file): dirstack.append(curdir) curdir = os.path.join(treetop, 'src', name, path) newpart = partobj(curdir, curpart, name, path) - print "Configuring PART %s, path %s\n" % (name,path) + print "Configuring PART %s, path %s" % (name,path) if (debug): print "PUSH part %s %s" % (name, curpart.dir) pstack.push(curpart) @@ -718,13 +748,19 @@ def flatten_name(str): def addaction(id, str): o = getvalue(makebaserules, id) - a = dequote(str) - o.addaction(a) + if (o): + a = dequote(str) + o.addaction(a) + return + fatal("No such rule \"%s\" for addaction" % id); def adddep(id, str): o = getvalue(makebaserules, id) - a = dequote(str) - o.adddependency(a) + if (o): + a = dequote(str) + o.adddependency(a) + return + fatal("No such rule \"%s\" for adddependency" % id); # If the first part of matches treetop, replace that part with "$(TOP)" def topify(path): @@ -742,7 +778,8 @@ def set_arch(my_arch): global curdir arch = my_arch setoption('ARCH', my_arch) - part('arch', my_arch, 'config/make.base.lb') + #part('arch', my_arch, 'config/make.base.lb') + part('arch', my_arch, 'Config.lb') def mainboard(path): @@ -754,6 +791,7 @@ def mainboard(path): mainboard_part_number = re.sub("[^/]/", "", path) setoption('MAINBOARD_VENDOR', vendor) setoption('MAINBOARD_PART_NUMBER', mainboard_part_number) + dodir('/config', 'Config.lb') part('mainboard', path, 'Config.lb') #============================================================================= @@ -766,7 +804,8 @@ def writemakefileheader(file, fname): def writemakefilesettings(path): - global treetop, arch, mainboard_dir, target_dir, options_by_order, root + global treetop, arch, mainboard_dir, target_dir, root + global options_by_order, options # Write Makefile.settings to seperate the settings # from the actual makefile creation # In practice you need to rerun NLBConfig.py to change @@ -801,7 +840,7 @@ def writemakefilesettings(path): # first, dump all the -D stuff def writemakefile(path): - global root + global root, useinitincludes makefilepath = os.path.join(path, "Makefile") print "Creating", makefilepath file = open(makefilepath, 'w+') @@ -831,9 +870,17 @@ CPUFLAGS := $(foreach _var_,$(VARIABLES),$(call D_item,$(_var_))) file.write("all: linuxbios.rom") # print out all the object dependencies file.write("\n# object dependencies (objectrules:)\n") + file.write("INIT-OBJECTS :=\n") file.write("OBJECTS :=\n") file.write("DRIVER :=\n") file.write("\nSOURCES :=\n") + for irule in initobjectrules.keys(): + init = initobjectrules[irule] + i_name = init[0] + i_source = init[1] + file.write("INIT-OBJECTS += %s\n" % (i_name)) + file.write("SOURCES += %s\n" % (i_source)) + for objrule in objectrules.keys(): obj = objectrules[objrule] obj_name = obj[0] @@ -857,11 +904,19 @@ CPUFLAGS := $(foreach _var_,$(VARIABLES),$(call D_item,$(_var_))) # Print out the dependencies for crt0_includes.h file.write("\n# Dependencies for crt0_includes.h\n") file.write("CRT0_INCLUDES:=\n") - for i in crt0includes: - if (local_path.match(i)): - file.write("CRT0_INCLUDES += %s\n" % i) - else: - file.write("CRT0_INCLUDES += $(TOP)/src/%s\n" % i) + if (useinitincludes): + for inc in initincludes.keys(): + if (local_path.match(inc)): + file.write("CRT0_INCLUDES += %s\n" % inc) + else: + file.write("CRT0_INCLUDES += $(TOP)/src/%s\n" % inc) + else: + for i in crt0includes: + if (local_path.match(i)): + file.write("CRT0_INCLUDES += %s\n" % i) + else: + file.write("CRT0_INCLUDES += $(TOP)/src/%s\n" % i) + # Print out the user defines. file.write("\n# userdefines:\n") @@ -902,11 +957,14 @@ CPUFLAGS := $(foreach _var_,$(VARIABLES),$(call D_item,$(_var_))) file.write("GENERATED:=\n") for genfile in [ 'Makefile', 'Makefile.settings', - 'crt0_includes.h', 'nsuperio.c', 'chip.c', 'LinuxBIOSDoc.config' ]: file.write("GENERATED += %s\n" % genfile) + if (useinitincludes): + file.write("GENERATED += crt0.S\n") + else: + file.write("GENERATED += crt0_includes.h\n") file.write("\n# Remake Makefile (and the other files generated by\n") file.write("# NLBConfig.py) if any config dependencies change.\n") @@ -945,12 +1003,54 @@ def writecrt0_includes(path): crt0filepath = os.path.join(path, "crt0_includes.h") print "Creating", crt0filepath file = open(crt0filepath, 'w+') - for i in crt0includes: file.write("#include <%s>\n" % i) file.close() +def writeinitincludes(path): + global initfile, include_pattern, crt0_includes + crt0filepath = os.path.join(path, "crt0.S") + print "Creating", crt0filepath + infile = open(initfile, 'r') + outfile = open(crt0filepath, 'w+') + + line = infile.readline() + while (line): + p = include_pattern.match(line) + if (p): + for i in initincludes.keys(): + inc = initincludes[i] + if (inc.getstring() == p.group(1)): + outfile.write("#include \"%s\"\n" % inc.getpath()) + else: + outfile.write(line); + line = infile.readline() + + infile.close() + outfile.close() + +def writeldoptions(path): + global options + # Write Makefile.settings to seperate the settings + # from the actual makefile creation + # In practice you need to rerun NLBConfig.py to change + # these but in theory you shouldn't need to. + + filename = os.path.join(path, "ldoptions") + print "Creating", filename + file = open(filename, 'w+') + for i in options.keys(): + if (isexported(i, 0) and IsInt(getoption(i, 0))): + file.write("%s = %s;\n" % (i, getformated(i, 0))) + file.close() + +# Add any run-time checks to verify that parsing the configuration +# was successful +def verifyparse(): + global useinitincludes, initfile + if (useinitincludes and initfile == ''): + fatal("An init file must be specified") %% parser Config: @@ -959,7 +1059,7 @@ parser Config: # less general tokens should come first, otherwise they get matched # by the re's - token ACT: 'act' + token ACTION: 'action' token ADDACTION: 'addaction' token ALWAYS: 'always' token ARCH: 'arch' @@ -967,7 +1067,7 @@ parser Config: token CPU: 'cpu' token DEFAULT: 'default' token DEFINE: 'define' - token DEP: 'dep' + token DEPENDS: 'depends' token DIR: 'dir' token DRIVER: 'driver' token ELSE: 'else' @@ -977,6 +1077,8 @@ parser Config: token FORMAT: 'format' token IF: 'if' token INIT: 'init' + token INITOBJECT: 'initobject' + token INITINCLUDE: 'initinclude' token LDSCRIPT: 'ldscript' token LOADOPTIONS: 'loadoptions' token MAINBOARD: 'mainboard' @@ -1004,7 +1106,7 @@ parser Config: token PATH: r'[a-zA-Z0-9_.][a-zA-Z0-9/_.]+[a-zA-Z0-9_.]+' # Dir's on the other hand are abitrary # this may all be stupid. - token DIRPATH: r'[a-zA-Z0-9_$()./]+' + token DIRPATH: r'[-a-zA-Z0-9_$()./]+' token ID: r'[a-zA-Z_.]+[a-zA-Z0-9_.]*' token DELEXPR: r'{([^}]+|\\.)*}' token STR: r'"([^\\"]+|\\.)*"' @@ -1061,9 +1163,17 @@ parser Config: SOUTHBRIDGE PATH {{ if (C): part('southbridge', PATH, 'Config.lb')}} partend<> - rule mainboardinit<>: + rule mainboardinit<>: MAINBOARDINIT DIRPATH {{ if (C): addcrt0include(DIRPATH)}} + rule initinclude<>: + INITINCLUDE + STR + DIRPATH {{ if (C): addinitinclude(STR, DIRPATH)}} + + rule initobject<>: + INITOBJECT DIRPATH {{ if (C): addinitobject(DIRPATH)}} + rule object<>: OBJECT DIRPATH {{ if (C): addobject(DIRPATH)}} rule driver<>: DRIVER DIRPATH {{ if (C): adddriver(DIRPATH)}} @@ -1081,12 +1191,13 @@ parser Config: (stmt<>)* [ ELSE (stmt<>)* ] END rule depsacts<>: - ( DEP STR {{ if (C): adddep(ID, STR) }} - | ACT STR {{ if (C): addaction(ID, STR) }} + ( DEPENDS STR {{ if (C): adddep(ID, STR) }} + | ACTION STR {{ if (C): addaction(ID, STR) }} )* rule makerule<>: MAKERULE DIRPATH {{ if (C): addrule(DIRPATH) }} depsacts<> + END rule makedefine<>: MAKEDEFINE RAWTEXT {{ if (C): adduserdefine(RAWTEXT) }} @@ -1094,7 +1205,7 @@ parser Config: rule addaction<>: ADDACTION ID STR {{ if (C): addaction(ID, STR) }} - rule init<>: INIT STR {{ if (C): curpart.addinit(STR) }} + rule init<>: INIT DIRPATH {{ if (C): addinit(DIRPATH) }} rule register<>: REGISTER STR {{ if (C): curpart.addregister(STR) }} @@ -1108,9 +1219,11 @@ parser Config: | northbridge<> {{ return northbridge }} | southbridge<> {{ return southbridge }} | superio<> {{ return superio }} + | initobject<> {{ return initobject }} | object<> {{ return object }} | driver<> {{ return driver }} | mainboardinit<> {{ return mainboardinit }} + | initinclude<> {{ return initinclude }} | makerule<> {{ return makerule }} | makedefine<> {{ return makedefine }} | addaction<> {{ return addaction }} @@ -1250,6 +1363,8 @@ if __name__=='__main__': if (not parse('board', open(argv[1], 'r').read())): fatal("Error: Could not parse file") + verifyparse() + if (debug): print "DEVICE TREE:" dumptree(root, 0) @@ -1281,5 +1396,9 @@ if __name__=='__main__': print " makerule %s dep %s act %s" % (i, m.dependency, m.actions) writemakefilesettings(target_dir) - writecrt0_includes(target_dir) + if (useinitincludes): + writeinitincludes(target_dir) + else: + writecrt0_includes(target_dir) writemakefile(target_dir) + writeldoptions(target_dir)