Merge branch '2022-06-28-Kconfig-migrations' into next

- Convert a large number of CONFIG symbols to Kconfig.  Of note is a
  large chunk of USB symbols (and dead code removal), ensuring all
  SPL/TPL/VPL symbols have an appropriate dependency, largely (but not
  entirely) removing the testing of CONFIG_SPL_BUILD in board headers,
  and allowing CONFIG_EXTRA_ENV_TEXT and CONFIG_EXTRA_ENV_SETTINGS to
  co-exist as this facilities migration of many platforms.

diff --cc configs/avnet_ultrazedev_cc_v1_0_ultrazedev_som_v1_0_defconfig
index 450b2830e56afc6e8eca4c452265f448753436f4,450b2830e56afc6e8eca4c452265f448753436f4..6eefc29ab903adb29c3dbae333320a9293caa129
--- 1/configs/avnet_ultrazedev_cc_v1_0_ultrazedev_som_v1_0_defconfig
--- 2/configs/avnet_ultrazedev_cc_v1_0_ultrazedev_som_v1_0_defconfig
+++ b/configs/avnet_ultrazedev_cc_v1_0_ultrazedev_som_v1_0_defconfig
@@@ -6,8 -6,8 +6,6 @@@ CONFIG_SYS_MALLOC_F_LEN=0x800
  CONFIG_DM_GPIO=y
  CONFIG_DEFAULT_DEVICE_TREE="avnet-ultrazedev-cc-v1.0-ultrazedev-som-v1.0"
  CONFIG_SPL=y
--CONFIG_DEBUG_UART_BASE=0xff000000
--CONFIG_DEBUG_UART_CLOCK=100000000
  CONFIG_SPL_SPI_FLASH_SUPPORT=y
  CONFIG_SPL_SPI=y
  CONFIG_ZYNQ_MAC_IN_EEPROM=y

diff --cc configs/axm_defconfig
index b61151129fcd6bb4d74828622cc971a53d7010c5,b61151129fcd6bb4d74828622cc971a53d7010c5..a5f60bd8d0c47aa9655e3469b3658da2d9e257f2
--- 1/configs/axm_defconfig
--- 2/configs/axm_defconfig
+++ b/configs/axm_defconfig
@@@ -7,7 -7,7 +7,6 @@@ CONFIG_SYS_THUMB_BUILD=
  # CONFIG_SPL_USE_ARCH_MEMCPY is not set
  # CONFIG_SPL_USE_ARCH_MEMSET is not set
  CONFIG_ARCH_AT91=y
--CONFIG_SPL_LDSCRIPT="arch/arm/cpu/u-boot-spl.lds"
  CONFIG_SYS_TEXT_BASE=0x21000000
  CONFIG_SYS_MALLOC_LEN=0x460000
  CONFIG_TARGET_TAURUS=y
@@@ -17,6 -17,6 +16,7 @@@ CONFIG_SPL_GPIO=
  CONFIG_SPL_LIBCOMMON_SUPPORT=y
  CONFIG_SPL_LIBGENERIC_SUPPORT=y
  CONFIG_NR_DRAM_BANKS=1
++CONFIG_SPL_LDSCRIPT="arch/arm/cpu/u-boot-spl.lds"
  CONFIG_ENV_OFFSET=0x100000
  CONFIG_SPL_DM_SPI=y
  CONFIG_DEFAULT_DEVICE_TREE="at91sam9g20-taurus"

diff --cc configs/bitmain_antminer_s9_defconfig
index f8ab91435875d8f1b2e1d23e8ba40a54b7bae45c,98d38a89a042ce788ec52e89d199e70ba780022f..f6451b97018ae5fb1fd3f0b30d7400a80ff9aa67
--- 1/configs/bitmain_antminer_s9_defconfig
--- 2/configs/bitmain_antminer_s9_defconfig
+++ b/configs/bitmain_antminer_s9_defconfig
@@@ -13,7 -13,7 +13,6 @@@ CONFIG_SPL_STACK_R_ADDR=0x20000
  CONFIG_SYS_BOOTCOUNT_ADDR=0xEFFFFF0
  CONFIG_SPL=y
  CONFIG_DEBUG_UART_BASE=0xe0001000
--CONFIG_DEBUG_UART_CLOCK=50000000
  CONFIG_SYS_LOAD_ADDR=0x0
  CONFIG_DEBUG_UART=y
  CONFIG_REMAKE_ELF=y

diff --cc configs/boston32r2el_defconfig
index 3c4aac93d89a167a7ec9a73845a1cd041a05acd9,3c4aac93d89a167a7ec9a73845a1cd041a05acd9..93c5aec101c2805538b961fa5f44ab58ec8e614d
--- 1/configs/boston32r2el_defconfig
--- 2/configs/boston32r2el_defconfig
+++ b/configs/boston32r2el_defconfig
@@@ -8,12 -8,12 +8,12 @@@ CONFIG_DEFAULT_DEVICE_TREE="img,boston
  CONFIG_SYS_LOAD_ADDR=0x88000000
  CONFIG_ENV_ADDR=0xBFFE0000
  CONFIG_TARGET_BOSTON=y
--CONFIG_SYS_LITTLE_ENDIAN=y
  # CONFIG_MIPS_BOOT_CMDLINE_LEGACY is not set
  # CONFIG_MIPS_BOOT_ENV_LEGACY is not set
  CONFIG_MIPS_BOOT_FDT=y
  CONFIG_SYS_MEMTEST_START=0x80000000
  CONFIG_SYS_MEMTEST_END=0x90000000
++CONFIG_SYS_LITTLE_ENDIAN=y
  CONFIG_DISTRO_DEFAULTS=y
  CONFIG_FIT=y
  CONFIG_FIT_VERBOSE=y

diff --cc configs/boston32r6el_defconfig
index f1253e6a51cf072de00926751ac889874a889185,f1253e6a51cf072de00926751ac889874a889185..2a2169fb77b57a6bc61f0e0d184f9a84e3224f4a
--- 1/configs/boston32r6el_defconfig
--- 2/configs/boston32r6el_defconfig
+++ b/configs/boston32r6el_defconfig
@@@ -8,13 -8,13 +8,13 @@@ CONFIG_DEFAULT_DEVICE_TREE="img,boston
  CONFIG_SYS_LOAD_ADDR=0x88000000
  CONFIG_ENV_ADDR=0xBFFE0000
  CONFIG_TARGET_BOSTON=y
