configs: Resync with savedefconfig

Resync all defconfig files using qconfig.py

Signed-off-by: Tom Rini <[email protected]>

44 files changed, 43 insertions, 47 deletions

diff --git a/configs/apalis-tk1_defconfig b/configs/apalis-tk1_defconfig
index 846c7bde234..14d98041980 100644
--- a/configs/apalis-tk1_defconfig
+++ b/configs/apalis-tk1_defconfig
@@ -3,8 +3,8 @@ CONFIG_SYS_L2CACHE_OFF=y
 CONFIG_ARCH_TEGRA=y
 CONFIG_TEXT_BASE=0x80110000
 CONFIG_SYS_MALLOC_F_LEN=0x2000
-CONFIG_NR_DRAM_BANKS=2
 CONFIG_ENV_SOURCE_FILE="apalis-tk1"
+CONFIG_NR_DRAM_BANKS=2
 CONFIG_ENV_SIZE=0x2000
 CONFIG_ENV_OFFSET=0xFFFFDE00
 CONFIG_DEFAULT_DEVICE_TREE="tegra124-apalis"
diff --git a/configs/apalis_t30_defconfig b/configs/apalis_t30_defconfig
index 57e1eb733a8..f98582fca16 100644
--- a/configs/apalis_t30_defconfig
+++ b/configs/apalis_t30_defconfig
@@ -3,8 +3,8 @@ CONFIG_SYS_L2CACHE_OFF=y
 CONFIG_ARCH_TEGRA=y
 CONFIG_TEXT_BASE=0x80110000
 CONFIG_SYS_MALLOC_F_LEN=0x2000
-CONFIG_NR_DRAM_BANKS=2
 CONFIG_ENV_SOURCE_FILE="apalis_t30"
+CONFIG_NR_DRAM_BANKS=2
 CONFIG_ENV_SIZE=0x2000
 CONFIG_ENV_OFFSET=0xFFFFDE00
 CONFIG_DEFAULT_DEVICE_TREE="tegra30-apalis"
diff --git a/configs/brcp150_defconfig b/configs/brcp150_defconfig
index bae185e8126..84cf7c8067e 100644
--- a/configs/brcp150_defconfig
+++ b/configs/brcp150_defconfig
@@ -6,8 +6,8 @@ CONFIG_ARCH_ZYNQ=y
 CONFIG_TEXT_BASE=0x4000000
 CONFIG_SYS_MALLOC_F_LEN=0x1000
 CONFIG_SPL_GPIO=y
-CONFIG_NR_DRAM_BANKS=1
 CONFIG_ENV_SOURCE_FILE="env/brcp150"
+CONFIG_NR_DRAM_BANKS=1
 CONFIG_SF_DEFAULT_SPEED=100000000
 CONFIG_SF_DEFAULT_MODE=0x3
 CONFIG_ENV_SIZE=0x10000
diff --git a/configs/brcp170_defconfig b/configs/brcp170_defconfig
index f8e17ece276..ea7c239ac94 100644
--- a/configs/brcp170_defconfig
+++ b/configs/brcp170_defconfig
@@ -6,8 +6,8 @@ CONFIG_ARCH_ZYNQ=y
 CONFIG_TEXT_BASE=0x4000000
 CONFIG_SYS_MALLOC_F_LEN=0x1000
 CONFIG_SPL_GPIO=y
-CONFIG_NR_DRAM_BANKS=1
 CONFIG_ENV_SOURCE_FILE="env/brcp1"
+CONFIG_NR_DRAM_BANKS=1
 CONFIG_SF_DEFAULT_SPEED=100000000
 CONFIG_SF_DEFAULT_MODE=0x3
 CONFIG_ENV_SIZE=0x10000
diff --git a/configs/brcp1_1r_defconfig b/configs/brcp1_1r_defconfig
index 568313d4860..af87780a68a 100644
--- a/configs/brcp1_1r_defconfig
+++ b/configs/brcp1_1r_defconfig
@@ -6,8 +6,8 @@ CONFIG_ARCH_ZYNQ=y
 CONFIG_TEXT_BASE=0x4000000
 CONFIG_SYS_MALLOC_F_LEN=0x1000
 CONFIG_SPL_GPIO=y
-CONFIG_NR_DRAM_BANKS=1
 CONFIG_ENV_SOURCE_FILE="env/brcp1"
+CONFIG_NR_DRAM_BANKS=1
 CONFIG_SF_DEFAULT_SPEED=100000000
 CONFIG_SF_DEFAULT_MODE=0x3
 CONFIG_ENV_SIZE=0x10000
diff --git a/configs/brcp1_1r_switch_defconfig b/configs/brcp1_1r_switch_defconfig
index 805de796df6..6162ca6b5bb 100644
--- a/configs/brcp1_1r_switch_defconfig
+++ b/configs/brcp1_1r_switch_defconfig
@@ -6,8 +6,8 @@ CONFIG_ARCH_ZYNQ=y
 CONFIG_TEXT_BASE=0x4000000
 CONFIG_SYS_MALLOC_F_LEN=0x1000
 CONFIG_SPL_GPIO=y
