[commit] r5456 - in trunk: . src/arch/i386 util/abuild

[repository service]

Author: oxygene
Date: Mon Apr 19 22:39:22 2010
New Revision: 5456
URL: https://tracker.coreboot.org/trac/coreboot/changeset/5456

Log:
- Make abuild -sb work again
- More explicit rules for obj/%.c->obj/%.o builds
- Hide printf even with verbose make

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

Modified:
   trunk/Makefile
   trunk/src/arch/i386/Makefile.inc
   trunk/util/abuild/abuild

Modified: trunk/Makefile
==============================================================================
--- trunk/Makefile	Sat Apr 17 19:59:40 2010	(r5455)
+++ trunk/Makefile	Mon Apr 19 22:39:22 2010	(r5456)
@@ -155,6 +155,14 @@
    mkdir -p $(obj)/mainboard/$(MAINBOARDDIR)
    $(objutil)/sconfig/sconfig $(MAINBOARDDIR) $(obj)/mainboard/$(MAINBOARDDIR)

+$(objutil)/%.o: $(objutil)/%.c $(obj)/config.h
+	@printf "    HOSTCC     $(subst $(objutil)/,,$(@))\n"
+	$(HOSTCC) -MMD $(HOSTCFLAGS) -c -o $@ $<
+
+$(obj)/%.o: $(obj)/%.c $(obj)/config.h
+	@printf "    CC         $(subst $(obj)/,,$(@))\n"
+	$(CC) -MMD $(CFLAGS) -c -o $@ $<
+
 objs:=$(obj)/mainboard/$(MAINBOARDDIR)/static.o
 initobjs:=
 drivers:=
@@ -215,7 +223,7 @@
 # $4 additional compiler flags
 de$(EMPTY)fine $(1)_$(2)_template
 $(obj)/$$(1)%$(3).o: src/$$(1)%.$(2) $(obj)/config.h
-	printf "    CC         $$$$(subst $$$$(obj)/,,$$$$(@))\n"
+	@printf "    CC         $$$$(subst $$$$(obj)/,,$$$$(@))\n"
    $(CC) $(4) -MMD $$$$(CFLAGS) -c -o $$$$@ $$$$<
 en$(EMPTY)def
 endef

Modified: trunk/src/arch/i386/Makefile.inc
==============================================================================
--- trunk/src/arch/i386/Makefile.inc	Sat Apr 17 19:59:40 2010	(r5455)
+++ trunk/src/arch/i386/Makefile.inc	Mon Apr 19 22:39:22 2010	(r5456)
@@ -27,7 +27,7 @@
 endif

$(obj)/coreboot.rom: $(obj)/coreboot.pre $(obj)/coreboot_ram $(CBFSTOOL) $(call strip_quotes,$(COREBOOT_ROM_DEPENDENCIES))
-	printf "    CBFS       $(subst $(obj)/,,$(@))\n"
+	@printf "    CBFS       $(subst $(obj)/,,$(@))\n"
    cp $(obj)/coreboot.pre $@.tmp
    if [ -f $(obj)/coreboot_ap ]; \
    then \
@@ -35,25 +35,25 @@
    fi
    $(CBFSTOOL) $@.tmp add-stage $(obj)/coreboot_ram $(CONFIG_CBFS_PREFIX)/coreboot_ram $(CBFS_COMPRESS_FLAG)
 ifeq ($(CONFIG_PAYLOAD_NONE),y)
-	printf "    PAYLOAD    \e[1;31mnone (as specified by user)\e[0m\n"
+	@printf "    PAYLOAD    \e[1;31mnone (as specified by user)\e[0m\n"
 else
-	printf "    PAYLOAD    $(CONFIG_FALLBACK_PAYLOAD_FILE) (compression: $(CBFS_PAYLOAD_COMPRESS_NAME))\n"
+	@printf "    PAYLOAD    $(CONFIG_FALLBACK_PAYLOAD_FILE) (compression: $(CBFS_PAYLOAD_COMPRESS_NAME))\n"
    $(CBFSTOOL) $@.tmp add-payload $(CONFIG_FALLBACK_PAYLOAD_FILE) $(CONFIG_CBFS_PREFIX)/payload $(CBFS_PAYLOAD_COMPRESS_FLAG)
 endif
 ifeq ($(CONFIG_VGA_BIOS),y)