--CONFIG_SYS_LITTLE_ENDIAN=y
  CONFIG_CPU_MIPS32_R6=y
  # CONFIG_MIPS_BOOT_CMDLINE_LEGACY is not set
  # CONFIG_MIPS_BOOT_ENV_LEGACY is not set
  CONFIG_MIPS_BOOT_FDT=y
  CONFIG_SYS_MEMTEST_START=0x80000000
  CONFIG_SYS_MEMTEST_END=0x90000000
++CONFIG_SYS_LITTLE_ENDIAN=y
  CONFIG_DISTRO_DEFAULTS=y
  CONFIG_FIT=y
  CONFIG_FIT_VERBOSE=y

diff --cc configs/boston64r2el_defconfig
index 326c757057fbe3334dee128d0fda46a36b97922c,326c757057fbe3334dee128d0fda46a36b97922c..139ea4e1dc2d6d3e3c7956c04eb6eca2dcca558f
--- 1/configs/boston64r2el_defconfig
--- 2/configs/boston64r2el_defconfig
+++ b/configs/boston64r2el_defconfig
@@@ -8,13 -8,13 +8,13 @@@ CONFIG_DEFAULT_DEVICE_TREE="img,boston
  CONFIG_SYS_LOAD_ADDR=0xffffffff88000000
  CONFIG_ENV_ADDR=0xFFFFFFFFBFFE0000
  CONFIG_TARGET_BOSTON=y
--CONFIG_SYS_LITTLE_ENDIAN=y
  CONFIG_CPU_MIPS64_R2=y
  # CONFIG_MIPS_BOOT_CMDLINE_LEGACY is not set
  # CONFIG_MIPS_BOOT_ENV_LEGACY is not set
  CONFIG_MIPS_BOOT_FDT=y
  CONFIG_SYS_MEMTEST_START=0x80000000
  CONFIG_SYS_MEMTEST_END=0x90000000
++CONFIG_SYS_LITTLE_ENDIAN=y
  CONFIG_DISTRO_DEFAULTS=y
  CONFIG_FIT=y
  CONFIG_FIT_VERBOSE=y

diff --cc configs/boston64r6el_defconfig
index 72b3649d4a13e44e560289a175dfdae5e6b5844e,72b3649d4a13e44e560289a175dfdae5e6b5844e..d2af060fd689840c3e203a24ba04ea675e2a4205
--- 1/configs/boston64r6el_defconfig
--- 2/configs/boston64r6el_defconfig
+++ b/configs/boston64r6el_defconfig
@@@ -8,13 -8,13 +8,13 @@@ CONFIG_DEFAULT_DEVICE_TREE="img,boston
  CONFIG_SYS_LOAD_ADDR=0xffffffff88000000
  CONFIG_ENV_ADDR=0xFFFFFFFFBFFE0000
  CONFIG_TARGET_BOSTON=y
--CONFIG_SYS_LITTLE_ENDIAN=y
  CONFIG_CPU_MIPS64_R6=y
  # CONFIG_MIPS_BOOT_CMDLINE_LEGACY is not set
  # CONFIG_MIPS_BOOT_ENV_LEGACY is not set
  CONFIG_MIPS_BOOT_FDT=y
  CONFIG_SYS_MEMTEST_START=0x80000000
  CONFIG_SYS_MEMTEST_END=0x90000000
++CONFIG_SYS_LITTLE_ENDIAN=y
  CONFIG_DISTRO_DEFAULTS=y
  CONFIG_FIT=y
  CONFIG_FIT_VERBOSE=y

diff --cc configs/brppt2_defconfig
index db87b579eedab652a0bc779732f1301827d6e41e,40e32d1f513687524bf0b8621119223163092f23..e2c36e13add8439f76a7c76a54ed4702aaf88083
--- 1/configs/brppt2_defconfig
--- 2/configs/brppt2_defconfig
+++ b/configs/brppt2_defconfig
@@@ -2,7 -2,7 +2,6 @@@ CONFIG_ARM=
  # CONFIG_SPL_SYS_THUMB_BUILD is not set
  CONFIG_SYS_L2CACHE_OFF=y
  CONFIG_ARCH_MX6=y
--CONFIG_SPL_LDSCRIPT="arch/arm/cpu/u-boot-spl.lds"
  CONFIG_SYS_TEXT_BASE=0x17800000
  CONFIG_SYS_MALLOC_LEN=0xa00000
  CONFIG_SYS_MALLOC_F_LEN=0x1000
@@@ -10,6 -10,6 +9,7 @@@ CONFIG_SPL_GPIO=
  CONFIG_SPL_LIBCOMMON_SUPPORT=y
  CONFIG_SPL_LIBGENERIC_SUPPORT=y
  CONFIG_NR_DRAM_BANKS=1
++CONFIG_SPL_LDSCRIPT="arch/arm/cpu/u-boot-spl.lds"
  CONFIG_ENV_SIZE=0x10000
  CONFIG_ENV_OFFSET=0x20000
  CONFIG_ENV_SECT_SIZE=0x10000

diff --cc configs/devkit8000_defconfig
index a5e9f614df18c7b3e4df8bafee77856f2e62bc61,a5e9f614df18c7b3e4df8bafee77856f2e62bc61..ac3079447868b37303a6c6f384c45159379fcf57
--- 1/configs/devkit8000_defconfig
--- 2/configs/devkit8000_defconfig
+++ b/configs/devkit8000_defconfig
@@@ -69,11 -69,11 +69,9 @@@ CONFIG_BOOTP_SEND_HOSTNAME=
  CONFIG_SPL_DM=y
  CONFIG_SPL_DM_SEQ_ALIAS=y
  CONFIG_SPL_OF_TRANSLATE=y
--CONFIG_SYS_I2C_LEGACY=y
--CONFIG_SPL_SYS_I2C_LEGACY=y
++CONFIG_DM_I2C=y
  CONFIG_TWL4030_LED=y
  CONFIG_MMC_OMAP_HS=y
--CONFIG_DM_I2C=y
  CONFIG_MTD=y
  CONFIG_MTD_RAW_NAND=y
  CONFIG_NAND_OMAP_ECCSCHEME_HAM1_CODE_HW=y

