[commit] r5941 - trunk/src/arch/i386

[repository service]

Author: wt
Date: Tue Oct 12 08:12:00 2010
New Revision: 5941
URL: https://tracker.coreboot.org/trac/coreboot/changeset/5941

Log:
Build bootblock.S instead of bootblock.c.

The file is actually just including a bunch of assembly. The build rule
for bootblock.c even states that the file will be "assembler-with-cpp."

Signed-off-by: Warren Turkal 
Acked-by: Stefan Reinauer

Modified:
   trunk/src/arch/i386/Makefile.bootblock.inc

Modified: trunk/src/arch/i386/Makefile.bootblock.inc
==============================================================================
--- trunk/src/arch/i386/Makefile.bootblock.inc	Tue Oct 12 01:22:24 2010	(r5940)
+++ trunk/src/arch/i386/Makefile.bootblock.inc	Tue Oct 12 08:12:00 2010	(r5941)
@@ -52,7 +52,7 @@
    mkdir -p $(obj)/bootblock
    printf '$(foreach ldscript,ldoptions $(bootblock_lds),INCLUDE "$(ldscript)"\n)' > $@

-$(obj)/bootblock/bootblock.c: $$(bootblock_inc)
+$(obj)/bootblock/bootblock.S: $$(bootblock_inc)
    @printf "    GEN        $(subst $(obj)/,,$(@))\n"
    mkdir -p $(obj)/bootblock
    printf '$(foreach crt0,config.h $(bootblock_inc),#include "$(crt0)"\n)' > $@
@@ -61,9 +61,9 @@
    @printf "    CC         $(subst $(obj)/,,$(@))\n"
    $(CC) -I$(obj) -Wa,-acdlns -c -o $@ $<  > $(dir $@)/crt0.disasm

-$(obj)/mainboard/$(MAINBOARDDIR)/bootblock.s: $(obj)/bootblock/bootblock.c
+$(obj)/mainboard/$(MAINBOARDDIR)/bootblock.s: $(obj)/bootblock/bootblock.S
    @printf "    CC         $(subst $(obj)/,,$(@))\n"
-	$(CC) -MMD -x assembler-with-cpp -DASSEMBLY -E -I$(src)/include -I$(src)/arch/i386/include -I$(obj) -I$(obj)/bootblock -include $(obj)/config.h -I. -I$(src) $< -o $@
+	$(CC) -MMD -DASSEMBLY -E -I$(src)/include -I$(src)/arch/i386/include -I$(obj) -I$(obj)/bootblock -include $(obj)/config.h -I. -I$(src) $< -o $@

$(obj)/mainboard/$(MAINBOARDDIR)/bootblock.inc: $(src)/arch/i386/init/$(subst ",,$(CONFIG_BOOTBLOCK_SOURCE)) $(objutil)/romcc/romcc
    @printf "    ROMCC      $(subst $(obj)/,,$(@))\n"