typo fixed.
[coreboot.git] / util / newconfig / config.g
index ad06bc4ec0385572e21b6ed2b49d8ce40541a3da..7cfdc14236c03a496d9088d5fa94599da5ebf524 100644 (file)
@@ -3,56 +3,114 @@ import os
 import re
 import string
 
-debug = 0
 warnings = 0
 errors = 0
 
-arch = ''
-ldscriptbase = ''
-payloadfile = ''
+target_dir = ''
+target_name = ''
+treetop = ''
+global_options = {}
+global_options_by_order = []
+global_option_values = {}
+global_uses_options = {}
+romimages = {}
+buildroms = []
+curimage = 0
+alloptions = 0 # override uses at top level
 
-makeoptions = {}
-makeexpressions = []
+local_path = re.compile(r'^\.')
+include_pattern = re.compile(r'%%([^%]+)%%')
 
-# Key is the rule name. Value is a mkrule object.
-makebaserules = {}
+# -----------------------------------------------------------------------------
+#                    Utility Classes
+# -----------------------------------------------------------------------------
 
-# List of targets in the order defined by makerule commands.
-makerule_targets = {}
+class stack:
+       """Used to keep track of the current part or dir"""
+       class __stack_iter:
+               def __init__ (self, stack):
+                       self.index = 0
+                       self.len = len(stack)
+                       self.stack = stack
 
-treetop = ''
-target_dir = ''
+               def __iter__ (self):
+                       return self
 
-sources = {}
-objectrules = {}
-# make these a hash so they will be unique.
-driverrules = {}
-ldscripts = []
-userdefines = []
-curpart = 0
-root = 0
-
-globalvars = {}       # We will globals here
-parts = {}
-
-options = {}
-# options in order defined. These will be unique due to use of hash 
-# for options. 
-options_by_order = []
-crt0includes = []
-partinstance = 0
-curdir = '' 
-dirstack = []
-config_file_list = []
+               def next (self):
+                       if (self.index < self.len):
+                               s = self.stack[self.index]
+                               self.index = self.index + 1
+                               return s
+                       raise StopIteration
 
-local_path = re.compile(r'^\.')
+       def __init__ (self):
+               self.stack = []
+
+       def __len__ (self):
+               return len(self.stack)
+
+       def __getitem__ (self, i):
+               try:
+                       return self.stack[i]
+               except IndexError:
+                       return 0
+
+       def __iter__ (self):
+               return self.__stack_iter(self.stack)
+
+       def push(self, part):
+               self.stack.append(part)
+
+       def pop(self):
+               try:
+                       return self.stack.pop()
+               except IndexError:
+                       return 0
+
+       def tos(self):
+               try:
+                       return self.stack[-1]
+               except IndexError:
+                       return 0
+
+       def empty(self):
+               return (len(self.stack) == 0)
+partstack = stack()
+dirstack = stack()
+
+class debug_info:
+       none = 0
+       gencode = 1
+       dumptree = 2
+       object = 3
+       dict = 4
+       statement = 5
+       dump = 6
+
+       def __init__(self, *level):
+               self.__level = level
+
+       def setdebug(self, *level):
+               self.__level = level
+
+       def level(self, level):
+               return level in self.__level
+
+       def info(self, level, str):
+               if level in self.__level:
+                       print str
+
+global debug
+debug = debug_info(debug_info.none)
 
 # -----------------------------------------------------------------------------
 #                    Error Handling
 # -----------------------------------------------------------------------------
 
 class location:
-       class place:
+       """Used to keep track of our current location while parsing
+       configuration files"""
+       class __place:
                 def __init__(self, file, line, command):
                         self.file = file
                         self.line = line
@@ -64,26 +122,276 @@ class location:
                         return "%s:%d" % (self.file, self.line)
         
         def __init__ (self):
-                self.stack = []
+                self.stack = stack()
+
+       def __str__ (self):
+               s = ''
+               for p in self.stack:
+                       if (s == ''):
+                               s = p.at()
+                       else:
+                               s = s + '\n' + p.at()
+               return s
 
         def file(self):
-                return self.stack[-1].file
+                return self.stack.tos().file
+
         def line(self):
-                 return self.stack[-1].line
+                return self.stack.tos().line
+
         def command(self):
-                return self.stack[-1].command
+                return self.stack.tos().command
 
-        def push_file(self, file):
-                self.stack.append(self.place(file, 0, ""))
-        def pop_file(self):
+        def push(self, file):
+                self.stack.push(self.__place(os.path.normpath(file), 0, ""))
+
+        def pop(self):
                 self.stack.pop()
+
         def next_line(self, command):
-                self.stack[-1].next_line(command)
+                self.stack.tos().next_line(command)
+
         def at(self):
-                return self.stack[-1].at()
+                return self.stack.tos().at()
 loc = location()
 
+def error(string):      
+       """Print error message"""
+        global errors, loc
+       errors = errors + 1
+        print "===> ERROR: %s" % string
+        print "%s" % loc
+
+def fatal(string):      
+       """Print error message and exit"""
+       error(string)
+        exitiferrors()
+
+def warning(string):
+       """Print warning message"""
+        global warnings, loc
+       warnings = warnings + 1
+        print "===> Warning: %s" % string
+        print "%s" % loc
+
+def exitiferrors():
+       """Exit parser if an error has been encountered"""
+       if (errors != 0):
+               sys.exit(1)
+
+# -----------------------------------------------------------------------------
+#                    Main classes
+# -----------------------------------------------------------------------------
+
+class romimage:
+       """A rom image is the ultimate goal of linuxbios"""
+       def __init__ (self, name):
+               self.name = name
+               self.arch = ''
+               self.payload = ''
+               self.initfile = ''
+               self.makebaserules = {}
+               self.objectrules = {}
+               self.initobjectrules = {}
+               self.driverrules = {}
+               self.ldscripts = []
+               self.userdefines = []
+               self.initincludes = {}
+               self.useinitincludes = 0 # transitional
+               self.partinstance = 0
+               self.root = 0
+               self.target_dir = ''
+               self.values = {} # values of options set in romimage
+
+       def getname(self):
+               return self.name
+
+       def getvalues(self):
+               return self.values
+
+       def setarch(self, arch):
+               self.arch = arch
+
+       def setpayload(self, payload):
+               self.payload = payload
+
+       def setinitfile(self, initfile):
+               self.initfile = initfile
+
+       def getinitfile(self):
+               return self.initfile
+
+       def addmakerule(self, id):
+               o = getdict(self.makebaserules, id)
+               if (o):
+                       print "Warning, rule %s previously defined" % id
+               o = makerule(id)
+               setdict(self.makebaserules, id, o)
+
+       def getmakerules(self):
+               return self.makebaserules
+
+       def getmakerule(self, id):
+               o = getdict(self.makebaserules, id)
+               if (o):
+                       return o
+               fatal("No such make rule \"%s\"" % id);
+
+       def addmakeaction(self, id, str):
+               o = getdict(self.makebaserules, id)
+               if (o):
+                       a = dequote(str)
+                       o.addaction(a)
+                       return
+               fatal("No such rule \"%s\" for addmakeaction" % id);
+
+       def addmakedepend(self, id, str):
+               o = getdict(self.makebaserules, id)
+               if (o):
+                       a = dequote(str)
+                       o.adddependency(a)
+                       return
+               fatal("No such rule \"%s\" for addmakedepend" % id);
+
+       # this is called with an an object name. 
+       # the easiest thing to do is add this object to the current 
+       # component.
+       # such kludgery. If the name starts with '.' then make the 
+       # dependency be on ./thing.x gag me.
+       def addobjectdriver(self, dict, object_name):
+               global dirstack
+               suffix = object_name[-2:]
+               if (suffix == '.o'):
+                       suffix = '.c'
+               base = object_name[:-2]
+               if (object_name[0] == '.'):
+                       source = base + suffix
+               else:
+                       source = os.path.join(dirstack.tos(), base + suffix)
+               object = base + '.o'
+               debug.info(debug.object, "add object %s source %s" % (object_name, source))
+               l = getdict(dict, base)
+               if (l):
+                       print "Warning, object/driver %s previously defined" % base
+               setdict(dict, base, [object, source])
+
+       def addinitobjectrule(self, name):
+               self.addobjectdriver(self.initobjectrules, name)
+
+       def addobjectrule(self, name):
+               self.addobjectdriver(self.objectrules, name)
+
+       def adddriverrule(self, name):
+               self.addobjectdriver(self.driverrules, name)
+
+       def getinitobjectrules(self):
+               return self.initobjectrules
+
+       def getinitobjectrule(self, name):
+               o = getdict(self.initobjectrules, name)
+               if (o):
+                       return o
+               fatal("No such init object rule \"%s\"" % name);
+
+       def getobjectrules(self):
+               return self.objectrules
+
+       def getobjectrule(self, name):
+               o = getdict(self.objectrules, name)
+               if (o):
+                       return o
+               fatal("No such object rule \"%s\"" % name);
+
+       def getdriverrules(self):
+               return self.driverrules
+
+       def getdriverrule(self, name):
+               o = getdict(self.driverrules, name)
+               if (o):
+                       return o
+               fatal("No such driver rule \"%s\"" % name);
+
+       def addldscript(self, path):
+               self.ldscripts.append(path)
+
+       def getldscripts(self):
+               return self.ldscripts
+
+       def adduserdefine(self, str):
+               self.userdefines.append(str)
+
+       def getuserdefines(self):
+               return self.userdefines
+
+       def addinitinclude(self, str, path):
+               if (str != 0):
+                       self.useinitincludes = 1
+
+               debug.info(debug.object, "ADDCRT0: %s -> %s" % (str, path))
+               o = getdict(self.initincludes, path)
+               if (o):
+                       print "Warning, init include for %s previously defined" % path
+               o = initinclude(str, path)
+               setdict(self.initincludes, path, o)
+
+       def getinitincludes(self):
+               return self.initincludes
+
+       def getinitinclude(self, path):
+               o = getdict(self.initincludes, path)
+               if (o):
+                       return o
+               fatal("No such init include \"%s\"" % path);
+
+       def getincludefilename(self):
+               if (self.useinitincludes):
+                       return "crt0.S"
+               else:
+                       return "crt0_includes.h"
+       
+       def newformat(self):
+               return self.useinitincludes
+
+       def numparts(self):
+               return self.partinstance
+
+       def newpartinstance(self):
+               i = self.partinstance
+               self.partinstance = self.partinstance + 1
+               return i
+
+       def setroot(self, part):
+               self.root = part
+
+       def getroot(self):
+               return self.root
+
+       def settargetdir(self, path):
+               self.targetdir = path
+
+       def gettargetdir(self):
+               return self.targetdir
+
+class buildrom:
+       """A buildrom statement"""
+       def __init__ (self, size, roms):
+               self.size = size
+               self.roms = roms
+
+class initinclude:
+       """include file for initialization code"""
+       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:
+       """Rule to be included in Makefile"""
        def __init__ (self, target):
                self.target = target
                self.dependency = []
@@ -105,10 +413,10 @@ class makerule:
                return self.actions
 
 class option:
+       """Configuration option"""
        def __init__ (self, name):
                self.name = name        # name of option
                self.loc = 0            # current location
-               self.value = 0          # option value
                self.set = 0            # option has been set
                self.used = 0           # option has been set
                self.default = 0        # option has default value (otherwise
@@ -119,48 +427,35 @@ class option:
                self.defined = 0        # option has a value
                self.format = '%s'      # option print format
 
-       def setvalue(self, value, loc):
-               if (self.set):
-                       print "Option %s: " % self.name
-                       print "Attempt to set %s at %s" % (value, loc.at()) 
-                       print "Already set to %s at %s" % \
-                                       (self.value, self.loc.at())
-                       sys.exit(1)
+       def setvalue(self, value, values, loc):
                self.set = 1
-               self.value = value
                self.defined = 1
                self.loc = loc
-
-       def getvalue(self, part):
-               global curpart
-               if (not (type(self.value) is str)):
-                       return self.value
-               if (self.value == '' or self.value[0] != '{'):
-                       return self.value
-               # save curpart so we can evaluate expression
-               # in context of part
-               s = curpart
-               curpart = part
-               v = parse('delexpr', self.value)
+               #self.value = value
+               setdict(values, self.name, value)
+
+       def getvalue(self, image, values):
+               global curimage
+               v = getdict(values, self.name)
+               if (v == 0):
+                       return 0
+               val = v.contents()
+               if (not (type(val) is str)):
+                       return v
+               if (val == '' or val[0] != '{'):
+                       return v
+               s = curimage
+               curimage = image
+               val = parse('delexpr', val)
+               curimage = s
                # TODO: need to check for parse errors!
-               curpart = s
-               return v
+               return option_value(val)
 
        def setdefault(self, value, loc):
+               global global_option_values
                if (self.default):
-                       print "%s: " % self.name
-                       print "Attempt to default %s at %s" % (value, loc) 
-                       print "Already defaulted to %s at %s" %  \
-                                       (self.value, self.loc.at())
-                       print "Warning only"
-               if (self.set):
-                       print "%s: " % self.name
-                       print "Attempt to default %s at %s" % (value, loc) 
-                       print "Already set to %s at %s" % \
-                                       (self.value, self.loc.at())
-                       print "Warning only"
-                       return
-               self.value = value
+                       fatal("Error: default value for %s already set" % self.name)
+               setdict(global_option_values, self.name, value)
                self.defined = 1
                self.default = 1
                self.loc = loc
@@ -173,12 +468,12 @@ class option:
        def where(self):
                return self.loc
 
-       def setcomment(self, value, loc):
+       def setcomment(self, comment, loc):
                if (self.comment != ''):
                        print "%s: " % self.name
                        print "Attempt to modify comment at %s" % loc 
                        return
-               self.comment = value
+               self.comment = comment
 
        def setexportable(self):
                self.exportable = 1
@@ -205,66 +500,125 @@ class option:
        def isexported(self):
                return (self.exported and self.defined)
 
-       def isdefined(self):
-               return (self.defined)
+#      def isdefined(self):
+#              return (self.defined)
 
        def isset(self):
                return (self.set)
 
-       def isused(self):
-               return (self.used)
+#      def isused(self):
+#              return (self.used)
+
+class option_value:
+       """Value of a configuration option"""
+       def __init__(self, value):
+               self.value = value
+
+       def contents(self):
+               return self.value
 
 class partobj:
-       def __init__ (self, dir, parent, type):
-               global partinstance
-               if (debug):
-                       print "partobj dir %s parent %s type %s" %(dir,parent,type)
-               self.children = []
+       """A configuration part"""
+       def __init__ (self, image, dir, parent, type, name):
+               debug.info(debug.object, "partobj dir %s parent %s type %s" %(dir,parent,type))
+               self.image = image
+               self.children = 0
+               self.siblings = 0
                self.initcode = []
                self.registercode = []
-               self.siblings = 0
+               # sibling is not a list. 
                self.type = type
                self.objects = []
                self.dir = dir
                self.irq = 0
-               self.instance = partinstance + 1
-               partinstance = partinstance + 1
+               self.instance = image.newpartinstance()
+               self.flatten_name = flatten_name(type + "/" + name)
+               debug.info(debug.object, "INSTANCE %d" % self.instance)
                self.devfn = 0  
                self.private = 0        
-               self.options = {}
+               self.uses_options = {}
+               # chip initialization. If there is a chip.h in the 
+               # directory, generate the structs etc. to 
+               # initialize the code
+               if (os.path.exists(dir + "/" + "chip.h")): 
+                       self.chipconfig = 1
+               else:
+                       self.chipconfig = 0
+               
                if (parent):
-                       if (debug):
-                               print "add to parent"
+                       debug.info(debug.gencode, "add to parent")
                        self.parent   = parent
-                       parent.children.append(self)
+                       # add current child as my sibling, 
+                       # me as the child.
+                       if (parent.children):
+                               debug.info(debug.gencode, "add %s (%d) as sibling" % (parent.children.dir, parent.children.instance))
+                               self.siblings = parent.children
+                       parent.children = self
                else:
                        self.parent = self
 
        def dumpme(self, lvl):
                print "%d: type %s" % (lvl, self.type)
+               print "%d: instance %d" % (lvl, self.instance)
                print "%d: dir %s" % (lvl,self.dir)
+               print "%d: flatten_name %s" % (lvl,self.flatten_name)
                print "%d: parent %s" % (lvl,self.parent.type)
                print "%d: parent dir %s" % (lvl,self.parent.dir)
+               if (self.children):
+                       print "%d: child %s" % (lvl, self.children.dir)
+               if (self.siblings):
+                       print "%d: siblings %s" % (lvl, self.siblings.dir)
                print "%d: initcode " % lvl
                for i in self.initcode:
                        print "  %s" % i
                print "%d: registercode " % lvl
                for i in self.registercode:
                        print "  %s" % i
-
-       def gencode(self):
-               print "struct cdev dev%d = {" % self.instance
-               print "/* %s %s */" % (self.type, self.dir)
-               print "  .devfn = %d" % self.devfn
+               print "\n"
+
+       def gencode(self, file):
+               if (self.chipconfig):
+                       debug.info(debug.gencode, "gencode: chipconfig(%d)" % self.instance)
+                       file.write("#include \"%s/chip.h\"\n" % self.dir)
+                       file.write("extern struct chip_control %s_control;\n" % \
+                                       self.flatten_name)
+                       file.write("struct %s_config %s_config_%d" % (\
+                                       self.flatten_name ,\
+                                       self.flatten_name , \
+                                       self.instance))
+                       if (self.registercode):
+                               file.write("\t= {\n")
+                               for i in self.registercode:
+                                       file.write( "\t  %s" % i)
+                               file.write("\t};\n")
+                       else:
+                               file.write(";")
+                       file.write("\n");
+               if (self.instance):
+                       file.write("struct chip dev%d = {\n" % self.instance)
+               else:
+                       file.write("struct chip root = {\n")
+               file.write("/* %s %s */\n" % (self.type, self.dir))
+               #file.write("  .devfn = %d,\n" % self.devfn)
                if (self.siblings):
-                       print "  .next = &dev%d" % self.sibling.instance
+                       debug.info(debug.gencode, "gencode: siblings(%d)" % self.siblings.instance)
+                       file.write("  .next = &dev%d,\n" % self.siblings.instance)
                if (self.children):