-CONFIG_NR_DRAM_BANKS=1
 CONFIG_ENV_SOURCE_FILE="env/brcp1"
+CONFIG_NR_DRAM_BANKS=1
 CONFIG_SF_DEFAULT_SPEED=100000000
 CONFIG_SF_DEFAULT_MODE=0x3
 CONFIG_ENV_SIZE=0x10000
diff --git a/configs/brcp1_2r_defconfig b/configs/brcp1_2r_defconfig
index e92d8381bbb..95e185f6ac6 100644
--- a/configs/brcp1_2r_defconfig
+++ b/configs/brcp1_2r_defconfig
@@ -6,8 +6,8 @@ CONFIG_ARCH_ZYNQ=y
 CONFIG_TEXT_BASE=0x4000000
 CONFIG_SYS_MALLOC_F_LEN=0x1000
 CONFIG_SPL_GPIO=y
-CONFIG_NR_DRAM_BANKS=1
 CONFIG_ENV_SOURCE_FILE="env/brcp1"
+CONFIG_NR_DRAM_BANKS=1
 CONFIG_SF_DEFAULT_SPEED=100000000
 CONFIG_SF_DEFAULT_MODE=0x3
 CONFIG_ENV_SIZE=0x10000
diff --git a/configs/brsmarc2_defconfig b/configs/brsmarc2_defconfig
index 2ed54817af4..0e85ea594d7 100644
--- a/configs/brsmarc2_defconfig
+++ b/configs/brsmarc2_defconfig
@@ -8,8 +8,8 @@ CONFIG_INITRD_TAG=y
 CONFIG_TEXT_BASE=0x4000000
 CONFIG_SYS_MALLOC_F_LEN=0x1000
 CONFIG_SPL_GPIO=y
-CONFIG_NR_DRAM_BANKS=1
 CONFIG_ENV_SOURCE_FILE="env/brcp1"
+CONFIG_NR_DRAM_BANKS=1
 CONFIG_SF_DEFAULT_SPEED=100000000
 CONFIG_SF_DEFAULT_MODE=0x3
 CONFIG_ENV_SIZE=0x10000
diff --git a/configs/cardhu_defconfig b/configs/cardhu_defconfig
index 318fbaa529b..9deed0a1e93 100644
--- a/configs/cardhu_defconfig
+++ b/configs/cardhu_defconfig
@@ -3,8 +3,8 @@ CONFIG_SYS_HAS_NONCACHED_MEMORY=y
 CONFIG_SYS_L2CACHE_OFF=y
 CONFIG_ARCH_TEGRA=y
 CONFIG_TEXT_BASE=0x80110000
-CONFIG_NR_DRAM_BANKS=2
 CONFIG_ENV_SOURCE_FILE="cardhu"
+CONFIG_NR_DRAM_BANKS=2
 CONFIG_SF_DEFAULT_SPEED=24000000
 CONFIG_ENV_SIZE=0x2000
 CONFIG_ENV_OFFSET=0xFFFFE000
diff --git a/configs/chagall_defconfig b/configs/chagall_defconfig
index 1688b4c4d07..f51c4f18d63 100644
--- a/configs/chagall_defconfig
+++ b/configs/chagall_defconfig
@@ -1,8 +1,8 @@
 CONFIG_ARM=y
 CONFIG_ARCH_TEGRA=y
 CONFIG_TEXT_BASE=0x80110000
-CONFIG_NR_DRAM_BANKS=2
 CONFIG_ENV_SOURCE_FILE="chagall"
+CONFIG_NR_DRAM_BANKS=2
 CONFIG_ENV_SIZE=0x3000
 CONFIG_ENV_OFFSET=0xFFFFD000
 CONFIG_DEFAULT_DEVICE_TREE="tegra30-pegatron-chagall"
diff --git a/configs/colibri_t20_defconfig b/configs/colibri_t20_defconfig
index 02e33ba5e3c..036717160aa 100644
--- a/configs/colibri_t20_defconfig
+++ b/configs/colibri_t20_defconfig
@@ -3,8 +3,8 @@ CONFIG_SYS_L2CACHE_OFF=y
 CONFIG_ARCH_TEGRA=y
 CONFIG_TEXT_BASE=0x00110000
 CONFIG_SYS_MALLOC_F_LEN=0x2000
-CONFIG_NR_DRAM_BANKS=2
 CONFIG_ENV_SOURCE_FILE="colibri_t20"
+CONFIG_NR_DRAM_BANKS=2
 CONFIG_ENV_SIZE=0x10000
 CONFIG_ENV_OFFSET=0x200000
 CONFIG_DEFAULT_DEVICE_TREE="tegra20-colibri"
