arm: mach-k3: j721e: Cleanup MAIN R5 boot code from R5 SPL

The common J7 specific start_non_linux_remote_cores() override function
implements the logic to load and boot the Main R5FSS Core0 from R5 SPL.
This won't be supported any more for either J721E or J7200 after the R5
SPL rearchitecture for the System Firmware split into TI Foundation
Security (TIFS) and Device Management (DM) firmwares. So, cleanup the
corresponding code and the related SPL env variables.

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-3-s-anna@ti.com

diff --git a/arch/arm/mach-k3/j721e_init.c b/arch/arm/mach-k3/j721e_init.c
index 55d738396bd4c309e2fbbeb3e420e3d9896c2cfb..78d80be1758ec476d90466af9c4008df8c38e582 100644 (file)
--- a/arch/arm/mach-k3/j721e_init.c
+++ b/arch/arm/mach-k3/j721e_init.c
@@ -370,43 +370,3 @@ void release_resources_for_core_shutdown(void)
        }
 }
 #endif
-
-#ifdef CONFIG_SYS_K3_SPL_ATF
-void start_non_linux_remote_cores(void)
-{
-       int size = 0, ret;
-       u32 loadaddr = 0;
-
-       /*
-        * 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",
-                            &loadaddr);
-       if (size <= 0)
-               goto err_load;
-
-       /* assuming remoteproc 2 is aliased for the needed remotecore */
-       ret = rproc_load(2, loadaddr, size);
-       if (ret) {
-               printf("Firmware failed to start on rproc (%d)\n", ret);
-               goto err_load;
-       }
-
-       ret = rproc_start(2);
-       if (ret) {
-               printf("Firmware init failed on rproc (%d)\n", ret);
-               goto err_load;
-       }
-
-       printf("Remoteproc 2 started successfully\n");
-
-       return;
-
-err_load:
-       rproc_reset(2);
-}
-#endif

diff --git a/include/configs/j721e_evm.h b/include/configs/j721e_evm.h
index a6d998ec681cfc2b84bf0e601dfec11369ca553d..18b80ef8ce7d3681fc2bae009310c7e694ee1ec6 100644 (file)
--- a/include/configs/j721e_evm.h
+++ b/include/configs/j721e_evm.h
@@ -82,8 +82,6 @@
 #ifdef CONFIG_SYS_K3_SPL_ATF
 #if defined(CONFIG_TARGET_J721E_R5_EVM)
 #define EXTRA_ENV_R5_SPL_RPROC_FW_ARGS_MMC                             \
-       "addr_mainr5f0_0load=0x88000000\0"                              \
-       "name_mainr5f0_0fw=/lib/firmware/j7-main-r5f0_0-fw\0"           \
        "addr_mcur5f0_0load=0x89000000\0"                               \
        "name_mcur5f0_0fw=/lib/firmware/j7-mcu-r5f0_0-fw\0"
 #elif defined(CONFIG_TARGET_J7200_R5_EVM)