configs: Resync with savedefconfig

Resync all defconfig files using qconfig.py

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

diff --git a/configs/bcm947622_defconfig b/configs/bcm947622_defconfig
index cf0651c650233ead8f9cc9795198f208ed25d24c..566f9f2920f2e5e5f7bd2d3bb8797c3a943e901b 100644 (file)
--- a/configs/bcm947622_defconfig
+++ b/configs/bcm947622_defconfig
@@ -18,10 +18,7 @@ CONFIG_DISPLAY_BOARDINFO_LATE=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_NAND=y
 CONFIG_CMD_CACHE=y
-CONFIG_OF_CONTROL=y
-CONFIG_OF_UPSTREAM=y
 CONFIG_OF_EMBED=y
-CONFIG_DM=y
 CONFIG_CLK=y
 CONFIG_MTD=y
 CONFIG_DM_MTD=y

diff --git a/configs/bcm94912_defconfig b/configs/bcm94912_defconfig
index bce823b90418fbd5940b939733970f096303c91b..46bbfb67980cb3dfde3f8e1412112fb6330d0dd1 100644 (file)
--- a/configs/bcm94912_defconfig
+++ b/configs/bcm94912_defconfig
@@ -18,10 +18,7 @@ CONFIG_DISPLAY_BOARDINFO_LATE=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_NAND=y
 CONFIG_CMD_CACHE=y
-CONFIG_OF_CONTROL=y
-CONFIG_OF_UPSTREAM=y
 CONFIG_OF_EMBED=y
-CONFIG_DM=y
 CONFIG_CLK=y
 CONFIG_MTD=y
 CONFIG_DM_MTD=y

diff --git a/configs/bcm963146_defconfig b/configs/bcm963146_defconfig
index 691d055e310c0a060443b4e2f6df293cec4b93ed..239a8a10fa5d9221b3a65fa8bb4c4a62889f7544 100644 (file)
--- a/configs/bcm963146_defconfig
+++ b/configs/bcm963146_defconfig
@@ -18,10 +18,7 @@ CONFIG_DISPLAY_BOARDINFO_LATE=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_NAND=y
 CONFIG_CMD_CACHE=y
-CONFIG_OF_CONTROL=y
-CONFIG_OF_UPSTREAM=y
 CONFIG_OF_EMBED=y
-CONFIG_DM=y
 CONFIG_CLK=y
 CONFIG_MTD=y
 CONFIG_DM_MTD=y

diff --git a/configs/bcm963158_defconfig b/configs/bcm963158_defconfig
index 6e4a85ec3a3c7ed5354c23d30bfec44e08556bf8..a6cfea6cd7958dba6c68876781f9369512b7290c 100644 (file)
--- a/configs/bcm963158_defconfig
+++ b/configs/bcm963158_defconfig
@@ -18,10 +18,7 @@ CONFIG_DISPLAY_BOARDINFO_LATE=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_NAND=y
 CONFIG_CMD_CACHE=y
-CONFIG_OF_CONTROL=y
-CONFIG_OF_UPSTREAM=y
 CONFIG_OF_EMBED=y
-CONFIG_DM=y
 CONFIG_CLK=y
 CONFIG_MTD=y
 CONFIG_DM_MTD=y

diff --git a/configs/bcm963178_defconfig b/configs/bcm963178_defconfig
index 60a198719a359ff6912b504b1975e0e0934303e8..95c9c8e396eeaa9501110a528e02cf49292863e7 100644 (file)
--- a/configs/bcm963178_defconfig
+++ b/configs/bcm963178_defconfig
@@ -19,10 +19,7 @@ CONFIG_DISPLAY_BOARDINFO_LATE=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_NAND=y
 CONFIG_CMD_CACHE=y
-CONFIG_OF_CONTROL=y
-CONFIG_OF_UPSTREAM=y
 CONFIG_OF_EMBED=y
-CONFIG_DM=y
 CONFIG_CLK=y
 CONFIG_MTD=y
 CONFIG_DM_MTD=y

diff --git a/configs/bcm96756_defconfig b/configs/bcm96756_defconfig
index 4b1fa991a04d2ae7722da64307ac2e23eb787df4..bfd309c25f51d13245c439c91ab5d506a6502c9f 100644 (file)
--- a/configs/bcm96756_defconfig
+++ b/configs/bcm96756_defconfig
@@ -19,10 +19,7 @@ CONFIG_DISPLAY_BOARDINFO_LATE=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_NAND=y
 CONFIG_CMD_CACHE=y
-CONFIG_OF_CONTROL=y
-CONFIG_OF_UPSTREAM=y
 CONFIG_OF_EMBED=y
-CONFIG_DM=y
 CONFIG_CLK=y
 CONFIG_MTD=y
 CONFIG_DM_MTD=y

diff --git a/configs/bcm96813_defconfig b/configs/bcm96813_defconfig
index 553bdc148b28074c5dd52f86746830d0645d7e6b..7f165231648c85be40fe49dbd4fdecf1c5ef3409 100644 (file)
--- a/configs/bcm96813_defconfig
+++ b/configs/bcm96813_defconfig
@@ -18,10 +18,7 @@ CONFIG_DISPLAY_BOARDINFO_LATE=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_NAND=y
 CONFIG_CMD_CACHE=y
-CONFIG_OF_CONTROL=y
-CONFIG_OF_UPSTREAM=y
 CONFIG_OF_EMBED=y
-CONFIG_DM=y
 CONFIG_CLK=y
 CONFIG_MTD=y
 CONFIG_DM_MTD=y

