Each SoC now has a directory in mach-k3, let's move the SoC specific
files into their respective directories.
Signed-off-by: Andrew Davis
---
Changes for v2:
- Rebased on latest -next
arch/arm/mach-k3/Makefile | 24 ++---
arch/arm/mach-k3/am62ax/Makefile| 7 ++
arch/arm/mach-k3/{ => am62ax}/am62a7_fdt.c | 3 ++-
arch/arm/mach-k3/{ => am62ax}/am62a7_init.c | 5 +++--
arch/arm/mach-k3/am62px/Makefile| 6 ++
arch/arm/mach-k3/{ => am62px}/am62p5_init.c | 5 +++--
arch/arm/mach-k3/am62x/Makefile | 3 +++
arch/arm/mach-k3/{ => am62x}/am625_fdt.c| 3 ++-
arch/arm/mach-k3/{ => am62x}/am625_init.c | 5 +++--
arch/arm/mach-k3/am64x/Makefile | 2 ++
arch/arm/mach-k3/{ => am64x}/am642_init.c | 5 +++--
arch/arm/mach-k3/am65x/Makefile | 7 ++
arch/arm/mach-k3/{ => am65x}/am654_fdt.c| 3 ++-
arch/arm/mach-k3/{ => am65x}/am654_init.c | 5 +++--
arch/arm/mach-k3/j721e/Makefile | 7 ++
arch/arm/mach-k3/{ => j721e}/j721e_fdt.c| 3 ++-
arch/arm/mach-k3/{ => j721e}/j721e_init.c | 5 +++--
arch/arm/mach-k3/j721s2/Makefile| 7 ++
arch/arm/mach-k3/{ => j721s2}/j721s2_fdt.c | 3 ++-
arch/arm/mach-k3/{ => j721s2}/j721s2_init.c | 5 +++--
arch/arm/mach-k3/j784s4/Makefile| 7 ++
arch/arm/mach-k3/{ => j784s4}/j784s4_fdt.c | 3 ++-
arch/arm/mach-k3/{ => j784s4}/j784s4_init.c | 5 +++--
23 files changed, 88 insertions(+), 40 deletions(-)
create mode 100644 arch/arm/mach-k3/am62ax/Makefile
rename arch/arm/mach-k3/{ => am62ax}/am62a7_fdt.c (93%)
rename arch/arm/mach-k3/{ => am62ax}/am62a7_init.c (99%)
create mode 100644 arch/arm/mach-k3/am62px/Makefile
rename arch/arm/mach-k3/{ => am62px}/am62p5_init.c (99%)
rename arch/arm/mach-k3/{ => am62x}/am625_fdt.c (98%)
rename arch/arm/mach-k3/{ => am62x}/am625_init.c (99%)
rename arch/arm/mach-k3/{ => am64x}/am642_init.c (99%)
create mode 100644 arch/arm/mach-k3/am65x/Makefile
rename arch/arm/mach-k3/{ => am65x}/am654_fdt.c (88%)
rename arch/arm/mach-k3/{ => am65x}/am654_init.c (99%)
create mode 100644 arch/arm/mach-k3/j721e/Makefile
rename arch/arm/mach-k3/{ => j721e}/j721e_fdt.c (88%)
rename arch/arm/mach-k3/{ => j721e}/j721e_init.c (99%)
create mode 100644 arch/arm/mach-k3/j721s2/Makefile
rename arch/arm/mach-k3/{ => j721s2}/j721s2_fdt.c (88%)
rename arch/arm/mach-k3/{ => j721s2}/j721s2_init.c (99%)
create mode 100644 arch/arm/mach-k3/j784s4/Makefile
rename arch/arm/mach-k3/{ => j784s4}/j784s4_fdt.c (92%)
rename arch/arm/mach-k3/{ => j784s4}/j784s4_init.c (99%)
diff --git a/arch/arm/mach-k3/Makefile b/arch/arm/mach-k3/Makefile
index 3101f57d324..2b3ebd5c535 100644
--- a/arch/arm/mach-k3/Makefile
+++ b/arch/arm/mach-k3/Makefile
@@ -6,24 +6,12 @@
obj-$(CONFIG_ARM64) += arm64/
obj-$(CONFIG_CPU_V7R) += r5/
obj-$(CONFIG_OF_LIBFDT) += common_fdt.o
-ifeq ($(CONFIG_OF_LIBFDT)$(CONFIG_OF_SYSTEM_SETUP),yy)
-obj-$(CONFIG_SOC_K3_AM654) += am654_fdt.o
-obj-$(CONFIG_SOC_K3_J721E) += j721e_fdt.o
-obj-$(CONFIG_SOC_K3_J721S2) += j721s2_fdt.o
-obj-$(CONFIG_SOC_K3_AM625) += am625_fdt.o
-obj-$(CONFIG_SOC_K3_AM62A7) += am62a7_fdt.o
-obj-$(CONFIG_SOC_K3_J784S4) += j784s4_fdt.o
-endif
-ifeq ($(CONFIG_SPL_BUILD),y)
-obj-$(CONFIG_SOC_K3_AM654) += am654_init.o
-obj-$(CONFIG_SOC_K3_J721E) += j721e_init.o
-obj-$(CONFIG_SOC_K3_J721S2) += j721s2_init.o
-obj-$(CONFIG_SOC_K3_AM642) += am642_init.o
-obj-$(CONFIG_SOC_K3_AM625) += am625_init.o
-obj-$(CONFIG_SOC_K3_AM62A7) += am62a7_init.o
-obj-$(CONFIG_SOC_K3_J784S4) += j784s4_init.o
-obj-$(CONFIG_SOC_K3_AM62P5) += am62p5_init.o
-endif
obj-y += common.o security.o
+obj-$(CONFIG_SOC_K3_AM62A7) += am62ax/
+obj-$(CONFIG_SOC_K3_AM62P5) += am62px/
obj-$(CONFIG_SOC_K3_AM625) += am62x/
obj-$(CONFIG_SOC_K3_AM642) += am64x/
+obj-$(CONFIG_SOC_K3_AM654) += am65x/
+obj-$(CONFIG_SOC_K3_J721E) += j721e/
+obj-$(CONFIG_SOC_K3_J721S2) += j721s2/
+obj-$(CONFIG_SOC_K3_J784S4) += j784s4/
diff --git a/arch/arm/mach-k3/am62ax/Makefile b/arch/arm/mach-k3/am62ax/Makefile
new file mode 100644
index 000..1717ca343d6
--- /dev/null
+++ b/arch/arm/mach-k3/am62ax/Makefile
@@ -0,0 +1,7 @@
+# SPDX-License-Identifier: GPL-2.0+
+#
+# Copyright (C) 2024 Texas Instruments Incorporated - https://www.ti.com/
+# Andrew Davis
+
+obj-$(CONFIG_OF_SYSTEM_SETUP) += am62a7_fdt.o
+obj-$(CONFIG_SPL_BUILD) += am62a7_init.o
diff --git a/arch/arm/mach-k3/am62a7_fdt.c
b/arch/arm/mach-k3/am62ax/am62a7_fdt.c
similarity index 93%
rename from arch/arm/mach-k3/am62a7_fdt.c
rename to arch/arm/mach-k3/am62ax/am62a7_fdt.c
index d67f012a5dc..7f764ab36b5 100644
--- a/arch/arm/mach-k3/am62a7_fdt.c
+++ b/arch/arm/mach-k3/am62ax/am62a7_fdt.c
@@ -4,9 +4,10 @@
*/
#include
-#include "common_fdt.h"
#include
+#include "../common_fdt.h"
+
int ft_system_setup(void *blob, struct bd_info *bd)
{
fdt_fixup_reserved(blob, "tfa", CONFIG_K3_ATF_LOAD_ADDR, 0x8);
diff --git
