diff options
author | Sascha Hauer <s.hauer@pengutronix.de> | 2023-05-09 16:18:45 +0200 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2023-05-22 12:38:17 +0200 |
commit | f4b2051bdc409d0537c04d29cede0a1c946158f0 (patch) | |
tree | a73f4bbd3605e48a04965fcc7d84c89bc067f263 /arch | |
parent | 3453d482d52a2dd44e4020f15a42fe67881d8fc8 (diff) | |
download | barebox-f4b2051bdc409d0537c04d29cede0a1c946158f0.tar.gz barebox-f4b2051bdc409d0537c04d29cede0a1c946158f0.tar.xz |
ARM: Add _32 suffix to aarch32 specific filenames
Several files in arch/arm/cpu/ have 32bit and 64bit versions. The
64bit versions have a _64 suffix, but the 32bit versions have none.
This can be confusing sometimes as one doesn't know if a file is
32bit specific or common code.
Add a _32 suffix to the 32bit files to avoid this confusion.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Reviewed-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm/Makefile | 5 | ||||
-rw-r--r-- | arch/arm/cpu/Makefile | 20 | ||||
-rw-r--r-- | arch/arm/cpu/cache_32.c (renamed from arch/arm/cpu/cache.c) | 0 | ||||
-rw-r--r-- | arch/arm/cpu/entry_ll_32.S (renamed from arch/arm/cpu/entry_ll.S) | 0 | ||||
-rw-r--r-- | arch/arm/cpu/exceptions_32.S (renamed from arch/arm/cpu/exceptions.S) | 0 | ||||
-rw-r--r-- | arch/arm/cpu/interrupts_32.c (renamed from arch/arm/cpu/interrupts.c) | 0 | ||||
-rw-r--r-- | arch/arm/cpu/lowlevel_32.S (renamed from arch/arm/cpu/lowlevel.S) | 0 | ||||
-rw-r--r-- | arch/arm/cpu/mmu-early_32.c (renamed from arch/arm/cpu/mmu-early.c) | 0 | ||||
-rw-r--r-- | arch/arm/cpu/mmu_32.c (renamed from arch/arm/cpu/mmu.c) | 0 | ||||
-rw-r--r-- | arch/arm/cpu/setupc_32.S (renamed from arch/arm/cpu/setupc.S) | 0 | ||||
-rw-r--r-- | arch/arm/cpu/smccc-call_32.S (renamed from arch/arm/cpu/smccc-call.S) | 0 |
11 files changed, 14 insertions, 11 deletions
diff --git a/arch/arm/Makefile b/arch/arm/Makefile index a506f1e3a3..cb88c7b330 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile @@ -78,10 +78,13 @@ endif ifeq ($(CONFIG_CPU_V8), y) KBUILD_CPPFLAGS += $(CFLAGS_ABI) $(arch-y) $(tune-y) KBUILD_AFLAGS += -include asm/unified.h -export S64 = _64 +export S64_32 = 64 +export S64 = 64 else KBUILD_CPPFLAGS += $(CFLAGS_ABI) $(arch-y) $(tune-y) $(CFLAGS_THUMB2) KBUILD_AFLAGS += -include asm/unified.h -msoft-float $(AFLAGS_THUMB2) +export S64_32 = 32 +export S32 = 32 endif # Machine directory name. This list is sorted alphanumerically diff --git a/arch/arm/cpu/Makefile b/arch/arm/cpu/Makefile index 7674c1464c..fef2026da5 100644 --- a/arch/arm/cpu/Makefile +++ b/arch/arm/cpu/Makefile @@ -2,15 +2,15 @@ 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_$(S64_32).o mmu-common.o +obj-pbl-y += lowlevel_$(S64_32).o +obj-pbl-$(CONFIG_MMU) += mmu-early_$(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 @@ -18,7 +18,7 @@ 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 @@ -35,9 +35,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 @@ -52,7 +52,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 diff --git a/arch/arm/cpu/cache.c b/arch/arm/cpu/cache_32.c index 4202406d0d..4202406d0d 100644 --- a/arch/arm/cpu/cache.c +++ b/arch/arm/cpu/cache_32.c diff --git a/arch/arm/cpu/entry_ll.S b/arch/arm/cpu/entry_ll_32.S index 2800174c45..2800174c45 100644 --- a/arch/arm/cpu/entry_ll.S +++ b/arch/arm/cpu/entry_ll_32.S diff --git a/arch/arm/cpu/exceptions.S b/arch/arm/cpu/exceptions_32.S index 749c713aab..749c713aab 100644 --- a/arch/arm/cpu/exceptions.S +++ b/arch/arm/cpu/exceptions_32.S diff --git a/arch/arm/cpu/interrupts.c b/arch/arm/cpu/interrupts_32.c index 5bc790a796..5bc790a796 100644 --- a/arch/arm/cpu/interrupts.c +++ b/arch/arm/cpu/interrupts_32.c diff --git a/arch/arm/cpu/lowlevel.S b/arch/arm/cpu/lowlevel_32.S index 960a92b78c..960a92b78c 100644 --- a/arch/arm/cpu/lowlevel.S +++ b/arch/arm/cpu/lowlevel_32.S diff --git a/arch/arm/cpu/mmu-early.c b/arch/arm/cpu/mmu-early_32.c index 4895911cdb..4895911cdb 100644 --- a/arch/arm/cpu/mmu-early.c +++ b/arch/arm/cpu/mmu-early_32.c diff --git a/arch/arm/cpu/mmu.c b/arch/arm/cpu/mmu_32.c index 78dd05577a..78dd05577a 100644 --- a/arch/arm/cpu/mmu.c +++ b/arch/arm/cpu/mmu_32.c diff --git a/arch/arm/cpu/setupc.S b/arch/arm/cpu/setupc_32.S index eafc9b52c6..eafc9b52c6 100644 --- a/arch/arm/cpu/setupc.S +++ b/arch/arm/cpu/setupc_32.S diff --git a/arch/arm/cpu/smccc-call.S b/arch/arm/cpu/smccc-call_32.S index 9875e1f947..9875e1f947 100644 --- a/arch/arm/cpu/smccc-call.S +++ b/arch/arm/cpu/smccc-call_32.S |