diff options
Diffstat (limited to 'arch/arm/cpu/Makefile')
-rw-r--r-- | arch/arm/cpu/Makefile | 26 |
1 files changed, 15 insertions, 11 deletions
diff --git a/arch/arm/cpu/Makefile b/arch/arm/cpu/Makefile index c0993c1abe..28161cd7d7 100644 --- a/arch/arm/cpu/Makefile +++ b/arch/arm/cpu/Makefile @@ -2,21 +2,24 @@ obj-y += cpu.o -obj-$(CONFIG_ARM_EXCEPTIONS) += exceptions$(S64).o interrupts$(S64).o -obj-$(CONFIG_MMU) += mmu$(S64).o mmu-common.o -obj-pbl-y += lowlevel$(S64).o -obj-pbl-$(CONFIG_MMU) += mmu-early$(S64).o +obj-$(CONFIG_ARM_EXCEPTIONS) += exceptions_$(S64_32).o interrupts_$(S64_32).o +obj-$(CONFIG_MMU) += mmu-common.o +obj-pbl-$(CONFIG_MMU) += mmu_$(S64_32).o +obj-$(CONFIG_MMU) += dma_$(S64_32).o +obj-pbl-y += lowlevel_$(S64_32).o obj-pbl-$(CONFIG_CPU_32v7) += hyp.o AFLAGS_hyp.o :=-Wa,-march=armv7-a -Wa,-mcpu=all AFLAGS_hyp.pbl.o :=-Wa,-march=armv7-a -Wa,-mcpu=all -obj-y += start.o entry.o entry_ll$(S64).o +obj-y += start.o entry.o entry_ll_$(S64_32).o KASAN_SANITIZE_start.o := n +pbl-$(CONFIG_CPU_64) += head_64.o + pbl-$(CONFIG_BOARD_ARM_GENERIC_DT) += board-dt-2nd.o pbl-$(CONFIG_BOARD_ARM_GENERIC_DT_AARCH64) += board-dt-2nd-aarch64.o -obj-pbl-y += setupc$(S64).o cache$(S64).o +obj-pbl-y += setupc_$(S64_32).o cache_$(S64_32).o obj-$(CONFIG_ARM_PSCI_CLIENT) += psci-client.o @@ -24,8 +27,9 @@ obj-$(CONFIG_ARM_PSCI_CLIENT) += psci-client.o # Any variants can be called as start-armxyz.S # obj-$(CONFIG_CMD_ARM_CPUINFO) += cpuinfo.o -obj-$(CONFIG_CMD_ARM_MMUINFO) += mmuinfo.o +obj-$(CONFIG_MMUINFO) += mmuinfo.o mmuinfo_$(S64_32).o obj-$(CONFIG_OFDEVICE) += dtb.o +obj-$(CONFIG_BOOTM_ELF) += bootm-elf.o ifeq ($(CONFIG_MMU),) obj-$(CONFIG_CPU_32v7) += no-mmu.o @@ -33,9 +37,9 @@ endif obj-$(CONFIG_ARM_PSCI) += psci.o obj-$(CONFIG_ARM_PSCI_OF) += psci-of.o -obj-pbl-$(CONFIG_ARM_SMCCC) += smccc-call$(S64).o -AFLAGS_smccc-call$(S64).o :=-Wa,-march=armv$(if $(S64),8,7)-a -AFLAGS_smccc-call$(S64).pbl.o :=-Wa,-march=armv$(if $(S64),8,7)-a +obj-pbl-$(CONFIG_ARM_SMCCC) += smccc-call_$(S64_32).o +AFLAGS_smccc-call_$(S64_32).o :=-Wa,-march=armv$(if $(S64),8,7)-a +AFLAGS_smccc-call_$(S64_32).pbl.o :=-Wa,-march=armv$(if $(S64),8,7)-a obj-$(CONFIG_ARM_SECURE_MONITOR) += sm.o sm_as.o AFLAGS_sm_as.o :=-Wa,-march=armv7-a @@ -50,7 +54,7 @@ obj-pbl-$(CONFIG_CPU_64v8) += cache-armv8.o AFLAGS_cache-armv8.o :=-Wa,-march=armv8-a AFLAGS-cache-armv8.pbl.o :=-Wa,-march=armv8-a -pbl-y += entry.o entry_ll$(S64).o +pbl-y += entry.o entry_ll_$(S64_32).o pbl-y += uncompress.o pbl-$(CONFIG_ARM_ATF) += atf.o |