sravan/system76-coreboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

build: Add ccopts back into the build

Browse Source 
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 25b56c3af5.

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>
This commit is contained in:
Marc Jones
2014-11-06 15:50:22 -07:00
parent 430363ace7
commit a38ccfdee1
5 changed files with 33 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/arch/arm/armv4/Makefile.inc
View File

@@ -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

12
src/arch/arm/armv7/Makefile.inc
View File

@@ -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