From f7a1e8e4e794a9b6a4d10957270876de2f8e2300 Mon Sep 17 00:00:00 2001 From: Andrew Davis Date: Thu, 1 Feb 2024 18:24:48 -0600 Subject: [PATCH] arm: mach-k3: Move ARM64 specific code into new arm64 directory Like we did with R5, move ARM64 code into a specific directory to make it clear what code is only meant to run on each core type. Signed-off-by: Andrew Davis --- arch/arm/mach-k3/Makefile | 3 +-- arch/arm/mach-k3/arm64/Makefile | 6 ++++++ arch/arm/mach-k3/{ => arm64}/arm64-mmu.c | 0 arch/arm/mach-k3/{ => arm64}/cache.S | 0 4 files changed, 7 insertions(+), 2 deletions(-) create mode 100644 arch/arm/mach-k3/arm64/Makefile rename arch/arm/mach-k3/{ => arm64}/arm64-mmu.c (100%) rename arch/arm/mach-k3/{ => arm64}/cache.S (100%) diff --git a/arch/arm/mach-k3/Makefile b/arch/arm/mach-k3/Makefile index 945698e6e8..19b2d79e57 100644 --- a/arch/arm/mach-k3/Makefile +++ b/arch/arm/mach-k3/Makefile @@ -3,9 +3,8 @@ # Copyright (C) 2017-2018 Texas Instruments Incorporated - https://www.ti.com/ # Lokesh Vutla +obj-$(CONFIG_ARM64) += arm64/ obj-$(CONFIG_CPU_V7R) += r5/ -obj-$(CONFIG_ARM64) += arm64-mmu.o -obj-$(CONFIG_ARM64) += cache.o obj-$(CONFIG_OF_LIBFDT) += common_fdt.o ifeq ($(CONFIG_OF_LIBFDT)$(CONFIG_OF_SYSTEM_SETUP),yy) obj-$(CONFIG_SOC_K3_AM654) += am654_fdt.o diff --git a/arch/arm/mach-k3/arm64/Makefile b/arch/arm/mach-k3/arm64/Makefile new file mode 100644 index 0000000000..f3d322e17f --- /dev/null +++ b/arch/arm/mach-k3/arm64/Makefile @@ -0,0 +1,6 @@ +# SPDX-License-Identifier: GPL-2.0+ +# +# Copyright (C) 2023 Texas Instruments Incorporated - https://www.ti.com/ + +obj-y += arm64-mmu.o +obj-y += cache.o diff --git a/arch/arm/mach-k3/arm64-mmu.c b/arch/arm/mach-k3/arm64/arm64-mmu.c similarity index 100% rename from arch/arm/mach-k3/arm64-mmu.c rename to arch/arm/mach-k3/arm64/arm64-mmu.c diff --git a/arch/arm/mach-k3/cache.S b/arch/arm/mach-k3/arm64/cache.S similarity index 100% rename from arch/arm/mach-k3/cache.S rename to arch/arm/mach-k3/arm64/cache.S -- 2.39.5