[coreboot] New patch to review for coreboot: d714b57 Change the name of generated file bootblock.ld

[Marc Jones (marcj303@gmail.com)]

Marc Jones (marcj303 at gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/1031

-gerrit

commit d714b5751fc1fc237f2002aee17bb1cce33d7c6c
Author: Marc Jones <marc.jones at se-eng.com>
Date:   Fri May 11 13:23:45 2012 -0600

    Change the name of generated file bootblock.ld
    
    There is a source file bootblock.ld and a generated file of
    the same name. Change the generated to bootblocklink.ld to
    avoid confusion.
    
    Change-Id: I7ca9147bb821fe6f83224d170f5fe25654ef250f
    Signed-off-by: Marc Jones <marc.jones at se-eng.com>
---
 src/arch/x86/Makefile.inc |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/arch/x86/Makefile.inc b/src/arch/x86/Makefile.inc
index 5486bb1..8556cfe 100644
--- a/src/arch/x86/Makefile.inc
+++ b/src/arch/x86/Makefile.inc
@@ -287,7 +287,7 @@ ifeq ($(CONFIG_SSE),y)
 bootblock_romccflags := -mcpu=k7 -msse -O2 -D__PRE_RAM__
 endif
 
-$(objgenerated)/bootblock.ld: $$(bootblock_lds) $(obj)/ldoptions
+$(objgenerated)/bootblocklink.ld: $$(bootblock_lds) $(obj)/ldoptions
 	@printf "    GEN        $(subst $(obj)/,,$(@))\n"
 	printf '$(foreach ldscript,ldoptions $(bootblock_lds),INCLUDE "$(ldscript)"\n)' > $@
 
@@ -309,9 +309,9 @@ $(objgenerated)/bootblock.inc: $(src)/arch/x86/init/$(subst ",,$(CONFIG_BOOTBLOC
 		$< > $(objgenerated)/bootblock.inc.d
 	$(ROMCC) -c -S $(bootblock_romccflags) $(ROMCCFLAGS) -I. $(INCLUDES) $< -o $@
 
-$(objcbfs)/bootblock.debug: $(objgenerated)/bootblock.o $(objgenerated)/bootblock.ld
+$(objcbfs)/bootblock.debug: $(objgenerated)/bootblock.o $(objgenerated)/bootblocklink.ld
 	@printf "    LINK       $(subst $(obj)/,,$(@))\n"
-	$(CC) -nostdlib -nostartfiles -static -o $@ -L$(obj) -T $(objgenerated)/bootblock.ld $<
+	$(CC) -nostdlib -nostartfiles -static -o $@ -L$(obj) -T $(objgenerated)/bootblocklink.ld $<
 
 #######################################################################
 # Build the romstage