The J7200 EVM will not include this file, all these J7200 checks look to be copy/paste errors from j721e_evm.h, which J7200 *can* include.
Signed-off-by: Andrew Davis afd@ti.com --- include/configs/j721s2_evm.h | 23 ++--------------------- 1 file changed, 2 insertions(+), 21 deletions(-)
diff --git a/include/configs/j721s2_evm.h b/include/configs/j721s2_evm.h index d401f28ff21..45d080023f6 100644 --- a/include/configs/j721s2_evm.h +++ b/include/configs/j721s2_evm.h @@ -20,7 +20,7 @@ #define CFG_SYS_SDRAM_BASE1 0x880000000
/* SPL Loader Configuration */ -#if defined(CONFIG_TARGET_J721S2_A72_EVM) || defined(CONFIG_TARGET_J7200_A72_EVM) +#if defined(CONFIG_TARGET_J721S2_A72_EVM) #define CFG_SYS_UBOOT_BASE 0x50280000 /* Image load address in RAM for DFU boot*/ #else @@ -52,10 +52,6 @@ #define EXTRA_ENV_R5_SPL_RPROC_FW_ARGS_MMC \ "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" #else #define EXTRA_ENV_R5_SPL_RPROC_FW_ARGS_MMC "" #endif @@ -86,7 +82,7 @@ "partitions=" PARTS_DEFAULT
/* Set the default list of remote processors to boot */ -#if defined(CONFIG_TARGET_J721S2_A72_EVM) || defined(CONFIG_TARGET_J7200_A72_EVM) +#if defined(CONFIG_TARGET_J721S2_A72_EVM) #ifdef DEFAULT_RPROCS #undef DEFAULT_RPROCS #endif @@ -102,21 +98,6 @@ "7 /lib/firmware/j721s2-c71_1-fw " #endif /* CONFIG_TARGET_J721S2_A72_EVM */
-#ifdef CONFIG_TARGET_J7200_A72_EVM -#define EXTRA_ENV_CONFIG_MAIN_CPSW0_QSGMII_PHY \ - "do_main_cpsw0_qsgmii_phyinit=1\0" \ - "init_main_cpsw0_qsgmii_phy=gpio set gpio@22_17;" \ - "gpio clear gpio@22_16\0" \ - "main_cpsw0_qsgmii_phyinit=" \ - "if test ${do_main_cpsw0_qsgmii_phyinit} -eq 1 && test ${dorprocboot} -eq 1 && " \ - "test ${boot} = mmc; then " \ - "run init_main_cpsw0_qsgmii_phy;" \ - "fi;\0" -#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 */ - #ifndef EXTRA_ENV_CONFIG_MAIN_CPSW0_QSGMII_PHY #define EXTRA_ENV_CONFIG_MAIN_CPSW0_QSGMII_PHY #endif