New patch to review for coreboot: arch/x86/Makefile.inc: Simplify rule for bootblock.debug

[Alexandru Gagniuc]

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

-gerrit

commit 4dcfef350b7cd4d89da4b9e38fd176570170eb09
Author: Alexandru Gagniuc 
Date:   Fri Oct 2 12:24:00 2015 -0700

arch/x86/Makefile.inc: Simplify rule for bootblock.debug

The only difference between the ifeq/else/endif guarded rules is the
    linker flags specific to x86. Set those flags elsewhere, in a
    variable, and only use one rule for bootblock.debug.

Change-Id: I986a93e0418f05fb273512d7efe0573052493332
    Signed-off-by: Alexandru Gagniuc 
---
 src/arch/x86/Makefile.inc | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/arch/x86/Makefile.inc b/src/arch/x86/Makefile.inc
index 1bda5f6..fba07c7 100644
--- a/src/arch/x86/Makefile.inc
+++ b/src/arch/x86/Makefile.inc
@@ -74,6 +74,13 @@ CBFS_BASE_ADDRESS=$(call int-add, $(call int-subtract, 0xffffffff $(CONFIG_CBFS_

ifeq ($(CONFIG_ARCH_BOOTBLOCK_X86_32)$(CONFIG_ARCH_BOOTBLOCK_X86_64),y)

+# x86-specific linker flags
+ifeq ($(CONFIG_ARCH_BOOTBLOCK_X86_32),y)
+LDFLAGS_x86 := -m elf_i386 --oformat elf32-i386
+else
+LDFLAGS_x86 := -m elf_x86_64 --oformat elf64-x86-64
+endif
+
 # Add the assembly file that pulls in the rest of the dependencies in
 # the right order. Make sure the auto generated bootblock.inc is a proper
 # dependency. Make the same true for the linker sript.
@@ -105,11 +112,8 @@ $(objgenerated)/bootblock.inc: $(src)/arch/x86/$(subst ",,$(CONFIG_BOOTBLOCK_SOU

$(objcbfs)/bootblock.debug: $(obj)/arch/x86/bootblock.bootblock.o $(obj)/arch/x86/bootblock.bootblock.ld
    @printf "    LINK       $(subst $(obj)/,,$(@))\n"
-ifeq ($(CONFIG_ARCH_BOOTBLOCK_X86_32),y)
-	$(LD_bootblock) $(LDFLAGS_common) -m elf_i386 --oformat elf32-i386 -static -o $@ -L$(obj) $< -T $(obj)/arch/x86/bootblock.bootblock.ld
-else
-	$(LD_bootblock) $(LDFLAGS_common) -m elf_x86_64 --oformat elf64-x86-64 -static -o $@ -L$(obj) $< -T $(obj)/arch/x86/bootblock.bootblock.ld
-endif
+	$(LD_bootblock) $(LDFLAGS_common) $(LDFLAGS_x86) -static \
+		-o $@ -L$(obj) $< -T $(obj)/arch/x86/bootblock.bootblock.ld

endif # CONFIG_ARCH_BOOTBLOCK_X86_32 / CONFIG_ARCH_BOOTBLOCK_X86_64