v2/src romfs->cbfs rename
[coreboot.git] / util / newconfig / config.g
index 93e36bbde222befdc046601f5a07c39f45d8f4fb..02e04b1ff6b26746f0cb06477ee1df650021f4ee 100644 (file)
@@ -22,7 +22,9 @@ global_uses_options = {}
 global_exported_options = []
 romimages = {}
 buildroms = []
+rommapping = {}
 curimage = 0
+bootblocksize = 0
 alloptions = 0 # override uses at top level
 
 local_path = re.compile(r'^\.')
@@ -93,6 +95,7 @@ class debug_info:
        dict = 4
        statement = 5
        dump = 6
+       gengraph = 7
 
        def __init__(self, *level):
                self.__level = level
@@ -108,7 +111,8 @@ class debug_info:
                        print str
 
 global debug
-debug = debug_info(debug_info.none)
+debug = debug_info(debug_info.dumptree)
+debug = debug_info(debug_info.object)
 
 # -----------------------------------------------------------------------------
 #                    Error Handling
@@ -226,6 +230,9 @@ class romimage:
                # driver files added by 'driver' directive
                self.driverrules = {}
 
+               # smm object files added by 'smmobject' directive
+               self.smmobjectrules = {}
+
                # loader scripts added by 'ldscript' directive
                self.ldscripts = []
 
@@ -272,8 +279,11 @@ class romimage:
                self.arch = arch
 
        def setpayload(self, payload):
+               global rommapping
                self.payload = payload
 
+               rommapping[self.name] = payload
+
        def setinitfile(self, initfile):
                self.initfile = initfile
 
@@ -326,14 +336,20 @@ class romimage:
                type = object_name[-1:]
                if (object_name[0] == '.'):
                        source = base + suffix
+                       object = base + '.o'
+                       rel_base = base
                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)
+                       rel_base = re.sub(treetop, "", os.path.join(dirstack.tos(), base))
+                       source = "$(TOP)/" + rel_base + suffix
+                       if (rel_base[0] == '/'):
+                               rel_base = re.sub("^/", "", rel_base)
+                       object = rel_base + '.o'
+
+               debug.info(debug.object, "add object %s source %s" % (object, source))
+               l = getdict(dict, rel_base)
                if (l):
-                       warning("object/driver %s previously defined" % base)
-               setdict(dict, base, [object, source, type, base])
+                       warning("object/driver %s previously defined" % rel_base)
+               setdict(dict, rel_base, [object, source, type, rel_base])
 
        def addinitobjectrule(self, name):
                self.addobjectdriver(self.initobjectrules, name)
@@ -344,6 +360,9 @@ class romimage:
        def adddriverrule(self, name):
                self.addobjectdriver(self.driverrules, name)
 
+       def addsmmobjectrule(self, name):
+               self.addobjectdriver(self.smmobjectrules, name)
+
        def getinitobjectrules(self):
                return self.initobjectrules
 
@@ -371,6 +390,15 @@ class romimage:
                        return o
                fatal("No such driver rule \"%s\"" % name)
 
+       def getsmmobjectrules(self):
+               return self.smmobjectrules
+
+       def getsmmobjectrule(self, name):
+               o = getdict(self.smmobjectrules, name)
+               if (o):
+                       return o
+               fatal("No such smm object rule \"%s\"" % name)
+
        def addldscript(self, path):
                self.ldscripts.append(path)
 
@@ -682,6 +710,18 @@ class partobj:
                else:
                        name = "%s %s" % (name, self.path)
                return name
+
+       def graph_name(self):
+               name = "{ {_dev%d|" % self.instance
+               if (self.part):
+                       name = "%s%s" % (name, self.part)
+               else:
+                       name = "%s%s" % (name, self.chip_or_device)
+               if (self.type_name):
+                       name = "%s}|%s}" % (name, self.type_name)
+               else:
+                       name = "%s}|%s}" % (name, self.parent.type_name)
+               return name
                        
        def dumpme(self, lvl):
                """Dump information about this part for debugging"""
@@ -917,7 +957,7 @@ class partobj:
                        fatal("Invalid device id")
                if ((function < 0) or (function > 7)):
                        fatal("Invalid pci function %s" % function )