diff --git a/configs/colibri_t30_defconfig b/configs/colibri_t30_defconfig
index 63b695c1e54..cd98d75ba19 100644
--- a/configs/colibri_t30_defconfig
+++ b/configs/colibri_t30_defconfig
@@ -3,8 +3,8 @@ CONFIG_SYS_L2CACHE_OFF=y
 CONFIG_ARCH_TEGRA=y
 CONFIG_TEXT_BASE=0x80110000
 CONFIG_SYS_MALLOC_F_LEN=0x2000
-CONFIG_NR_DRAM_BANKS=2
 CONFIG_ENV_SOURCE_FILE="colibri_t30"
+CONFIG_NR_DRAM_BANKS=2
 CONFIG_ENV_SIZE=0x2000
 CONFIG_ENV_OFFSET=0xFFFFDE00
 CONFIG_DEFAULT_DEVICE_TREE="tegra30-colibri"
diff --git a/configs/endeavoru_defconfig b/configs/endeavoru_defconfig
index 165c0996038..220b8616ae9 100644
--- a/configs/endeavoru_defconfig
+++ b/configs/endeavoru_defconfig
@@ -1,8 +1,8 @@
 CONFIG_ARM=y
 CONFIG_ARCH_TEGRA=y
 CONFIG_TEXT_BASE=0x80110000
-CONFIG_NR_DRAM_BANKS=2
 CONFIG_ENV_SOURCE_FILE="endeavoru"
+CONFIG_NR_DRAM_BANKS=2
 CONFIG_ENV_SIZE=0x3000
 CONFIG_ENV_OFFSET=0xFFFFD000
 CONFIG_DEFAULT_DEVICE_TREE="tegra30-htc-endeavoru"
diff --git a/configs/exynos-mobile_defconfig b/configs/exynos-mobile_defconfig
index 81a2c4d3373..3a0b455b169 100644
--- a/configs/exynos-mobile_defconfig
+++ b/configs/exynos-mobile_defconfig
@@ -29,8 +29,6 @@ CONFIG_OF_LIST="exynos/exynos7870-a2corelte exynos/exynos7870-j6lte exynos/exyno
 CONFIG_MULTI_DTB_FIT=y
 CONFIG_BUTTON=y
 CONFIG_BUTTON_REMAP_PHONE_KEYS=y
-CONFIG_CLK=y
-CONFIG_CLK_CCF=y
 CONFIG_CLK_EXYNOS7870=y
 CONFIG_USB_FUNCTION_FASTBOOT=y
 CONFIG_FASTBOOT_BUF_ADDR=0xdead0000
diff --git a/configs/grouper_defconfig b/configs/grouper_defconfig
index b6c9550bbbc..91ba341c941 100644
--- a/configs/grouper_defconfig
+++ b/configs/grouper_defconfig
@@ -1,8 +1,8 @@
 CONFIG_ARM=y
 CONFIG_ARCH_TEGRA=y
 CONFIG_TEXT_BASE=0x80110000
-CONFIG_NR_DRAM_BANKS=2
 CONFIG_ENV_SOURCE_FILE="grouper"
+CONFIG_NR_DRAM_BANKS=2
 CONFIG_ENV_SIZE=0x3000
 CONFIG_ENV_OFFSET=0xFFFFD000
 CONFIG_DEFAULT_DEVICE_TREE="tegra30-asus-nexus7-grouper-E1565"
diff --git a/configs/ideapad-yoga-11_defconfig b/configs/ideapad-yoga-11_defconfig
index 68ca8333019..20eecb716fc 100644
--- a/configs/ideapad-yoga-11_defconfig
+++ b/configs/ideapad-yoga-11_defconfig
@@ -1,8 +1,8 @@
 CONFIG_ARM=y
 CONFIG_ARCH_TEGRA=y
 CONFIG_TEXT_BASE=0x80110000
-CONFIG_NR_DRAM_BANKS=2
 CONFIG_ENV_SOURCE_FILE="ideapad-yoga-11"
+CONFIG_NR_DRAM_BANKS=2
 CONFIG_ENV_SIZE=0x3000
 CONFIG_ENV_OFFSET=0xFFFFD000
 CONFIG_DEFAULT_DEVICE_TREE="tegra30-lenovo-ideapad-yoga-11"
diff --git a/configs/imx6dl_sielaff_defconfig b/configs/imx6dl_sielaff_defconfig
index a4271ea071a..917b8250e8f 100644
--- a/configs/imx6dl_sielaff_defconfig
+++ b/configs/imx6dl_sielaff_defconfig
@@ -5,8 +5,8 @@ CONFIG_SYS_MALLOC_F_LEN=0x4000
 CONFIG_SPL_GPIO=y
 CONFIG_SPL_LIBCOMMON_SUPPORT=y
 CONFIG_SPL_LIBGENERIC_SUPPORT=y
-CONFIG_NR_DRAM_BANKS=1
 CONFIG_ENV_SOURCE_FILE="imx6dl-sielaff"
