arm: mach-k3: j721e: Move booting of Main R5FSS Core0 to A72 U-Boot

The Main R5FSS Core0 on J721E SoCs is originally booted from R5 SPL
itself to achieve certain product-level early-boot metrics. This is
no longer supported after the R5 SPL re-architecture (support merged
for v2021.10-rc1). Move the booting of this core altogether from R5
SPL to A72 U-Boot.

The env variables are left as is for now, and will be cleaned up
in a subsequent patch.

Signed-off-by: Suman Anna <s-anna@ti.com>
Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com>
Link: https://lore.kernel.org/r/20210726211311.5977-2-s-anna@ti.com

diff --git a/arch/arm/mach-k3/j721e_init.c b/arch/arm/mach-k3/j721e_init.c
index e9e076c9e72a13ed5cc3e689076c4584981ec14b..55d738396bd4c309e2fbbeb3e420e3d9896c2cfb 100644 (file)
--- a/arch/arm/mach-k3/j721e_init.c
+++ b/arch/arm/mach-k3/j721e_init.c
@@ -377,7 +377,11 @@ void start_non_linux_remote_cores(void)
        int size = 0, ret;
        u32 loadaddr = 0;
 
-       if (!soc_is_j721e())
+       /*
+        * Skip booting of Main R5FSS Core0 in R5 SPL. This is no longer
+        * supported after the R5 SPL re-architecture.
+        */
+       if (soc_is_j721e() || soc_is_j7200())
                return;
 
        size = load_firmware("name_mainr5f0_0fw", "addr_mainr5f0_0load",

diff --git a/include/configs/j721e_evm.h b/include/configs/j721e_evm.h
index 759b7abb9ec230246093f40438ab1af194ad0d3d..a6d998ec681cfc2b84bf0e601dfec11369ca553d 100644 (file)
--- a/include/configs/j721e_evm.h
+++ b/include/configs/j721e_evm.h
@@ -129,6 +129,7 @@
 
 #ifdef CONFIG_TARGET_J721E_A72_EVM
 #define DEFAULT_RPROCS ""                                              \
+               "2 /lib/firmware/j7-main-r5f0_0-fw "                    \
                "3 /lib/firmware/j7-main-r5f0_1-fw "                    \
                "4 /lib/firmware/j7-main-r5f1_0-fw "                    \
                "5 /lib/firmware/j7-main-r5f1_1-fw "                    \