-               self.set_path(".type=DEVICE_PATH_PCI,.u={.pci={ .devfn = PCI_DEVFN(0x%x,%d)}}" % (slot, function))
+               self.set_path(".type=DEVICE_PATH_PCI,{.pci={ .devfn = PCI_DEVFN(0x%x,%d)}}" % (slot, function))
 
        def addpnppath(self, port, device):
                """ Add a relative path to a pnp device hanging off our parent """
@@ -925,44 +965,44 @@ class partobj:
                        fatal("Invalid port")
                if ((device < 0) or (device > 0xffff)):
                        fatal("Invalid device")
-               self.set_path(".type=DEVICE_PATH_PNP,.u={.pnp={ .port = 0x%x, .device = 0x%x }}" % (port, device))
+               self.set_path(".type=DEVICE_PATH_PNP,{.pnp={ .port = 0x%x, .device = 0x%x }}" % (port, device))
                
        def addi2cpath(self, device):
                """ Add a relative path to a i2c device hanging off our parent """
                if ((device < 0) or (device > 0x7f)):
                        fatal("Invalid device")
-               self.set_path(".type=DEVICE_PATH_I2C,.u={.i2c={ .device = 0x%x }}" % (device))
+               self.set_path(".type=DEVICE_PATH_I2C,{.i2c={ .device = 0x%x }}" % (device))
 
        def addapicpath(self, apic_id):
                """ Add a relative path to a cpu device hanging off our parent """
                if ((apic_id < 0) or (apic_id > 255)):
                        fatal("Invalid device")
-               self.set_path(".type=DEVICE_PATH_APIC,.u={.apic={ .apic_id = 0x%x }}" % (apic_id))
+               self.set_path(".type=DEVICE_PATH_APIC,{.apic={ .apic_id = 0x%x }}" % (apic_id))
     
        def addpci_domainpath(self, pci_domain):
                """ Add a pci_domain number to a chip """
                if ((pci_domain < 0) or (pci_domain > 0xffff)):
                        fatal("Invalid pci_domain: 0x%x is out of the range 0 to 0xffff" % pci_domain)
-               self.set_path(".type=DEVICE_PATH_PCI_DOMAIN,.u={.pci_domain={ .domain = 0x%x }}" % (pci_domain))
+               self.set_path(".type=DEVICE_PATH_PCI_DOMAIN,{.pci_domain={ .domain = 0x%x }}" % (pci_domain))
     
        def addapic_clusterpath(self, cluster):
                """ Add an apic cluster to a chip """
                if ((cluster < 0) or (cluster > 15)):
                        fatal("Invalid apic cluster: %d is out of the range 0 to ff" % cluster)
-               self.set_path(".type=DEVICE_PATH_APIC_CLUSTER,.u={.apic_cluster={ .cluster = 0x%x }}" % (cluster))
+               self.set_path(".type=DEVICE_PATH_APIC_CLUSTER,{.apic_cluster={ .cluster = 0x%x }}" % (cluster))
     
        def addcpupath(self, cpu_id):
                """ Add a relative path to a cpu device hanging off our parent """
                if ((cpu_id < 0) or (cpu_id > 255)):
                        fatal("Invalid device")
-               self.set_path(".type=DEVICE_PATH_CPU,.u={.cpu={ .id = 0x%x }}" % (cpu_id))
+               self.set_path(".type=DEVICE_PATH_CPU,{.cpu={ .id = 0x%x }}" % (cpu_id))
     
 
        def addcpu_buspath(self, id):
                """ Add a cpu_bus to a chip """
                if ((id < 0) or (id > 255)):
                        fatal("Invalid device")
-               self.set_path(".type=DEVICE_PATH_CPU_BUS,.u={.cpu_bus={ .id = 0x%x }}" % (id))
+               self.set_path(".type=DEVICE_PATH_CPU_BUS,{.cpu_bus={ .id = 0x%x }}" % (id))
     
        def usesoption(self, name):
                """Declare option that can be used by this part"""
@@ -990,6 +1030,8 @@ def getdict(dict, name):
 
 def setdict(dict, name, value):
        debug.info(debug.dict, "setdict sets %s to %s" % (name, value))
+       if name in dict.keys():
+               print "Duplicate in dict: %s" % name
        dict[name] = value
 
 # options. 
@@ -1314,7 +1356,10 @@ def startromimage(name):
 
 def endromimage():
        global curimage
