diff options
| author | Patrick Georgi <patrick.georgi@coresystems.de> | 2009-04-04 10:01:21 +0000 |
|---|---|---|
| committer | Patrick Georgi <patrick.georgi@coresystems.de> | 2009-04-04 10:01:21 +0000 |
| commit | 2d2589e682a7c3a12d330f0b849bd2ace392c828 (patch) | |
| tree | ec77caf307f5f9c73b464d1f5adfe8e4b2614561 /util/newconfig | |
| parent | d7a709a60fa8b7fa948a2f1996383bf3bde105ad (diff) | |
| download | coreboot-2d2589e682a7c3a12d330f0b849bd2ace392c828.tar.xz | |
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
Diffstat (limited to 'util/newconfig')
| -rw-r--r-- | util/newconfig/config.g | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/util/newconfig/config.g b/util/newconfig/config.g index 9444fc0f6d..1d3395b071 100644 --- a/util/newconfig/config.g +++ b/util/newconfig/config.g @@ -2225,13 +2225,14 @@ def writemakefile(path): 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 @@ def writemakefile(path): 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(): |