Patch set updated for coreboot: 409d26d arm: Remove some pointless CFLAGS

[Isaac Christensen]

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

-gerrit

commit 409d26d66630c0901403cd46cc34b8007e32922e
Author: Julius Werner 
Date:   Tue Nov 12 14:46:07 2013 -0800

arm: Remove some pointless CFLAGS

This patch removes the -ffixed-r8 CFLAG from the coreboot and libpayload
    Makefiles. This seems to be a relic from U-Boot, which uses that
    register to keep it's global data structure pointer. There's no reason
    for us to throw away a perfectly fine register on this already pretty
    constrained architecture.

Also removed a config.h inclusion from the Makefile because that should
    really be done inside the C files.

Change-Id: Ia176c0f323c1be07cddf88fa5488788786a27cdf
    Signed-off-by: Julius Werner 
    Reviewed-on: https://chromium-review.googlesource.com/177110
    Reviewed-by: Gabe Black 
    (cherry picked from commit 2a81112abde284ba09020db6afa363169911a7f6)
    Signed-off-by: Isaac Christensen 
---
 payloads/libpayload/arch/arm/Makefile.inc | 2 +-
 src/arch/arm/Makefile.inc                 | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/payloads/libpayload/arch/arm/Makefile.inc b/payloads/libpayload/arch/arm/Makefile.inc
index 42d6ed2..8d7bb5e 100644
--- a/payloads/libpayload/arch/arm/Makefile.inc
+++ b/payloads/libpayload/arch/arm/Makefile.inc
@@ -27,7 +27,7 @@
 ## SUCH DAMAGE.
 ##

-CFLAGS += -ffixed-r8 -mfloat-abi=hard -marm -mabi=aapcs-linux -march=armv7-a
+CFLAGS += -mfloat-abi=hard -marm -mabi=aapcs-linux -march=armv7-a

head.o-y += head.S
 libc-y += main.c sysinfo.c
diff --git a/src/arch/arm/Makefile.inc b/src/arch/arm/Makefile.inc
index 09f2fd3..027fbe1 100644
--- a/src/arch/arm/Makefile.inc
+++ b/src/arch/arm/Makefile.inc
@@ -59,12 +59,12 @@ bootblock-y += memset.S
 bootblock-y += memcpy.S
 bootblock-y += memmove.S

-$(objcbfs)/bootblock.debug: $(src)/arch/arm/bootblock.ld $(obj)/ldoptions $$(bootblock-objs) $(obj)/config.h
+$(objcbfs)/bootblock.debug: $(src)/arch/arm/bootblock.ld $(obj)/ldoptions $$(bootblock-objs)
    @printf "    LINK       $(subst $(obj)/,,$(@))\n"
 ifeq ($(CONFIG_COMPILER_LLVM_CLANG),y)
    $(LD_bootblock) -m armelf_linux_eabi -static -o $@ -L$(obj) $< -T $(src)/arch/arm/bootblock.ld
 else
-	$(CC_bootblock) $(CFLAGS_bootblock) -nostartfiles -include $(obj)/config.h -static -o $@ -L$(obj) -T $(src)/arch/arm/bootblock.ld -Wl,--start-group $(bootblock-objs) $(LIBGCC_FILE_NAME_bootblock) -Wl,--end-group
+	$(CC_bootblock) $(CFLAGS_bootblock) -nostartfiles -static -o $@ -L$(obj) -T $(src)/arch/arm/bootblock.ld -Wl,--start-group $(bootblock-objs) $(LIBGCC_FILE_NAME_bootblock) -Wl,--end-group
 endif

endif # CONFIG_ARCH_BOOTBLOCK_ARM