+       global bootblocksize
        mainboard()
+       imagesize = getoption("ROM_IMAGE_SIZE", curimage)
+       bootblocksize += imagesize
        print "End ROMIMAGE"
        curimage = 0
        #curpart = 0
@@ -1338,7 +1383,7 @@ def mainboard():
        fulldir = os.path.join(srcdir, partdir)
        type_name = flatten_name(partdir)
        newpart = partobj(curimage, fulldir, partstack.tos(), 'mainboard', \
-               type_name, 0, 'chip')
+               'mainboard', 0, 'chip')
        #print "Configuring PART %s" % (type)
        partstack.push(newpart)
        #print "  new PART tos is now %s\n" %partstack.tos().info()
@@ -1370,6 +1415,10 @@ def adddriver(driver_name):
        global curimage
        curimage.adddriverrule(driver_name)
 
+def addsmmobject(object_name):
+       global curimage
+       curimage.addsmmobjectrule(object_name)
+
 def target(name):
         global target_dir, target_name
        print "Configuring TARGET %s" % name
@@ -1593,6 +1642,7 @@ parser Config:
     token PRINT:               'print'
     token REGISTER:            'register'
     token ROMIMAGE:            'romimage'
+    token SMMOBJECT:           'smmobject'
     token SOUTHBRIDGE:         'southbridge'
     token SUPERIO:             'superio'
     token TARGET:              'target'
@@ -1693,6 +1743,10 @@ parser Config:
 
     rule driver<<C>>:  DRIVER DIRPATH          {{ if (C): adddriver(DIRPATH)}}
 
+    rule smmobject<<C>>:
+                       SMMOBJECT DIRPATH       {{ if (C): addsmmobject(DIRPATH)}}
+
+
     rule dir<<C>>:     DIR DIRPATH             {{ if (C): dodir(DIRPATH, 'Config.lb') }}
 
     rule default<<C>>: DEFAULT ID EQ value     {{ if (C): setdefault(ID, value, 0) }}
@@ -1826,6 +1880,7 @@ parser Config:
                |       prtstmt<<C>>            {{ return prtstmt }}
                |       register<<C>>           {{ return register }}
                |       device<<C>>             {{ return device }}
+               |       smmobject<<C>>          {{ return smmobject }}
 
     # ENTRY for parsing Config.lb file
     rule cfgfile:      (uses<<1>>)* 
@@ -1979,7 +2034,7 @@ def writeimagesettings(image):
        for o in exported:
                file.write("export VARIABLES += %s\n" % o.name)
        file.write("\n")
-       writemakefilefooter(file,filename)
+       writemakefilefooter(file,filename)
        file.close()
 
 # write the romimage makefile
@@ -2002,9 +2057,9 @@ def writeimagemakefile(image):
        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 -DCONFIG_MAX_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("D_item = $(shell echo '$(if $(subst undefined,,$(origin $1)),\\#define $1$(if $($1), $($1),),\\#undef $1)' >> settings.h)\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")
+       file.write("CPUFLAGS := $(strip $(shell echo '/* autogenerated */' > settings.h)$(foreach _var_,$(VARIABLES),$(call D_item,$(_var_)))--include=settings.h)\n\n")
 
        for i in image.getuserdefines():
                file.write("%s\n" %i)
@@ -2028,6 +2083,13 @@ def writeimagemakefile(image):
                file.write("OBJECTS += %s\n" % (obj_name))
                file.write("SOURCES += %s\n" % (obj_source))
 
+       for srule, smm in image.getsmmobjectrules().items():
+               s_name = smm[0]
+               s_source = smm[1]
+               file.write("SMM-OBJECTS += %s\n" % (s_name))
+               file.write("SOURCES += %s\n" % (s_source))
+
+
        # for chip_target.c
        file.write("OBJECTS += static.o\n")
        file.write("SOURCES += static.c\n")
@@ -2104,6 +2166,23 @@ def writeimagemakefile(image):
                file.write("\t$(CC) -c $(CFLAGS) -o $@ $<\n")
                #file.write("%s\n" % objrule[2])
 
