Author: uwe Date: 2009-10-28 00:14:54 +0100 (Wed, 28 Oct 2009) New Revision: 4875
Modified: trunk/coreboot-v2/Makefile trunk/coreboot-v2/src/arch/i386/Makefile.inc trunk/coreboot-v2/util/cbfstool/Makefile.inc trunk/coreboot-v2/util/sconfig/config.g trunk/coreboot-v2/util/sconfig/parsedesc.g trunk/coreboot-v2/util/sconfig/yapps2.py Log: Prefix all build output file names of files which end up in the build directory with "build/" for consistency (trivial, sort of).
Also, drop printing of "config.g" input file, we usually only print generated/output files in the build output.
Finally, rename non-existing COMPRESSFLAG variable to CBFS_PAYLOAD_COMPRESS_FLAG in a printf line. The build output now says
PAYLOAD payload.elf l
for payloads (the "l" specifies LZMA compression).
Signed-off-by: Uwe Hermann uwe@hermann-uwe.de Acked-by: Uwe Hermann uwe@hermann-uwe.de
Modified: trunk/coreboot-v2/Makefile =================================================================== --- trunk/coreboot-v2/Makefile 2009-10-27 21:49:33 UTC (rev 4874) +++ trunk/coreboot-v2/Makefile 2009-10-27 23:14:54 UTC (rev 4875) @@ -311,7 +311,7 @@ awk '/^#define ([^"])* ([^"])*$$/ {print $$2 " = " $$3 ";";}' $< > $@
$(obj)/romcc: $(top)/util/romcc/romcc.c - @printf " HOSTCC romcc (this may take a while)\n" + @printf " HOSTCC build/romcc (this may take a while)\n" $(HOSTCC) -g -O2 -Wall -o $@ $<
.PHONY: $(PHONY) prepare prepare2 clean distclean doxygen doxy coreboot
Modified: trunk/coreboot-v2/src/arch/i386/Makefile.inc =================================================================== --- trunk/coreboot-v2/src/arch/i386/Makefile.inc 2009-10-27 21:49:33 UTC (rev 4874) +++ trunk/coreboot-v2/src/arch/i386/Makefile.inc 2009-10-27 23:14:54 UTC (rev 4875) @@ -20,18 +20,18 @@ then \ $(CBFSTOOL) $@ add-stage fallback/coreboot_apc fallback/coreboot_apc $(CBFS_COMPRESS_FLAG); \ fi - $(CBFSTOOL) $@ add-stage $(obj)/coreboot_ram fallback/coreboot_ram $(CBFS_COMPRESS_FLAG) + $(CBFSTOOL) $@ add-stage $(obj)/coreboot_ram fallback/coreboot_ram $(CBFS_COMPRESS_FLAG) ifeq ($(CONFIG_PAYLOAD_NONE),y) @printf " PAYLOAD none (as specified by user)\n" else - @printf " PAYLOAD $(CONFIG_FALLBACK_PAYLOAD_FILE) $(COMPRESSFLAG)\n" - $(CBFSTOOL) ./build/coreboot.rom add-payload $(CONFIG_FALLBACK_PAYLOAD_FILE) fallback/payload $(CBFS_PAYLOAD_COMPRESS_FLAG) + @printf " PAYLOAD $(CONFIG_FALLBACK_PAYLOAD_FILE) $(CBFS_PAYLOAD_COMPRESS_FLAG)\n" + $(CBFSTOOL) ./build/coreboot.rom add-payload $(CONFIG_FALLBACK_PAYLOAD_FILE) fallback/payload $(CBFS_PAYLOAD_COMPRESS_FLAG) endif ifeq ($(CONFIG_VGA_BIOS),y) @printf " VGABIOS $(CONFIG_FALLBACK_VGA_BIOS_FILE) $(CONFIG_FALLBACK_VGA_BIOS_ID)\n" $(CBFSTOOL) ./build/coreboot.rom add $(CONFIG_FALLBACK_VGA_BIOS_FILE) "pci$(CONFIG_FALLBACK_VGA_BIOS_ID).rom" optionrom endif - @printf " CBFSPRINT ./build/coreboot.rom\n\n" + @printf " CBFSPRINT build/coreboot.rom\n\n" $(CBFSTOOL) build/coreboot.rom print
@@ -39,7 +39,7 @@ # Build the bootblock
$(obj)/coreboot.bootblock: $(obj)/coreboot - @printf " OBJCOPY $(subst $(obj)/,,$(@))\n" + @printf " OBJCOPY $(subst $(shell pwd)/,,$(@))\n" $(OBJCOPY) -O binary $< $@
$(obj)/ldscript.ld: $(ldscripts) $(obj)/ldoptions @@ -56,7 +56,7 @@ $(CC) -x assembler-with-cpp -DASSEMBLY -E -I$(src)/include -I$(src)/arch/i386/include -I$(obj) -include $(obj)/config.h -I. -I$(src) $< > $@.new && mv $@.new $@
$(obj)/coreboot: $(initobjs) $(obj)/ldscript.ld - @printf " LINK $(subst $(obj)/,,$(@))\n" + @printf " LINK $(subst $(shell pwd)/,,$(@))\n" $(CC) -nostdlib -nostartfiles -static -o $@ -L$(obj) -T $(obj)/ldscript.ld $(initobjs) $(NM) -n $(obj)/coreboot | sort > $(obj)/coreboot.map
@@ -64,27 +64,27 @@ # i386 specific tools
$(obj)/option_table.h $(obj)/option_table.c: $(obj)/build_opt_tbl $(top)/src/mainboard/$(MAINBOARDDIR)/cmos.layout - @printf " OPTION $(subst $(obj)/,,$(@))\n" + @printf " OPTION $(subst $(shell pwd)/,,$(@))\n" $(obj)/build_opt_tbl --config $(top)/src/mainboard/$(MAINBOARDDIR)/cmos.layout --header $(obj)/option_table.h --option $(obj)/option_table.c
$(obj)/build_opt_tbl: $(top)/util/options/build_opt_tbl.c $(top)/src/include/pc80/mc146818rtc.h $(top)/src/include/boot/coreboot_tables.h $(obj)/config.h - @printf " HOSTCC $(subst $(obj)/,,$(@))\n" + @printf " HOSTCC $(subst $(shell pwd)/,,$(@))\n" $(HOSTCC) $(HOSTCFLAGS) -include $(obj)/config.h $< -o $@
####################################################################### # Build the coreboot_ram (stage 2)
$(obj)/coreboot_ram: $(obj)/coreboot_ram.o $(src)/config/coreboot_ram.ld #ldoptions - @printf " CC $(subst $(obj)/,,$(@))\n" + @printf " CC $(subst $(shell pwd)/,,$(@))\n" $(CC) -nostdlib -nostartfiles -static -o $@ -L$(obj) -T $(src)/config/coreboot_ram.ld $(obj)/coreboot_ram.o $(NM) -n $(obj)/coreboot_ram | sort > $(obj)/coreboot_ram.map
$(obj)/coreboot_ram.o: $(obj)/arch/i386/lib/c_start.o $(drivers) $(obj)/coreboot.a $(LIBGCC_FILE_NAME) - @printf " CC $(subst $(obj)/,,$(@))\n" + @printf " CC $(subst $(shell pwd)/,,$(@))\n" $(CC) -nostdlib -r -o $@ $(obj)/arch/i386/lib/c_start.o $(drivers) -Wl,-( $(obj)/coreboot.a $(LIBGCC_FILE_NAME) -Wl,-)
$(obj)/coreboot.a: $(objs) - @printf " AR $(subst $(obj)/,,$(@))\n" + @printf " AR $(subst $(shell pwd)/,,$(@))\n" rm -f $(obj)/coreboot.a $(AR) cr $(obj)/coreboot.a $(objs)
Modified: trunk/coreboot-v2/util/cbfstool/Makefile.inc =================================================================== --- trunk/coreboot-v2/util/cbfstool/Makefile.inc 2009-10-27 21:49:33 UTC (rev 4874) +++ trunk/coreboot-v2/util/cbfstool/Makefile.inc 2009-10-27 23:14:54 UTC (rev 4875) @@ -22,35 +22,35 @@ mkdir -p $@
$(obj)/util/cbfstool/%.o: $(top)/util/cbfstool/%.c - printf " HOSTCC $(subst $(obj)/,,$(@))\n" + printf " HOSTCC $(subst $(shell pwd)/,,$(@))\n" $(HOSTCC) $(CBFSTOOLFLAGS) $(HOSTCFLAGS) -c -o $@ $<
$(obj)/util/cbfstool/%.o: $(top)/util/cbfstool/lzma/%.cc - printf " HOSTCXX $(subst $(obj)/,,$(@))\n" + printf " HOSTCXX $(subst $(shell pwd)/,,$(@))\n" $(HOSTCXX) $(CBFSTOOLFLAGS) $(HOSTCXXFLAGS) -c -o $@ $<
$(obj)/util/cbfstool/%.o: $(top)/util/cbfstool/lzma/C/7zip/Compress/LZMA/%.cpp - printf " HOSTCXX $(subst $(obj)/,,$(@))\n" + printf " HOSTCXX $(subst $(shell pwd)/,,$(@))\n" $(HOSTCXX) $(CBFSTOOLFLAGS) $(HOSTCXXFLAGS) -c -o $@ $<
$(obj)/util/cbfstool/%.o: $(top)/util/cbfstool/lzma/C/7zip/Compress/LZ/%.cpp - printf " HOSTCXX $(subst $(obj)/,,$(@))\n" + printf " HOSTCXX $(subst $(shell pwd)/,,$(@))\n" $(HOSTCXX) $(CBFSTOOLFLAGS) $(HOSTCXXFLAGS) -c -o $@ $<
$(obj)/util/cbfstool/%.o: $(top)/util/cbfstool/lzma/C/7zip/Compress/RangeCoder/%.cpp - printf " HOSTCXX $(subst $(obj)/,,$(@))\n" + printf " HOSTCXX $(subst $(shell pwd)/,,$(@))\n" $(HOSTCXX) $(CBFSTOOLFLAGS) $(HOSTCXXFLAGS) -c -o $@ $<
$(obj)/util/cbfstool/%.o: $(top)/util/cbfstool/lzma/C/7zip/Common/%.cpp - printf " HOSTCXX $(subst $(obj)/,,$(@))\n" + printf " HOSTCXX $(subst $(shell pwd)/,,$(@))\n" $(HOSTCXX) $(CBFSTOOLFLAGS) $(HOSTCXXFLAGS) -c -o $@ $<
$(obj)/util/cbfstool/%.o: $(top)/util/cbfstool/lzma/C/Common/%.cpp - printf " HOSTCXX $(subst $(obj)/,,$(@))\n" + printf " HOSTCXX $(subst $(shell pwd)/,,$(@))\n" $(HOSTCXX) $(CBFSTOOLFLAGS) $(HOSTCXXFLAGS) -c -o $@ $<
$(obj)/util/cbfstool/cbfstool: $(obj)/util/cbfstool $(addprefix $(obj)/util/cbfstool/,$(cbfsobj)) - printf " HOSTCXX $(subst $(obj)/,,$(@)) (link)\n" + printf " HOSTCXX $(subst $(shell pwd)/,,$(@)) (link)\n" $(HOSTCXX) $(CBFSTOOLFLAGS) -o $@ $(addprefix $(obj)/util/cbfstool/,$(cbfsobj))
endif
Modified: trunk/coreboot-v2/util/sconfig/config.g =================================================================== --- trunk/coreboot-v2/util/sconfig/config.g 2009-10-27 21:49:33 UTC (rev 4874) +++ trunk/coreboot-v2/util/sconfig/config.g 2009-10-27 23:14:54 UTC (rev 4875) @@ -886,7 +886,7 @@
def writecode(image): filename = os.path.join(img_dir, "static.c") - print " SCONFIG Creating", os.path.basename(filename) + print " SCONFIG ", join(filename.split('/')[-5:], '/') file = safe_open(filename, 'w+') file.write("#include <device/device.h>\n") file.write("#include <device/pci.h>\n") @@ -920,7 +920,7 @@
def writegraph(image): filename = os.path.join(img_dir, "static.dot") - print " SCONFIG Creating", os.path.basename(filename) + print " SCONFIG ", join(filename.split('/')[-5:], '/') file = safe_open(filename, 'w+') file.write("digraph devicetree {\n") file.write(" rankdir=LR\n")
Modified: trunk/coreboot-v2/util/sconfig/parsedesc.g =================================================================== --- trunk/coreboot-v2/util/sconfig/parsedesc.g 2009-10-27 21:49:33 UTC (rev 4874) +++ trunk/coreboot-v2/util/sconfig/parsedesc.g 2009-10-27 23:14:54 UTC (rev 4875) @@ -126,8 +126,7 @@ if inputfilename[-2:]=='.g': outputfilename = inputfilename[:-2]+'.py' else: raise "Invalid Filename", outputfilename
- print ' SCONFIG Input Grammar:', os.path.basename(inputfilename) - print ' SCONFIG Output File:', os.path.basename(outputfilename) + print ' SCONFIG ', join(outputfilename.split('/')[-5:], '/')
DIVIDER = '\n%%\n' # This pattern separates the pre/post parsers preparser, postparser = None, None # Code before and after the parser desc
Modified: trunk/coreboot-v2/util/sconfig/yapps2.py =================================================================== --- trunk/coreboot-v2/util/sconfig/yapps2.py 2009-10-27 21:49:33 UTC (rev 4874) +++ trunk/coreboot-v2/util/sconfig/yapps2.py 2009-10-27 23:14:54 UTC (rev 4875) @@ -709,10 +709,9 @@ if not outputfilename: if inputfilename[-2:]=='.g': outputfilename = inputfilename[:-2]+'.py' else: raise "Invalid Filename", outputfilename - - print ' SCONFIG Input Grammar:', os.path.basename(inputfilename) - print ' SCONFIG Output File:', os.path.basename(outputfilename) - + + print ' SCONFIG ', join(outputfilename.split('/')[-5:], '/') + DIVIDER = '\n%%\n' # This pattern separates the pre/post parsers preparser, postparser = None, None # Code before and after the parser desc