env: ti: j721e-evm: Limit scope of rproc env variables used by R5 SPL

The commit 316c927135d6 ("include: configs: j721e_evm: Add env variables
for mcu_r5fss0_core0 & main_r5fss0_core0") added four different new env
variables 'addr_mainr5f0_0load', 'name_mainr5f0_0fw', 'addr_mcur5f0_0load'
and 'name_mcur5f0_0fw' to the generic environment, but these are only
needed and used in R5 SPL for early-booting the MCU R5FSS0 and Main
R5FSS0 Core0 on J721E SoCs.

These are not really needed for A72 U-Boot, so limit the scope of
these variables only to R5 SPL. While at this, also fix the loadaddr
variable values to include the hex prefix like with other such env
variables.

Cc: Keerthy <j-keerthy@ti.com>
Signed-off-by: Suman Anna <s-anna@ti.com>

diff --git a/include/configs/j721e_evm.h b/include/configs/j721e_evm.h
index 2eaa058501494e64ca838553702d0b9e5fae7f00..15c34e19bf83ba1c9b3c12a4c3efead4a51af20b 100644 (file)
--- a/include/configs/j721e_evm.h
+++ b/include/configs/j721e_evm.h
@@ -83,16 +83,23 @@
        "uuid_disk=${uuid_gpt_disk};" \
        "name=rootfs,start=0,size=-,uuid=${uuid_gpt_rootfs}\0"
 
+#ifdef CONFIG_SYS_K3_SPL_ATF
+#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"
+#else
+#define EXTRA_ENV_R5_SPL_RPROC_FW_ARGS_MMC ""
+#endif /* CONFIG_SYS_K3_SPL_ATF */
+
 /* U-Boot MMC-specific configuration */
 #define EXTRA_ENV_J721E_BOARD_SETTINGS_MMC                             \
        "boot=mmc\0"                                                    \
        "mmcdev=1\0"                                                    \
        "bootpart=1:2\0"                                                \
        "bootdir=/boot\0"                                               \
-       "addr_mainr5f0_0load=88000000\0"                                        \
-       "name_mainr5f0_0fw=/lib/firmware/j7-main-r5f0_0-fw\0"           \
-       "addr_mcur5f0_0load=89000000\0"                                 \
-       "name_mcur5f0_0fw=/lib/firmware/j7-mcu-r5f0_0-fw\0"             \
+       EXTRA_ENV_R5_SPL_RPROC_FW_ARGS_MMC                              \
        "rd_spec=-\0"                                                   \
        "init_mmc=run args_all args_mmc\0"                              \
        "get_fdt_mmc=load mmc ${bootpart} ${fdtaddr} ${bootdir}/${name_fdt}\0" \