+       file.write("\n# smmobjectrules:\n")
+       for irule, smm in image.getsmmobjectrules().items():
+               source = topify(smm[1])
+               type = smm[2]
+               if (type  == 'S'):
+                       # for .S, .o depends on .s
+                       file.write("%s: %s.s\n" % (smm[0], smm[3]))
+                       file.write("\t$(CC) -c $(CPU_OPT) -o $@ $<\n")
+                       # and .s depends on .S
+                       file.write("%s.s: %s\n" % (smm[3], source))
+                       # Note: next 2 lines are ONE output line!
+                       file.write("\t$(CPP) $(CPPFLAGS) $< ")
+                       file.write(">$@.new && mv $@.new $@\n")
+               else:
+                       file.write("%s: %s\n" % (smm[0], source))
+                       file.write("\t$(CC) -c $(CFLAGS) -o $@ $<\n")
+
        # special rule for chip_target.c
        file.write("static.o: static.c\n")
        file.write("\t$(CC) -c $(CFLAGS) -o $@ $<\n")
@@ -2138,16 +2217,32 @@ def writeimagemakefile(image):
 
 #
 def writemakefile(path):
+       global rommapping
+       global bootblocksize
        makefilepath = os.path.join(path, "Makefile")
        print "Creating", makefilepath
        file = safe_open(makefilepath, 'w+')
        writemakefileheader(file, makefilepath)
 
+       # Hack to get the necessary settings (CONFIG_CBFS):
+       file.write("include %s/Makefile.settings\n\n" % romimages.keys()[0])
+
        # main rule
-       file.write("\nall:")
+       file.write("ifeq \"$(CONFIG_CBFS)\" \"1\"\n")
+       file.write("\nall: ")
+       for i in buildroms:
+               file.write(" %sfs" % i.name)
+       file.write("\n")
+       file.write("else")
+       file.write("\nall: ")
        for i in buildroms:
                file.write(" %s" % i.name)
-       file.write("\n\n")      
+       file.write("\n")
+       file.write("endif\n\n")
+
+       # cbfstool rules
+       file.write("\ncbfstool:\n\tmkdir -p tools/lzma\n\t$(MAKE) -C $(TOP)/util/cbfstool obj=$(shell pwd)\n\n")
+
        file.write("include Makefile.settings\n\n")
        for i, o in romimages.items():
                file.write("%s/coreboot.rom:\n" % o.getname())
@@ -2174,9 +2269,26 @@ def writemakefile(path):
                for j in i.roms:
                        file.write(" %s/coreboot.rom " % j)
                file.write("> %s\n\n" %i.name)
+               # build the bootblock here as well. 
+               file.write("\n")
+               file.write("\t cat ")
+               for j in i.roms:
+                       file.write(" %s/coreboot.strip " % j)
+               file.write("> %s.bootblock\n\n" %i.name)
+
+       romsize = getoption("ROM_SIZE", image)
+       # i.name? That can not be right, can it? 
+       file.write("%sfs: %s cbfstool\n" %(i.name,i.name));
+       file.write("\trm -f coreboot.cbfs\n");
+       file.write("\t./cbfstool %sfs create %s %s %s.bootblock\n" % (i.name, romsize, bootblocksize, i.name))
+       for i in buildroms:
+               for j in i.roms:
+                       #failover is a hack that will go away soon. 
+                       if (j != "failover") and (rommapping[j] != "/dev/null"):
+                               file.write("\tif [ -f %s/cbfs-support ]; then ./cbfstool %sfs add-payload %s %s/payload `cat %s/cbfs-support`; fi\n" % (j, i.name, rommapping[j], j, j))
+               file.write("\t ./cbfstool %sfs print\n" % i.name)
 
-
-       file.write(".PHONY: all clean")
+       file.write(".PHONY: all clean cbfstool")
        for i in romimages.keys():
                file.write(" %s-clean" % i)
        for i, o in romimages.items():
@@ -2255,7 +2367,9 @@ def writecode(image):
        file.write("#include <device/pci.h>\n")
        for path in image.getconfigincludes().values():
                file.write("#include \"%s\"\n" % path)
+       file.write("\n/* pass 0 */\n")
        gencode(image.getroot(), file, 0)
+       file.write("\n/* pass 1 */\n")
        gencode(image.getroot(), file, 1)
        file.close()
 
@@ -2279,6 +2393,75 @@ def gencode(part, file, pass_num):
                kid = kid.next_sibling
        debug.info(debug.gencode, "DONE GENCODE")
 
