[v2] r4061 - trunk/coreboot-v2/util/newconfig

Author: oxygene
Date: 2009-04-04 12:01:21 +0200 (Sat, 04 Apr 2009)
New Revision: 4061

Modified:
   trunk/coreboot-v2/util/newconfig/config.g
Log:
Fix the concurrency issue of building romtool.
romtool is still built in util/romtool, as happens without this patch.

Signed-off-by: Patrick Georgi 
Acked-by: Stefan Reinauer

Modified: trunk/coreboot-v2/util/newconfig/config.g
===================================================================
--- trunk/coreboot-v2/util/newconfig/config.g	2009-04-03 22:23:34 UTC (rev 4060)
+++ trunk/coreboot-v2/util/newconfig/config.g	2009-04-04 10:01:21 UTC (rev 4061)
@@ -2225,13 +2225,14 @@
    writemakefileheader(file, makefilepath)

# main rule
-	file.write("\nall: romtool")
+	file.write("\nall: ")
    for i in buildroms:
    	file.write(" %sfs" % i.name)
    file.write("\n\n")

# romtool rules
-	file.write("\nromtool:\n\tcd $(TOP)/util/romtool; make\n")
+	file.write("\nromtool:\n\t$(MAKE) -C $(TOP)/util/romtool\n\tmkdir -p tools\n")
+	file.write("\tcp $(TOP)/util/romtool/tools/rom-mkpayload $(TOP)/util/romtool/tools/rom-mkstage tools\n\tcp $(TOP)/util/romtool/romtool romtool\n")

file.write("include Makefile.settings\n\n")
    for i, o in romimages.items():
@@ -2268,15 +2269,15 @@

romsize = getoption("ROM_SIZE", image)
    # i.name? That can not be right, can it? 
-	file.write("%sfs: %s $(TOP)/util/romtool/romtool\n" %(i.name,i.name));
+	file.write("%sfs: %s romtool\n" %(i.name,i.name));
    file.write("\trm -f coreboot.romfs\n");
-	file.write("\t$(TOP)/util/romtool/romtool %sfs create %s %s %s.bootblock\n" % (i.name, romsize, bootblocksize, i.name))
+	file.write("\t./romtool %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/romfs-support ]; then $(TOP)/util/romtool/romtool %sfs add-payload %s %s/payload `cat %s/romfs-support`; fi\n" % (j, i.name, rommapping[j], j, j))
-		file.write("\t $(TOP)/util/romtool/romtool %sfs print\n" % i.name)
+				file.write("\tif [ -f %s/romfs-support ]; then ./romtool %sfs add-payload %s %s/payload `cat %s/romfs-support`; fi\n" % (j, i.name, rommapping[j], j, j))
+		file.write("\t ./romtool %sfs print\n" % i.name)

file.write(".PHONY: all clean romtool")
    for i in romimages.keys():