j7200-evm has minor differences with j721e-evm based on the IPs available in the SoC. Introduce separate build targets for j7200-evm to incorporate the differences.
Signed-off-by: Lokesh Vutla lokeshvutla@ti.com Reviewed-by: Suman Anna s-anna@ti.com --- board/ti/j721e/Kconfig | 53 +++++++++++++++++++++++++++++++++++++ board/ti/j721e/evm.c | 3 ++- include/configs/j721e_evm.h | 4 +-- 3 files changed, 57 insertions(+), 3 deletions(-)
diff --git a/board/ti/j721e/Kconfig b/board/ti/j721e/Kconfig index e56dc53bfa..2cbe2b2481 100644 --- a/board/ti/j721e/Kconfig +++ b/board/ti/j721e/Kconfig @@ -27,6 +27,26 @@ config TARGET_J721E_R5_EVM imply SYS_K3_SPL_ATF imply TI_I2C_BOARD_DETECT
+config TARGET_J7200_A72_EVM + bool "TI K3 based J7200 EVM running on A72" + select ARM64 + select SOC_K3_J721E + select BOARD_LATE_INIT + imply TI_I2C_BOARD_DETECT + select SYS_DISABLE_DCACHE_OPS + +config TARGET_J7200_R5_EVM + bool "TI K3 based J7200 EVM running on R5" + select CPU_V7R + select SYS_THUMB_BUILD + select SOC_K3_J721E + select K3_LOAD_SYSFW + select RAM + select SPL_RAM + select K3_J721E_DDRSS + imply SYS_K3_SPL_ATF + imply TI_I2C_BOARD_DETECT + endchoice
if TARGET_J721E_A72_EVM @@ -61,3 +81,36 @@ config SPL_LDSCRIPT source "board/ti/common/Kconfig"
endif + +if TARGET_J7200_A72_EVM + +config SYS_BOARD + default "j721e" + +config SYS_VENDOR + default "ti" + +config SYS_CONFIG_NAME + default "j721e_evm" + +source "board/ti/common/Kconfig" + +endif + +if TARGET_J7200_R5_EVM + +config SYS_BOARD + default "j721e" + +config SYS_VENDOR + default "ti" + +config SYS_CONFIG_NAME + default "j721e_evm" + +config SPL_LDSCRIPT + default "arch/arm/mach-omap2/u-boot-spl.lds" + +source "board/ti/common/Kconfig" + +endif diff --git a/board/ti/j721e/evm.c b/board/ti/j721e/evm.c index 86e7cd4051..ae508316ef 100644 --- a/board/ti/j721e/evm.c +++ b/board/ti/j721e/evm.c @@ -362,7 +362,8 @@ void spl_board_init(void) int ret; #endif
- if (IS_ENABLED(CONFIG_TARGET_J721E_A72_EVM) && + if ((IS_ENABLED(CONFIG_TARGET_J721E_A72_EVM) || + IS_ENABLED(CONFIG_TARGET_J7200_A72_EVM)) && IS_ENABLED(CONFIG_TI_I2C_BOARD_DETECT)) probe_daughtercards();
diff --git a/include/configs/j721e_evm.h b/include/configs/j721e_evm.h index 7b917c2247..29744e8d9a 100644 --- a/include/configs/j721e_evm.h +++ b/include/configs/j721e_evm.h @@ -20,7 +20,7 @@ #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) /* Image load address in RAM for DFU boot*/ @@ -127,7 +127,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"