+CONFIG_NR_DRAM_BANKS=1
 CONFIG_SF_DEFAULT_SPEED=20000000
 CONFIG_ENV_SIZE=0x10000
 CONFIG_ENV_OFFSET=0xF0000
diff --git a/configs/imx8mn_beacon_2g_defconfig b/configs/imx8mn_beacon_2g_defconfig
index c757a2180c0..32319823a43 100644
--- a/configs/imx8mn_beacon_2g_defconfig
+++ b/configs/imx8mn_beacon_2g_defconfig
@@ -5,8 +5,8 @@ CONFIG_SYS_MALLOC_LEN=0x2000000
 CONFIG_SPL_GPIO=y
 CONFIG_SPL_LIBCOMMON_SUPPORT=y
 CONFIG_SPL_LIBGENERIC_SUPPORT=y
-CONFIG_NR_DRAM_BANKS=1
 CONFIG_ENV_SOURCE_FILE="imx8mn_beacon"
+CONFIG_NR_DRAM_BANKS=1
 CONFIG_SF_DEFAULT_SPEED=40000000
 CONFIG_ENV_SIZE=0x2000
 CONFIG_ENV_OFFSET=0xFFFFDE00
diff --git a/configs/imx8mn_beacon_defconfig b/configs/imx8mn_beacon_defconfig
index ddaea0c68bd..4f77d51ab4b 100644
--- a/configs/imx8mn_beacon_defconfig
+++ b/configs/imx8mn_beacon_defconfig
@@ -5,8 +5,8 @@ CONFIG_SYS_MALLOC_LEN=0x2000000
 CONFIG_SPL_GPIO=y
 CONFIG_SPL_LIBCOMMON_SUPPORT=y
 CONFIG_SPL_LIBGENERIC_SUPPORT=y
-CONFIG_NR_DRAM_BANKS=1
 CONFIG_ENV_SOURCE_FILE="imx8mn_beacon"
+CONFIG_NR_DRAM_BANKS=1
 CONFIG_SF_DEFAULT_SPEED=40000000
 CONFIG_ENV_SIZE=0x2000
 CONFIG_ENV_OFFSET=0xFFFFDE00
diff --git a/configs/imx8mn_beacon_fspi_defconfig b/configs/imx8mn_beacon_fspi_defconfig
index 4a49355195a..96c2ed3da71 100644
--- a/configs/imx8mn_beacon_fspi_defconfig
+++ b/configs/imx8mn_beacon_fspi_defconfig
@@ -5,8 +5,8 @@ CONFIG_SYS_MALLOC_LEN=0x2000000
 CONFIG_SPL_GPIO=y
 CONFIG_SPL_LIBCOMMON_SUPPORT=y
 CONFIG_SPL_LIBGENERIC_SUPPORT=y
-CONFIG_NR_DRAM_BANKS=1
 CONFIG_ENV_SOURCE_FILE="imx8mn_beacon"
+CONFIG_NR_DRAM_BANKS=1
 CONFIG_SF_DEFAULT_SPEED=40000000
 CONFIG_ENV_SIZE=0x2000
 CONFIG_ENV_OFFSET=0xFFFFDE00
diff --git a/configs/imx93-phycore_defconfig b/configs/imx93-phycore_defconfig
index 4c952e966d1..189d92543d7 100644
--- a/configs/imx93-phycore_defconfig
+++ b/configs/imx93-phycore_defconfig
@@ -5,10 +5,10 @@ CONFIG_SYS_MALLOC_LEN=0x2000000
 CONFIG_SYS_MALLOC_F_LEN=0x20000
 CONFIG_SPL_LIBCOMMON_SUPPORT=y
 CONFIG_SPL_LIBGENERIC_SUPPORT=y
+CONFIG_ENV_SOURCE_FILE="phycore_imx93"
 CONFIG_NR_DRAM_BANKS=2
 CONFIG_PHYTEC_SOM_DETECTION=y
 CONFIG_PHYTEC_EEPROM_BUS=2
-CONFIG_ENV_SOURCE_FILE="phycore_imx93"
 CONFIG_ENV_SIZE=0x10000
 CONFIG_ENV_OFFSET=0x700000
 CONFIG_IMX_CONFIG="arch/arm/mach-imx/imx9/imximage.cfg"
diff --git a/configs/imx943_evk_defconfig b/configs/imx943_evk_defconfig
index 39b616e266e..0371dbe28a9 100644
--- a/configs/imx943_evk_defconfig
+++ b/configs/imx943_evk_defconfig
@@ -6,8 +6,8 @@ CONFIG_SYS_MALLOC_F_LEN=0x10000
 CONFIG_SPL_GPIO=y
 CONFIG_SPL_LIBCOMMON_SUPPORT=y
 CONFIG_SPL_LIBGENERIC_SUPPORT=y
-CONFIG_NR_DRAM_BANKS=2
 CONFIG_ENV_SOURCE_FILE="imx94_evk"