-                       print "  .children = &dev%d" %  \
-                                       self.children[0].instance
+                       debug.info(debug.gencode, "gencode: children(%d)" % self.children.instance)
+                       file.write("  .children = &dev%d,\n" % \
+                                       self.children.instance)
                if (self.private):
-                       print "  .private = private%d" % self.instance
-               print "};"
-
+                       file.write("  .private = private%d,\n" % self.instance)
+               if (self.chipconfig):
+                       # set the pointer to the structure for all this
+                       # type of part
+                       file.write("  .control= &%s_control,\n" % \
+                                       self.flatten_name )
+                       # generate the pointer to the isntance
+                       # of the chip struct
+                       file.write("  .chip_info = (void *) &%s_config_%d,\n" %\
+                                       (self.flatten_name, self.instance ))
+               file.write("};\n")
                
        def irq(self, irq):
                self.irq = irq
@@ -273,80 +627,34 @@ class partobj:
                self.initcode.append(code)
                
        def addregister(self, code):
+               code = dequote(code)
                self.registercode.append(code)
 
        def usesoption(self, name):
-               o = getvalue(options, name)
+               global global_options
+               o = getdict(global_options, name)
                if (o == 0):
                        fatal("Error: can't use undefined option %s" % name)
                o.setused()
-               setvalue(self.options, name, o)
-               if (debug):
-                       print "option %s used in %s" % (name, self)
-
-class partsstack:
-       def __init__ (self):
-               self.stack = []
-
-       def push(self, part):
-               self.stack.append(part)
-
-       def pop(self):
-               return self.stack.pop()
-
-       def tos(self):
-               return self.stack[-1]
-pstack = partsstack()
-
-def error(string):      
-        global errors, loc
-       errors = errors + 1
-        size = len(loc.stack)
-        i = 0
-        while(i < size -1): 
-                print loc.stack[i].at()
-                i = i + 1
-        print "%s: %s"% (loc.at(), string)
-
-def exitiferrors():
-       if (errors != 0):
-               sys.exit(1)
-
-def fatal(string):      
-       error(string)
-        exitiferrors()
-
-def warning(string):
-        global warnings, loc
-       warnings = warnings + 1
-        print "===> Warning:"
-        size = len(loc.stack)
-        i = 0
-        while(i < size -1):
-                print loc.stack[i].at()
-                i = i + 1
-        print "%s: %s"% (loc.at(), string)
-
+               o1 = getdict(self.uses_options, name)
+               if (o1):
+                       return
+               setdict(self.uses_options, name, o)
 
 # -----------------------------------------------------------------------------
 #                    statements 
 # -----------------------------------------------------------------------------
 
-def getvalue(dict, name):
+def getdict(dict, name):
        if name not in dict.keys(): 
-               if (debug >1):
-                       print 'Undefined:', name
+               debug.info(debug.dict, "Undefined: %s" % name)
                return 0
        v = dict.get(name, 0)
-       if (debug > 1):
-               print "getvalue %s returning %s" % (name, v)
+       debug.info(debug.dict, "getdict %s returning %s" % (name, v))
        return v
 
-def setvalue(dict, name, value):
-       if name in dict.keys(): 
-               print "Warning, %s previously defined" % name
-       if (debug > 1):
-               print "setvalue sets %s to %s" % (name, value)
+def setdict(dict, name, value):
+       debug.info(debug.dict, "setdict sets %s to %s" % (name, value))
        dict[name] = value
 
 # options. 
@@ -360,59 +668,65 @@ def setvalue(dict, name, value):
 # use the value, then try to set the value
 
 def newoption(name):
-       o = getvalue(options, name)
+       global global_options, global_options_by_order
+       o = getdict(global_options, name)
        if (o):
                print "option %s already defined" % name
                sys.exit(1)
        o = option(name)
-       setvalue(options, name, o)
-       options_by_order.append(name)
-
-# option must be declared before being used in a part
-# if we're not processing a part, then we must
-# be at the top level where all options are available
-def getoption(name, part):
-       global options
-       if (part):
-               o = getvalue(part.options, name)
+       setdict(global_options, name, o)
+       global_options_by_order.append(name)
+
+def getoption(name, image):
+       """option must be declared before being used in a part
+       if we're not processing a part, then we must
+       be at the top level where all options are available
+       global global_uses_options, global_option_values"""
+       curpart = partstack.tos()
+       if (curpart):
+               o = getdict(curpart.uses_options, name)
+       elif (alloptions):
+               o = getdict(global_options, name)
        else:
-               o = getvalue(options, name)
+               o = getdict(global_uses_options, name)
        if (o == 0 or not o.defined):
-               error("Error: Option %s undefined (missing use command?)." % name)
+               error("Option %s undefined (missing use command?)" % name)
                return
-       v = o.getvalue(part)
-       if (debug > 2):
-               print "getoption returns %s" % v
-               print "%s" % o.where()
-       return v
-
-# setoptionstmt only allowed at top level
-def setoptionstmt(name, value):
-       global curpart
-       if (curpart != root):
-               fatal("Error: options can only be set in target configuration file")
-       setoption(name, value)
+       v = 0
+       if (image):
+               v = o.getvalue(image, image.getvalues())
+       if (v == 0):
+               v = o.getvalue(image, global_option_values)
+       return v.contents()
 
 def setoption(name, value):
-       global loc
-       o = getvalue(options, name)
+       global loc, global_options, global_option_values, curimage
+       curpart = partstack.tos()
+       if (curpart and curpart.type != 'mainboard'):
+               fatal("Options may only be set in top-level and mainboard configuration files")
+       o = getdict(global_options, name)
        if (o == 0):
-               fatal("Error: attempt set nonexistent option %s" % name)
-       o.setvalue(value, loc)
+               fatal("Attempt to set nonexistent option %s" % name)
+       v = option_value(value)
+       if (curimage):
+               o.setvalue(v, curimage.getvalues(), loc)
+       else:
+               o.setvalue(v, global_option_values, loc)
 
 def setdefault(name, value):
-       global loc
-       o = getvalue(options, name)
+       global loc, global_options
+       o = getdict(global_options, name)
        if (not o):
                return
        if (o.default):
                print "setdefault: attempt to duplicate default for %s" % name
                return
-       o.setdefault(value, loc)
+       v = option_value(value)
+       o.setdefault(v, loc)
 
 def setnodefault(name):
-       global loc
-       o = getvalue(options, name)
+       global loc, global_options
+       o = getdict(global_options, name)
        if (not o):
                return
        if (o.default):
@@ -421,243 +735,319 @@ def setnodefault(name):
        o.setnodefault(loc)
 
 def setcomment(name, value):
-       o = getvalue(options, name)
+       global loc, global_options
+       o = getdict(global_options, name)
        if (not o):
                fatal("setcomment: %s not here" % name)
        o.setcomment(value, loc)
 
 def setexported(name):
-       o = getvalue(options, name)
+       global global_options
+       o = getdict(global_options, name)
        if (not o):
                fatal("setexported: %s not here" % name)
        o.setexported()
 
 def setnoexport(name):
-       o = getvalue(options, name)
+       global global_options
+       o = getdict(global_options, name)
        if (not o):
                fatal("setnoexport: %s not here" % name)
        o.setnoexport()
 
 def setexportable(name):
-       o = getvalue(options, name)
+       global global_options
+       o = getdict(global_options, name)
        if (not o):
                fatal("setexportable: %s not here" % name)
        o.setexportable()
 
 def setformat(name, fmt):
-       o = getvalue(options, name)
+       global global_options
+       o = getdict(global_options, name)
        if (not o):
                fatal("setformat: %s not here" % name)
        o.setformat(fmt)
 
-def getformated(name, part):
-       global options
-       if (part):
-               o = getvalue(part.options, name)
-       else:
-               o = getvalue(options, name)
+def getformated(name, image):
+       global global_options, global_option_values
+       o = getdict(global_options, name)
        if (o == 0 or not o.defined):
-               fatal( "Error: Option %s undefined (missing use command?)." % name)
-       v = o.getvalue(part)
+               fatal( "Option %s undefined." % name)
+       v = 0
+       if (image):
+               v = o.getvalue(image, image.getvalues())
+       if (v == 0):
+               v = o.getvalue(image, global_option_values)
        f = o.getformat()
-       return (f % v)
+       return (f % v.contents())
 
-def isexported(name, part):
-       if (part):
-               o = getvalue(part.options, name)
-       else:
-               o = getvalue(options, name)
+def isexported(name):
+       global global_options
+       o = getdict(global_options, name)
        if (o):
                return o.isexported()
        return 0
 
-def isdefined(name, part):
-       if (part):
-               o = getvalue(part.options, name)
-       else:
-               o = getvalue(options, name)
-       if (o):
-               return o.isdefined()
-       return 0
+#def isdefined(name, part):
+#      global global_options
+#      if (part):
+#              o = getdict(part.uses_options, name)
+#      else:
+#              o = getdict(global_options, name)
+#      if (o):
+#              return o.isdefined()
+#      return 0
 
 def isset(name, part):
+       global global_uses_options
        if (part):
-               o = getvalue(part.options, name)
+               o = getdict(part.uses_options, name)
        else:
-               o = getvalue(options, name)
+               o = getdict(global_uses_options, name)
        if (o):
                return o.isset()
        return 0
 
