The TARGET_x_R5_EVM check is already enough to limit these defines to only the correct builds. Remove the extra outer check.
Signed-off-by: Andrew Davis afd@ti.com --- include/configs/j721e_evm.h | 4 +--- include/configs/j721s2_evm.h | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/include/configs/j721e_evm.h b/include/configs/j721e_evm.h index 48b1cea6e39..b2138c33b57 100644 --- a/include/configs/j721e_evm.h +++ b/include/configs/j721e_evm.h @@ -51,7 +51,6 @@ "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_mcur5f0_0load=0x89000000\0" \ @@ -60,10 +59,9 @@ #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 */ +#endif
/* U-Boot MMC-specific configuration */ #define EXTRA_ENV_J721E_BOARD_SETTINGS_MMC \ diff --git a/include/configs/j721s2_evm.h b/include/configs/j721s2_evm.h index bfada9eebc2..d401f28ff21 100644 --- a/include/configs/j721s2_evm.h +++ b/include/configs/j721s2_evm.h @@ -48,7 +48,6 @@ "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_J721S2_R5_EVM) #define EXTRA_ENV_R5_SPL_RPROC_FW_ARGS_MMC \ "addr_mcur5f0_0load=0x89000000\0" \ @@ -57,10 +56,9 @@ #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_J721S2_R5_EVM */ #else #define EXTRA_ENV_R5_SPL_RPROC_FW_ARGS_MMC "" -#endif /* CONFIG_SYS_K3_SPL_ATF */ +#endif
/* U-Boot MMC-specific configuration */ #define EXTRA_ENV_J721S2_BOARD_SETTINGS_MMC \