Our 64bit file variants have the suffix "_64". This adds a make variable that is either empty or contains "_64" which can be used to easily alternatively compile the 32bit or 64bit variant. Signed-off-by: Sascha Hauer <s.hauer@xxxxxxxxxxxxxx> --- arch/arm/Makefile | 1 + arch/arm/cpu/Makefile | 19 ++++++------------- 2 files changed, 7 insertions(+), 13 deletions(-) diff --git a/arch/arm/Makefile b/arch/arm/Makefile index 620a3ccb0b..da307343c7 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile @@ -65,6 +65,7 @@ endif ifeq ($(CONFIG_CPU_V8), y) CPPFLAGS += $(CFLAGS_ABI) $(arch-y) $(tune-y) AFLAGS += -include asm/unified.h +export S64 = _64 else CPPFLAGS += $(CFLAGS_ABI) $(arch-y) $(tune-y) -msoft-float $(CFLAGS_THUMB2) AFLAGS += -include asm/unified.h -msoft-float $(AFLAGS_THUMB2) diff --git a/arch/arm/cpu/Makefile b/arch/arm/cpu/Makefile index 94f7d1bf45..ba729fb6e4 100644 --- a/arch/arm/cpu/Makefile +++ b/arch/arm/cpu/Makefile @@ -1,24 +1,17 @@ obj-y += cpu.o -ifeq ($(CONFIG_CPU_64v8), y) -obj-$(CONFIG_ARM_EXCEPTIONS) += exceptions_64.o -obj-$(CONFIG_MMU) += mmu_64.o -lwl-y += lowlevel_64.o -else -obj-$(CONFIG_ARM_EXCEPTIONS) += exceptions.o -obj-$(CONFIG_MMU) += mmu.o +obj-$(CONFIG_ARM_EXCEPTIONS) += exceptions$(S64).o +obj-$(CONFIG_MMU) += mmu$(S64).o +lwl-y += lowlevel$(S64).o + +ifeq ($(CONFIG_CPU_32), y) obj-pbl-$(CONFIG_MMU) += mmu-early.o -lwl-y += lowlevel.o endif obj-$(CONFIG_ARM_EXCEPTIONS) += interrupts.o obj-y += start.o entry.o -ifeq ($(CONFIG_CPU_64v8), y) -obj-pbl-y += setupc_64.o -else -obj-pbl-y += setupc.o -endif +obj-pbl-y += setupc$(S64).o # # Any variants can be called as start-armxyz.S -- 2.16.1 _______________________________________________ barebox mailing list barebox@xxxxxxxxxxxxxxxxxxx http://lists.infradead.org/mailman/listinfo/barebox
