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

[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 7488b66..b707fc4 100644 (file)
--- a/include/configs/j721e_evm.h
+++ b/include/configs/j721e_evm.h
@@ -2,7 +2,7 @@
 /*
  * Configuration header file for K3 J721E EVM
  *
- * Copyright (C) 2018-2019 Texas Instruments Incorporated - http://www.ti.com/
+ * Copyright (C) 2018-2020 Texas Instruments Incorporated - https://www.ti.com/
  *     Lokesh Vutla <lokeshvutla@ti.com>
  */
 
@@ -20,12 +20,13 @@
 #define CONFIG_SYS_SDRAM_BASE1         0x880000000
 
 /* SPL Loader Configuration */
-#ifdef CONFIG_TARGET_J721E_A72_EVM
+#if defined(CONFIG_TARGET_J721E_A72_EVM) || defined(CONFIG_TARGET_J7200_A72_EVM)
 #define CONFIG_SYS_INIT_SP_ADDR         (CONFIG_SPL_TEXT_BASE +        \
                                         CONFIG_SYS_K3_NON_SECURE_MSRAM_SIZE)
+#define CONFIG_SYS_UBOOT_BASE          0x50280000
 /* Image load address in RAM for DFU boot*/
-#define CONFIG_SPL_LOAD_FIT_ADDRESS    0x81000000
 #else
+#define CONFIG_SYS_UBOOT_BASE          0x50080000
 /*
  * Maximum size in memory allocated to the SPL BSS. Keep it as tight as
  * possible (to allow the build to go through), as this directly affects
@@ -48,7 +49,6 @@
 #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
@@ -69,9 +69,6 @@
        "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 "  \
@@ -83,16 +80,29 @@
        "uuid_disk=${uuid_gpt_disk};" \
        "name=rootfs,start=0,size=-,uuid=${uuid_gpt_rootfs}\0"
 
+#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)
+#define EXTRA_ENV_R5_SPL_RPROC_FW_ARGS_MMC                             \
+       "addr_mcur5f0_0load=0x89000000\0"                               \
+       "name_mcur5f0_0fw=/lib/firmware/j7200-mcu-r5f0_0-fw\0"
+#endif /* CONFIG_TARGET_J721E_R5_EVM */
+#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" \
@@ -101,8 +111,8 @@
                "fdt resize 0x100000;"                                  \
                "for overlay in $name_overlays;"                        \
                "do;"                                                   \
-               "load mmc ${bootpart} ${overlayaddr} ${bootdir}/${overlay} && " \
-               "fdt apply ${overlayaddr};"                             \
+               "load mmc ${bootpart} ${dtboaddr} ${bootdir}/${overlay} && "    \
+               "fdt apply ${dtboaddr};"                                \
                "done;\0"                                               \
        "partitions=" PARTS_DEFAULT                                     \
        "get_kern_mmc=load mmc ${bootpart} ${loadaddr} "                \
@@ -111,15 +121,28 @@
                "${bootdir}/${name_fit}\0"                              \
        "partitions=" PARTS_DEFAULT
 
+/* Set the default list of remote processors to boot */
+#if defined(CONFIG_TARGET_J721E_A72_EVM) || defined(CONFIG_TARGET_J7200_A72_EVM)
 #ifdef DEFAULT_RPROCS
 #undef DEFAULT_RPROCS
 #endif
+#endif
+
+#ifdef CONFIG_TARGET_J721E_A72_EVM
 #define DEFAULT_RPROCS ""                                              \
                "3 /lib/firmware/j7-main-r5f0_1-fw "                    \
                "4 /lib/firmware/j7-main-r5f1_0-fw "                    \
+               "5 /lib/firmware/j7-main-r5f1_1-fw "                    \
                "6 /lib/firmware/j7-c66_0-fw "                          \
                "7 /lib/firmware/j7-c66_1-fw "                          \
                "8 /lib/firmware/j7-c71_0-fw "
+#endif /* CONFIG_TARGET_J721E_A72_EVM */
+
+#ifdef CONFIG_TARGET_J7200_A72_EVM
+#define DEFAULT_RPROCS ""                                              \
+               "2 /lib/firmware/j7200-main-r5f0_0-fw "                 \
+               "3 /lib/firmware/j7200-main-r5f0_1-fw "
+#endif /* CONFIG_TARGET_J7200_A72_EVM */
 
 /* set default dfu_bufsiz to 128KB (sector size of OSPI) */
 #define EXTRA_ENV_DFUARGS \
@@ -129,7 +152,7 @@
        DFU_ALT_INFO_RAM \
        DFU_ALT_INFO_OSPI
 
-#ifdef CONFIG_TARGET_J721E_A72_EVM
+#if defined(CONFIG_TARGET_J721E_A72_EVM) || defined(CONFIG_TARGET_J7200_A72_EVM)
 #define EXTRA_ENV_J721E_BOARD_SETTINGS_MTD                             \
        "mtdids=" CONFIG_MTDIDS_DEFAULT "\0"                            \
        "mtdparts=" CONFIG_MTDPARTS_DEFAULT "\0"
@@ -139,6 +162,7 @@
 
 /* Incorporate settings into the U-Boot environment */
 #define CONFIG_EXTRA_ENV_SETTINGS                                      \
+       DEFAULT_LINUX_BOOT_ENV                                          \
        DEFAULT_MMC_TI_ARGS                                             \
        DEFAULT_FIT_TI_ARGS                                             \
        EXTRA_ENV_J721E_BOARD_SETTINGS                                  \
@@ -152,9 +176,5 @@
 #include <configs/ti_armv7_common.h>
 
 /* MMC ENV related defines */
-#ifdef CONFIG_ENV_IS_IN_MMC
-#define CONFIG_SYS_MMC_ENV_DEV         0
-#define CONFIG_SYS_MMC_ENV_PART        1
-#endif
 
 #endif /* __CONFIG_J721E_EVM_H */