diff --cc configs/edminiv2_defconfig
index b8906b1bb0deb244bb2b1d548716d40c50d1b71a,d47f20a4e60eb86ecc11429fbd2ec969f9506817..6b7cdbe4b119991bf33c005125eec1e92a3cbf3b
--- 1/configs/edminiv2_defconfig
--- 2/configs/edminiv2_defconfig
+++ b/configs/edminiv2_defconfig
@@@ -1,12 -1,12 +1,12 @@@
  CONFIG_ARM=y
  CONFIG_ARCH_CPU_INIT=y
  CONFIG_ARCH_ORION5X=y
--CONFIG_SPL_LDSCRIPT="arch/arm/mach-orion5x/u-boot-spl.lds"
  CONFIG_SYS_TEXT_BASE=0x00800000
  CONFIG_SYS_MALLOC_LEN=0x40000
  CONFIG_SPL_LIBCOMMON_SUPPORT=y
  CONFIG_SPL_LIBGENERIC_SUPPORT=y
  CONFIG_NR_DRAM_BANKS=1
++CONFIG_SPL_LDSCRIPT="arch/arm/mach-orion5x/u-boot-spl.lds"
  CONFIG_ENV_SIZE=0x2000
  CONFIG_ENV_SECT_SIZE=0x2000
  CONFIG_SPL_TEXT_BASE=0xffff0000

diff --cc configs/evb-ast2600_defconfig
index a91a53da4fc27c3d26784b454db7b6bd136b35a9,a91a53da4fc27c3d26784b454db7b6bd136b35a9..5c4d8426607c35f32cb7e42467272c366cf2057b
--- 1/configs/evb-ast2600_defconfig
--- 2/configs/evb-ast2600_defconfig
+++ b/configs/evb-ast2600_defconfig
@@@ -1,7 -1,7 +1,6 @@@
  CONFIG_ARM=y
  CONFIG_SYS_DCACHE_OFF=y
  CONFIG_SPL_SYS_THUMB_BUILD=y
--CONFIG_SPL_LDSCRIPT="arch/arm/mach-aspeed/ast2600/u-boot-spl.lds"
  CONFIG_ARCH_ASPEED=y
  CONFIG_SYS_TEXT_BASE=0x80000000
  CONFIG_SYS_MALLOC_LEN=0x2000000
@@@ -11,6 -11,6 +10,7 @@@ CONFIG_TARGET_EVB_AST2600=
  CONFIG_SPL_LIBCOMMON_SUPPORT=y
  CONFIG_SPL_LIBGENERIC_SUPPORT=y
  CONFIG_NR_DRAM_BANKS=1
++CONFIG_SPL_LDSCRIPT="arch/arm/mach-aspeed/ast2600/u-boot-spl.lds"
  CONFIG_ENV_SIZE=0x10000
  CONFIG_DM_GPIO=y
  CONFIG_DEFAULT_DEVICE_TREE="ast2600-evb"

diff --cc configs/imx8mn_evk_defconfig
index 70d3d83e9a5dbad05bc8bb08098f23e5c1f4aeea,70d3d83e9a5dbad05bc8bb08098f23e5c1f4aeea..6390a274e5096c912c2c3b2c7206114e8522b72b
--- 1/configs/imx8mn_evk_defconfig
--- 2/configs/imx8mn_evk_defconfig
+++ b/configs/imx8mn_evk_defconfig
@@@ -59,9 -59,9 +59,6 @@@ CONFIG_CMD_FUSE=
  CONFIG_CMD_GPIO=y
  CONFIG_CMD_I2C=y
  CONFIG_CMD_MMC=y
--CONFIG_CMD_DHCP=y
--CONFIG_CMD_MII=y
--CONFIG_CMD_PING=y
  CONFIG_CMD_CACHE=y
  CONFIG_CMD_REGULATOR=y
  CONFIG_CMD_EXT4_WRITE=y

diff --cc configs/malta64el_defconfig
index b268e33a379f0bf17e5177fe5409b66f5115ffbc,b268e33a379f0bf17e5177fe5409b66f5115ffbc..206d5bbbea74493b2793bb6a67805b498a860385
--- 1/configs/malta64el_defconfig
--- 2/configs/malta64el_defconfig
+++ b/configs/malta64el_defconfig
@@@ -9,8 -9,8 +9,8 @@@ CONFIG_SYS_LOAD_ADDR=0xffffffff8100000
  CONFIG_ENV_ADDR=0xFFFFFFFFBE3E0000
  CONFIG_TARGET_MALTA=y
  CONFIG_BUILD_TARGET="u-boot-swap.bin"
--CONFIG_SYS_LITTLE_ENDIAN=y
  CONFIG_CPU_MIPS64_R2=y
++CONFIG_SYS_LITTLE_ENDIAN=y
  # CONFIG_AUTOBOOT is not set
  CONFIG_BOARD_EARLY_INIT_F=y
  CONFIG_MISC_INIT_R=y

diff --cc configs/mscc_jr2_defconfig
index 04e15c61487bd93dfbb23d5a3d3bd79bc37a11e0,04e15c61487bd93dfbb23d5a3d3bd79bc37a11e0..082a32b7f72e0d1f7d95deb7e46136b4b6507d40
--- 1/configs/mscc_jr2_defconfig
--- 2/configs/mscc_jr2_defconfig
+++ b/configs/mscc_jr2_defconfig
@@@ -13,10 -13,10 +13,10 @@@ CONFIG_ENV_OFFSET_REDUND=0x14000
  CONFIG_SYS_LOAD_ADDR=0x100000
  CONFIG_ARCH_MSCC=y
  CONFIG_SOC_JR2=y
--CONFIG_SYS_LITTLE_ENDIAN=y
  CONFIG_DEBUG_UART=y
  CONFIG_SYS_MEMTEST_START=0x80000000
  CONFIG_SYS_MEMTEST_END=0x9fc00000
++CONFIG_SYS_LITTLE_ENDIAN=y
  CONFIG_FIT=y
  CONFIG_BOOTDELAY=3
  CONFIG_USE_BOOTARGS=y