-def isused(name, part):
-       if (part):
-               o = getvalue(part.options, name)
-       else:
-               o = getvalue(options, name)
-       if (o):
-               return o.isused()
-       return 0
+#def isused(name, part):
+#      global global_options
+#      if (part):
+#              o = getdict(part.uses_options, name)
+#      else:
+#              o = getdict(global_options, name)
+#      if (o):
+#              return o.isused()
+#      return 0
 
 def usesoption(name):
-       global curpart
-       curpart.usesoption(name)
+       global global_options, global_uses_options
+       curpart = partstack.tos()
+       if (curpart):
+               curpart.usesoption(name)
+               return
+       o = getdict(global_options, name)
+       if (o == 0):
+               fatal("Can't use undefined option %s" % name)
+       o.setused()
+       o1 = getdict(global_uses_options, name)
+       if (o1):
+               return
+       setdict(global_uses_options, name, o)
 
 def validdef(name, defval):
-       o = getvalue(options, name)
+       global global_options
+       o = getdict(global_options, name)
        if (not o):
                fatal("validdef: %s not here" % name)
        if ((defval & 1) != 1):
-           fatal("Error: must specify default value for option %s" % name)
+           fatal("Must specify default value for option %s" % name)
        if ((defval & 2) != 2):
-           fatal("Error: must specify export for option %s" % name)
+           fatal("Must specify export for option %s" % name)
        if ((defval & 4) != 4):
-           fatal("Error: must specify comment for option %s" % name)
+           fatal("Must specify comment for option %s" % name)
 
 def loadoptions():
-       global treetop
-       optionsfile = os.path.join(treetop, 'src', 'config', 'Options.lb')
-       loc.push_file(optionsfile)
+       file = os.path.join('src', 'config', 'Options.lb')
+       optionsfile = os.path.join(treetop, file)
+       loc.push(file)
        if (not parse('options', open(optionsfile, 'r').read())):
-               fatal("Error: Could not parse file")
-       loc.pop_file()
+               fatal("Could not parse file")
+       loc.pop()
+
+def addinit(path):
+       global curimage, dirstack
+       if (path[0] == '/'):
+               curimage.setinitfile(treetop + '/src/' + path)
+       else:
+               curimage.setinitfile(dirstack.tos() + '/' + path)
+       print "Adding init file: %s" % path
+
+def addregister(code):
+       global partstack
+       curpart = partstack.tos()
+       curpart.addregister(code)
 
-# 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)
+       """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."""
+       global curimage
+       curimage.addinitinclude(0, path)
+
+def addinitinclude(str, path):
+       global curimage
+       curimage.addinitinclude(dequote(str), path)
 
 def addldscript(path):
-       global ldscripts
+       global curimage, dirstack
+       curdir = dirstack.tos()
        if (path[0] == '/'):
                fullpath =  treetop + '/src/' + path
        else:
                fullpath = curdir + '/' + path
-       #fullpath = os.path.join(curdir, path)
-       #setvalue(ldscripts, fullpath, loc)
-       if (debug):
-               print "fullpath :%s: curdir :%s: path :%s:" % (fullpath, curdir, path)
-       ldscripts.append(fullpath)
+       debug.info(debug.statement, "fullpath :%s: curdir :%s: path :%s:" % (fullpath, curdir, path))
+       curimage.addldscript(fullpath)
 
 def payload(path):
-       global payloadfile
-       adduserdefine("PAYLOAD:=%s"%path)
+       global curimage
+       curimage.setpayload(path)
+#      adduserdefine("PAYLOAD:=%s"%path)
 #      addrule('payload')
 #      adddep('payload', path)
 #      addaction('payload', 'cp $< $@')
 
-# this is called with an an object name. 
-# the easiest thing to do is add this object to the current 
-# component.
-# such kludgery. If the name starts with '.' then make the 
-# dependency be on ./thing.x gag me.
-def addobjectdriver(dict, object_name):
-       suffix = object_name[-2:]
-       if (suffix == '.o'):
-               suffix = '.c'
-       base = object_name[:-2]
-       if (object_name[0] == '.'):
-               source = base + suffix
-       else:
-               source = os.path.join(curdir, base + suffix)
-       object = base + '.o'
-       if (debug):
-               print "add object %s source %s" % (object_name, source)
-       setvalue(dict, base, [object, source])
+def startromimage(name):
+       global romimages, curimage, target_dir, target_name
+       print "Configuring ROMIMAGE %s" % name
+       o = getdict(romimages, name)
+       if (o):
+               fatal("romimage %s previously defined" % name)
+       curimage = romimage(name)
+       curimage.settargetdir(os.path.join(target_dir, name))
+       #o = partobj(curimage, target_dir, 0, 'board', target_name)
+       #curimage.setroot(o)
+       setdict(romimages, name, curimage)
+
+def endromimage():
+       global curimage
+       print "End ROMIMAGE"
+       curimage = 0
+       #curpart = 0
+
+def mainboard(path):
+       full_path = os.path.join(treetop, 'src', 'mainboard', path)
+       setoption('MAINBOARD', full_path)
+        vendor = re.sub("/.*", "", path)
+        part_number = re.sub("[^/]*/", "", path)
+       setoption('MAINBOARD_VENDOR', vendor)
+       setoption('MAINBOARD_PART_NUMBER', part_number)
+       dodir('/config', 'Config.lb')
+       part('mainboard', path, 'Config.lb')
+       curimage.setroot(partstack.tos())
+       partpop()
+
+def addbuildrom(size, roms):
+       global buildroms
+       print "Build ROM size %d" % size
+       b = buildrom(size, roms)
+       buildroms.append(b)
+
+def addinitobject(object_name):
+       global curimage
+       curimage.addinitobjectrule(object_name)
 
 def addobject(object_name):
-       addobjectdriver(objectrules, object_name)
+       global curimage
+       curimage.addobjectrule(object_name)
 
 def adddriver(driver_name):
-       addobjectdriver(driverrules, driver_name)
-
-def target(targ_name):
-        global target_dir
-       global curpart
-       global root
-       print "Configuring TARGET %s" % targ_name
-        target_dir = os.path.join(os.path.dirname(loc.file()), targ_name)
-        if not os.path.isdir(target_dir):
-                print "Creating directory %s" % target_dir
-                os.makedirs(target_dir)
-        print "Will place Makefile, crt0.S, etc. in %s" % target_dir
-       root = partobj(target_dir, 0, 'board')
-       curpart = root
+       global curimage
+       curimage.adddriverrule(driver_name)
+
+def target(name):
+        global target_dir, target_name
+       print "Configuring TARGET %s" % name
+       target_name = name
+       target_dir = os.path.join(os.path.dirname(loc.file()), name)
+       if not os.path.isdir(target_dir):
+               print "Creating directory %s" % target_dir
+               os.makedirs(target_dir)
+       print "Will place Makefile, crt0.S, etc. in %s" % target_dir
+
 
 def part(name, path, file):
-       global curpart,curdir,treetop
-       dirstack.append(curdir)
-       curdir = os.path.join(treetop, 'src', name, path)
-       newpart = partobj(curdir, curpart, name)
-       print "Configuring PART %s" % name
-       if (debug):
-               print "PUSH part %s %s" % (name, curpart.dir)
-       pstack.push(curpart)
-       curpart = newpart
-       doconfigfile(curdir, file)
+       global curimage, dirstack, partstack
+       partdir = os.path.join(name, path)
+       srcdir = os.path.join(treetop, 'src')
+       fulldir = os.path.join(srcdir, partdir)
+       newpart = partobj(curimage, fulldir, partstack.tos(), name, path)
+       print "Configuring PART %s, path %s" % (name, path)
+       partstack.push(newpart)
+       dirstack.push(fulldir)
+       doconfigfile(srcdir, partdir, file)
 
 def partpop():
-       global curpart,curdir
+       global dirstack, partstack
+       curpart = partstack.pop()
+       if (curpart == 0):
+               fatal("Trying to pop non-existent part")
        print "End PART %s" % curpart.type
        # Warn if options are used without being set in this part
-       for i in curpart.options.keys():
+       for i in curpart.uses_options.keys():
                if (not isset(i, curpart)):
-                       print "WARNING: Option %s using default value %s" % (i, getformated(i, curpart))
-       curpart = pstack.pop()
-       curdir = dirstack.pop()
+                       print "WARNING: Option %s using default value %s" % (i, getformated(i, curpart.image))
+       dirstack.pop()
 
-# dodir is like part but there is no new part
 def dodir(path, file):
-       global curdir,  treetop
+       """dodir is like part but there is no new part"""
+       global dirstack
        # if the first char is '/', it is relative to treetop, 
        # else relative to curdir
        # os.path.join screws up if the name starts with '/', sigh.
+       print "Configuring DIR %s" % os.path.join(path, file)
        if (path[0] == '/'):
-               fullpath = treetop + '/src/' + path 
+               fullpath = os.path.join(treetop, 'src')
+               path = re.sub('^/*', '', path)
        else:
-               fullpath = os.path.join(curdir,  path)
-       if (debug):
-               print "DODIR: path %s, fullpath %s" % (path, fullpath)
-               print "DODIR: curdis %s treetop %s" % (curdir, treetop)
-       print "Configuring DIR %s" % os.path.join(path, file)
-       dirstack.append(curdir)
-       curdir = fullpath
-       file = os.path.join(fullpath, file)
-       config_file_list.append(file)
-       doconfigfile(fullpath, file)
-       curdir = dirstack.pop()
+               fullpath = dirstack.tos()
+       debug.info(debug.statement, "DODIR: path %s, fullpath %s" % (path, fullpath))
+       dirstack.push(os.path.join(fullpath, path))
+       doconfigfile(fullpath, path, file)
+       dirstack.pop()
 
 def lookup(name):
-    global curpart
-    v = getoption(name, curpart)
-    exitiferrors()
-    return v
+       global curimage
+       v = getoption(name, curimage)
+       exitiferrors()
+       return v
+
+def addrule(id):
+       global curimage
+       curimage.addmakerule(id)
+       
+def adduserdefine(str):
+       global curimage
+       curimage.adduserdefine(str)
+
+def addaction(id, str):
+       global curimage
+       curimage.addmakeaction(id, str)
+
+def adddep(id, str):
+       global curimage
+       curimage.addmakedepend(id, str)
+
+def set_arch(my_arch):
+       """arch is 'different' ... darn it."""
+       global curimage
+       curimage.setarch(my_arch)
+       setoption('ARCH', my_arch)
+       part('arch', my_arch, 'Config.lb')
+
+def doconfigfile(path, confdir, file):
+       rname = os.path.join(confdir, file)
+       loc.push(rname)
+       fullpath = os.path.join(path, rname)
+       if (not parse('cfgfile', open(fullpath, 'r').read())):
+               fatal("Could not parse file")
+       exitiferrors()
+       loc.pop()
 
+#=============================================================================
+#              MISC FUNCTIONS
+#=============================================================================
 def ternary(val, yes, no):
-       if (debug):
-               print "ternary %s" % expr
-       if (debug):
-               print "expr %s a %d yes %d no %d"% (expr, a, yes, no)
+       debug.info(debug.statement, "ternary %s" % expr)
+       debug.info(debug.statement, "expr %s a %d yes %d no %d"% (expr, a, yes, no))
         if (val == 0):
-               if (debug):
-                   print "Ternary returns %d" % yes
+               debug.info(debug.statement, "Ternary returns %d" % yes)
                return yes
         else:
-               if (debug):
-                       print "Ternary returns %d" % no
+               debug.info(debug.statement, "Ternary returns %d" % no)
                return no
 
-# atoi is in the python library, but not strtol? Weird!
 def tohex(name):
+       """atoi is in the python library, but not strtol? Weird!"""
        return eval('int(%s)' % name)
 
 def IsInt( str ):
@@ -668,13 +1058,6 @@ def IsInt( str ):
        except ValueError:
                return 0
 
-def addrule(id):
-       o = makerule(id)
-       setvalue(makebaserules, id, o)
-       
-def adduserdefine(str):
-       userdefines.append(str)
-
 def dequote(str):
        a = re.sub("^\"", "", str)
        a = re.sub("\"$", "", a)
@@ -682,19 +1065,13 @@ def dequote(str):
        a = re.sub("\\\\\"", "\"", a)
        return a
 
-def addaction(id, str):
-       o = getvalue(makebaserules, id)
-       a = dequote(str)
-       o.addaction(a)
-
-def adddep(id, str):
-       o = getvalue(makebaserules, id)
-       a = dequote(str)
-       o.adddependency(a)
+def flatten_name(str):
+       a = re.sub("/", "_", str)
+       return a
 
-# If the first part of <path> matches treetop, replace that part with "$(TOP)"
 def topify(path):
-       global treetop
+       """If the first part of <path> matches treetop, replace 
+       that part with $(TOP)"""
        if path[0:len(treetop)] == treetop:
                path = path[len(treetop):len(path)]
                if (path[0:1] == "/"):
@@ -702,245 +1079,40 @@ def topify(path):
                path = "$(TOP)/" + path
        return path
 
-# arch is 'different' ... darn it.
-def set_arch(my_arch):
-       global arch
-       global curdir
-       arch = my_arch
-       setoption('ARCH', my_arch)
-       part('arch', my_arch, 'config/make.base.lb')
-
-
-def mainboard(path):
-       global mainboard_dir, treetop
-       mainboard_dir = path
-       full_mainboard_dir = os.path.join(treetop, 'src/mainboard', path)
-       setoption('MAINBOARD', full_mainboard_dir)
-        vendor = re.sub("/.*", "", path)
-        mainboard_part_number = re.sub("[^/]/", "", path)
-       setoption('MAINBOARD_VENDOR', vendor)
-       setoption('MAINBOARD_PART_NUMBER', mainboard_part_number)
-       part('mainboard', path, 'Config.lb')
-
-#=============================================================================
-#              FILE OUTPUT 
-#=============================================================================
-def writemakefileheader(file, fname):
-       file.write("# File: %s\n" % fname)
-       file.write("# This file was generated by '%s %s %s'\n\n"
-               % (sys.argv[0], sys.argv[1], sys.argv[2]))
-
-
-def writemakefilesettings(path):
-       global treetop, arch, mainboard_dir, target_dir, options_by_order, root
-       # 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, "Makefile.settings")
-       print "Creating", filename
-       file = open(filename, 'w+')
-       writemakefileheader(file, filename)
-       file.write("TOP:=%s\n" % (treetop))
-       #file.write("ARCH:=%s\n" % (arch))
-       #file.write("MAINBOARD:=%s\n" % (mainboard_dir))
-       file.write("TARGET_DIR:=%s\n" % (target_dir))
-       for i in options_by_order:
-               if (isexported(i, 0)):
-                       file.write("export %s:=%s\n" % (i, getformated(i, 0)))
-       file.write("export VARIABLES := ")
-       for i in options.keys():
-               if (isexported(i, 0)):
-                       file.write("%s " % i)
-       file.write("\n")
-#      file.write("CPUFLAGS := ")
-#      for i in options.keys():
-#              o = options[i]
-#              file.write("-D%s=%s " % (i, o.getvalue()))
-#      file.write("\n")
-       file.close()
-
-
-# write the makefile
-# let's try the Makefile
-# first, dump all the -D stuff
-
-def writemakefile(path):
-       global root
-       makefilepath = os.path.join(path, "Makefile")
-       print "Creating", makefilepath
-       file = open(makefilepath, 'w+')
-       writemakefileheader(file, makefilepath)
-
-       # file.write("include Makefile.settings\n")
-       # file.write("include cpuflags\n")
-       # Putting "include cpuflags" in the Makefile has the problem that the
-       # cpuflags file would be generated _after_ we want to include it.
-       # Instead, let make do the work of computing CPUFLAGS:
-       file.write("""\
-# Get the value of TOP, VARIABLES, and several other variables.
-include Makefile.settings
-
-# Function to create an item like -Di586 or -DMAX_CPUS='1' or -Ui686
-D_item = $(if $(subst undefined,,$(origin $1)),-D$1$(if $($1),='$($1)',),-U$1)
-
-# Compute the value of CPUFLAGS here during make's first pass.
-CPUFLAGS := $(foreach _var_,$(VARIABLES),$(call D_item,$(_var_)))
-""")
-
-       for i in userdefines:
-               file.write("%s\n" %i)
-       file.write("\n")
-
-       # print out all the object dependencies
-       file.write("\n# object dependencies (objectrules:)\n")
-       file.write("OBJECTS :=\n")
-       file.write("DRIVERS :=\n")
-       for objrule in objectrules.keys():
-               obj = objectrules[objrule]
-               obj_name = obj[0]
-               obj_source = obj[1]
-               file.write("OBJECTS-1 += %s\n" % (obj_name))
-
-       for driverrule in driverrules.keys():
-               driver = driverrules[driverrule]
-               obj_name = driver[0]
-               obj_source = driver[1]
-               file.write("DRIVER += %s\n" % (obj_name))
-
-       # Print out all ldscript.ld dependencies.
-       file.write("\n# ldscript.ld dependencies:\n")
-       file.write("LDSUBSCRIPTS-1 := \n" )
-       for script in ldscripts:
-               file.write("LDSUBSCRIPTS-1 += %s\n" % topify(script))
-
-       # 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)
-
-       file.write("\nSOURCES=\n")
-       #for source in sources:
-               #file.write("SOURCES += %s\n" % source)
-       
-       # Print out the user defines.
-       file.write("\n# userdefines:\n")
-       #for udef in userdefines:
-               #file.write("%s\n" % udef)
-               
-       # Print out the base rules.
-       # Need to have a rule that counts on 'all'.
-       file.write("\n# mainrulelist:")
-       #file.write("\nmainrule: %s\n" % mainrulelist)
-
-       # Print out any user rules.
-       file.write("\n# From makerule or docipl commands:\n")
-       # Old way (hash order): for target in makebaserules.keys():
-       # New way (config file order):
-       #for target in makerule_targets:
-               #makebaserules[target].write(file)
-
-       file.write("\n# objectrules:\n")
-       for objrule in objectrules.keys():
-               obj = objectrules[objrule]
-               source = topify(obj[1])
-               file.write("%s: %s\n" % (obj[0], source))
-               file.write("\t$(CC) -c $(CFLAGS) -o $@ $<\n")
-               #file.write("%s\n" % objrule[2])
-
-       for driverrule in driverrules.keys():
-               driver = driverrules[driverrule]
-               source = topify(driver[1])
-               file.write("%s: %s\n" % (driver[0], source))
-               #file.write("%s\n" % objrule[2])
-
-       # Print out the rules that will make cause the files
-       # generated by NLBConfig.py to be remade if any dependencies change.
-
-       file.write("\n# Remember the automatically generated files\n")
-       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)
-
-       file.write("\n# Remake Makefile (and the other files generated by\n")
-       file.write("# NLBConfig.py) if any config dependencies change.\n")
-
-       for cfile in config_file_list:
-               file.write("$(GENERATED): %s\n" % topify(cfile))
-
-       for depfile in [ '%s' % top_config_file,    # This a duplicate, remove?
-                       '$(TOP)/util/config/NLBConfig.py',
-                       '$(TOP)/src/arch/$(ARCH)/config/make.base' ]:
-               file.write("$(GENERATED): %s\n" % depfile)
-
-       file.write("$(GENERATED):\n")
-       file.write("\tpython $(TOP)/util/config/NLBConfig.py %s $(TOP)\n"
-                       % top_config_file)
-
-       keys = root.options.keys()
-       keys.sort()
-       file.write("\necho:\n")
-       for key in keys:
-                file.write("\t@echo %s='$(%s)'\n"% (key,key))
-       
-
-       for i in makebaserules.keys():
-               m = makebaserules[i]
-               file.write("%s: " %i)
-               for i in m.dependency:
-                       file.write("%s " % i)
-               file.write("\n")
-               for i in m.actions:
-                       file.write("\t%s\n" % i)
-       file.close()
-
-# Write out crt0_includes.h (top-level assembly language) include file.
-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()
-
-
 %%