+CONFIG_NR_DRAM_BANKS=2
 CONFIG_ENV_SIZE=0x4000
 CONFIG_ENV_OFFSET=0x700000
 CONFIG_DM_GPIO=y
diff --git a/configs/imx95_15x15_evk_defconfig b/configs/imx95_15x15_evk_defconfig
index 96b1d2a64af..f3099f14401 100644
--- a/configs/imx95_15x15_evk_defconfig
+++ b/configs/imx95_15x15_evk_defconfig
@@ -6,8 +6,8 @@ CONFIG_SYS_MALLOC_F_LEN=0x10000
 CONFIG_SPL_GPIO=y
 CONFIG_SPL_LIBCOMMON_SUPPORT=y
 CONFIG_SPL_LIBGENERIC_SUPPORT=y
-CONFIG_NR_DRAM_BANKS=3
 CONFIG_ENV_SOURCE_FILE="imx95_evk"
+CONFIG_NR_DRAM_BANKS=3
 CONFIG_SF_DEFAULT_SPEED=40000000
 CONFIG_ENV_SIZE=0x4000
 CONFIG_ENV_OFFSET=0x700000
diff --git a/configs/imxrt1050-evk_fspi_defconfig b/configs/imxrt1050-evk_fspi_defconfig
index cc7e8a3e10b..f213135eb20 100644
--- a/configs/imxrt1050-evk_fspi_defconfig
+++ b/configs/imxrt1050-evk_fspi_defconfig
@@ -8,8 +8,8 @@ CONFIG_SYS_MALLOC_F_LEN=0x8000
 CONFIG_SPL_GPIO=y
 CONFIG_SPL_LIBCOMMON_SUPPORT=y
 CONFIG_SPL_LIBGENERIC_SUPPORT=y
-CONFIG_NR_DRAM_BANKS=1
 CONFIG_ENV_SOURCE_FILE="imxrt1050-evk-nor"
+CONFIG_NR_DRAM_BANKS=1
 CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y
 CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x20020000
 CONFIG_ENV_OFFSET=0x80000
diff --git a/configs/mocha_defconfig b/configs/mocha_defconfig
index ded43ccea58..19c3693a8c5 100644
--- a/configs/mocha_defconfig
+++ b/configs/mocha_defconfig
@@ -2,8 +2,8 @@ CONFIG_ARM=y
 CONFIG_ARCH_TEGRA=y
 CONFIG_TEXT_BASE=0x80110000
 CONFIG_SYS_MALLOC_LEN=0x2500000
-CONFIG_NR_DRAM_BANKS=2
 CONFIG_ENV_SOURCE_FILE="mocha"
+CONFIG_NR_DRAM_BANKS=2
 CONFIG_ENV_SIZE=0x3000
 CONFIG_ENV_OFFSET=0xFFFFD000
 CONFIG_DEFAULT_DEVICE_TREE="tegra124-xiaomi-mocha"
diff --git a/configs/mot_defconfig b/configs/mot_defconfig
index f6066b9e149..fec44ac8f79 100644
--- a/configs/mot_defconfig
+++ b/configs/mot_defconfig
@@ -1,8 +1,8 @@
 CONFIG_ARM=y
 CONFIG_ARCH_TEGRA=y
 CONFIG_TEXT_BASE=0x00110000
-CONFIG_NR_DRAM_BANKS=2
 CONFIG_ENV_SOURCE_FILE="mot"
+CONFIG_NR_DRAM_BANKS=2
 CONFIG_ENV_SIZE=0x3000
 CONFIG_ENV_OFFSET=0xFFFFD000
 CONFIG_DEFAULT_DEVICE_TREE="tegra20-motorola-olympus"
diff --git a/configs/n1_defconfig b/configs/n1_defconfig
index 1940a2208a9..15acd675afb 100644
--- a/configs/n1_defconfig
+++ b/configs/n1_defconfig
@@ -1,8 +1,8 @@
 CONFIG_ARM=y
 CONFIG_ARCH_TEGRA=y
 CONFIG_TEXT_BASE=0x00110000
-CONFIG_NR_DRAM_BANKS=2
 CONFIG_ENV_SOURCE_FILE="n1"
+CONFIG_NR_DRAM_BANKS=2
 CONFIG_ENV_SIZE=0x3000
 CONFIG_ENV_OFFSET=0xFFFFD000
 CONFIG_DEFAULT_DEVICE_TREE="tegra20-samsung-n1"
diff --git a/configs/ouya_defconfig b/configs/ouya_defconfig
index e82f65a9a86..ed1d1b64395 100644
--- a/configs/ouya_defconfig
+++ b/configs/ouya_defconfig
@@ -1,8 +1,8 @@
 CONFIG_ARM=y
 CONFIG_ARCH_TEGRA=y
 CONFIG_TEXT_BASE=0x80110000