diff --cc configs/mscc_luton_defconfig
index b144dd4354c52ad4316d23619a50b70f2018c2b3,b144dd4354c52ad4316d23619a50b70f2018c2b3..722a585d56af8e07d7da41cf1c6a4d752a1117e9
--- 1/configs/mscc_luton_defconfig
--- 2/configs/mscc_luton_defconfig
+++ b/configs/mscc_luton_defconfig
@@@ -14,11 -14,11 +14,11 @@@ CONFIG_SYS_LOAD_ADDR=0x10000
  CONFIG_ARCH_MSCC=y
  CONFIG_SOC_LUTON=y
  CONFIG_DDRTYPE_MT47H128M8HQ=y
--CONFIG_SYS_LITTLE_ENDIAN=y
  CONFIG_MIPS_BOOT_FDT=y
  CONFIG_DEBUG_UART=y
  CONFIG_SYS_MEMTEST_START=0x80000000
  CONFIG_SYS_MEMTEST_END=0x87c00000
++CONFIG_SYS_LITTLE_ENDIAN=y
  CONFIG_FIT=y
  CONFIG_BOOTDELAY=3
  CONFIG_USE_BOOTARGS=y

diff --cc configs/mscc_ocelot_defconfig
index e088f3ca04add1ddf98c032445bae6abdd7321d1,e088f3ca04add1ddf98c032445bae6abdd7321d1..0b1e49926a0644e383fd8a991c4d88d25f4b205b
--- 1/configs/mscc_ocelot_defconfig
--- 2/configs/mscc_ocelot_defconfig
+++ b/configs/mscc_ocelot_defconfig
@@@ -12,10 -12,10 +12,10 @@@ CONFIG_DEBUG_UART_BOARD_INIT=
  CONFIG_ENV_OFFSET_REDUND=0x140000
  CONFIG_SYS_LOAD_ADDR=0x100000
  CONFIG_ARCH_MSCC=y
--CONFIG_SYS_LITTLE_ENDIAN=y
  CONFIG_DEBUG_UART=y
  CONFIG_SYS_MEMTEST_START=0x80000000
  CONFIG_SYS_MEMTEST_END=0x9fc00000
++CONFIG_SYS_LITTLE_ENDIAN=y
  CONFIG_FIT=y
  CONFIG_BOOTDELAY=3
  CONFIG_USE_BOOTARGS=y

diff --cc configs/mscc_serval_defconfig
index a56c5ebdecfe5d8fafcb3081ae6a89575e19ce88,a56c5ebdecfe5d8fafcb3081ae6a89575e19ce88..4dfb6b79caef902e654875ac058c58f8bc5f4c8b
--- 1/configs/mscc_serval_defconfig
--- 2/configs/mscc_serval_defconfig
+++ b/configs/mscc_serval_defconfig
@@@ -11,9 -11,9 +11,9 @@@ CONFIG_SYS_LOAD_ADDR=0x10000
  CONFIG_ARCH_MSCC=y
  CONFIG_SOC_SERVAL=y
  CONFIG_DDRTYPE_H5TQ1G63BFA=y
--CONFIG_SYS_LITTLE_ENDIAN=y
  CONFIG_SYS_MEMTEST_START=0x80000000
  CONFIG_SYS_MEMTEST_END=0x87c00000
++CONFIG_SYS_LITTLE_ENDIAN=y
  CONFIG_FIT=y
  CONFIG_BOOTDELAY=3
  CONFIG_USE_BOOTARGS=y

diff --cc configs/mscc_servalt_defconfig
index cf1c4db1d384df4bb459c8b31cfac56fb83ffa59,cf1c4db1d384df4bb459c8b31cfac56fb83ffa59..3104ac35b8a8924bc69296dd77eba630ce46c833
--- 1/configs/mscc_servalt_defconfig
--- 2/configs/mscc_servalt_defconfig
+++ b/configs/mscc_servalt_defconfig
@@@ -10,9 -10,9 +10,9 @@@ CONFIG_ENV_OFFSET_REDUND=0x14000
  CONFIG_SYS_LOAD_ADDR=0x100000
  CONFIG_ARCH_MSCC=y
  CONFIG_SOC_SERVALT=y
--CONFIG_SYS_LITTLE_ENDIAN=y
  CONFIG_SYS_MEMTEST_START=0x80000000
  CONFIG_SYS_MEMTEST_END=0x9fc00000
++CONFIG_SYS_LITTLE_ENDIAN=y
  CONFIG_FIT=y
  CONFIG_BOOTDELAY=3
  CONFIG_USE_BOOTARGS=y

diff --cc configs/openpiton_riscv64_defconfig
index aa4c307b4c6f003d178a174833a7e32fa9890c34,aa4c307b4c6f003d178a174833a7e32fa9890c34..5605fbcab57334fd9149eda46db3514c76ef4a3c
--- 1/configs/openpiton_riscv64_defconfig
--- 2/configs/openpiton_riscv64_defconfig
+++ b/configs/openpiton_riscv64_defconfig
@@@ -74,7 -74,7 +74,6 @@@ CONFIG_DM_RTC=
  CONFIG_SYS_NS16550=y
  CONFIG_FS_SQUASHFS=y
  CONFIG_SPL_TINY_MEMSET=y
--CONFIG_TPL_TINY_MEMSET=y
  CONFIG_SHA1=y
  CONFIG_SHA256=y
  CONFIG_MD5=y

diff --cc configs/openpiton_riscv64_spl_defconfig
index bf0e09b73c8e695bb865c882313ce778f422e398,bf0e09b73c8e695bb865c882313ce778f422e398..e9514f3da1deb4520dbbbbb8bd82950cd21680e7
--- 1/configs/openpiton_riscv64_spl_defconfig
--- 2/configs/openpiton_riscv64_spl_defconfig
+++ b/configs/openpiton_riscv64_spl_defconfig
@@@ -90,7 -90,7 +90,6 @@@ CONFIG_DM_RTC=
  CONFIG_SYS_NS16550=y
  CONFIG_FS_SQUASHFS=y
  CONFIG_SPL_TINY_MEMSET=y
--CONFIG_TPL_TINY_MEMSET=y
  CONFIG_SHA1=y
  CONFIG_SHA256=y
  CONFIG_MD5=y