diff --git a/configs/bcm96855_defconfig b/configs/bcm96855_defconfig
index ff6dff0fca6340ba94d519abd63a196f4585aa08..342be0a0e17c2c6cedcfc615e64ea0b3f509a260 100644 (file)
--- a/configs/bcm96855_defconfig
+++ b/configs/bcm96855_defconfig
@@ -19,10 +19,7 @@ CONFIG_DISPLAY_BOARDINFO_LATE=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_NAND=y
 CONFIG_CMD_CACHE=y
-CONFIG_OF_CONTROL=y
-CONFIG_OF_UPSTREAM=y
 CONFIG_OF_EMBED=y
-CONFIG_DM=y
 CONFIG_CLK=y
 CONFIG_MTD=y
 CONFIG_DM_MTD=y

diff --git a/configs/bcm96856_defconfig b/configs/bcm96856_defconfig
index 7c6fba29abf6d2eaed513102c7e4787100eeb426..5f22186966fa187cba90a282a6b34e9060ee3724 100644 (file)
--- a/configs/bcm96856_defconfig
+++ b/configs/bcm96856_defconfig
@@ -18,10 +18,7 @@ CONFIG_DISPLAY_BOARDINFO_LATE=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_NAND=y
 CONFIG_CMD_CACHE=y
-CONFIG_OF_CONTROL=y
-CONFIG_OF_UPSTREAM=y
 CONFIG_OF_EMBED=y
-CONFIG_DM=y
 CONFIG_CLK=y
 CONFIG_MTD=y
 CONFIG_DM_MTD=y

diff --git a/configs/bcm96858_defconfig b/configs/bcm96858_defconfig
index 3e11b40126016d96b6f46649b83934c4d18b171d..682cb14e898c31a96ca63acbf0da5ab524ac3da5 100644 (file)
--- a/configs/bcm96858_defconfig
+++ b/configs/bcm96858_defconfig
@@ -18,10 +18,7 @@ CONFIG_DISPLAY_BOARDINFO_LATE=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_NAND=y
 CONFIG_CMD_CACHE=y
-CONFIG_OF_CONTROL=y
-CONFIG_OF_UPSTREAM=y
 CONFIG_OF_EMBED=y
-CONFIG_DM=y
 CONFIG_CLK=y
 CONFIG_MTD=y
 CONFIG_DM_MTD=y

diff --git a/configs/bcm96878_defconfig b/configs/bcm96878_defconfig
index 52c869aab9b6991eeb5b5342fcd9648a6de2e8bd..ad65187c30cec77f2a12ead5d3c21d438a327f12 100644 (file)
--- a/configs/bcm96878_defconfig
+++ b/configs/bcm96878_defconfig
@@ -19,10 +19,7 @@ CONFIG_DISPLAY_BOARDINFO_LATE=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_NAND=y
 CONFIG_CMD_CACHE=y
-CONFIG_OF_CONTROL=y
-CONFIG_OF_UPSTREAM=y
 CONFIG_OF_EMBED=y
-CONFIG_DM=y
 CONFIG_CLK=y
 CONFIG_MTD=y
 CONFIG_DM_MTD=y

diff --git a/configs/sifive_unmatched_defconfig b/configs/sifive_unmatched_defconfig
index 6f511796a20785a5100f99816d54b29102eab4ee..4fed7eda948424e8dccf38793e4b03375c66ee87 100644 (file)
--- a/configs/sifive_unmatched_defconfig
+++ b/configs/sifive_unmatched_defconfig
@@ -36,7 +36,6 @@ CONFIG_DISPLAY_BOARDINFO=y
 CONFIG_DISPLAY_BOARDINFO_LATE=y
 CONFIG_ID_EEPROM=y
 CONFIG_PCI_INIT_R=y
-CONFIG_PCI_REGION_MULTI_ENTRY=y
 CONFIG_SPL_MAX_SIZE=0x100000
 # CONFIG_SPL_SHARES_INIT_SP_ADDR is not set
 CONFIG_SPL_SYS_MALLOC=y
@@ -60,6 +59,7 @@ CONFIG_SYS_I2C_EEPROM_ADDR=0x54
 CONFIG_SPI_FLASH_ISSI=y
 CONFIG_E1000=y
 CONFIG_NVME_PCI=y
+CONFIG_PCI_REGION_MULTI_ENTRY=y
 CONFIG_PCIE_DW_SIFIVE=y
 CONFIG_SCSI=y
 CONFIG_USB=y

diff --git a/configs/starfive_visionfive2_defconfig b/configs/starfive_visionfive2_defconfig
index 319e1d358a0b171dab67701527997e0ccd638f14..20f89ae67963b68c33d65a3c0cfd84559a0a0cd3 100644 (file)
--- a/configs/starfive_visionfive2_defconfig
+++ b/configs/starfive_visionfive2_defconfig
@@ -56,9 +56,6 @@ CONFIG_SPL_PAD_TO=0x0
 CONFIG_SPL_SYS_MALLOC=y
 CONFIG_SPL_HAS_CUSTOM_MALLOC_START=y
 CONFIG_SPL_CUSTOM_SYS_MALLOC_ADDR=0x80000000
-CONFIG_SPL_SYS_MMCSD_RAW_MODE=y
-CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_PARTITION=y
-CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_PARTITION=0x2
 CONFIG_SPL_SYS_MALLOC_SIZE=0x400000
 CONFIG_SPL_SYS_MMCSD_RAW_MODE=y
 CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_PARTITION=y