-CONFIG_NR_DRAM_BANKS=2
 CONFIG_ENV_SOURCE_FILE="ouya"
+CONFIG_NR_DRAM_BANKS=2
 CONFIG_ENV_SIZE=0x3000
 CONFIG_ENV_OFFSET=0xFFFFD000
 CONFIG_DEFAULT_DEVICE_TREE="tegra30-ouya"
diff --git a/configs/p2771-0000-000_defconfig b/configs/p2771-0000-000_defconfig
index 462bec3bae2..24655774374 100644
--- a/configs/p2771-0000-000_defconfig
+++ b/configs/p2771-0000-000_defconfig
@@ -4,8 +4,8 @@ CONFIG_COUNTER_FREQUENCY=19200000
 CONFIG_SYS_L2CACHE_OFF=y
 CONFIG_ARCH_TEGRA=y
 CONFIG_TEXT_BASE=0x80080000
-CONFIG_NR_DRAM_BANKS=1026
 CONFIG_ENV_SOURCE_FILE="p2771-0000"
+CONFIG_NR_DRAM_BANKS=1026
 CONFIG_ENV_SIZE=0x2000
 CONFIG_ENV_OFFSET=0xFFFFE000
 CONFIG_DEFAULT_DEVICE_TREE="tegra186-p2771-0000-000"
diff --git a/configs/p3450-0000_defconfig b/configs/p3450-0000_defconfig
index 2ebcf8b83fc..f6e09ba1fee 100644
--- a/configs/p3450-0000_defconfig
+++ b/configs/p3450-0000_defconfig
@@ -5,8 +5,8 @@ CONFIG_SYS_L2CACHE_OFF=y
 CONFIG_ARCH_TEGRA=y
 CONFIG_TEXT_BASE=0x80080000
 CONFIG_SYS_MALLOC_LEN=0x2500000
-CONFIG_NR_DRAM_BANKS=2
 CONFIG_ENV_SOURCE_FILE="p3450-0000"
+CONFIG_NR_DRAM_BANKS=2
 CONFIG_SF_DEFAULT_SPEED=24000000
 CONFIG_ENV_SIZE=0x2000
 CONFIG_ENV_OFFSET=0xFFFFE000
diff --git a/configs/pg_wcom_expu1_defconfig b/configs/pg_wcom_expu1_defconfig
index 321e46e8c52..27e40c87c73 100644
--- a/configs/pg_wcom_expu1_defconfig
+++ b/configs/pg_wcom_expu1_defconfig
@@ -4,8 +4,8 @@ CONFIG_COUNTER_FREQUENCY=8333333
 CONFIG_TARGET_PG_WCOM_EXPU1=y
 CONFIG_TEXT_BASE=0x60100000
 CONFIG_SYS_MALLOC_LEN=0x1004000
-CONFIG_NR_DRAM_BANKS=1
 CONFIG_ENV_SOURCE_FILE="pg-wcom-expu1"
+CONFIG_NR_DRAM_BANKS=1
 CONFIG_ENV_SIZE=0x4000
 CONFIG_ENV_SECT_SIZE=0x20000
 CONFIG_DM_GPIO=y
diff --git a/configs/pg_wcom_expu1_update_defconfig b/configs/pg_wcom_expu1_update_defconfig
index b53af5be52c..6e4925562c3 100644
--- a/configs/pg_wcom_expu1_update_defconfig
+++ b/configs/pg_wcom_expu1_update_defconfig
@@ -4,8 +4,8 @@ CONFIG_COUNTER_FREQUENCY=8333333
 CONFIG_TARGET_PG_WCOM_EXPU1=y
 CONFIG_TEXT_BASE=0x60240000
 CONFIG_SYS_MALLOC_LEN=0x1004000
-CONFIG_NR_DRAM_BANKS=1
 CONFIG_ENV_SOURCE_FILE="pg-wcom-expu1"
+CONFIG_NR_DRAM_BANKS=1
 CONFIG_ENV_SIZE=0x4000
 CONFIG_ENV_SECT_SIZE=0x20000
 CONFIG_DM_GPIO=y
diff --git a/configs/pg_wcom_seli8_defconfig b/configs/pg_wcom_seli8_defconfig
index 561df3ee009..915483fb72a 100644
--- a/configs/pg_wcom_seli8_defconfig
+++ b/configs/pg_wcom_seli8_defconfig
@@ -4,8 +4,8 @@ CONFIG_COUNTER_FREQUENCY=8333333
 CONFIG_TARGET_PG_WCOM_SELI8=y
 CONFIG_TEXT_BASE=0x60100000
 CONFIG_SYS_MALLOC_LEN=0x1004000
-CONFIG_NR_DRAM_BANKS=1
 CONFIG_ENV_SOURCE_FILE="pg-wcom-seli8"
+CONFIG_NR_DRAM_BANKS=1
 CONFIG_ENV_SIZE=0x4000
 CONFIG_ENV_SECT_SIZE=0x20000
 CONFIG_DM_GPIO=y