diff --cc configs/socfpga_agilex_atf_defconfig
index e20789a6b463068000b6e18276e986905ab2ae63,e20789a6b463068000b6e18276e986905ab2ae63..8f2d26e43d0685f9340b7203b0703e051fb69236
--- 1/configs/socfpga_agilex_atf_defconfig
--- 2/configs/socfpga_agilex_atf_defconfig
+++ b/configs/socfpga_agilex_atf_defconfig
@@@ -1,10 -1,10 +1,10 @@@
  CONFIG_ARM=y
  CONFIG_COUNTER_FREQUENCY=400000000
--CONFIG_SPL_LDSCRIPT="arch/arm/mach-socfpga/u-boot-spl-soc64.lds"
  CONFIG_ARCH_SOCFPGA=y
  CONFIG_SYS_TEXT_BASE=0x200000
  CONFIG_SYS_MALLOC_LEN=0x500000
  CONFIG_NR_DRAM_BANKS=2
++CONFIG_SPL_LDSCRIPT="arch/arm/mach-socfpga/u-boot-spl-soc64.lds"
  CONFIG_ENV_SIZE=0x1000
  CONFIG_ENV_OFFSET=0x200
  CONFIG_DM_GPIO=y

diff --cc configs/socfpga_agilex_vab_defconfig
index 539548bfcbb949c65a6ebe9db2174e9cff4e45d9,539548bfcbb949c65a6ebe9db2174e9cff4e45d9..2beadc7ff7acb29052cb1f1763469238ff02bdd7
--- 1/configs/socfpga_agilex_vab_defconfig
--- 2/configs/socfpga_agilex_vab_defconfig
+++ b/configs/socfpga_agilex_vab_defconfig
@@@ -1,10 -1,10 +1,10 @@@
  CONFIG_ARM=y
  CONFIG_COUNTER_FREQUENCY=400000000
--CONFIG_SPL_LDSCRIPT="arch/arm/mach-socfpga/u-boot-spl-soc64.lds"
  CONFIG_ARCH_SOCFPGA=y
  CONFIG_SYS_TEXT_BASE=0x200000
  CONFIG_SYS_MALLOC_LEN=0x500000
  CONFIG_NR_DRAM_BANKS=2
++CONFIG_SPL_LDSCRIPT="arch/arm/mach-socfpga/u-boot-spl-soc64.lds"
  CONFIG_ENV_SIZE=0x1000
  CONFIG_ENV_OFFSET=0x200
  CONFIG_DM_GPIO=y

diff --cc configs/socfpga_n5x_atf_defconfig
index 77d868a74ae53f85270723eafb5e4a9ac5cf9b49,77d868a74ae53f85270723eafb5e4a9ac5cf9b49..2917ece783dac65d0c94e98db7190d3e6eb8b4f1
--- 1/configs/socfpga_n5x_atf_defconfig
--- 2/configs/socfpga_n5x_atf_defconfig
+++ b/configs/socfpga_n5x_atf_defconfig
@@@ -1,10 -1,10 +1,10 @@@
  CONFIG_ARM=y
  CONFIG_COUNTER_FREQUENCY=400000000
--CONFIG_SPL_LDSCRIPT="arch/arm/mach-socfpga/u-boot-spl-soc64.lds"
  CONFIG_ARCH_SOCFPGA=y
  CONFIG_SYS_TEXT_BASE=0x200000
  CONFIG_SYS_MALLOC_LEN=0x500000
  CONFIG_NR_DRAM_BANKS=2
++CONFIG_SPL_LDSCRIPT="arch/arm/mach-socfpga/u-boot-spl-soc64.lds"
  CONFIG_ENV_SIZE=0x1000
  CONFIG_ENV_OFFSET=0x200
  CONFIG_DM_GPIO=y

diff --cc configs/socfpga_n5x_vab_defconfig
index d3a9042ef222d7de7320151e48752e56be85f9ca,d3a9042ef222d7de7320151e48752e56be85f9ca..b9358fcc5d016db4deff73c3919e79703309a824
--- 1/configs/socfpga_n5x_vab_defconfig
--- 2/configs/socfpga_n5x_vab_defconfig
+++ b/configs/socfpga_n5x_vab_defconfig
@@@ -1,10 -1,10 +1,10 @@@
  CONFIG_ARM=y
  CONFIG_COUNTER_FREQUENCY=400000000
--CONFIG_SPL_LDSCRIPT="arch/arm/mach-socfpga/u-boot-spl-soc64.lds"
  CONFIG_ARCH_SOCFPGA=y
  CONFIG_SYS_TEXT_BASE=0x200000
  CONFIG_SYS_MALLOC_LEN=0x500000
  CONFIG_NR_DRAM_BANKS=2
++CONFIG_SPL_LDSCRIPT="arch/arm/mach-socfpga/u-boot-spl-soc64.lds"
  CONFIG_ENV_SIZE=0x1000
  CONFIG_ENV_OFFSET=0x200
  CONFIG_DM_GPIO=y

diff --cc configs/socfpga_stratix10_atf_defconfig
index e4d8a2e049a5a71d4e5885b135511facd9f39bd4,e4d8a2e049a5a71d4e5885b135511facd9f39bd4..6c8ea81b67b601cd3b0422907ddeab2e530320ec
--- 1/configs/socfpga_stratix10_atf_defconfig
--- 2/configs/socfpga_stratix10_atf_defconfig
+++ b/configs/socfpga_stratix10_atf_defconfig
@@@ -1,10 -1,10 +1,10 @@@
  CONFIG_ARM=y
  CONFIG_COUNTER_FREQUENCY=400000000
--CONFIG_SPL_LDSCRIPT="arch/arm/mach-socfpga/u-boot-spl-soc64.lds"
  CONFIG_ARCH_SOCFPGA=y
  CONFIG_SYS_TEXT_BASE=0x200000
  CONFIG_SYS_MALLOC_LEN=0x500000
  CONFIG_NR_DRAM_BANKS=2
++CONFIG_SPL_LDSCRIPT="arch/arm/mach-socfpga/u-boot-spl-soc64.lds"
  CONFIG_ENV_SIZE=0x1000
  CONFIG_ENV_OFFSET=0x200
  CONFIG_DM_GPIO=y