+def writegraph(image):
+       filename = os.path.join(img_dir, "static.dot")
+       print "Creating", filename
+       file = safe_open(filename, 'w+')
+       file.write("digraph devicetree {\n")
+       file.write("    rankdir=LR\n")
+       genranks(image.getroot(), file, 0)
+       gennodes(image.getroot(), file)
+       gengraph(image.getroot(), file)
+       file.write("}\n")
+       file.close()
+
+def genranks(part, file, level):
+       #file.write("   # Level %d\n" % level )
+       file.write("    { rank = same; \"dev_%s_%d\"" % (part.type_name,part.instance ))
+       sib = part.next_sibling
+       while (sib):
+               file.write("; \"dev_%s_%d\"" % (sib.type_name, sib.instance))
+               sib = sib.next_sibling
+       file.write("}\n" )
+       # now dump the children 
+       if (part.children):
+               genranks(part.children, file, level + 1)
+
+       kid = part.next_sibling
+       while (kid):
+               if (kid.children):
+                       genranks(kid.children, file, level + 1)
+               kid = kid.next_sibling
+
+
+def gennodes(part, file):
+       file.write("    dev_%s_%d[shape=record, label=\"%s\"];\n" % (part.type_name,part.instance,part.graph_name() ))
+       sib = part.next_sibling
+       while (sib):
+               file.write("    dev_%s_%d[shape=record, label=\"%s\"];\n" % (sib.type_name,sib.instance,sib.graph_name() ))
+               sib = sib.next_sibling
+       # now dump the children
+       if (part.children):
+               gennodes(part.children, file)
+
+       kid = part.next_sibling
+       while (kid):
+               if (kid.children):
+                       gennodes(kid.children, file)
+               kid = kid.next_sibling
+
+
+def gengraph(part, file):
+       if (part.parent != part):
+               file.write("    dev_%s_%d -> dev_%s_%d;\n" % \
+                               (part.parent.type_name, part.parent.instance, \
+                                part.type_name, part.instance ))
+       sib = part.next_sibling
+       while (sib):
+               file.write("    dev_%s_%d -> dev_%s_%d;\n" % \
+                               (sib.parent.type_name, sib.parent.instance, \
+                                sib.type_name, sib.instance ))
+               sib = sib.next_sibling
+
+       kid = part.next_sibling
+       while (kid):
+               if (kid.children):
+                       gengraph(kid.children, file)
+               kid = kid.next_sibling
+
+       if (part.children):
+               gengraph(part.children, file)
+
 def verifyparse():
        """Add any run-time checks to verify that parsing the configuration
        was successful"""
@@ -2329,6 +2512,30 @@ if __name__=='__main__':
                        print "Creating directory %s" % img_dir
                        os.makedirs(img_dir)
 
+               for objrule, obj in image.getobjectrules().items():
+                       sub_dir = img_dir + '/' + os.path.dirname(obj[0])
+                       if not os.path.isdir(sub_dir):
+                               print "Creating sub directory %s" % sub_dir
+                               os.makedirs(sub_dir)
+
+               for driverrule, driver in image.getdriverrules().items():
+                       sub_dir = img_dir + '/' + os.path.dirname(driver[0])
+                       if not os.path.isdir(sub_dir):
+                               print "Creating sub directory %s" % sub_dir
+                               os.makedirs(sub_dir)
+
+               for srule, smm in image.getsmmobjectrules().items():
+                       sub_dir = img_dir + '/' + os.path.dirname(smm[0])
+                       if not os.path.isdir(sub_dir):
+                               print "Creating sub directory %s" % sub_dir
+                               os.makedirs(sub_dir)
+
+               for irule, init in image.getinitobjectrules().items():
+                       sub_dir = img_dir + '/' + os.path.dirname(init[0])
+                       if not os.path.isdir(sub_dir):
+                               print "Creating sub directory %s" % sub_dir
+                               os.makedirs(sub_dir)
+
                if (debug.level(debug.dump)):
                        for i in image.getinitincludes():
                                debug.info(debug.dump, "crt0include file %s" % i)
@@ -2344,6 +2551,7 @@ if __name__=='__main__':
                writeinitincludes(image)
                writeimagemakefile(image)
                writeldoptions(image)
+               writegraph(image)
 
        writemakefilesettings(target_dir)
        writemakefile(target_dir)