Merge branch '2022-02-08-TI-platform-updates'

[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 10555d1..627c363 100644 (file)
--- a/include/configs/j721e_evm.h
+++ b/include/configs/j721e_evm.h
@@ -60,7 +60,6 @@
 #define CONFIG_CQSPI_REF_CLK           133333333
 
 /* HyperFlash related configuration */
-#define CONFIG_SYS_MAX_FLASH_BANKS_DETECT 1
 
 /* U-Boot general configuration */
 #define EXTRA_ENV_J721E_BOARD_SETTINGS                                 \
@@ -120,6 +119,16 @@
 
 /* Set the default list of remote processors to boot */
 #if defined(CONFIG_TARGET_J721E_A72_EVM) || defined(CONFIG_TARGET_J7200_A72_EVM)
+#define EXTRA_ENV_CONFIG_MAIN_CPSW0_QSGMII_PHY                         \
+       "dorprocboot=1\0"                                               \
+       "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"
 #ifdef DEFAULT_RPROCS
 #undef DEFAULT_RPROCS
 #endif
@@ -137,15 +146,6 @@
 #endif /* CONFIG_TARGET_J721E_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 "