diff --cc configs/syzygy_hub_defconfig
index 31a550031dae8c47b97c2e99ac4a8b82eede944a,31a550031dae8c47b97c2e99ac4a8b82eede944a..4db093118951f940be54781f86e90ca54da238b1
--- 1/configs/syzygy_hub_defconfig
--- 2/configs/syzygy_hub_defconfig
+++ b/configs/syzygy_hub_defconfig
@@@ -9,8 -9,8 +9,6 @@@ CONFIG_DM_GPIO=
  CONFIG_DEFAULT_DEVICE_TREE="zynq-syzygy-hub"
  CONFIG_SPL_STACK_R_ADDR=0x200000
  CONFIG_SPL=y
--CONFIG_DEBUG_UART_BASE=0xe0000000
--CONFIG_DEBUG_UART_CLOCK=50000000
  CONFIG_ZYNQ_MAC_IN_EEPROM=y
  CONFIG_ZYNQ_GEM_I2C_MAC_OFFSET=0xFA
  CONFIG_SYS_LOAD_ADDR=0x0

diff --cc configs/taurus_defconfig
index c0a4dcc271dcde7ec52da35e462b01bd779db832,c0a4dcc271dcde7ec52da35e462b01bd779db832..cf538d0f5f5f13c570be52ed2f8414be31a1d0c2
--- 1/configs/taurus_defconfig
--- 2/configs/taurus_defconfig
+++ b/configs/taurus_defconfig
@@@ -8,7 -8,7 +8,6 @@@ CONFIG_SYS_THUMB_BUILD=
  # CONFIG_SPL_USE_ARCH_MEMCPY is not set
  # CONFIG_SPL_USE_ARCH_MEMSET is not set
  CONFIG_ARCH_AT91=y
--CONFIG_SPL_LDSCRIPT="arch/arm/cpu/u-boot-spl.lds"
  CONFIG_SYS_TEXT_BASE=0x21000000
  CONFIG_SYS_MALLOC_LEN=0x460000
  CONFIG_TARGET_TAURUS=y
@@@ -19,6 -19,6 +18,7 @@@ CONFIG_SPL_GPIO=
  CONFIG_SPL_LIBCOMMON_SUPPORT=y
  CONFIG_SPL_LIBGENERIC_SUPPORT=y
  CONFIG_NR_DRAM_BANKS=1
++CONFIG_SPL_LDSCRIPT="arch/arm/cpu/u-boot-spl.lds"
  CONFIG_ENV_OFFSET=0x100000
  CONFIG_SPL_DM_SPI=y
  CONFIG_DEFAULT_DEVICE_TREE="at91sam9g20-taurus"

diff --cc configs/topic_miami_defconfig
index a11a17905cb9873c31d3f1567a30af5010b4233f,a11a17905cb9873c31d3f1567a30af5010b4233f..4e8519b5b1bf9b819ac9cab7b0dae843207421e8
--- 1/configs/topic_miami_defconfig
--- 2/configs/topic_miami_defconfig
+++ b/configs/topic_miami_defconfig
@@@ -10,7 -10,7 +10,6 @@@ CONFIG_DM_GPIO=
  CONFIG_DEFAULT_DEVICE_TREE="zynq-topic-miami"
  CONFIG_SPL_STACK_R_ADDR=0x200000
  CONFIG_SPL=y
--CONFIG_DEBUG_UART_BASE=0xe0000000
  CONFIG_DEBUG_UART_CLOCK=100000000
  CONFIG_BOOT_INIT_FILE="board/topic/zynq/zynq-topic-miami/ps7_regs.txt"
  CONFIG_SYS_LOAD_ADDR=0x0

diff --cc configs/topic_miamilite_defconfig
index f962f37d7ebe5fb31cdf408245703e1edca5e330,f962f37d7ebe5fb31cdf408245703e1edca5e330..7b97527507eaeeb6f2f959ef10bbf698e28aa1df
--- 1/configs/topic_miamilite_defconfig
--- 2/configs/topic_miamilite_defconfig
+++ b/configs/topic_miamilite_defconfig
@@@ -10,7 -10,7 +10,6 @@@ CONFIG_DM_GPIO=
  CONFIG_DEFAULT_DEVICE_TREE="zynq-topic-miamilite"
  CONFIG_SPL_STACK_R_ADDR=0x200000
  CONFIG_SPL=y
--CONFIG_DEBUG_UART_BASE=0xe0000000
  CONFIG_DEBUG_UART_CLOCK=100000000
  CONFIG_BOOT_INIT_FILE="board/topic/zynq/zynq-topic-miamilite/ps7_regs.txt"
  CONFIG_SYS_LOAD_ADDR=0x0

diff --cc configs/topic_miamiplus_defconfig
index dc71856f7204485517003df20c8b529b9eeedd2a,dc71856f7204485517003df20c8b529b9eeedd2a..372bf654ba67b50e1fed7010f8c463b7e7f45d4e
--- 1/configs/topic_miamiplus_defconfig
--- 2/configs/topic_miamiplus_defconfig
+++ b/configs/topic_miamiplus_defconfig
@@@ -10,7 -10,7 +10,6 @@@ CONFIG_DM_GPIO=
  CONFIG_DEFAULT_DEVICE_TREE="zynq-topic-miamiplus"
  CONFIG_SPL_STACK_R_ADDR=0x200000
  CONFIG_SPL=y
--CONFIG_DEBUG_UART_BASE=0xe0000000
  CONFIG_DEBUG_UART_CLOCK=100000000
  CONFIG_BOOT_INIT_FILE="board/topic/zynq/zynq-topic-miamiplus/ps7_regs.txt"
  CONFIG_SYS_LOAD_ADDR=0x0

diff --cc scripts/config_whitelist.txt
index 726973b26e21a178e6582150f0b2d8018aa61ff7,6e901fde7ef6ca52ea2c459972b09538297db243..d9d63913dc36ba2f4c4d82007cf36fc329a40825
--- 1/scripts/config_whitelist.txt
--- 2/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@@ -26,28 -26,28 +26,15 @@@ CONFIG_DM9000_NO_SRO
  CONFIG_DM9000_USE_16BIT
  CONFIG_DP_DDR_DIMM_SLOTS_PER_CTLR
  CONFIG_DSP_CLUSTER_START
--CONFIG_DWC_AHSATA_BASE_ADDR
--CONFIG_DWC_AHSATA_PORT_ID
  CONFIG_DW_ALTDESCRIPTOR
  CONFIG_DW_GMAC_DEFAULT_DMA_PBL
  CONFIG_DW_WDT_BASE
  CONFIG_DW_WDT_CLOCK_KHZ
