From: Andrew Davis <afd@ti.com>
To: Neha Malcom Francis <n-francis@ti.com>,
Simon Glass <sjg@chromium.org>, Tom Rini <trini@konsulko.com>,
Vignesh Raghavendra <vigneshr@ti.com>, Nishanth Menon <nm@ti.com>
Cc: <u-boot@lists.denx.de>, Andrew Davis <afd@ti.com>
Subject: [PATCH 1/3] arm: mach-k3: Move R5 specific code into new r5/ directory
Date: Tue, 14 Nov 2023 09:59:48 -0600 [thread overview]
Message-ID: <20231114155950.296644-1-afd@ti.com> (raw)
This makes it clear these are only to be used by the R5 builds of SPL.
And this will be used to later more cleanly split the two builds.
Signed-off-by: Andrew Davis <afd@ti.com>
---
arch/arm/mach-k3/Makefile | 6 +-----
arch/arm/mach-k3/r5/Makefile | 13 +++++++++++++
arch/arm/mach-k3/{ => r5}/am62ax/Makefile | 0
arch/arm/mach-k3/{ => r5}/am62ax/am62a_qos_data.c | 0
arch/arm/mach-k3/{ => r5}/am62ax/clk-data.c | 0
arch/arm/mach-k3/{ => r5}/am62ax/dev-data.c | 0
arch/arm/mach-k3/{ => r5}/am62x/Makefile | 0
arch/arm/mach-k3/{ => r5}/am62x/clk-data.c | 0
arch/arm/mach-k3/{ => r5}/am62x/dev-data.c | 0
arch/arm/mach-k3/{ => r5}/j7200/Makefile | 0
arch/arm/mach-k3/{ => r5}/j7200/clk-data.c | 0
arch/arm/mach-k3/{ => r5}/j7200/dev-data.c | 0
arch/arm/mach-k3/{ => r5}/j721e/Makefile | 0
arch/arm/mach-k3/{ => r5}/j721e/clk-data.c | 0
arch/arm/mach-k3/{ => r5}/j721e/dev-data.c | 0
arch/arm/mach-k3/{ => r5}/j721s2/Makefile | 0
arch/arm/mach-k3/{ => r5}/j721s2/clk-data.c | 0
arch/arm/mach-k3/{ => r5}/j721s2/dev-data.c | 0
arch/arm/mach-k3/{ => r5}/lowlevel_init.S | 0
arch/arm/mach-k3/{ => r5}/r5_mpu.c | 2 +-
20 files changed, 15 insertions(+), 6 deletions(-)
create mode 100644 arch/arm/mach-k3/r5/Makefile
rename arch/arm/mach-k3/{ => r5}/am62ax/Makefile (100%)
rename arch/arm/mach-k3/{ => r5}/am62ax/am62a_qos_data.c (100%)
rename arch/arm/mach-k3/{ => r5}/am62ax/clk-data.c (100%)
rename arch/arm/mach-k3/{ => r5}/am62ax/dev-data.c (100%)
rename arch/arm/mach-k3/{ => r5}/am62x/Makefile (100%)
rename arch/arm/mach-k3/{ => r5}/am62x/clk-data.c (100%)
rename arch/arm/mach-k3/{ => r5}/am62x/dev-data.c (100%)
rename arch/arm/mach-k3/{ => r5}/j7200/Makefile (100%)
rename arch/arm/mach-k3/{ => r5}/j7200/clk-data.c (100%)
rename arch/arm/mach-k3/{ => r5}/j7200/dev-data.c (100%)
rename arch/arm/mach-k3/{ => r5}/j721e/Makefile (100%)
rename arch/arm/mach-k3/{ => r5}/j721e/clk-data.c (100%)
rename arch/arm/mach-k3/{ => r5}/j721e/dev-data.c (100%)
rename arch/arm/mach-k3/{ => r5}/j721s2/Makefile (100%)
rename arch/arm/mach-k3/{ => r5}/j721s2/clk-data.c (100%)
rename arch/arm/mach-k3/{ => r5}/j721s2/dev-data.c (100%)
rename arch/arm/mach-k3/{ => r5}/lowlevel_init.S (100%)
rename arch/arm/mach-k3/{ => r5}/r5_mpu.c (98%)
diff --git a/arch/arm/mach-k3/Makefile b/arch/arm/mach-k3/Makefile
index c7ca0fdce56..215c755c5dc 100644
--- a/arch/arm/mach-k3/Makefile
+++ b/arch/arm/mach-k3/Makefile
@@ -3,12 +3,8 @@
# Copyright (C) 2017-2018 Texas Instruments Incorporated - https://www.ti.com/
# Lokesh Vutla <lokeshvutla@ti.com>
-obj-$(CONFIG_SOC_K3_J721E) += j721e/ j7200/
-obj-$(CONFIG_SOC_K3_J721S2) += j721s2/
-obj-$(CONFIG_SOC_K3_AM625) += am62x/
-obj-$(CONFIG_SOC_K3_AM62A7) += am62ax/
+obj-$(CONFIG_CPU_V7R) += r5/
obj-$(CONFIG_ARM64) += arm64-mmu.o
-obj-$(CONFIG_CPU_V7R) += r5_mpu.o lowlevel_init.o
obj-$(CONFIG_ARM64) += cache.o
obj-$(CONFIG_OF_LIBFDT) += common_fdt.o
ifeq ($(CONFIG_OF_LIBFDT)$(CONFIG_OF_SYSTEM_SETUP),yy)
diff --git a/arch/arm/mach-k3/r5/Makefile b/arch/arm/mach-k3/r5/Makefile
new file mode 100644
index 00000000000..8a6af73a44e
--- /dev/null
+++ b/arch/arm/mach-k3/r5/Makefile
@@ -0,0 +1,13 @@
+# SPDX-License-Identifier: GPL-2.0+
+#
+# Copyright (C) 2023 Texas Instruments Incorporated - https://www.ti.com/
+# Andrew Davis <afd@ti.com>
+
+obj-$(CONFIG_SOC_K3_J721E) += j721e/
+obj-$(CONFIG_SOC_K3_J721E) += j7200/
+obj-$(CONFIG_SOC_K3_J721S2) += j721s2/
+obj-$(CONFIG_SOC_K3_AM625) += am62x/
+obj-$(CONFIG_SOC_K3_AM62A7) += am62ax/
+
+obj-y += lowlevel_init.o
+obj-y += r5_mpu.o
diff --git a/arch/arm/mach-k3/am62ax/Makefile b/arch/arm/mach-k3/r5/am62ax/Makefile
similarity index 100%
rename from arch/arm/mach-k3/am62ax/Makefile
rename to arch/arm/mach-k3/r5/am62ax/Makefile
diff --git a/arch/arm/mach-k3/am62ax/am62a_qos_data.c b/arch/arm/mach-k3/r5/am62ax/am62a_qos_data.c
similarity index 100%
rename from arch/arm/mach-k3/am62ax/am62a_qos_data.c
rename to arch/arm/mach-k3/r5/am62ax/am62a_qos_data.c
diff --git a/arch/arm/mach-k3/am62ax/clk-data.c b/arch/arm/mach-k3/r5/am62ax/clk-data.c
similarity index 100%
rename from arch/arm/mach-k3/am62ax/clk-data.c
rename to arch/arm/mach-k3/r5/am62ax/clk-data.c
diff --git a/arch/arm/mach-k3/am62ax/dev-data.c b/arch/arm/mach-k3/r5/am62ax/dev-data.c
similarity index 100%
rename from arch/arm/mach-k3/am62ax/dev-data.c
rename to arch/arm/mach-k3/r5/am62ax/dev-data.c
diff --git a/arch/arm/mach-k3/am62x/Makefile b/arch/arm/mach-k3/r5/am62x/Makefile
similarity index 100%
rename from arch/arm/mach-k3/am62x/Makefile
rename to arch/arm/mach-k3/r5/am62x/Makefile
diff --git a/arch/arm/mach-k3/am62x/clk-data.c b/arch/arm/mach-k3/r5/am62x/clk-data.c
similarity index 100%
rename from arch/arm/mach-k3/am62x/clk-data.c
rename to arch/arm/mach-k3/r5/am62x/clk-data.c
diff --git a/arch/arm/mach-k3/am62x/dev-data.c b/arch/arm/mach-k3/r5/am62x/dev-data.c
similarity index 100%
rename from arch/arm/mach-k3/am62x/dev-data.c
rename to arch/arm/mach-k3/r5/am62x/dev-data.c
diff --git a/arch/arm/mach-k3/j7200/Makefile b/arch/arm/mach-k3/r5/j7200/Makefile
similarity index 100%
rename from arch/arm/mach-k3/j7200/Makefile
rename to arch/arm/mach-k3/r5/j7200/Makefile
diff --git a/arch/arm/mach-k3/j7200/clk-data.c b/arch/arm/mach-k3/r5/j7200/clk-data.c
similarity index 100%
rename from arch/arm/mach-k3/j7200/clk-data.c
rename to arch/arm/mach-k3/r5/j7200/clk-data.c
diff --git a/arch/arm/mach-k3/j7200/dev-data.c b/arch/arm/mach-k3/r5/j7200/dev-data.c
similarity index 100%
rename from arch/arm/mach-k3/j7200/dev-data.c
rename to arch/arm/mach-k3/r5/j7200/dev-data.c
diff --git a/arch/arm/mach-k3/j721e/Makefile b/arch/arm/mach-k3/r5/j721e/Makefile
similarity index 100%
rename from arch/arm/mach-k3/j721e/Makefile
rename to arch/arm/mach-k3/r5/j721e/Makefile
diff --git a/arch/arm/mach-k3/j721e/clk-data.c b/arch/arm/mach-k3/r5/j721e/clk-data.c
similarity index 100%
rename from arch/arm/mach-k3/j721e/clk-data.c
rename to arch/arm/mach-k3/r5/j721e/clk-data.c
diff --git a/arch/arm/mach-k3/j721e/dev-data.c b/arch/arm/mach-k3/r5/j721e/dev-data.c
similarity index 100%
rename from arch/arm/mach-k3/j721e/dev-data.c
rename to arch/arm/mach-k3/r5/j721e/dev-data.c
diff --git a/arch/arm/mach-k3/j721s2/Makefile b/arch/arm/mach-k3/r5/j721s2/Makefile
similarity index 100%
rename from arch/arm/mach-k3/j721s2/Makefile
rename to arch/arm/mach-k3/r5/j721s2/Makefile
diff --git a/arch/arm/mach-k3/j721s2/clk-data.c b/arch/arm/mach-k3/r5/j721s2/clk-data.c
similarity index 100%
rename from arch/arm/mach-k3/j721s2/clk-data.c
rename to arch/arm/mach-k3/r5/j721s2/clk-data.c
diff --git a/arch/arm/mach-k3/j721s2/dev-data.c b/arch/arm/mach-k3/r5/j721s2/dev-data.c
similarity index 100%
rename from arch/arm/mach-k3/j721s2/dev-data.c
rename to arch/arm/mach-k3/r5/j721s2/dev-data.c
diff --git a/arch/arm/mach-k3/lowlevel_init.S b/arch/arm/mach-k3/r5/lowlevel_init.S
similarity index 100%
rename from arch/arm/mach-k3/lowlevel_init.S
rename to arch/arm/mach-k3/r5/lowlevel_init.S
diff --git a/arch/arm/mach-k3/r5_mpu.c b/arch/arm/mach-k3/r5/r5_mpu.c
similarity index 98%
rename from arch/arm/mach-k3/r5_mpu.c
rename to arch/arm/mach-k3/r5/r5_mpu.c
index 605f7931518..e409fdcfea8 100644
--- a/arch/arm/mach-k3/r5_mpu.c
+++ b/arch/arm/mach-k3/r5/r5_mpu.c
@@ -9,7 +9,7 @@
#include <common.h>
#include <asm/io.h>
#include <linux/kernel.h>
-#include "common.h"
+#include <asm/armv7_mpu.h>
struct mpu_region_config k3_mpu_regions[16] = {
/*
--
2.39.2
next reply other threads:[~2023-11-14 16:00 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-11-14 15:59 Andrew Davis [this message]
2023-11-14 15:59 ` [PATCH 2/3] arm: mach-k3: Remove incorrect checks for SPL build Andrew Davis
2023-11-14 15:59 ` [PATCH 3/3] arm: mach-k3: Move sysfw-loader into R5 directory Andrew Davis
2023-11-15 6:01 ` [PATCH 1/3] arm: mach-k3: Move R5 specific code into new r5/ directory Neha Malcom Francis
2023-11-22 20:49 ` Tom Rini
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20231114155950.296644-1-afd@ti.com \
--to=afd@ti.com \
--cc=n-francis@ti.com \
--cc=nm@ti.com \
--cc=sjg@chromium.org \
--cc=trini@konsulko.com \
--cc=u-boot@lists.denx.de \
--cc=vigneshr@ti.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox