Merge https://gitlab.denx.de/u-boot/custodians/u-boot-fsl-qoriq

[platform/kernel/u-boot.git] / include / configs / j721e_evm.h

diff --git a/include/configs/j721e_evm.h b/include/configs/j721e_evm.h
index 48d81df..7488b66 100644 (file)
--- a/include/configs/j721e_evm.h
+++ b/include/configs/j721e_evm.h
@@ -23,6 +23,8 @@
 #ifdef CONFIG_TARGET_J721E_A72_EVM
 #define CONFIG_SYS_INIT_SP_ADDR         (CONFIG_SPL_TEXT_BASE +        \
                                         CONFIG_SYS_K3_NON_SECURE_MSRAM_SIZE)
+/* Image load address in RAM for DFU boot*/
+#define CONFIG_SPL_LOAD_FIT_ADDRESS    0x81000000
 #else
 /*
  * Maximum size in memory allocated to the SPL BSS. Keep it as tight as
@@ -45,6 +47,8 @@
 /* Configure R5 SPL post-relocation malloc pool in DDR */
 #define CONFIG_SYS_SPL_MALLOC_START    0x84000000
 #define CONFIG_SYS_SPL_MALLOC_SIZE     SZ_16M
+/* Image load address in RAM for DFU boot*/
+#define CONFIG_SPL_LOAD_FIT_ADDRESS    0x80080000
 #endif
 
 #ifdef CONFIG_SYS_K3_SPL_ATF
@@ -62,13 +66,16 @@
 /* U-Boot general configuration */
 #define EXTRA_ENV_J721E_BOARD_SETTINGS                                 \
        "default_device_tree=" CONFIG_DEFAULT_DEVICE_TREE ".dtb\0"      \
-       "findfdt=setenv fdtfile ${default_device_tree}\0"               \
+       "findfdt="                                                      \
+               "setenv name_fdt ${default_device_tree};"               \
+               "setenv fdtfile ${name_fdt}\0"                          \
        "loadaddr=0x80080000\0"                                         \
        "fdtaddr=0x82000000\0"                                          \
        "overlayaddr=0x83000000\0"                                      \
        "name_kern=Image\0"                                             \
        "console=ttyS2,115200n8\0"                                      \
-       "args_all=setenv optargs earlycon=ns16550a,mmio32,0x02800000\0" \
+       "args_all=setenv optargs earlycon=ns16550a,mmio32,0x02800000 "  \
+               "${mtdparts}\0"                                         \
        "run_kern=booti ${loadaddr} ${rd_spec} ${fdtaddr}\0"
 
 #define PARTS_DEFAULT \
@@ -82,9 +89,13 @@
        "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"             \
        "rd_spec=-\0"                                                   \
        "init_mmc=run args_all args_mmc\0"                              \
-       "get_fdt_mmc=load mmc ${bootpart} ${fdtaddr} ${bootdir}/${fdtfile}\0" \
+       "get_fdt_mmc=load mmc ${bootpart} ${fdtaddr} ${bootdir}/${name_fdt}\0" \
        "get_overlay_mmc="                                              \
                "fdt address ${fdtaddr};"                               \
                "fdt resize 0x100000;"                                  \
@@ -95,7 +106,10 @@
                "done;\0"                                               \
        "partitions=" PARTS_DEFAULT                                     \
        "get_kern_mmc=load mmc ${bootpart} ${loadaddr} "                \
-               "${bootdir}/${name_kern}\0"
+               "${bootdir}/${name_kern}\0"                             \
+       "get_fit_mmc=load mmc ${bootpart} ${addr_fit} "                 \
+               "${bootdir}/${name_fit}\0"                              \
+       "partitions=" PARTS_DEFAULT
 
 #ifdef DEFAULT_RPROCS
 #undef DEFAULT_RPROCS
@@ -115,14 +129,24 @@
        DFU_ALT_INFO_RAM \
        DFU_ALT_INFO_OSPI
 
+#ifdef CONFIG_TARGET_J721E_A72_EVM
+#define EXTRA_ENV_J721E_BOARD_SETTINGS_MTD                             \
+       "mtdids=" CONFIG_MTDIDS_DEFAULT "\0"                            \
+       "mtdparts=" CONFIG_MTDPARTS_DEFAULT "\0"
+#else
+#define EXTRA_ENV_J721E_BOARD_SETTINGS_MTD
+#endif
+
 /* Incorporate settings into the U-Boot environment */
 #define CONFIG_EXTRA_ENV_SETTINGS                                      \
        DEFAULT_MMC_TI_ARGS                                             \
+       DEFAULT_FIT_TI_ARGS                                             \
        EXTRA_ENV_J721E_BOARD_SETTINGS                                  \
        EXTRA_ENV_J721E_BOARD_SETTINGS_MMC                              \
        EXTRA_ENV_RPROC_SETTINGS                                        \
        EXTRA_ENV_DFUARGS                                               \
-       DEFAULT_UFS_TI_ARGS
+       DEFAULT_UFS_TI_ARGS                                             \
+       EXTRA_ENV_J721E_BOARD_SETTINGS_MTD
 
 /* Now for the remaining common defines */
 #include <configs/ti_armv7_common.h>