-	printf "    VGABIOS    $(CONFIG_FALLBACK_VGA_BIOS_FILE) $(CONFIG_FALLBACK_VGA_BIOS_ID)\n"
+	@printf "    VGABIOS    $(CONFIG_FALLBACK_VGA_BIOS_FILE) $(CONFIG_FALLBACK_VGA_BIOS_ID)\n"
    $(CBFSTOOL) $@.tmp add $(CONFIG_FALLBACK_VGA_BIOS_FILE) "pci$(CONFIG_FALLBACK_VGA_BIOS_ID).rom" optionrom
 endif
 ifeq ($(CONFIG_INTEL_MBI),y)
-	printf "    MBI        $(CONFIG_FALLBACK_MBI_FILE)\n"
+	@printf "    MBI        $(CONFIG_FALLBACK_MBI_FILE)\n"
    $(CBFSTOOL) $@.tmp add $(CONFIG_FALLBACK_MBI_FILE) mbi.bin mbi
 endif
 ifeq ($(CONFIG_BOOTSPLASH),y)
-	printf "    BOOTSPLASH $(CONFIG_FALLBACK_BOOTSPLASH_FILE)\n"
+	@printf "    BOOTSPLASH $(CONFIG_FALLBACK_BOOTSPLASH_FILE)\n"
    $(CBFSTOOL) $@.tmp add $(CONFIG_FALLBACK_BOOTSPLASH_FILE) bootsplash.jpg bootsplash
 endif
    mv $@.tmp $@
-	printf "    CBFSPRINT  $(subst $(obj)/,,$(@))\n\n"
+	@printf "    CBFSPRINT  $(subst $(obj)/,,$(@))\n\n"
    $(CBFSTOOL) $@ print

#######################################################################
@@ -174,11 +174,11 @@
    $(CC) -MMD $(CFLAGS) -I$(src) -I. -c $(src)/mainboard/$(MAINBOARDDIR)/ap_romstage.c -o $@

$(obj)/mainboard/$(MAINBOARDDIR)/romstage.pre.inc: $(src)/mainboard/$(MAINBOARDDIR)/romstage.c $(OPTION_TABLE_H) $(obj)/build.h
-	printf "    CC         romstage.inc\n"
+	@printf "    CC         romstage.inc\n"
    $(CC) -MMD $(CFLAGS) -D__PRE_RAM__ -I$(src) -I. -c -S $< -o $@

$(obj)/mainboard/$(MAINBOARDDIR)/romstage.inc: $(obj)/mainboard/$(MAINBOARDDIR)/romstage.pre.inc
-	printf "    POST       romstage.inc\n"
+	@printf "    POST       romstage.inc\n"
    sed -e 's/.rodata/.rom.data/g' -e 's/.text/.section .rom.text/g' $^ > $@.tmp
    mv $@.tmp $@
 endif

Modified: trunk/util/abuild/abuild
==============================================================================
--- trunk/util/abuild/abuild	Sat Apr 17 19:59:40 2010	(r5455)
+++ trunk/util/abuild/abuild	Mon Apr 19 22:39:22 2010	(r5456)
@@ -430,12 +430,15 @@
    stime=`perl -e 'print time();' 2>/dev/null || date +%s`
    create_buildenv $VENDOR $MAINBOARD $CONFIG
    if [ $? -eq 0  -a  $configureonly -eq 0 ]; then
+		if [ "$scanbuild" = "true" ]; then
+			rm -rf $TARGET/scan-build-results-tmp
+		fi
    	compile_target $VENDOR $MAINBOARD && 
    		xml "  <status>ok</status>" ||
    		xml "<status>broken</status>"
    	if [ "$scanbuild" = "true" ]; then
+			rm -rf $TARGET/${VENDOR}_${MAINBOARD}-scanbuild
    		mv `dirname $TARGET/scan-build-results-tmp/*/index.html` $TARGET/${VENDOR}_${MAINBOARD}-scanbuild
-			MAKE=$origMAKE
    	fi
    fi
    # Not calculated here because we still print it in compile_target