--CONFIG_E1000_NO_NVM
--CONFIG_EFLASH_PROTSECTORS
--CONFIG_EHCI_DESC_BIG_ENDIAN
--CONFIG_EHCI_HCD_INIT_AFTER_RESET
--CONFIG_EHCI_MMIO_BIG_ENDIAN
--CONFIG_EHCI_MXS_PORT0
--CONFIG_EHCI_MXS_PORT1
  CONFIG_EMU
  CONFIG_ENABLE_36BIT_PHYS
  CONFIG_ENABLE_MMU
  CONFIG_ENV_FLAGS_LIST_STATIC
  CONFIG_ENV_IS_EMBEDDED
--CONFIG_ENV_MAX_ENTRIES
--CONFIG_ENV_MIN_ENTRIES
--CONFIG_ENV_RANGE
--CONFIG_ENV_REFLASH
  CONFIG_ENV_SETTINGS_BUTTONS_AND_LEDS
  CONFIG_ENV_SETTINGS_NAND_V1
  CONFIG_ENV_SETTINGS_NAND_V2
@@@ -55,32 -55,32 +42,15 @@@ CONFIG_ENV_SETTINGS_V
  CONFIG_ENV_SETTINGS_V2
  CONFIG_ENV_SROM_BANK
  CONFIG_ENV_TOTAL_SIZE
--CONFIG_ENV_VERSION
  CONFIG_ESBC_ADDR_64BIT
  CONFIG_ESBC_HDR_LS
  CONFIG_ESDHC_DETECT_QUIRK
  CONFIG_ESDHC_HC_BLK_ADDR
--CONFIG_ESPRESSO7420
  CONFIG_ET1100_BASE
  CONFIG_ETHBASE
  CONFIG_EXTRA_CLOCK
  CONFIG_EXTRA_ENV
  CONFIG_EXTRA_ENV_SETTINGS
--CONFIG_EXTRA_ENV_SETTINGS_COMMON
--CONFIG_EXYNOS4
--CONFIG_EXYNOS4210
--CONFIG_EXYNOS5
--CONFIG_EXYNOS5250
--CONFIG_EXYNOS5420
--CONFIG_EXYNOS5_DT
--CONFIG_EXYNOS_ACE_SHA
--CONFIG_EXYNOS_DP
--CONFIG_EXYNOS_FB
--CONFIG_EXYNOS_MIPI_DSIM
--CONFIG_EXYNOS_RELOCATE_CODE_BASE
--CONFIG_EXYNOS_SPL
--CONFIG_EXYNOS_TMU
--CONFIG_FACTORYSET
  CONFIG_FB_ADDR
  CONFIG_FDTADDR
  CONFIG_FDTFILE
@@@ -95,8 -95,8 +65,6 @@@ CONFIG_FLASH_SHOW_PROGRES
  CONFIG_FLASH_SPANSION_S29WS_N
  CONFIG_FLASH_VERIFY
  CONFIG_FM_PLAT_CLK_DIV
--CONFIG_FPGA_COUNT
--CONFIG_FPGA_STRATIX_V
  CONFIG_FSL_CADMUS
  CONFIG_FSL_CORENET
  CONFIG_FSL_CPLD
@@@ -115,7 -115,7 +83,6 @@@ CONFIG_FSL_PMIC_BU
  CONFIG_FSL_PMIC_CLK
  CONFIG_FSL_PMIC_CS
  CONFIG_FSL_PMIC_MODE
--CONFIG_FSL_SATA_V2
  CONFIG_FSL_SDHC_V2_3
  CONFIG_FSL_SERDES
  CONFIG_FSL_SERDES1
@@@ -131,8 -131,8 +98,6 @@@ CONFIG_G_DNL_THOR_PRODUCT_NU
  CONFIG_G_DNL_THOR_VENDOR_NUM
  CONFIG_G_DNL_UMS_PRODUCT_NUM
  CONFIG_G_DNL_UMS_VENDOR_NUM
--CONFIG_HAS_FSL_DR_USB
--CONFIG_HAS_FSL_MPH_USB
  CONFIG_HDMI_ENCODER_I2C_ADDR
  CONFIG_HETROGENOUS_CLUSTERS
  CONFIG_HIDE_LOGO_VERSION
@@@ -291,7 -291,7 +256,6 @@@ CONFIG_I2C_MVTWSI_BASE
  CONFIG_I2C_MVTWSI_BASE1
  CONFIG_I2C_RTC_ADDR
  CONFIG_ICS307_REFCLK_HZ
--CONFIG_IDE_PREINIT
  CONFIG_IMX
  CONFIG_IMX6_PWM_PER_CLK
  CONFIG_IMX_HDMI
@@@ -343,7 -343,7 +307,6 @@@ CONFIG_KSNET_SERDES_SGMII_BAS
  CONFIG_L1_INIT_RAM
  CONFIG_L2_CACHE
  CONFIG_LAYERSCAPE_NS_ACCESS
--CONFIG_LBA48
  CONFIG_LCD_ALIGNMENT
  CONFIG_LCD_MENU
  CONFIG_LD9040
@@@ -418,7 -418,7 +381,6 @@@ CONFIG_NORBOO
  CONFIG_NS16550_MIN_FUNCTIONS
  CONFIG_NUM_DSP_CPUS
  CONFIG_ODROID_REV_AIN
--CONFIG_ORIGEN
  CONFIG_OTHBOOTARGS
  CONFIG_OVERWRITE_ETHADDR_ONCE
  CONFIG_PALMAS_POWER
@@@ -490,7 -490,7 +452,6 @@@ CONFIG_RAMBOOT_TEXT_BAS
  CONFIG_RAMDISK_ADDR
  CONFIG_RD_LVL
  CONFIG_RESET_VECTOR_ADDRESS
--CONFIG_RESTORE_FLASH
  CONFIG_ROCKCHIP_CHIP_TAG
  CONFIG_ROCKCHIP_MAX_INIT_SIZE
  CONFIG_ROCKCHIP_SDHCI_MAX_FREQ
@@@ -504,12 -504,12 +465,7 @@@ CONFIG_RTC_MC13XX
  CONFIG_RTC_MCFRRTC
  CONFIG_RTC_MXS
  CONFIG_RTC_PT7C4338
