diff options
| author | Marc Jones <marc.jones@se-eng.com> | 2014-11-06 15:50:22 -0700 |
|---|---|---|
| committer | Marc Jones <marc.jones@se-eng.com> | 2014-11-09 01:36:43 +0100 |
| commit | a38ccfdee1404211dbf3c43edf7b5b686a3a05fd (patch) | |
| tree | a162c0b5c8a6c6fc7272f8e966039861ca54f1cd /src/arch | |
| parent | 430363ace7338b9708feefb5917d667f1733944d (diff) | |
build: Add ccopts back into the build
The ccopts mechanism is needed for passing ARM assembler flags to GCC.
There are many gotchas in adding ASFLAGS. As things have moved
around, the revert doesn't remove cleanly, so this reverts and cleans
up the ccopts.
This reverts commit 25b56c3af514faa8a730d56fe14cae4960ac83aa.
Change-Id: I44c025535258e6afb05a814123c10c24775a88e8
Signed-off-by: Marc Jones <marc.jones@se-eng.com>
Reviewed-on: http://review.coreboot.org/7352
Tested-by: build bot (Jenkins)
Reviewed-by: Julius Werner <jwerner@chromium.org>
Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
Diffstat (limited to 'src/arch')
| -rw-r--r-- | src/arch/arm/armv4/Makefile.inc | 12 | ||||
| -rw-r--r-- | src/arch/arm/armv7/Makefile.inc | 12 |
2 files changed, 12 insertions, 12 deletions
diff --git a/src/arch/arm/armv4/Makefile.inc b/src/arch/arm/armv4/Makefile.inc index aa788688d0..6b516b9cf9 100644 --- a/src/arch/arm/armv4/Makefile.inc +++ b/src/arch/arm/armv4/Makefile.inc @@ -35,8 +35,8 @@ endif bootblock-y += cache.c -CFLAGS_bootblock += $(armv4_flags) -CPPFLAGS_bootblock += $(armv4_flags) +bootblock-c-ccopts += $(armv4_flags) +bootblock-S-ccopts += $(armv4_flags) endif # CONFIG_ARCH_BOOTBLOCK_ARMV4 @@ -47,8 +47,8 @@ endif # CONFIG_ARCH_BOOTBLOCK_ARMV4 ifeq ($(CONFIG_ARCH_ROMSTAGE_ARMV4),y) -CFLAGS_romstage += $(armv4_flags) -CPPFLAGS_romstage += $(armv4_flags) +romstage-c-ccopts += $(armv4_flags) +romstage-S-ccopts += $(armv4_flags) endif # CONFIG_ARCH_ROMSTAGE_ARMV4 @@ -58,7 +58,7 @@ endif # CONFIG_ARCH_ROMSTAGE_ARMV4 ifeq ($(CONFIG_ARCH_RAMSTAGE_ARMV4),y) -CFLAGS_ramstage += $(armv4_flags) -CPPFLAGS_ramstage += $(armv4_flags) +ramstage-c-ccopts += $(armv4_flags) +ramstage-S-ccopts += $(armv4_flags) endif # CONFIG_ARCH_RAMSTAGE_ARMV4 diff --git a/src/arch/arm/armv7/Makefile.inc b/src/arch/arm/armv7/Makefile.inc index c46fb39c5e..4f3e75789c 100644 --- a/src/arch/arm/armv7/Makefile.inc +++ b/src/arch/arm/armv7/Makefile.inc @@ -39,8 +39,8 @@ bootblock-$(CONFIG_BOOTBLOCK_CONSOLE) += exception.c bootblock-$(CONFIG_BOOTBLOCK_CONSOLE) += exception_asm.S bootblock-y += mmu.c -CFLAGS_bootblock += $(armv7_flags) -CPPFLAGS_bootblock += $(armv7_flags) +bootblock-c-ccopts += $(armv7_flags) +bootblock-S-ccopts += $(armv7_flags) endif # CONFIG_ARCH_BOOTBLOCK_ARMV7 @@ -56,8 +56,8 @@ romstage-y += exception.c romstage-y += exception_asm.S romstage-y += mmu.c -CFLAGS_romstage += $(armv7_flags) -CPPFLAGS_romstage += $(armv7_flags) +romstage-c-ccopts += $(armv7_flags) +romstage-S-ccopts += $(armv7_flags) endif # CONFIG_ARCH_ROMSTAGE_ARMV7 @@ -73,7 +73,7 @@ ramstage-y += exception.c ramstage-y += exception_asm.S ramstage-y += mmu.c -CFLAGS_ramstage += $(armv7_flags) -CPPFLAGS_ramstage += $(armv7_flags) +ramstage-c-ccopts += $(armv7_flags) +ramstage-S-ccopts += $(armv7_flags) endif # CONFIG_ARCH_RAMSTAGE_ARMV7 |