diff --git a/configs/pg_wcom_seli8_update_defconfig b/configs/pg_wcom_seli8_update_defconfig
index 2a631176095..81ca109facb 100644
--- a/configs/pg_wcom_seli8_update_defconfig
+++ b/configs/pg_wcom_seli8_update_defconfig
@@ -4,8 +4,8 @@ CONFIG_COUNTER_FREQUENCY=8333333
 CONFIG_TARGET_PG_WCOM_SELI8=y
 CONFIG_TEXT_BASE=0x60240000
 CONFIG_SYS_MALLOC_LEN=0x1004000
-CONFIG_NR_DRAM_BANKS=1
 CONFIG_ENV_SOURCE_FILE="pg-wcom-seli8"
+CONFIG_NR_DRAM_BANKS=1
 CONFIG_ENV_SIZE=0x4000
 CONFIG_ENV_SECT_SIZE=0x20000
 CONFIG_DM_GPIO=y
diff --git a/configs/picasso_defconfig b/configs/picasso_defconfig
index 9d153694245..ddc51c5b55c 100644
--- a/configs/picasso_defconfig
+++ b/configs/picasso_defconfig
@@ -1,8 +1,8 @@
 CONFIG_ARM=y
 CONFIG_ARCH_TEGRA=y
 CONFIG_TEXT_BASE=0x00110000
-CONFIG_NR_DRAM_BANKS=2
 CONFIG_ENV_SOURCE_FILE="picasso"
+CONFIG_NR_DRAM_BANKS=2
 CONFIG_ENV_SIZE=0x3000
 CONFIG_ENV_OFFSET=0xFFFFD000
 CONFIG_DEFAULT_DEVICE_TREE="tegra20-acer-a500-picasso"
diff --git a/configs/qc750_defconfig b/configs/qc750_defconfig
index 2be3838ae60..3db8550266b 100644
--- a/configs/qc750_defconfig
+++ b/configs/qc750_defconfig
@@ -1,8 +1,8 @@
 CONFIG_ARM=y
 CONFIG_ARCH_TEGRA=y
 CONFIG_TEXT_BASE=0x80110000
-CONFIG_NR_DRAM_BANKS=2
 CONFIG_ENV_SOURCE_FILE="qc750"
+CONFIG_NR_DRAM_BANKS=2
 CONFIG_ENV_SIZE=0x3000
 CONFIG_ENV_OFFSET=0xFFFFD000
 CONFIG_DEFAULT_DEVICE_TREE="tegra30-wexler-qc750"
diff --git a/configs/socfpga_cyclone5_defconfig b/configs/socfpga_cyclone5_defconfig
index f1bf0aec015..992abdbfdc4 100644
--- a/configs/socfpga_cyclone5_defconfig
+++ b/configs/socfpga_cyclone5_defconfig
@@ -12,8 +12,8 @@ CONFIG_DM_RESET=y
 CONFIG_SPL_STACK=0x0
 CONFIG_SPL_TEXT_BASE=0xFFFF0000
 CONFIG_TARGET_SOCFPGA_CYCLONE5_SOCDK=y
-# CONFIG_SPL_SPI is not set
 CONFIG_SPL_FS_FAT=y
+# CONFIG_SPL_SPI is not set
 CONFIG_TIMESTAMP=y
 CONFIG_FIT=y
 CONFIG_DISTRO_DEFAULTS=y
@@ -30,8 +30,6 @@ CONFIG_SPL_NO_BSS_LIMIT=y
 # CONFIG_SPL_SHARES_INIT_SP_ADDR is not set
 CONFIG_SPL_HAVE_INIT_STACK=y
 # CONFIG_SPL_SYS_MMCSD_RAW_MODE is not set
-CONFIG_SPL_SPI_LOAD=y
-CONFIG_SYS_SPI_U_BOOT_OFFS=0x40000
 CONFIG_SYS_MAXARGS=32
 CONFIG_CMD_ASKENV=y
 CONFIG_CMD_GREPENV=y
diff --git a/configs/star_defconfig b/configs/star_defconfig
index 59eabdcb2b4..f2cdcf066c0 100644
--- a/configs/star_defconfig
+++ b/configs/star_defconfig
@@ -1,8 +1,8 @@
 CONFIG_ARM=y
 CONFIG_ARCH_TEGRA=y
 CONFIG_TEXT_BASE=0x00110000
-CONFIG_NR_DRAM_BANKS=2
 CONFIG_ENV_SOURCE_FILE="star"
+CONFIG_NR_DRAM_BANKS=2
 CONFIG_ENV_SIZE=0x3000
 CONFIG_ENV_OFFSET=0xFFFFD000
 CONFIG_DEFAULT_DEVICE_TREE="tegra20-lg-star"