--CONFIG_S5P
--CONFIG_S5PC100
--CONFIG_S5PC110
--CONFIG_S5P_PA_SYSRAM
  CONFIG_SAMA5D3_LCD_BASE
--CONFIG_SAMSUNG
  CONFIG_SAMSUNG_ONENAND
  CONFIG_SANDBOX_ARCH
  CONFIG_SANDBOX_SDL
@@@ -517,8 -517,8 +473,6 @@@ CONFIG_SANDBOX_SPI_MAX_BU
  CONFIG_SANDBOX_SPI_MAX_CS
  CONFIG_SAR2_REG
  CONFIG_SAR_REG
--CONFIG_SATA1
--CONFIG_SATA2
  CONFIG_SCIF_A
  CONFIG_SCSI_DEV_LIST
  CONFIG_SC_TIMER_CLK
@@@ -577,7 -577,7 +531,6 @@@ CONFIG_STACKBAS
  CONFIG_STANDALONE_LOAD_ADDR
  CONFIG_STD_DEVICES_SETTINGS
  CONFIG_SYS_64BIT
--CONFIG_SYS_64BIT_LBA
  CONFIG_SYS_83XX_DDR_USES_CS0
  CONFIG_SYS_AMASK0
  CONFIG_SYS_AMASK1
@@@ -592,7 -592,7 +545,6 @@@ CONFIG_SYS_AT91_MAIN_CLOC
  CONFIG_SYS_AT91_PLLA
  CONFIG_SYS_AT91_PLLB
  CONFIG_SYS_AT91_SLOW_CLOCK
--CONFIG_SYS_AUTOLOAD
  CONFIG_SYS_AUTOMATIC_SDRAM_DETECTION
  CONFIG_SYS_AUXCORE_BOOTDATA
  CONFIG_SYS_BAUDRATE_TABLE
@@@ -820,7 -820,7 +772,6 @@@ CONFIG_SYS_DV_NOR_BOOT_CF
  CONFIG_SYS_EEPROM_BUS_NUM
  CONFIG_SYS_EEPROM_PAGE_WRITE_ENABLE
  CONFIG_SYS_EEPROM_WREN
--CONFIG_SYS_EHCI_USB1_ADDR
  CONFIG_SYS_EMIF_PRECALCULATED_TIMING_REGS
  CONFIG_SYS_ENET_BD_BASE
  CONFIG_SYS_ENV_SECT_SIZE
@@@ -1208,9 -1208,9 +1159,6 @@@ CONFIG_SYS_MPC83xx_DMA_ADD
  CONFIG_SYS_MPC83xx_DMA_OFFSET
  CONFIG_SYS_MPC83xx_ESDHC_ADDR
  CONFIG_SYS_MPC83xx_ESDHC_OFFSET
--CONFIG_SYS_MPC83xx_USB1_ADDR
--CONFIG_SYS_MPC83xx_USB1_OFFSET
--CONFIG_SYS_MPC85XX_NO_RESETVEC
  CONFIG_SYS_MPC85xx_DMA
  CONFIG_SYS_MPC85xx_DMA1_OFFSET
  CONFIG_SYS_MPC85xx_DMA2_OFFSET
@@@ -1498,12 -1498,12 +1446,6 @@@ CONFIG_SYS_RTC_BUS_NU
  CONFIG_SYS_RTC_CNT
  CONFIG_SYS_RTC_SETUP
  CONFIG_SYS_SATA
--CONFIG_SYS_SATA1
--CONFIG_SYS_SATA1_FLAGS
--CONFIG_SYS_SATA1_OFFSET
--CONFIG_SYS_SATA2
--CONFIG_SYS_SATA2_FLAGS
--CONFIG_SYS_SATA2_OFFSET
  CONFIG_SYS_SATA_FAT_BOOT_PARTITION
  CONFIG_SYS_SBFHDR_DATA_OFFSET
  CONFIG_SYS_SBFHDR_SIZE
@@@ -1630,7 -1630,7 +1572,6 @@@ CONFIG_SYS_UEC2_TX_CL
  CONFIG_SYS_UEC2_UCC_NUM
  CONFIG_SYS_ULB_CLK
  CONFIG_SYS_UNIFY_CACHE
--CONFIG_SYS_USB_FAT_BOOT_PARTITION
  CONFIG_SYS_USB_OHCI_BOARD_INIT
  CONFIG_SYS_USB_OHCI_CPU_INIT
  CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS
@@@ -1668,7 -1668,7 +1609,6 @@@ CONFIG_TEGRA_BOARD_STRIN
  CONFIG_TEGRA_CLOCK_SCALING
  CONFIG_TEGRA_ENABLE_UARTA
  CONFIG_TEGRA_ENABLE_UARTD
--CONFIG_TEGRA_GPU
  CONFIG_TEGRA_LP0
  CONFIG_TEGRA_PMU
  CONFIG_TEGRA_SLINK_CTRLS
@@@ -1681,11 -1681,11 +1621,9 @@@ CONFIG_TESTPIN_MAS
  CONFIG_TESTPIN_REG
  CONFIG_THOR_RESET_OFF
  CONFIG_THUNDERX
--CONFIG_TIZEN
  CONFIG_TMU_TIMER
  CONFIG_TPM_TIS_BASE_ADDRESS
  CONFIG_TPS6586X_POWER
--CONFIG_TRATS
  CONFIG_TSEC
  CONFIG_TSEC1
  CONFIG_TSEC1_NAME
@@@ -1722,7 -1722,7 +1660,6 @@@ CONFIG_USB_ATMEL_CLK_SEL_UPL
  CONFIG_USB_BOOTING
  CONFIG_USB_DEVICE
  CONFIG_USB_EHCI_EXYNOS
--CONFIG_USB_EHCI_TXFIFO_THRESH
  CONFIG_USB_EXT2_BOOT
  CONFIG_USB_FAT_BOOT
  CONFIG_USB_GADGET_AT91
@@@ -1748,4 -1747,4 +1684,3 @@@ CONFIG_X86EMU_RAW_I
  CONFIG_X86_MRC_ADDR
  CONFIG_X86_REFCODE_ADDR
  CONFIG_X86_REFCODE_RUN_ADDR
--CONFIG_XTFPGA