configs: Resync with savedefconfig

Rsync all defconfig files using moveconfig.py

Signed-off-by: Tom Rini <trini@konsulko.com>

diff --git a/configs/lschlv2_defconfig b/configs/lschlv2_defconfig
index e9cc632696de10e93fb3e762cc038b441f14f9f3..cfccfdcfc407050fb75cb5f71ca1cb50ec7ff6ce 100644 (file)
--- a/configs/lschlv2_defconfig
+++ b/configs/lschlv2_defconfig
@@ -60,7 +60,6 @@ CONFIG_MTD=y
 CONFIG_DM_SPI_FLASH=y
 CONFIG_SF_DEFAULT_SPEED=25000000
 CONFIG_SPI_FLASH_STMICRO=y
-CONFIG_DM_ETH=y
 CONFIG_DM_MDIO=y
 CONFIG_MVGBE=y
 CONFIG_MII=y

diff --git a/configs/lsxhl_defconfig b/configs/lsxhl_defconfig
index b83a072b04dd3a0283c6e5446adbfbf9b7999aa9..1945b72450c205032266682e76bb6581a9f8465f 100644 (file)
--- a/configs/lsxhl_defconfig
+++ b/configs/lsxhl_defconfig
@@ -61,7 +61,6 @@ CONFIG_MTD=y
 CONFIG_DM_SPI_FLASH=y
 CONFIG_SF_DEFAULT_SPEED=25000000
 CONFIG_SPI_FLASH_STMICRO=y
-CONFIG_DM_ETH=y
 CONFIG_DM_MDIO=y
 CONFIG_MVGBE=y
 CONFIG_MII=y

diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index c5e8942a76a1f6fe95f6e9d41c14c8cf0a062128..f505722f6b0420b2e0717c7ac2f7ba800f3aa339 100644 (file)
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -654,12 +654,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