Merge branch 'master' into next

[thirdparty/u-boot.git] / scripts / config_whitelist.txt

diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 22a0f2bf8a5d2cb19c829a0694a71ab12838d320..49e3b3847e46c8747293e7cf66246358cc3615a6 100644 (file)
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -653,12 +653,7 @@ CONFIG_SYS_FM1_DTSEC4_RISER_PHY_ADDR
 CONFIG_SYS_FM1_DTSEC5_PHY_ADDR
 CONFIG_SYS_FM1_QSGMII11_PHY_ADDR
 CONFIG_SYS_FM1_QSGMII21_PHY_ADDR
-CONFIG_SYS_FM2_10GEC1_PHY_ADDR
 CONFIG_SYS_FM2_CLK
-CONFIG_SYS_FM2_DTSEC1_PHY_ADDR
-CONFIG_SYS_FM2_DTSEC2_PHY_ADDR
-CONFIG_SYS_FM2_DTSEC3_PHY_ADDR
-CONFIG_SYS_FM2_DTSEC4_PHY_ADDR
 CONFIG_SYS_FM_MURAM_SIZE
 CONFIG_SYS_FPGAREG_DIPSW
 CONFIG_SYS_FPGAREG_FREQ