GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix the concurrency issue of building romtool. 

romtool is still built in util/romtool, as happens without this patch.

Signed-off-by: Patrick Georgi <patrick.georgi@coresystems.de>
Acked-by: Stefan Reinauer <stepan@coresystems.de>


git-svn-id: svn://svn.coreboot.org/coreboot/trunk@4061 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
This commit is contained in:
Patrick Georgi 2009-04-04 10:01:21 +00:00
parent d7a709a60f
commit 2d2589e682
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
util/newconfig/config.g
View File

@ -2225,13 +2225,14 @@ def writemakefile(path):
writemakefileheader(file, makefilepath) writemakefileheader(file, makefilepath)
# main rule # main rule
file.write("\nall: romtool") file.write("\nall: ")
for i in buildroms: for i in buildroms:
file.write(" %sfs" % i.name) file.write(" %sfs" % i.name)
file.write("\n\n") file.write("\n\n")
# romtool rules # 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") file.write("include Makefile.settings\n\n")
for i, o in romimages.items(): for i, o in romimages.items():
@ -2268,15 +2269,15 @@ def writemakefile(path):
romsize = getoption("ROM_SIZE", image) romsize = getoption("ROM_SIZE", image)
# i.name? That can not be right, can it? # 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("\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 i in buildroms:
for j in i.roms: for j in i.roms:
#failover is a hack that will go away soon. #failover is a hack that will go away soon.
if (j != "failover") and (rommapping[j] != "/dev/null"): 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("\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 $(TOP)/util/romtool/romtool %sfs print\n" % i.name) file.write("\t ./romtool %sfs print\n" % i.name)
file.write(".PHONY: all clean romtool") file.write(".PHONY: all clean romtool")
for i in romimages.keys(): for i in romimages.keys():