diff options
Diffstat (limited to 'src/arch/arm')
| -rw-r--r-- | src/arch/arm/armv4/Makefile.inc | 18 | ||||
| -rw-r--r-- | src/arch/arm/armv7/Makefile.inc | 42 |
2 files changed, 26 insertions, 34 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 diff --git a/src/arch/arm/armv7/Makefile.inc b/src/arch/arm/armv7/Makefile.inc index 3a489cb259..2e9c49cbe2 100644 --- a/src/arch/arm/armv7/Makefile.inc +++ b/src/arch/arm/armv7/Makefile.inc @@ -20,16 +20,14 @@ armv7-a_flags = -march=armv7-a $(armv7_flags) armv7-m_flags = -march=armv7-m $(armv7_flags) armv7_asm_flags = -Wa,-mthumb -Wa,-mimplicit-it=always -Wa,-mno-warn-deprecated -armv7-a_asm_flags = $(armv7-a_flags) $(armv7_asm_flags) -armv7-m_asm_flags = $(armv7-m_flags) $(armv7_asm_flags) ############################################################################### # bootblock ############################################################################### ifeq ($(CONFIG_ARCH_BOOTBLOCK_ARMV7),y) -bootblock-c-ccopts += $(armv7-a_flags) -bootblock-S-ccopts += $(armv7-a_asm_flags) +bootblock-generic-ccopts += $(armv7-a_flags) +bootblock-S-ccopts += $(armv7_asm_flags) ifneq ($(CONFIG_BOOTBLOCK_CUSTOM),y) bootblock-y += bootblock.S @@ -42,8 +40,8 @@ bootblock-$(CONFIG_BOOTBLOCK_CONSOLE) += exception_asm.S bootblock-y += mmu.c else ifeq ($(CONFIG_ARCH_BOOTBLOCK_ARMV7_M),y) -bootblock-c-ccopts += $(armv7-m_flags) -bootblock-S-ccopts += $(armv7-m_asm_flags) +bootblock-generic-ccopts += $(armv7-m_flags) +bootblock-S-ccopts += $(armv7_asm_flags) ifneq ($(CONFIG_BOOTBLOCK_CUSTOM),y) bootblock-y += bootblock_m.S @@ -58,10 +56,10 @@ endif # CONFIG_ARCH_BOOTBLOCK_ARMV7 ################################################################################ ifeq ($(CONFIG_ARCH_VERSTAGE_ARMV7),y) -libverstage-c-ccopts += $(armv7-a_flags) -libverstage-S-ccopts += $(armv7-a_asm_flags) -verstage-c-ccopts += $(armv7-a_flags) -verstage-S-ccopts += $(armv7-a_asm_flags) +libverstage-generic-ccopts += $(armv7-a_flags) +libverstage-S-ccopts += $(armv7_asm_flags) +verstage-generic-ccopts += $(armv7-a_flags) +verstage-S-ccopts += $(armv7_asm_flags) verstage-y += cache.c verstage-y += cpu.S @@ -70,10 +68,10 @@ verstage-y += exception_asm.S verstage-y += mmu.c else ifeq ($(CONFIG_ARCH_VERSTAGE_ARMV7_M),y) -libverstage-c-ccopts += $(armv7-m_flags) -libverstage-S-ccopts += $(armv7-m_asm_flags) -verstage-c-ccopts += $(armv7-m_flags) -verstage-S-ccopts += $(armv7-m_asm_flags) +libverstage-generic-ccopts += $(armv7-m_flags) +libverstage-S-ccopts += $(armv7_asm_flags) +verstage-generic-ccopts += $(armv7-m_flags) +verstage-S-ccopts += $(armv7_asm_flags) endif # CONFIG_ARCH_VERSTAGE_ARMV7_M @@ -87,11 +85,11 @@ romstage-y += exception.c romstage-y += exception_asm.S romstage-y += mmu.c -romstage-c-ccopts += $(armv7-a_flags) -romstage-S-ccopts += $(armv7-a_asm_flags) +romstage-generic-ccopts += $(armv7-a_flags) +romstage-S-ccopts += $(armv7_asm_flags) -rmodules_arm-c-ccopts += $(armv7-a_flags) -rmodules_arm-S-ccopts += $(armv7-a_asm_flags) +rmodules_arm-generic-ccopts += $(armv7-a_flags) +rmodules_arm-S-ccopts += $(armv7_asm_flags) endif # CONFIG_ARCH_ROMSTAGE_ARMV7 @@ -107,10 +105,10 @@ ramstage-y += exception.c ramstage-y += exception_asm.S ramstage-y += mmu.c -ramstage-c-ccopts += $(armv7-a_flags) -ramstage-S-ccopts += $(armv7-a_asm_flags) +ramstage-generic-ccopts += $(armv7-a_flags) +ramstage-S-ccopts += $(armv7_asm_flags) # All rmodule code is armv7 if ramstage is armv7. -rmodules_arm-c-ccopts += $(armv7-a_flags) -rmodules_arm-S-ccopts += $(armv7-a_asm_flags) +rmodules_arm-generic-ccopts += $(armv7-a_flags) +rmodules_arm-S-ccopts += $(armv7_asm_flags) endif # CONFIG_ARCH_RAMSTAGE_ARMV7 |