* [PATCH 1/3] arm: mach-k3: Move R5 specific code into new r5/ directory
@ 2023-11-14 15:59 Andrew Davis
2023-11-14 15:59 ` [PATCH 2/3] arm: mach-k3: Remove incorrect checks for SPL build Andrew Davis
` (3 more replies)
0 siblings, 4 replies; 5+ messages in thread
From: Andrew Davis @ 2023-11-14 15:59 UTC (permalink / raw)
To: Neha Malcom Francis, Simon Glass, Tom Rini, Vignesh Raghavendra,
Nishanth Menon
Cc: u-boot, Andrew Davis
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
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH 2/3] arm: mach-k3: Remove incorrect checks for SPL build
2023-11-14 15:59 [PATCH 1/3] arm: mach-k3: Move R5 specific code into new r5/ directory Andrew Davis
@ 2023-11-14 15:59 ` Andrew Davis
2023-11-14 15:59 ` [PATCH 3/3] arm: mach-k3: Move sysfw-loader into R5 directory Andrew Davis
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: Andrew Davis @ 2023-11-14 15:59 UTC (permalink / raw)
To: Neha Malcom Francis, Simon Glass, Tom Rini, Vignesh Raghavendra,
Nishanth Menon
Cc: u-boot, Andrew Davis
The kconfig option SPL means this build supports SPL but not that
this build is SPL, nor that this build is the SPL running on R5.
For options that are for R5 SPL use CPU_V7R.
Signed-off-by: Andrew Davis <afd@ti.com>
---
arch/arm/mach-k3/Kconfig | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/arch/arm/mach-k3/Kconfig b/arch/arm/mach-k3/Kconfig
index 9168bf842dc..4d19cf3e353 100644
--- a/arch/arm/mach-k3/Kconfig
+++ b/arch/arm/mach-k3/Kconfig
@@ -111,7 +111,7 @@ config K3_EARLY_CONS_IDX
config K3_LOAD_SYSFW
bool
- depends on SPL
+ depends on CPU_V7R
config K3_SYSFW_IMAGE_NAME
string "File name of SYSFW firmware and configuration blob"
@@ -158,7 +158,7 @@ config K3_SYSFW_IMAGE_SPI_OFFS
config SYS_K3_SPL_ATF
bool "Start Cortex-A from SPL"
- depends on SPL && CPU_V7R
+ depends on CPU_V7R
help
Enabling this will try to start Cortex-A (typically with ATF)
after SPL from R5.
@@ -172,7 +172,7 @@ config K3_ATF_LOAD_ADDR
config K3_DM_FW
bool "Separate DM firmware image"
- depends on SPL && CPU_V7R && (SOC_K3_J721E || SOC_K3_J721S2 || SOC_K3_AM625 || SOC_K3_AM62A7) && !CLK_TI_SCI && !TI_SCI_POWER_DOMAIN
+ depends on CPU_V7R && (SOC_K3_J721E || SOC_K3_J721S2 || SOC_K3_AM625 || SOC_K3_AM62A7) && !CLK_TI_SCI && !TI_SCI_POWER_DOMAIN
default y
help
Enabling this will indicate that the system has separate DM
--
2.39.2
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH 3/3] arm: mach-k3: Move sysfw-loader into R5 directory
2023-11-14 15:59 [PATCH 1/3] arm: mach-k3: Move R5 specific code into new r5/ directory Andrew Davis
2023-11-14 15:59 ` [PATCH 2/3] arm: mach-k3: Remove incorrect checks for SPL build Andrew Davis
@ 2023-11-14 15:59 ` 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
3 siblings, 0 replies; 5+ messages in thread
From: Andrew Davis @ 2023-11-14 15:59 UTC (permalink / raw)
To: Neha Malcom Francis, Simon Glass, Tom Rini, Vignesh Raghavendra,
Nishanth Menon
Cc: u-boot, Andrew Davis
SYSFW is only ever loaded by the R5 core, move the code into that
directory. While here also move the related Kconfig symbols.
Signed-off-by: Andrew Davis <afd@ti.com>
---
arch/arm/mach-k3/Kconfig | 51 ++----------------------
arch/arm/mach-k3/Makefile | 1 -
arch/arm/mach-k3/r5/Kconfig | 45 +++++++++++++++++++++
arch/arm/mach-k3/r5/Makefile | 4 ++
arch/arm/mach-k3/{ => r5}/sysfw-loader.c | 2 +-
5 files changed, 54 insertions(+), 49 deletions(-)
create mode 100644 arch/arm/mach-k3/r5/Kconfig
rename arch/arm/mach-k3/{ => r5}/sysfw-loader.c (99%)
diff --git a/arch/arm/mach-k3/Kconfig b/arch/arm/mach-k3/Kconfig
index 4d19cf3e353..ced7d3bcba6 100644
--- a/arch/arm/mach-k3/Kconfig
+++ b/arch/arm/mach-k3/Kconfig
@@ -109,53 +109,6 @@ config K3_EARLY_CONS_IDX
Use this option to set the index of the serial device to be used
for the early console during SPL execution.
-config K3_LOAD_SYSFW
- bool
- depends on CPU_V7R
-
-config K3_SYSFW_IMAGE_NAME
- string "File name of SYSFW firmware and configuration blob"
- depends on K3_LOAD_SYSFW
- default "sysfw.itb"
- help
- Filename of the combined System Firmware and configuration image tree
- blob to be loaded when booting from a filesystem.
-
-config K3_SYSFW_IMAGE_MMCSD_RAW_MODE_SECT
- hex "MMC sector to load SYSFW firmware and configuration blob from"
- depends on K3_LOAD_SYSFW && SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR
- default 0x3600
- help
- Address on the MMC to load the combined System Firmware and
- configuration image tree blob from, when the MMC is being used
- in raw mode. Units: MMC sectors (1 sector = 512 bytes).
-
-config K3_SYSFW_IMAGE_MMCSD_RAW_MODE_PART
- hex "MMC partition to load SYSFW firmware and configuration blob from"
- depends on K3_LOAD_SYSFW && SYS_MMCSD_RAW_MODE_U_BOOT_USE_PARTITION
- default 2
- help
- Partition on the MMC to the combined System Firmware and configuration
- image tree blob from, when the MMC is being used in raw mode.
-
-config K3_SYSFW_IMAGE_SIZE_MAX
- int "Amount of memory dynamically allocated for loading SYSFW blob"
- depends on K3_LOAD_SYSFW
- default 280000
- help
- Amount of memory (in bytes) reserved through dynamic allocation at
- runtime for loading the combined System Firmware and configuration image
- tree blob. Keep it as tight as possible, as this directly affects the
- overall SPL memory footprint.
-
-config K3_SYSFW_IMAGE_SPI_OFFS
- hex "SPI offset of SYSFW firmware and configuration blob"
- depends on K3_LOAD_SYSFW
- default 0x6C0000
- help
- Offset of the combined System Firmware and configuration image tree
- blob to be loaded when booting from a SPI flash memory.
-
config SYS_K3_SPL_ATF
bool "Start Cortex-A from SPL"
depends on CPU_V7R
@@ -187,6 +140,10 @@ config K3_X509_SWRV
help
SWRV for X509 certificate used for boot images
+if CPU_V7R
+source "arch/arm/mach-k3/r5/Kconfig"
+endif
+
source "board/ti/am65x/Kconfig"
source "board/ti/am64x/Kconfig"
source "board/ti/am62x/Kconfig"
diff --git a/arch/arm/mach-k3/Makefile b/arch/arm/mach-k3/Makefile
index 215c755c5dc..42161376469 100644
--- a/arch/arm/mach-k3/Makefile
+++ b/arch/arm/mach-k3/Makefile
@@ -20,6 +20,5 @@ 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_K3_LOAD_SYSFW) += sysfw-loader.o
endif
obj-y += common.o security.o
diff --git a/arch/arm/mach-k3/r5/Kconfig b/arch/arm/mach-k3/r5/Kconfig
new file mode 100644
index 00000000000..ae79f8ff6cd
--- /dev/null
+++ b/arch/arm/mach-k3/r5/Kconfig
@@ -0,0 +1,45 @@
+config K3_LOAD_SYSFW
+ bool
+
+config K3_SYSFW_IMAGE_NAME
+ string "File name of SYSFW firmware and configuration blob"
+ depends on K3_LOAD_SYSFW
+ default "sysfw.itb"
+ help
+ Filename of the combined System Firmware and configuration image tree
+ blob to be loaded when booting from a filesystem.
+
+config K3_SYSFW_IMAGE_MMCSD_RAW_MODE_SECT
+ hex "MMC sector to load SYSFW firmware and configuration blob from"
+ depends on K3_LOAD_SYSFW && SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR
+ default 0x3600
+ help
+ Address on the MMC to load the combined System Firmware and
+ configuration image tree blob from, when the MMC is being used
+ in raw mode. Units: MMC sectors (1 sector = 512 bytes).
+
+config K3_SYSFW_IMAGE_MMCSD_RAW_MODE_PART
+ hex "MMC partition to load SYSFW firmware and configuration blob from"
+ depends on K3_LOAD_SYSFW && SYS_MMCSD_RAW_MODE_U_BOOT_USE_PARTITION
+ default 2
+ help
+ Partition on the MMC to the combined System Firmware and configuration
+ image tree blob from, when the MMC is being used in raw mode.
+
+config K3_SYSFW_IMAGE_SIZE_MAX
+ int "Amount of memory dynamically allocated for loading SYSFW blob"
+ depends on K3_LOAD_SYSFW
+ default 280000
+ help
+ Amount of memory (in bytes) reserved through dynamic allocation at
+ runtime for loading the combined System Firmware and configuration image
+ tree blob. Keep it as tight as possible, as this directly affects the
+ overall SPL memory footprint.
+
+config K3_SYSFW_IMAGE_SPI_OFFS
+ hex "SPI offset of SYSFW firmware and configuration blob"
+ depends on K3_LOAD_SYSFW
+ default 0x6C0000
+ help
+ Offset of the combined System Firmware and configuration image tree
+ blob to be loaded when booting from a SPI flash memory.
diff --git a/arch/arm/mach-k3/r5/Makefile b/arch/arm/mach-k3/r5/Makefile
index 8a6af73a44e..b99199d3374 100644
--- a/arch/arm/mach-k3/r5/Makefile
+++ b/arch/arm/mach-k3/r5/Makefile
@@ -11,3 +11,7 @@ obj-$(CONFIG_SOC_K3_AM62A7) += am62ax/
obj-y += lowlevel_init.o
obj-y += r5_mpu.o
+
+ifeq ($(CONFIG_SPL_BUILD),y)
+obj-$(CONFIG_K3_LOAD_SYSFW) += sysfw-loader.o
+endif
diff --git a/arch/arm/mach-k3/sysfw-loader.c b/arch/arm/mach-k3/r5/sysfw-loader.c
similarity index 99%
rename from arch/arm/mach-k3/sysfw-loader.c
rename to arch/arm/mach-k3/r5/sysfw-loader.c
index 73a17276e12..51e3b3cd1ca 100644
--- a/arch/arm/mach-k3/sysfw-loader.c
+++ b/arch/arm/mach-k3/r5/sysfw-loader.c
@@ -23,7 +23,7 @@
#include <spi_flash.h>
#include <asm/io.h>
-#include "common.h"
+#include "../common.h"
DECLARE_GLOBAL_DATA_PTR;
--
2.39.2
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH 1/3] arm: mach-k3: Move R5 specific code into new r5/ directory
2023-11-14 15:59 [PATCH 1/3] arm: mach-k3: Move R5 specific code into new r5/ directory Andrew Davis
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 ` Neha Malcom Francis
2023-11-22 20:49 ` Tom Rini
3 siblings, 0 replies; 5+ messages in thread
From: Neha Malcom Francis @ 2023-11-15 6:01 UTC (permalink / raw)
To: Andrew Davis, Simon Glass, Tom Rini, Vignesh Raghavendra,
Nishanth Menon
Cc: u-boot
Hi Andrew
On 14/11/23 21:29, Andrew Davis wrote:
> 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] = {
> /*
I think a cover-letter with the motivation behind the series could have helped
me understand quicker (plus if in case there were any discussion links earlier
about doing this)
--
Thanking You
Neha Malcom Francis
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH 1/3] arm: mach-k3: Move R5 specific code into new r5/ directory
2023-11-14 15:59 [PATCH 1/3] arm: mach-k3: Move R5 specific code into new r5/ directory Andrew Davis
` (2 preceding siblings ...)
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
3 siblings, 0 replies; 5+ messages in thread
From: Tom Rini @ 2023-11-22 20:49 UTC (permalink / raw)
To: Andrew Davis
Cc: Neha Malcom Francis, Simon Glass, Vignesh Raghavendra,
Nishanth Menon, u-boot
[-- Attachment #1: Type: text/plain, Size: 319 bytes --]
On Tue, Nov 14, 2023 at 09:59:48AM -0600, Andrew Davis wrote:
> 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>
For the series, applied to u-boot/next, thanks!
--
Tom
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 659 bytes --]
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2023-11-22 20:49 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-11-14 15:59 [PATCH 1/3] arm: mach-k3: Move R5 specific code into new r5/ directory Andrew Davis
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
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox