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

Author: myles
Date: 2009-06-25 23:44:38 +0200 (Thu, 25 Jun 2009)
New Revision: 4371

Modified:
   trunk/coreboot-v2/util/newconfig/config.g
Log:
Remove the object files for cbfs from target directories and add a
cbfstool-clean target to the Makefile.

Signed-off-by: Myles Watson 
Acked-by: Ronald G. Minnich

Modified: trunk/coreboot-v2/util/newconfig/config.g
===================================================================
--- trunk/coreboot-v2/util/newconfig/config.g	2009-06-25 15:54:57 UTC (rev 4370)
+++ trunk/coreboot-v2/util/newconfig/config.g	2009-06-25 21:44:38 UTC (rev 4371)
@@ -2257,7 +2257,8 @@
    file.write("\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("\ncbfstool:\n\tmkdir -p cbfs/tools/lzma\n\t$(MAKE) -C $(TOP)/util/cbfstool obj=$(shell pwd)/cbfs\n")
+	file.write("\ncbfstool-clean:\n\t$(MAKE) -C $(TOP)/util/cbfstool obj=$(shell pwd)/cbfs clean\n\n")

file.write("include Makefile.settings\n\n")
    for i, o in romimages.items():
@@ -2295,18 +2296,18 @@
    	for j in i.roms:
    		file.write(" %s/coreboot.rom " % j)
    	file.write("> %s.bootblock\n\n" %i.name)
-		file.write("\t./cbfstool %s create %s %s %s.bootblock\n"
+		file.write("\t./cbfs/cbfstool %s create %s %s %s.bootblock\n"
    		   %(i.name, romsize, bootblocksize, i.name))
    	for j in pciroms:
-			file.write("\t./cbfstool %s add %s pci%04x,%04x.rom optionrom\n" % (i.name, j.name, j.pci_vid, j.pci_did))
+			file.write("\t./cbfs/cbfstool %s add %s pci%04x,%04x.rom optionrom\n" % (i.name, j.name, j.pci_vid, j.pci_did))
    	for j in i.roms:
    		#failover is a hack that will go away soon. 
    		if (j != "failover") and (rommapping[j] != "/dev/null"):
-				file.write("\t./cbfstool %s add-payload %s %s/payload $(CBFS_COMPRESS_FLAG)\n" % (i.name, rommapping[j], j,))
+				file.write("\t./cbfs/cbfstool %s add-payload %s %s/payload $(CBFS_COMPRESS_FLAG)\n" % (i.name, rommapping[j], j,))
    		if (j != "failover"):
-				file.write("\t./cbfstool %s add-stage %s/coreboot_ram %s/coreboot_ram $(CBFS_COMPRESS_FLAG)\n" % (i.name, j, j,))
-			file.write("\tif [ -f %s/coreboot_apc ]; then ./cbfstool %s add-stage %s/coreboot_apc %s/coreboot_apc $(CBFS_COMPRESS_FLAG); fi\n" % (j, i.name, j, j,))
-		file.write("\t./cbfstool %s print\n" % i.name)
+				file.write("\t./cbfs/cbfstool %s add-stage %s/coreboot_ram %s/coreboot_ram $(CBFS_COMPRESS_FLAG)\n" % (i.name, j, j,))
+			file.write("\tif [ -f %s/coreboot_apc ]; then ./cbfs/cbfstool %s add-stage %s/coreboot_apc %s/coreboot_apc $(CBFS_COMPRESS_FLAG); fi\n" % (j, i.name, j, j,))
+		file.write("\t./cbfs/cbfstool %s print\n" % i.name)
    	file.write("\n")
    file.write("else\n\n")