Patch set updated for coreboot: 129d4e6 Fix Cygwin bootblock generation

[Marc Jones]

Marc Jones ([e-mail]) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/1032

-gerrit

commit 129d4e61e013b9f3ad4f6c13879661e29b47d6b3
Author: Marc Jones 
Date:   Mon May 14 16:20:26 2012 -0600

Fix Cygwin bootblock generation

Cygwin is case insensitive, so bootblock.s and bootblock.S in the
    same directory cause a build failure. This changes bootblock.S
    to bootblock_inc.S, as it is generated from bootblock_inc.
    crt0.S and crt0.S also had this problem. This changes crt0.S to
    crt0.romstage.S.

Change-Id: I29d230a93b0743e34f11228f9034880ceaf7ab7b
    Signed-off-by: Marc Jones 
---
 src/arch/x86/Makefile.inc |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/arch/x86/Makefile.inc b/src/arch/x86/Makefile.inc
index 5ccfaab..49abfde 100644
--- a/src/arch/x86/Makefile.inc
+++ b/src/arch/x86/Makefile.inc
@@ -291,7 +291,7 @@ $(objgenerated)/bootblock.ld: $$(bootblock_lds) $(obj)/ldoptions
    @printf "    GEN        $(subst $(obj)/,,$(@))\n"
    printf '$(foreach ldscript,ldoptions $(bootblock_lds),INCLUDE "$(ldscript)"\n)' > $@

-$(objgenerated)/bootblock.S: $$(bootblock_inc)
+$(objgenerated)/bootblock_inc.S: $$(bootblock_inc)
    @printf "    GEN        $(subst $(obj)/,,$(@))\n"
    printf '$(foreach crt0,$(bootblock_inc),#include "$(crt0)"\n)' > $@

@@ -299,7 +299,7 @@ $(objgenerated)/bootblock.o: $(objgenerated)/bootblock.s
    @printf "    CC         $(subst $(obj)/,,$(@))\n"
    $(CC) -Wa,-acdlns -c -o $@ $<  > $(basename $@).disasm

-$(objgenerated)/bootblock.s: $(objgenerated)/bootblock.S $(obj)/config.h $(obj)/build.h
+$(objgenerated)/bootblock.s: $(objgenerated)/bootblock_inc.S $(obj)/config.h $(obj)/build.h
    @printf "    CC         $(subst $(obj)/,,$(@))\n"
    $(CC) -MMD -x assembler-with-cpp -E -I$(src)/include -I$(src)/arch/x86/include -I$(obj) -include $(obj)/build.h -include $(obj)/config.h -I. -I$(src) $< -o $@

@@ -346,7 +346,7 @@ $(objcbfs)/base_xip.txt: $(obj)/coreboot.pre1 $(objcbfs)/romstage_null.bin
    rm $@.tmp
    mv $@.tmp2 $@

-$(objgenerated)/crt0.S: $$(crt0s)
+$(objgenerated)/crt0.romstage.S: $$(crt0s)
    @printf "    GEN        $(subst $(obj)/,,$(@))\n"
    printf '$(foreach crt0,$(crt0s),#include "$(crt0:$(obj)/%=%)"\n)' > $@

@@ -354,7 +354,7 @@ $(objgenerated)/crt0.romstage.o: $(objgenerated)/crt0.s
    @printf "    CC         $(subst $(obj)/,,$(@))\n"
    $(CC) -Wa,-acdlns -c -o $@ $<  > $(basename $@).disasm

-$(objgenerated)/crt0.s: $(objgenerated)/crt0.S $(obj)/config.h $(obj)/build.h
+$(objgenerated)/crt0.s: $(objgenerated)/crt0.romstage.S $(obj)/config.h $(obj)/build.h
    @printf "    CC         $(subst $(obj)/,,$(@))\n"
    $(CC) -MMD -x assembler-with-cpp -E -I$(src)/include -I$(src)/arch/x86/include -I$(obj) -include $(obj)/config.h -include $(obj)/build.h -I. -I$(src) $< -o $@