+# to make if work without 2 passses, we use an old hack from SIMD, the 
+# context bit. If the bit is 1, then ops get done, otherwise
+# ops don't get done. From the top level, context is always
+# 1. In an if, context depends on eval of the if condition
+
 parser Config:
     ignore:                    r'\s+'
     ignore:                    "#.*?\r?\n"
 
     # 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'
+    token BUILDROM:            'buildrom'
     token COMMENT:             'comment'
     token CPU:                 'cpu'
     token DEFAULT:             'default'
     token DEFINE:              'define'
-    token DEP:                 'dep'
+    token DEPENDS:             'depends'
     token DIR:                 'dir'
     token DRIVER:              'driver'
     token ELSE:                        'else'
-    token END:                 '$|end'
+    token END:                 'end'
+    token EOF:                 '$'
     token EQ:                  '='
     token EXPORT:              'export'
     token FORMAT:              'format'
     token IF:                  'if'
     token INIT:                        'init'
+    token INITOBJECT:          'initobject'
+    token INITINCLUDE:         'initinclude'
     token LDSCRIPT:            'ldscript'
     token LOADOPTIONS:         'loadoptions'
     token MAINBOARD:           'mainboard'
@@ -954,7 +1126,9 @@ parser Config:
     token OPTION:              'option'
     token PAYLOAD:             'payload'
     token PMC:                 'pmc'
+    token PRINT:               'print'
     token REGISTER:            'register'
+    token ROMIMAGE:            'romimage'
     token SOUTHBRIDGE:         'southbridge'
     token SUPERIO:             'superio'
     token TARGET:              'target'
@@ -967,7 +1141,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'"([^\\"]+|\\.)*"'
@@ -999,11 +1173,8 @@ parser Config:
 
     rule unop:         "!" expr                {{ return not(expr) }}
 
-    rule partend<<C>>: (stmt<<C>>)* END        {{ partpop()}}
+    rule partend<<C>>: (stmt<<C>>)* END        {{ if (C): partpop()}}
 
-    rule mainboard:    MAINBOARD PATH          {{ mainboard(PATH) }}
-                       partend<<1>>
-                       
     rule northbridge<<C>>:
                        NORTHBRIDGE PATH        {{ if (C): part('northbridge', PATH, 'Config.lb') }}
                        partend<<C>>
@@ -1024,9 +1195,17 @@ parser Config:
                        SOUTHBRIDGE PATH        {{ if (C): part('southbridge', PATH, 'Config.lb')}}
                        partend<<C>>
 
-    rule mainboardinit<<C>>: 
+    rule mainboardinit<<C>>:
                        MAINBOARDINIT DIRPATH   {{ if (C): addcrt0include(DIRPATH)}}
 
+    rule initinclude<<C>>: 
+                       INITINCLUDE 
+                       STR 
+                       DIRPATH                 {{ if (C): addinitinclude(STR, DIRPATH)}}
+
+    rule initobject<<C>>:
+                       INITOBJECT DIRPATH      {{ if (C): addinitobject(DIRPATH)}}
+
     rule object<<C>>:  OBJECT DIRPATH          {{ if (C): addobject(DIRPATH)}}
 
     rule driver<<C>>:  DRIVER DIRPATH          {{ if (C): adddriver(DIRPATH)}}
@@ -1035,21 +1214,19 @@ parser Config:
 
     rule ldscript<<C>>:        LDSCRIPT DIRPATH        {{ if (C): addldscript(DIRPATH) }}
 
-    rule payload<<C>>: PAYLOAD DIRPATH         {{ if (C): payload(DIRPATH) }}
-
-# if is a bad id ....
-# needs to be C and ID, but nested if's are, we hope, not going to 
-# happen. IF so, possibly ID && C could be used.
     rule iif<<C>>:     IF ID                   {{ c = lookup(ID) }}
-                       (stmt<<c>>)* [ ELSE (stmt<<not c>>)* ] END
+                       (stmt<<C and c>>)* 
+                       [ ELSE (stmt<<C and not c>>)* ]
+                       END
 
     rule depsacts<<ID, C>>:
-                       ( 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<<C>>:        MAKERULE DIRPATH        {{ if (C): addrule(DIRPATH) }} 
                        depsacts<<DIRPATH, C>> 
+                       END
 
     rule makedefine<<C>>:
                        MAKEDEFINE RAWTEXT      {{ if (C): adduserdefine(RAWTEXT) }}
@@ -1057,36 +1234,47 @@ parser Config:
     rule addaction<<C>>:
                        ADDACTION ID STR        {{ if (C): addaction(ID, STR) }}
 
-    rule init<<C>>:    INIT STR                {{ if (C): curpart.addinit(STR) }}
+    rule init<<C>>:    INIT DIRPATH            {{ if (C): addinit(DIRPATH) }}
 
-    rule register<<C>>:        REGISTER STR            {{ if (C): curpart.addregister(STR) }}
+    rule register<<C>>:        REGISTER STR            {{ if (C): addregister(STR) }}
 
-# to make if work without 2 passses, we use an old hack from SIMD, the 
-# context bit. If the bit is 1, then ops get done, otherwise
-# ops don't get done. From the top level, context is always
-# 1. In an if, context depends on eval of the if condition
-    rule stmt<<C>>:    cpu<<C>>                {{ return cpu}}
-               |       pmc<<C>>                {{ return pmc}}
-               |       arch<<C>>               {{ return arch}}
-               |       northbridge<<C>>        {{ return northbridge }}
-               |       southbridge<<C>>        {{ return southbridge }}
-               |       superio<<C>>            {{ return superio }}
-               |       object<<C>>             {{ return object }}
+    rule prtval:       expr                    {{ return str(expr) }}
+               |       STR                     {{ return STR }}
+
+    rule prtlist:      prtval                  {{ el = "%(" + prtval }}
+                       ( "," prtval            {{ el = el + "," + prtval }}
+                       )*                      {{ return el + ")" }}   
+
+    rule prtstmt<<C>>: PRINT STR               {{ val = STR }}
+                       [ "," prtlist           {{ val = val + prtlist }}
+                       ]                       {{ if (C): print eval(val) }}
+
+    rule stmt<<C>>:    arch<<C>>               {{ return arch}}
+               |       addaction<<C>>          {{ return addaction }}
+               |       cpu<<C>>                {{ return cpu}}
+               |       dir<<C>>                {{ return dir}}
                |       driver<<C>>             {{ return driver }}
+               |       iif<<C>>                {{ return iif }}
+               |       init<<C>>               {{ return init }}
+               |       initinclude<<C>>        {{ return initinclude }}
+               |       initobject<<C>>         {{ return initobject }}
+               |       ldscript<<C>>           {{ return ldscript}}
                |       mainboardinit<<C>>      {{ return mainboardinit }}
-               |       makerule<<C>>           {{ return makerule }}
                |       makedefine<<C>>         {{ return makedefine }}
-               |       addaction<<C>>          {{ return addaction }}
-               |       init<<C>>               {{ return init }}
+               |       makerule<<C>>           {{ return makerule }}
+               |       northbridge<<C>>        {{ return northbridge }}
+               |       object<<C>>             {{ return object }}
+               |       option<<C>>             {{ return option }}
+               |       pmc<<C>>                {{ return pmc}}
+               |       prtstmt<<C>>            {{ return prtstmt}}
                |       register<<C>>           {{ return register}}
-               |       iif<<C>>                {{ return iif }}
-               |       dir<<C>>                {{ return dir}}
-               |       ldscript<<C>>           {{ return ldscript}}
-               |       payload<<C>>            {{ return payload}}
+               |       southbridge<<C>>        {{ return southbridge }}
+               |       superio<<C>>            {{ return superio }}
 
     # ENTRY for parsing Config.lb file
-    rule cfgfile:      (uses<<1>>)* (stmt<<1>>)*
-                                               {{ return 1 }}
+    rule cfgfile:      (uses<<1>>)* 
+                       (stmt<<1>>)*
+                       EOF                     {{ return 1 }}
 
     rule usesid<<C>>:  ID                      {{ if (C): usesoption(ID) }}
 
@@ -1096,23 +1284,55 @@ parser Config:
                |       expr                    {{ return expr }}
                |       DELEXPR                 {{ return DELEXPR }}
 
-    rule option<<C>>:  OPTION ID EQ value      {{ if (C): setoptionstmt(ID, value) }}
+    rule option<<C>>:  OPTION ID EQ value      {{ if (C): setoption(ID, value) }}
 
-    rule opif:         IF ID                   {{ c = lookup(ID) }}
-                       (option<<c>>)* [ ELSE (option<<not c>>)* ] END
+    rule opif<<C>>:    IF ID                   {{ c = lookup(ID) }}
+                       (opstmt<<C and c>>)* 
+                       [ ELSE (opstmt<<C and not c>>)* ] 
+                       END
 
-    rule opstmt:       option<<1>>
-               |       opif
+    rule opstmt<<C>>:  option<<C>>
+               |       opif<<C>>
+               |       prtstmt<<C>>
 
-    # ENTRY for parsing a delayed value
-    rule delexpr:      "{" expr "}"            {{ return expr }}
+    rule payload<<C>>: PAYLOAD DIRPATH         {{ if (C): payload(DIRPATH) }}
+
+    rule mainboard<<C>>:
+                       MAINBOARD PATH          {{ if (C): mainboard(PATH) }}
+
+    rule romif<<C>>:   IF ID                   {{ c = lookup(ID) }}
+                       (romstmt<<C and c>>)* 
+                       [ ELSE (romstmt<<C and not c>>)* ]
+                       END
+
+    rule romstmt<<C>>: romif<<C>>
+               |       option<<C>>
+               |       mainboard<<C>>
+               |       payload<<C>>
+
+    rule romimage:     ROMIMAGE STR            {{ startromimage(dequote(STR)) }}
+                       (romstmt<<1>>)*
+                       END                     {{ endromimage() }}
+
+    rule roms:         STR                     {{ s = '(' + STR }}
+                       ( STR                   {{ s = s + "," + STR }}
+                       )*                      {{ return eval(s + ')') }}
+
+    rule buildrom:     BUILDROM expr roms      {{ addbuildrom(expr, roms) }}
+
+    rule romstmts:     romimage 
+               |       buildrom
+               |       opstmt<<1>>
 
     # ENTRY for parsing root part
     rule board:                LOADOPTIONS             {{ loadoptions() }}
                        TARGET DIRPATH          {{ target(DIRPATH) }}
                        (uses<<1>>)*
-                       (opstmt)*
-                       mainboard               {{ return 1 }}
+                       (romstmts)*             
+                       EOF                     {{ return 1 }}
+
+    # ENTRY for parsing a delayed value
+    rule delexpr:      "{" expr "}" EOF        {{ return expr }}
 
     rule defstmts<<ID>>:                       {{ d = 0 }}
                        ( DEFAULT
@@ -1132,44 +1352,333 @@ parser Config:
                        defstmts<<ID>> END      {{ validdef(ID, defstmts) }}
 
     # ENTRY for parsing Options.lb file
-    rule options:      (define)* END           {{ return 1 }}
+    rule options:      (define)* EOF           {{ return 1 }}
 %%
 
+#=============================================================================
+#              FILE OUTPUT 
+#=============================================================================
+def writemakefileheader(file, fname):
+       file.write("# File: %s\n" % fname)
+       file.write("# This file was generated by '%s %s %s'\n\n"
+               % (sys.argv[0], sys.argv[1], sys.argv[2]))
+
+def writemakefilesettings(path):
+       global treetop, target_dir
+       # 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, "Makefile.settings")
+       print "Creating", filename
+       file = open(filename, 'w+')
+       writemakefileheader(file, filename)
+       file.write("TOP:=%s\n" % (treetop))
+       file.write("TARGET_DIR:=%s\n" % target_dir)
+#      for i in global_options_by_order:
+#              if (isexported(i, 0)):
+#                      file.write("export %s:=%s\n" % (i, getformated(i, 0)))
+#      file.write("export VARIABLES := ")
+#      for i in global_options.keys():
+#              if (isexported(i, 0)):
+#                      file.write("%s " % i)
+       file.write("\n")
+       file.close()
+
+def writeimagesettings(image):
+       global treetop
+       global global_options_by_order
+       # 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(image.gettargetdir(), "Makefile.settings")
+       print "Creating", filename
+       file = open(filename, 'w+')
+       writemakefileheader(file, filename)
+       file.write("TOP:=%s\n" % (treetop))
+       file.write("TARGET_DIR:=%s\n" % (image.gettargetdir()))
+       for i in global_options_by_order:
+               if (isexported(i)):
+                       file.write("export %s:=%s\n" % (i, getformated(i, image)))
+       file.write("export VARIABLES := ")
+       for i in global_options_by_order:
+               if (isexported(i)):
+                       file.write("%s " % i)
+       file.write("\n")
+       file.close()
+
+# write the romimage makefile
+# let's try the Makefile
+# first, dump all the -D stuff
+
+def writeimagemakefile(image):
+       makefilepath = os.path.join(image.gettargetdir(), "Makefile")
+       print "Creating", makefilepath
+       file = open(makefilepath, 'w+')
+       writemakefileheader(file, makefilepath)
+
+       #file.write("include cpuflags\n")
+       # Putting "include cpuflags" in the Makefile has the problem that the
+       # cpuflags file would be generated _after_ we want to include it.
+       # Instead, let make do the work of computing CPUFLAGS:
+       file.write("# Get the value of TOP, VARIABLES, and several other variables.\n")
+       file.write("include Makefile.settings\n\n")
+       file.write("# Function to create an item like -Di586 or -DMAX_CPUS='1' or -Ui686\n")
+       file.write("D_item = $(if $(subst undefined,,$(origin $1)),-D$1$(if $($1),='$($1)',),-U$1)\n\n")
+       file.write("# Compute the value of CPUFLAGS here during make's first pass.\n")
+       file.write("CPUFLAGS := $(foreach _var_,$(VARIABLES),$(call D_item,$(_var_)))\n\n")
+
+       for i in image.getuserdefines():
+               file.write("%s\n" %i)
+       file.write("\n")
+
+       # main rule
+       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, init in image.getinitobjectrules().items():
+               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, obj in image.getobjectrules().items():
+               obj_name = obj[0]
+               obj_source = obj[1]
+               file.write("OBJECTS += %s\n" % (obj_name))
+               file.write("SOURCES += %s\n" % (obj_source))
+
+       # for chip_target.c
+       file.write("OBJECTS += chip_%s.o\n" % target_name)
+       file.write("SOURCES += chip_%s.c\n" % target_name)
+
+       for driverrule, driver in image.getdriverrules().items():
+               obj_name = driver[0]
+               obj_source = driver[1]
+               file.write("DRIVER += %s\n" % (obj_name))
+               file.write("SOURCES += %s\n" % (obj_source))
+
+       # Print out all ldscript.ld dependencies.
+       file.write("\n# ldscript.ld dependencies:\n")
+       file.write("LDSUBSCRIPTS-1 := \n" )
+       for script in image.getldscripts():
+               file.write("LDSUBSCRIPTS-1 += %s\n" % topify(script))
+
+       # Print out the dependencies for crt0_includes.h
+       file.write("\n# Dependencies for crt0_includes.h\n")
+       file.write("CRT0_INCLUDES:=\n")
+       for inc in image.getinitincludes().keys():
+               if (local_path.match(inc)):
+                       file.write("CRT0_INCLUDES += %s\n" % inc)
+               else:
+                       file.write("CRT0_INCLUDES += $(TOP)/src/%s\n" % inc)
+
+       # Print out the user defines.
+       file.write("\n# userdefines:\n")
+       #for udef in image.userdefines:
+               #file.write("%s\n" % udef)
+               
+       # Print out the base rules.
+       # Need to have a rule that counts on 'all'.
+       file.write("\n# mainrulelist:")
+       #file.write("\nmainrule: %s\n" % image.mainrulelist)
+
+       # Print out any user rules.
+       file.write("\n# From makerule or docipl commands:\n")
+       # Old way (hash order): for target in makebaserules.keys():
+       # New way (config file order):
+       #for target in image.makerule_targets:
+               #image.makebaserules[target].write(file)
+
+       file.write("\n# objectrules:\n")
+       for objrule, obj in image.getobjectrules().items():
+               source = topify(obj[1])
+               file.write("%s: %s\n" % (obj[0], source))
+               file.write("\t$(CC) -c $(CFLAGS) -o $@ $<\n")
+               #file.write("%s\n" % objrule[2])
+
+       for driverrule, driver in image.getdriverrules().items():
+               source = topify(driver[1])
+               file.write("%s: %s\n" % (driver[0], source))
+               file.write("\t$(CC) -c $(CFLAGS) -o $@ $<\n")
+               #file.write("%s\n" % objrule[2])
+
+       # special rule for chip_target.c
+       file.write("chip_%s.o: chip_%s.c\n" % (target_name, target_name))
+       file.write("\t$(CC) -c $(CFLAGS) -o $@ $<\n")
+
+       # Print out the rules that will make cause the files
+       # generated by NLBConfig.py to be remade if any dependencies change.
+
+       file.write("\n# Remember the automatically generated files\n")
+       file.write("GENERATED:=\n")
+       for genfile in ['Makefile',
+                       'nsuperio.c',
+                       'chip_%s.c' % target_name, 
+                       'LinuxBIOSDoc.config' ]:
+               file.write("GENERATED += %s\n" % genfile)
+       file.write("GENERATED += %s\n" % image.getincludefilename())
+
+       #file.write("\n# Remake Makefile (and the other files generated by\n")
+       #file.write("# NLBConfig.py) if any config dependencies change.\n")
+
+       #for cfile in image.config_file_list:
+       #       file.write("$(GENERATED): %s\n" % topify(cfile))
+
+       #for depfile in [ '%s' % top_config_file,    # This a duplicate, remove?
+       #               '$(TOP)/util/config/NLBConfig.py',
+       #               '$(TOP)/src/arch/$(ARCH)/config/make.base' ]:
+       #       file.write("$(GENERATED): %s\n" % depfile)
+
+       #file.write("$(GENERATED):\n")
+       #file.write("\tpython $(TOP)/util/config/NLBConfig.py %s $(TOP)\n"
+       #               % top_config_file)
+
+       keys = image.getroot().uses_options.keys()
+       keys.sort()
+       file.write("\necho:\n")
+       for key in keys:
+                file.write("\t@echo %s='$(%s)'\n"% (key,key))
+
+       for i, m in image.getmakerules().items():
+               file.write("%s: " %i)
+               for i in m.dependency:
+                       file.write("%s " % i)
+               file.write("\n")
+               for i in m.actions:
+                       file.write("\t%s\n" % i)
+       file.close()
+
+#
+def writemakefile(path):
+       makefilepath = os.path.join(path, "Makefile")
+       print "Creating", makefilepath
+       file = open(makefilepath, 'w+')
+       writemakefileheader(file, makefilepath)
+
+       # main rule
+       file.write("all: ")
+       for i in romimages.keys():
+               file.write("%s-rom " % i)
+       file.write("\n\n")
+       for i, o in romimages.items():
+               file.write("%s-rom:\n" % o.getname())
+               file.write("\tif (cd %s; \\\n" % o.getname())
+               file.write("\t\tmake linuxbios.rom)\\\n");
+               file.write("\tthen true; else exit 1; fi;\n\n")
+       file.close()
+
+def writeinitincludes(image):
+       global include_pattern
+       filepath = os.path.join(image.gettargetdir(), image.getincludefilename())
+       print "Creating", filepath
+       outfile = open(filepath, 'w+')
+       if (image.newformat()):
+               infile = open(image.getinitfile(), 'r')
+
+               line = infile.readline()
+               while (line):
+                       p = include_pattern.match(line)
+                       if (p):
+                               for i, inc in image.getinitincludes().items():
+                                       if (inc.getstring() == p.group(1)):
+                                               outfile.write("#include \"%s\"\n" % inc.getpath())
+                       else:
+                               outfile.write(line);
+                       line = infile.readline()
+
+               infile.close()
+       else:
+               for i in image.getinitincludes().keys():
+                       outfile.write("#include <%s>\n" % i)
+       outfile.close()
+
+def writeldoptions(image):
+       # 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(image.gettargetdir(), "ldoptions")
+       print "Creating", filename
+       file = open(filename, 'w+')
+       for i in global_options.keys():
+               if (isexported(i) and IsInt(getoption(i, image))):
+                       file.write("%s = %s;\n" % (i, getformated(i, image)))
+       file.close()
+
 def dumptree(part, lvl):
-       if (debug):
-               print "DUMPTREE ME is"
+       debug.info(debug.dumptree, "DUMPTREE ME is")
        part.dumpme(lvl)
        # dump the siblings -- actually are there any? not sure
+       # siblings are:
+       debug.info(debug.dumptree, "DUMPTREE SIBLINGS are")
+       kid = part.siblings
+       while (kid):
+               kid.dumpme(lvl)
+               kid = kid.siblings
        # dump the kids
-       if (debug):
-               print "DUMPTREE KIDS are"
-       for kid in part.children:
-               dumptree(kid, lvl+1)
-       if (debug):
-               print "DONE DUMPTREE"
-
-def gencode(part):
-       if (debug):
-               print "GENCODE ME is"
-       if (debug):
-               part.gencode()
-       # dump the siblings -- actually are there any? not sure
-       # dump the kids
-       if (debug):
-               print "GENCODE KIDS are"
-       for kid in part.children:
-               gencode(kid)
-       if (debug):
-               print "DONE GENCODE"
-       
+       debug.info(debug.dumptree, "DUMPTREE KIDS are")
+       #for kid in part.children:
+       if (part.children):
+               dumptree(part.children, lvl+1)
+       debug.info(debug.dumptree, "DONE DUMPTREE")
+
+def writecode(image):
+       filename = os.path.join(img_dir, "chip_%s.c" % target_name)
+       print "Creating", filename
+       file = open(filename, 'w+')
+       # gen all the forward references
+
+       i = 0
+       file.write("#include <device/chip.h>\n")
+       file.write("struct chip ")
+       while (i <= image.numparts()):
+               if (i):
+                       file.write(", dev%d"% i)
+               else:
+                       file.write("root")
+               i = i + 1
+       file.write(";\n")
+       gencode(image.getroot(), file)
+       file.close()
 
-def doconfigfile(path, file):
-       filename = os.path.join(path, file)
-       loc.push_file(filename)
-       if (not parse('cfgfile', open(filename, 'r').read())):
-               fatal("Error: Could not parse file")
-       exitiferrors()
+def gencode(part, file):
+       debug.info(debug.gencode, "GENCODE ME is")
+       part.gencode(file)
+       # dump the siblings -- actually are there any? not sure
+       debug.info(debug.gencode, "GENCODE SIBLINGS are")
+       kid = part.siblings
+       while (kid):
+               kid.gencode(file)
+               kid = kid.siblings
+       # now dump the children 
+       debug.info(debug.gencode, "GENCODE KIDS are")
+       if (part.children):
+               gencode(part.children, file)
+       kid = part.siblings
+       while (kid):
+               if (kid.children):
+                       gencode(kid.children, file)
+               kid = kid.siblings
+       debug.info(debug.gencode, "DONE GENCODE")
+
+def verifyparse(image):
+       """Add any run-time checks to verify that parsing the configuration
+       was successful"""
+       if (image.newformat() and image.getinitfile() == ''):
+               fatal("An init file must be specified")
 
+#=============================================================================
+#              MAIN PROGRAM
+#=============================================================================
 if __name__=='__main__':
        from sys import argv
        if (len(argv) < 3):
@@ -1181,28 +1690,45 @@ if __name__=='__main__':
        treetop = os.path.abspath(sys.argv[2])
 
        # Now read in the customizing script...
-       loc.push_file(argv[1])
+       loc.push(argv[1])
        if (not parse('board', open(argv[1], 'r').read())):
-               fatal("Error: Could not parse file")
-
-       if (debug):
-               print "DEVICE TREE:"
-               dumptree(root, 0)
-
-       gencode(root)
-
-       # crt0 includes
-       if (debug):
-               for i in crt0includes:
-                       print "crt0include file %s" % (i)
-               for i in driverrules.keys():
-                       print "driver file %s" % (i)
-               for i in ldscripts:
-                       print "ldscript file %s" % (i)
-               for i in makebaserules.keys():
-                       m = makebaserules[i]
-                       print " makerule %s dep %s act %s" % (i, m.dependency, m.actions)
+               fatal("Could not parse file")
+       loc.pop()
+
+       for r in romimages.keys():
+               verifyparse(getdict(romimages, r))
+
+       # no longer need to check if an options has been used
+       alloptions = 1
+
+       for image_name, image in romimages.items():
+               if (debug.level(debug.dumptree)):
+                       debug.info(debug.dumptree, "DEVICE TREE:")
+                       dumptree(image.getroot(), 0)
+
+               img_dir = image.gettargetdir()
+               if not os.path.isdir(img_dir):
+                       print "Creating directory %s" % img_dir
+                       os.makedirs(img_dir)
+
+               # crt0 includes
+               if (debug.level(debug.dump)):
+                       for i in image.getinitincludes().keys():
+                               debug.info(debug.dump, "crt0include file %s" % i)
+                       for i in image.getdriverrules().keys():
+                               debug.info(debug.dump, "driver file %s" % i)
+                       for i in image.getldscripts():
+                               debug.info(debug.dump, "ldscript file %s" % i)
+                       for i, m in image.getmakerules().items():
+                               debug.info(debug.dump, " makerule %s dep %s act %s" % (i, m.dependency, m.actions))
+
+               writecode(image)
+               writeimagesettings(image)
+               writeinitincludes(image)
+               writeimagemakefile(image)
+               writeldoptions(image)
 
        writemakefilesettings(target_dir)
-       writecrt0_includes(target_dir)
        writemakefile(target_dir)
+
+       sys.exit(0)