summaryrefslogtreecommitdiff
path: root/src/arch/arm/armv4
diff options
context:
space:
mode:
authorJulius Werner <jwerner@chromium.org>2015-11-13 13:28:41 -0800
committerJulius Werner <jwerner@chromium.org>2015-11-17 21:31:07 +0100
commitd3634c108d63d07ce004a66e3abb05e8da57d65b (patch)
treefaa8038ed49e4041d3eee01c8a2ca1add304b569 /src/arch/arm/armv4
parent0dc6a1e8987597ce234f2a4f54932219cd5e2480 (diff)
downloadcoreboot-d3634c108d63d07ce004a66e3abb05e8da57d65b.tar.xz
rules.h: Add ENV_ macros to detect current architecture
This patch expands the existing ENV_<stage> macros in <rules.h> with a set of ENV_<arch> macros which can be used to detect which architecture the current compilation unit is built for. These are more consistent than compiler-defined macros (like '#ifdef __arm__') and will make it easier to write small, architecture-dependent differences in common code (where we currently often use IS_ENABLED(CONFIG_ARCH_...), which is technically incorrect in a world where every stage can run on a different architecture, and merely kinda happened to work out for now). Also remove a vestigal <arch/rules.h> from ARM64 which was no longer used, and genericise ARM subarchitecture Makefiles a little to make things like __COREBOOT_ARM_ARCH__ available from all file types (including .ld). BUG=None TEST=Compiled Falco, Blaze, Jerry and Smaug. Change-Id: Id51aeb290b5c215c653e42a51919d0838e28621f Signed-off-by: Julius Werner <jwerner@chromium.org> Reviewed-on: http://review.coreboot.org/12433 Tested-by: build bot (Jenkins) Reviewed-by: Aaron Durbin <adurbin@chromium.org> Reviewed-by: Kyösti Mälkki <kyosti.malkki@gmail.com> Tested-by: Raptor Engineering Automated Test Stand <noreply@raptorengineeringinc.com>
Diffstat (limited to 'src/arch/arm/armv4')
-rw-r--r--src/arch/arm/armv4/Makefile.inc18
1 files changed, 6 insertions, 12 deletions
diff --git a/src/arch/arm/armv4/Makefile.inc b/src/arch/arm/armv4/Makefile.inc
index ee1879cf8f..1b91961f7e 100644
--- a/src/arch/arm/armv4/Makefile.inc
+++ b/src/arch/arm/armv4/Makefile.inc
@@ -30,8 +30,7 @@ endif
bootblock-y += cache.c
-bootblock-c-ccopts += $(armv4_flags)
-bootblock-S-ccopts += $(armv4_flags)
+bootblock-generic-ccopts += $(armv4_flags)
endif # CONFIG_ARCH_BOOTBLOCK_ARMV4
@@ -40,10 +39,8 @@ endif # CONFIG_ARCH_BOOTBLOCK_ARMV4
################################################################################
ifeq ($(CONFIG_ARCH_VERSTAGE_ARMV4),y)
-libverstage-c-ccopts += $(armv4_flags)
-libverstage-S-ccopts += $(armv4_flags)
-verstage-c-ccopts += $(armv4_flags)
-verstage-S-ccopts += $(armv4_flags)
+libverstage-generic-ccopts += $(armv4_flags)
+verstage-generic-ccopts += $(armv4_flags)
verstage-y += cache.c
endif # CONFIG_ARCH_VERSTAGE_ARMV4
@@ -55,12 +52,10 @@ endif # CONFIG_ARCH_VERSTAGE_ARMV4
ifeq ($(CONFIG_ARCH_ROMSTAGE_ARMV4),y)
-romstage-c-ccopts += $(armv4_flags)
-romstage-S-ccopts += $(armv4_flags)
+romstage-generic-ccopts += $(armv4_flags)
romstage-y += cache.c
-rmodules_arm-c-ccopts += $(armv4_flags)
-rmodules_arm-S-ccopts += $(armv4_flags)
+rmodules_arm-generic-ccopts += $(armv4_flags)
endif # CONFIG_ARCH_ROMSTAGE_ARMV4
@@ -70,7 +65,6 @@ endif # CONFIG_ARCH_ROMSTAGE_ARMV4
ifeq ($(CONFIG_ARCH_RAMSTAGE_ARMV4),y)
-ramstage-c-ccopts += $(armv4_flags)
-ramstage-S-ccopts += $(armv4_flags)
+ramstage-generic-ccopts += $(armv4_flags)
endif # CONFIG_ARCH_RAMSTAGE_ARMV4