diff --git a/configs/surface-2_defconfig b/configs/surface-2_defconfig
index d3e6166cf89..5ec0d234fe3 100644
--- a/configs/surface-2_defconfig
+++ b/configs/surface-2_defconfig
@@ -2,8 +2,8 @@ CONFIG_ARM=y
 CONFIG_ARCH_TEGRA=y
 CONFIG_TEXT_BASE=0x80110000
 CONFIG_SYS_MALLOC_LEN=0x2500000
-CONFIG_NR_DRAM_BANKS=2
 CONFIG_ENV_SOURCE_FILE="surface-2"
+CONFIG_NR_DRAM_BANKS=2
 CONFIG_ENV_SIZE=0x3000
 CONFIG_ENV_OFFSET=0xFFFFD000
 CONFIG_DEFAULT_DEVICE_TREE="tegra114-microsoft-surface-2-0b"
diff --git a/configs/surface-rt_defconfig b/configs/surface-rt_defconfig
index 88b67749095..6e3752c72a3 100644
--- a/configs/surface-rt_defconfig
+++ b/configs/surface-rt_defconfig
@@ -1,8 +1,8 @@
 CONFIG_ARM=y
 CONFIG_ARCH_TEGRA=y
 CONFIG_TEXT_BASE=0x80110000
-CONFIG_NR_DRAM_BANKS=2
 CONFIG_ENV_SOURCE_FILE="surface-rt"
+CONFIG_NR_DRAM_BANKS=2
 CONFIG_ENV_SIZE=0x3000
 CONFIG_ENV_OFFSET=0xFFFFD000
 CONFIG_DEFAULT_DEVICE_TREE="tegra30-microsoft-surface-rt"
diff --git a/configs/tegratab_defconfig b/configs/tegratab_defconfig
index 27cb75c92b5..d2596453d8d 100644
--- a/configs/tegratab_defconfig
+++ b/configs/tegratab_defconfig
@@ -2,8 +2,8 @@ CONFIG_ARM=y
 CONFIG_ARCH_TEGRA=y
 CONFIG_TEXT_BASE=0x80110000
 CONFIG_SYS_MALLOC_LEN=0x2500000
-CONFIG_NR_DRAM_BANKS=2
 CONFIG_ENV_SOURCE_FILE="tegratab"
+CONFIG_NR_DRAM_BANKS=2
 CONFIG_ENV_SIZE=0x3000
 CONFIG_ENV_OFFSET=0xFFFFD000
 CONFIG_DEFAULT_DEVICE_TREE="tegra114-nvidia-tegratab"
diff --git a/configs/tf701t_defconfig b/configs/tf701t_defconfig
index e8f920587c3..abed3d65baf 100644
--- a/configs/tf701t_defconfig
+++ b/configs/tf701t_defconfig
@@ -2,8 +2,8 @@ CONFIG_ARM=y
 CONFIG_ARCH_TEGRA=y
 CONFIG_TEXT_BASE=0x80110000
 CONFIG_SYS_MALLOC_LEN=0x2500000
-CONFIG_NR_DRAM_BANKS=2
 CONFIG_ENV_SOURCE_FILE="transformer-t114"
+CONFIG_NR_DRAM_BANKS=2
 CONFIG_ENV_SIZE=0x3000
 CONFIG_ENV_OFFSET=0xFFFFD000
 CONFIG_DEFAULT_DEVICE_TREE="tegra114-asus-tf701t"
diff --git a/configs/transformer_t20_defconfig b/configs/transformer_t20_defconfig
index 61eab59fa3b..251bc955beb 100644
--- a/configs/transformer_t20_defconfig
+++ b/configs/transformer_t20_defconfig
@@ -1,8 +1,8 @@
 CONFIG_ARM=y
 CONFIG_ARCH_TEGRA=y
 CONFIG_TEXT_BASE=0x00110000
-CONFIG_NR_DRAM_BANKS=2
 CONFIG_ENV_SOURCE_FILE="transformer-t20"
+CONFIG_NR_DRAM_BANKS=2
 CONFIG_ENV_SIZE=0x3000
 CONFIG_ENV_OFFSET=0xFFFFD000
 CONFIG_DEFAULT_DEVICE_TREE="tegra20-asus-tf101"
diff --git a/configs/transformer_t30_defconfig b/configs/transformer_t30_defconfig
index 6f8953aa103..fb1900299b1 100644
--- a/configs/transformer_t30_defconfig
+++ b/configs/transformer_t30_defconfig
@@ -1,8 +1,8 @@
 CONFIG_ARM=y
 CONFIG_ARCH_TEGRA=y
 CONFIG_TEXT_BASE=0x80110000
-CONFIG_NR_DRAM_BANKS=2
 CONFIG_ENV_SOURCE_FILE="transformer-t30"
+CONFIG_NR_DRAM_BANKS=2
 CONFIG_ENV_SIZE=0x3000
 CONFIG_ENV_OFFSET=0xFFFFD000
 CONFIG_DEFAULT_DEVICE_TREE="tegra30-asus-tf201"