Merge branch 'next'

Merge all outstanding changes from the current next branch in now that
we have released.

diff --cc Makefile
Simple merge

diff --cc arch/riscv/Kconfig
Simple merge

diff --cc arch/sandbox/dts/test.dts
Simple merge

diff --cc common/spl/spl_opensbi.c
Simple merge

diff --cc configs/am3517_evm_defconfig
Simple merge

diff --cc configs/am43xx_hs_evm_defconfig
Simple merge

diff --cc configs/am57xx_evm_defconfig
index ac5d9d07f82f7975308878379d02b01fadb64be2,cefed5b060032d54d7b0cf5ee698f2638788bf99..dce50dc4be6cc1aeeed9003b0cd8103850a0812b
--- 1/configs/am57xx_evm_defconfig
--- 2/configs/am57xx_evm_defconfig
+++ b/configs/am57xx_evm_defconfig
@@@ -4,7 -4,7 +4,8 @@@ CONFIG_TI_COMMON_CMD_OPTIONS=
  CONFIG_SYS_MALLOC_F_LEN=0x2000
  CONFIG_SYS_SPI_U_BOOT_OFFS=0x40000
  CONFIG_DM_GPIO=y
+ CONFIG_SPL_DM_SPI=y
 +CONFIG_SPL_TEXT_BASE=0x40300000
  CONFIG_OMAP54XX=y
  CONFIG_TARGET_AM57XX_EVM=y
  CONFIG_NR_DRAM_BANKS=2
@@@ -13,7 -13,8 +14,8 @@@ CONFIG_ENV_OFFSET_REDUND=0x28000
  CONFIG_SPL_SPI_FLASH_SUPPORT=y
  CONFIG_SPL_SPI_SUPPORT=y
  CONFIG_ARMV7_LPAE=y
 -CONFIG_SPL_TEXT_BASE=0x40300000
  CONFIG_AHCI=y
++CONFIG_DEFAULT_DEVICE_TREE="am572x-idk"
  CONFIG_DISTRO_DEFAULTS=y
  CONFIG_SPL_LOAD_FIT=y
  CONFIG_OF_BOARD_SETUP=y
@@@ -30,6 -31,6 +32,7 @@@ CONFIG_SPL_SYS_MALLOC_SIMPLE=
  CONFIG_SPL_SEPARATE_BSS=y
  CONFIG_SPL_DMA=y
  # CONFIG_SPL_NAND_SUPPORT is not set
++CONFIG_SPL_DM_SPI_FLASH=y
  CONFIG_SPL_OS_BOOT=y
  CONFIG_SPL_SPI_LOAD=y
  CONFIG_SPL_YMODEM_SUPPORT=y
@@@ -44,7 -46,7 +48,6 @@@ CONFIG_BOOTP_DNS2=
  CONFIG_CMD_AVB=y
  CONFIG_OF_CONTROL=y
  CONFIG_SPL_OF_CONTROL=y
--CONFIG_DEFAULT_DEVICE_TREE="am572x-idk"
  CONFIG_OF_LIST="am57xx-beagle-x15 am57xx-beagle-x15-revb1 am57xx-beagle-x15-revc am5729-beagleboneai am572x-idk am571x-idk am574x-idk"
  CONFIG_ENV_IS_IN_MMC=y
  CONFIG_SYS_REDUNDAND_ENVIRONMENT=y

diff --cc configs/am57xx_hs_evm_usb_defconfig
index 0c3165fbce6db17be811971810f604ab38ce9c6f,154154c68fb05a03bb7753bfc166b8421bfa1426..2ecc990683e8366ddb414e3020f6934e32c930b7
--- 1/configs/am57xx_hs_evm_usb_defconfig
--- 2/configs/am57xx_hs_evm_usb_defconfig
+++ b/configs/am57xx_hs_evm_usb_defconfig
@@@ -6,7 -6,7 +6,8 @@@ CONFIG_TI_COMMON_CMD_OPTIONS=
  CONFIG_SYS_MALLOC_F_LEN=0x2000
  CONFIG_SYS_SPI_U_BOOT_OFFS=0x40000
  CONFIG_DM_GPIO=y
+ CONFIG_SPL_DM_SPI=y
 +CONFIG_SPL_TEXT_BASE=0x40306D50
  CONFIG_OMAP54XX=y
  CONFIG_TI_SECURE_EMIF_REGION_START=0xbdb00000
  CONFIG_TI_SECURE_EMIF_TOTAL_REGION_SIZE=0x02000000
@@@ -18,6 -18,7 +19,7 @@@ CONFIG_ENV_OFFSET_REDUND=0x28000
  CONFIG_SPL_SPI_FLASH_SUPPORT=y
  CONFIG_SPL_SPI_SUPPORT=y
  CONFIG_ARMV7_LPAE=y
 -CONFIG_SPL_TEXT_BASE=0x40306D50
++CONFIG_DEFAULT_DEVICE_TREE="am57xx-beagle-x15"
  CONFIG_DISTRO_DEFAULTS=y
  CONFIG_FIT_IMAGE_POST_PROCESS=y
  CONFIG_SPL_LOAD_FIT=y
@@@ -36,6 -37,6 +38,7 @@@ CONFIG_SPL_SYS_MALLOC_SIMPLE=
  CONFIG_SPL_SEPARATE_BSS=y
  CONFIG_SPL_DMA=y
  # CONFIG_SPL_NAND_SUPPORT is not set
++CONFIG_SPL_DM_SPI_FLASH=y
  CONFIG_SPL_RAM_SUPPORT=y
  CONFIG_SPL_SPI_LOAD=y
  CONFIG_SPL_USB_GADGET=y
@@@ -51,7 -53,7 +55,6 @@@ CONFIG_BOOTP_DNS2=
  CONFIG_CMD_AVB=y
  CONFIG_OF_CONTROL=y
  CONFIG_SPL_OF_CONTROL=y
--CONFIG_DEFAULT_DEVICE_TREE="am57xx-beagle-x15"
  CONFIG_OF_LIST="am57xx-beagle-x15 am57xx-beagle-x15-revb1 am57xx-beagle-x15-revc am572x-idk am571x-idk am574x-idk"
  CONFIG_ENV_IS_IN_MMC=y
  CONFIG_SYS_REDUNDAND_ENVIRONMENT=y

diff --cc configs/am65x_evm_a53_defconfig
index 45faab618fb1737274f2ac75d6446572b1ab1c3e,3f2f4e45e329fd7f8abb84b966bcf65f7364a710..918ff4de0c1fa2feac18675456b911b1179a1ccd
--- 1/configs/am65x_evm_a53_defconfig
--- 2/configs/am65x_evm_a53_defconfig
+++ b/configs/am65x_evm_a53_defconfig
@@@ -9,7 -9,7 +9,8 @@@ CONFIG_ENV_SIZE=0x2000
  CONFIG_ENV_OFFSET=0x680000
  CONFIG_SYS_SPI_U_BOOT_OFFS=0x280000
  CONFIG_DM_GPIO=y
+ CONFIG_SPL_DM_SPI=y
 +CONFIG_SPL_TEXT_BASE=0x80080000
  CONFIG_SPL_MMC_SUPPORT=y
  CONFIG_SPL_SERIAL_SUPPORT=y
  CONFIG_SPL_DRIVERS_MISC_SUPPORT=y
@@@ -21,6 -21,7 +22,7 @@@ CONFIG_SPL_LIBDISK_SUPPORT=
  CONFIG_SPL_SPI_FLASH_SUPPORT=y
  CONFIG_SPL_SPI_SUPPORT=y
  # CONFIG_PSCI_RESET is not set
 -CONFIG_SPL_TEXT_BASE=0x80080000
++CONFIG_DEFAULT_DEVICE_TREE="k3-am654-base-board"
  CONFIG_DISTRO_DEFAULTS=y
  # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
  CONFIG_SPL_LOAD_FIT=y
@@@ -58,7 -60,7 +61,6 @@@ CONFIG_CMD_UBI=
  # CONFIG_ISO_PARTITION is not set
  CONFIG_OF_CONTROL=y
  CONFIG_SPL_OF_CONTROL=y
--CONFIG_DEFAULT_DEVICE_TREE="k3-am654-base-board"
  CONFIG_SPL_MULTI_DTB_FIT=y
  CONFIG_SPL_MULTI_DTB_FIT_NO_COMPRESSION=y
  CONFIG_ENV_IS_IN_MMC=y

diff --cc configs/am65x_evm_r5_defconfig
index 8f1eb66da1a693e9649605498e3e3bf6d9b26503,14466465ab450e0f2d8e604247b4b082a3fb233b..09c8b74aeea797e766cb697001c796f76d1d2faf
--- 1/configs/am65x_evm_r5_defconfig
--- 2/configs/am65x_evm_r5_defconfig
+++ b/configs/am65x_evm_r5_defconfig
@@@ -10,7 -10,7 +10,8 @@@ CONFIG_TARGET_AM654_R5_EVM=
  CONFIG_ENV_SIZE=0x20000
  CONFIG_SYS_SPI_U_BOOT_OFFS=0x80000
  CONFIG_DM_GPIO=y
+ CONFIG_SPL_DM_SPI=y
 +CONFIG_SPL_TEXT_BASE=0x41c00000
  CONFIG_SPL_MMC_SUPPORT=y
  CONFIG_SPL_SERIAL_SUPPORT=y
  CONFIG_SPL_DRIVERS_MISC_SUPPORT=y
@@@ -20,6 -20,7 +21,7 @@@ CONFIG_SPL_FS_FAT=
  CONFIG_SPL_LIBDISK_SUPPORT=y
  CONFIG_SPL_SPI_FLASH_SUPPORT=y
  CONFIG_SPL_SPI_SUPPORT=y
 -CONFIG_SPL_TEXT_BASE=0x41c00000
++CONFIG_DEFAULT_DEVICE_TREE="k3-am654-r5-base-board"
  # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
  CONFIG_SPL_LOAD_FIT=y
  CONFIG_USE_BOOTCOMMAND=y
@@@ -54,7 -56,7 +57,6 @@@ CONFIG_CMD_TIME=
  CONFIG_CMD_FAT=y
  CONFIG_OF_CONTROL=y
  CONFIG_SPL_OF_CONTROL=y
--CONFIG_DEFAULT_DEVICE_TREE="k3-am654-r5-base-board"
  CONFIG_SPL_MULTI_DTB_FIT=y
  CONFIG_SPL_MULTI_DTB_FIT_NO_COMPRESSION=y
  CONFIG_ENV_IS_IN_FAT=y

diff --cc configs/am65x_hs_evm_a53_defconfig
index 7311c2d6e5e7620227a18299b9a0667245a3162b,373eb4b009330a6ca9c425151ea8bd579a1b3759..bc3da74509ea9f27544820d3b25b482289f6452e
--- 1/configs/am65x_hs_evm_a53_defconfig
--- 2/configs/am65x_hs_evm_a53_defconfig
+++ b/configs/am65x_hs_evm_a53_defconfig
@@@ -10,7 -10,7 +10,8 @@@ CONFIG_ENV_SIZE=0x2000
  CONFIG_ENV_OFFSET=0x680000
  CONFIG_SYS_SPI_U_BOOT_OFFS=0x280000
  CONFIG_DM_GPIO=y
+ CONFIG_SPL_DM_SPI=y
 +CONFIG_SPL_TEXT_BASE=0x80080000
  CONFIG_SPL_MMC_SUPPORT=y
  CONFIG_SPL_SERIAL_SUPPORT=y
  CONFIG_SPL_DRIVERS_MISC_SUPPORT=y
@@@ -22,6 -22,7 +23,7 @@@ CONFIG_SPL_LIBDISK_SUPPORT=
  CONFIG_SPL_SPI_FLASH_SUPPORT=y
  CONFIG_SPL_SPI_SUPPORT=y
  # CONFIG_PSCI_RESET is not set
 -CONFIG_SPL_TEXT_BASE=0x80080000
++CONFIG_DEFAULT_DEVICE_TREE="k3-am654-base-board"
  CONFIG_DISTRO_DEFAULTS=y
  # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
  CONFIG_FIT_IMAGE_POST_PROCESS=y
@@@ -61,7 -63,7 +64,6 @@@ CONFIG_CMD_UBI=
  # CONFIG_ISO_PARTITION is not set
  CONFIG_OF_CONTROL=y
  CONFIG_SPL_OF_CONTROL=y
--CONFIG_DEFAULT_DEVICE_TREE="k3-am654-base-board"
  CONFIG_SPL_MULTI_DTB_FIT=y
  CONFIG_SPL_MULTI_DTB_FIT_NO_COMPRESSION=y
  CONFIG_ENV_IS_IN_MMC=y

diff --cc configs/am65x_hs_evm_r5_defconfig
index ab601d9f81f28dda94f7a69fab4cc496263ae2b5,6e83f33379389435472dea97dfb87917e8cd8295..ead4a59c3874f3ce01940f996f2a93be556b997a
--- 1/configs/am65x_hs_evm_r5_defconfig
--- 2/configs/am65x_hs_evm_r5_defconfig
+++ b/configs/am65x_hs_evm_r5_defconfig
@@@ -11,7 -11,7 +11,8 @@@ CONFIG_TARGET_AM654_R5_EVM=
  CONFIG_ENV_SIZE=0x20000
  CONFIG_SYS_SPI_U_BOOT_OFFS=0x80000
  CONFIG_DM_GPIO=y
+ CONFIG_SPL_DM_SPI=y
 +CONFIG_SPL_TEXT_BASE=0x41c00000
  CONFIG_SPL_MMC_SUPPORT=y
  CONFIG_SPL_SERIAL_SUPPORT=y
  CONFIG_SPL_DRIVERS_MISC_SUPPORT=y
@@@ -21,6 -21,7 +22,7 @@@ CONFIG_SPL_FS_FAT=
  CONFIG_SPL_LIBDISK_SUPPORT=y
  CONFIG_SPL_SPI_FLASH_SUPPORT=y
  CONFIG_SPL_SPI_SUPPORT=y
 -CONFIG_SPL_TEXT_BASE=0x41c00000
++CONFIG_DEFAULT_DEVICE_TREE="k3-am654-r5-base-board"
  # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
  CONFIG_SPL_LOAD_FIT=y
  CONFIG_SPL_FIT_IMAGE_POST_PROCESS=y
@@@ -56,7 -58,7 +59,6 @@@ CONFIG_CMD_TIME=
  CONFIG_CMD_FAT=y
  CONFIG_OF_CONTROL=y
  CONFIG_SPL_OF_CONTROL=y
--CONFIG_DEFAULT_DEVICE_TREE="k3-am654-r5-base-board"
  CONFIG_SPL_MULTI_DTB_FIT=y
  CONFIG_SPL_MULTI_DTB_FIT_NO_COMPRESSION=y
  CONFIG_ENV_IS_IN_FAT=y

diff --cc configs/apalis-tk1_defconfig
Simple merge

diff --cc configs/apalis_imx6_defconfig
Simple merge

diff --cc configs/apf27_defconfig
Simple merge

diff --cc configs/cgtqmx6eval_defconfig
Simple merge

diff --cc configs/chromebit_mickey_defconfig
index eedd9a62f3878076c96a4a6240ede3dbc93042d8,22719fc5355cd51cc71e19d07d41f744d9c5b2a7..59b94f9ec067bffc4f538bdc2f5893acaef02e36
--- 1/configs/chromebit_mickey_defconfig
--- 2/configs/chromebit_mickey_defconfig
+++ b/configs/chromebit_mickey_defconfig
@@@ -13,8 -13,9 +13,9 @@@ CONFIG_DEBUG_UART_BASE=0xff69000
  CONFIG_DEBUG_UART_CLOCK=24000000
  CONFIG_SPL_SPI_FLASH_SUPPORT=y
  CONFIG_SPL_SPI_SUPPORT=y
 -CONFIG_SPL_TEXT_BASE=0xff704000
  CONFIG_SPL_PAYLOAD="u-boot.img"
  CONFIG_DEBUG_UART=y
++CONFIG_DEFAULT_DEVICE_TREE="rk3288-veyron-mickey"
  CONFIG_USE_PREBOOT=y
  CONFIG_DEFAULT_FDT_FILE="rk3288-veyron-mickey.dtb"
  # CONFIG_DISPLAY_CPUINFO is not set
@@@ -42,7 -43,7 +43,6 @@@ CONFIG_CMD_REGULATOR=
  # CONFIG_SPL_EFI_PARTITION is not set
  CONFIG_SPL_PARTITION_UUIDS=y
  CONFIG_SPL_OF_CONTROL=y
--CONFIG_DEFAULT_DEVICE_TREE="rk3288-veyron-mickey"
  CONFIG_OF_SPL_REMOVE_PROPS="pinctrl-0 pinctrl-names clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents"
  CONFIG_SPL_OF_PLATDATA=y
  CONFIG_SYS_RELOC_GD_ENV_ADDR=y

diff --cc configs/chromebook_bob_defconfig
index 8115d132843433edefa284bdbd772e75e78f12ed,b8093ca8fcce75794d9ba5ce418519edd5f11559..dad96d2ad11645633b66a0900f0d2aeb53ce4232
--- 1/configs/chromebook_bob_defconfig
--- 2/configs/chromebook_bob_defconfig
+++ b/configs/chromebook_bob_defconfig
@@@ -14,7 -14,8 +14,8 @@@ CONFIG_DEBUG_UART_BASE=0xff1a000
  CONFIG_DEBUG_UART_CLOCK=24000000
  CONFIG_SPL_SPI_FLASH_SUPPORT=y
  CONFIG_SPL_SPI_SUPPORT=y
 -CONFIG_SPL_TEXT_BASE=0xff8c2000
  CONFIG_DEBUG_UART=y
++CONFIG_DEFAULT_DEVICE_TREE="rk3399-gru-bob"
  CONFIG_DEFAULT_FDT_FILE="rockchip/rk3399-gru-bob.dtb"
  # CONFIG_DISPLAY_CPUINFO is not set
  CONFIG_DISPLAY_BOARDINFO_LATE=y
@@@ -36,7 -37,7 +37,6 @@@ CONFIG_CMD_PMIC=
  CONFIG_CMD_REGULATOR=y
  CONFIG_CMD_LOG=y
  CONFIG_SPL_OF_CONTROL=y
--CONFIG_DEFAULT_DEVICE_TREE="rk3399-gru-bob"
  CONFIG_OF_SPL_REMOVE_PROPS="pinctrl-0 pinctrl-names clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents"
  CONFIG_ENV_IS_IN_MMC=y
  CONFIG_SYS_RELOC_GD_ENV_ADDR=y

diff --cc configs/chromebook_coral_defconfig
index 815d549a960706e35636d0d43c090f9fa5a802d7,79f9b5a2321d5fda909a6f32652fcb8fd3a0aa20..ef3a03ba5a2694e936058cd94c01a7ef12d815d7
--- 1/configs/chromebook_coral_defconfig
--- 2/configs/chromebook_coral_defconfig
+++ b/configs/chromebook_coral_defconfig
@@@ -1,7 -1,7 +1,8 @@@
  CONFIG_X86=y
  CONFIG_SYS_TEXT_BASE=0x1110000
  CONFIG_SYS_MALLOC_F_LEN=0x3d00
+ CONFIG_SPL_DM_SPI=y
 +CONFIG_SPL_TEXT_BASE=0xfef10000
  CONFIG_SPL_SYS_MALLOC_F_LEN=0xf000
  CONFIG_NR_DRAM_BANKS=8
  CONFIG_BOOTSTAGE_STASH_ADDR=0xfef00000
@@@ -16,6 -17,6 +17,7 @@@ CONFIG_HAVE_ACPI_RESUME=
  CONFIG_INTEL_CAR_CQOS=y
  CONFIG_X86_OFFSET_U_BOOT=0xffe00000
  CONFIG_X86_OFFSET_SPL=0xffe80000
++CONFIG_DEFAULT_DEVICE_TREE="chromebook_coral"
  CONFIG_BOOTSTAGE=y
  CONFIG_SPL_BOOTSTAGE=y
  CONFIG_TPL_BOOTSTAGE=y
@@@ -64,7 -66,7 +67,6 @@@ CONFIG_MAC_PARTITION=
  CONFIG_ISO_PARTITION=y
  CONFIG_EFI_PARTITION=y
  # CONFIG_SPL_EFI_PARTITION is not set
--CONFIG_DEFAULT_DEVICE_TREE="chromebook_coral"
  # CONFIG_NET is not set
  CONFIG_REGMAP=y
  CONFIG_SYSCON=y

diff --cc configs/chromebook_jerry_defconfig
index 21573eff93f3d780e81084f1dd5fe6c05a2b1a95,6523921aee1316434a850791b7ee8fa84a01579b..e32de90843865c5143baec88d11c396e906a0946
--- 1/configs/chromebook_jerry_defconfig
--- 2/configs/chromebook_jerry_defconfig
+++ b/configs/chromebook_jerry_defconfig
@@@ -12,8 -12,9 +12,9 @@@ CONFIG_DEBUG_UART_BASE=0xff69000
  CONFIG_DEBUG_UART_CLOCK=24000000
  CONFIG_SPL_SPI_FLASH_SUPPORT=y
  CONFIG_SPL_SPI_SUPPORT=y
 -CONFIG_SPL_TEXT_BASE=0xff704000
  CONFIG_SPL_PAYLOAD="u-boot.img"
  CONFIG_DEBUG_UART=y
++CONFIG_DEFAULT_DEVICE_TREE="rk3288-veyron-jerry"
  CONFIG_USE_PREBOOT=y
  CONFIG_SILENT_CONSOLE=y
  CONFIG_LOG=y
@@@ -44,7 -45,7 +45,6 @@@ CONFIG_CMD_REGULATOR=
  # CONFIG_SPL_EFI_PARTITION is not set
  CONFIG_SPL_PARTITION_UUIDS=y
  CONFIG_SPL_OF_CONTROL=y
--CONFIG_DEFAULT_DEVICE_TREE="rk3288-veyron-jerry"
  CONFIG_OF_SPL_REMOVE_PROPS="pinctrl-0 pinctrl-names clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents"
  CONFIG_SPL_OF_PLATDATA=y
  CONFIG_SYS_RELOC_GD_ENV_ADDR=y

diff --cc configs/chromebook_link64_defconfig
index 07dac7c3b903a3ef3c49f1f595032ab7f657005f,3e760e75ddda0a5ca405fc94654aeec67698484c..7828e2dc3473331939c60a45ad9746783c0739a9
--- 1/configs/chromebook_link64_defconfig
--- 2/configs/chromebook_link64_defconfig
+++ b/configs/chromebook_link64_defconfig
@@@ -3,7 -3,7 +3,8 @@@ CONFIG_SYS_MALLOC_F_LEN=0x200
  CONFIG_ENV_SIZE=0x1000
  CONFIG_ENV_OFFSET=0x3F8000
  CONFIG_ENV_SECT_SIZE=0x1000
+ CONFIG_SPL_DM_SPI=y
 +CONFIG_SPL_TEXT_BASE=0xfffd0000
  CONFIG_NR_DRAM_BANKS=8
  CONFIG_DEBUG_UART_BOARD_INIT=y
  CONFIG_DEBUG_UART_BASE=0x3f8
@@@ -15,6 -16,6 +16,7 @@@ CONFIG_DEBUG_UART=
  CONFIG_HAVE_MRC=y
  CONFIG_SMP=y
  CONFIG_HAVE_VGA_BIOS=y
++CONFIG_DEFAULT_DEVICE_TREE="chromebook_link"
  CONFIG_FIT=y
  CONFIG_SPL_LOAD_FIT=y
  CONFIG_BOOTSTAGE=y
@@@ -30,6 -31,8 +32,7 @@@ CONFIG_SPL_SYS_MALLOC_SIMPLE=
  CONFIG_SPL_CPU_SUPPORT=y
  CONFIG_SPL_ENV_SUPPORT=y
  CONFIG_SPL_I2C_SUPPORT=y
 -CONFIG_SPL_DM_SPI=y
+ CONFIG_SPL_DM_SPI_FLASH=y
  CONFIG_SPL_NET_SUPPORT=y
  CONFIG_SPL_PCI=y
  CONFIG_SPL_PCH_SUPPORT=y
@@@ -52,7 -55,7 +55,6 @@@ CONFIG_CMD_EXT4=
  CONFIG_CMD_EXT4_WRITE=y
  CONFIG_CMD_FAT=y
  CONFIG_CMD_FS_GENERIC=y
--CONFIG_DEFAULT_DEVICE_TREE="chromebook_link"
  CONFIG_SYS_RELOC_GD_ENV_ADDR=y
  CONFIG_REGMAP=y
  CONFIG_SYSCON=y

diff --cc configs/chromebook_minnie_defconfig
index c9711e0b3f39a2143b320580dd8392736dca38be,f33ab19998ffe331350509199cd3287a8a2e5dcd..49d576883d67516c7e5bb95d3375b9218f8bed99
--- 1/configs/chromebook_minnie_defconfig
--- 2/configs/chromebook_minnie_defconfig
+++ b/configs/chromebook_minnie_defconfig
@@@ -13,8 -13,9 +13,9 @@@ CONFIG_DEBUG_UART_BASE=0xff69000
  CONFIG_DEBUG_UART_CLOCK=24000000
  CONFIG_SPL_SPI_FLASH_SUPPORT=y
  CONFIG_SPL_SPI_SUPPORT=y
 -CONFIG_SPL_TEXT_BASE=0xff704000
  CONFIG_SPL_PAYLOAD="u-boot.img"
  CONFIG_DEBUG_UART=y
++CONFIG_DEFAULT_DEVICE_TREE="rk3288-veyron-minnie"
  CONFIG_USE_PREBOOT=y
  CONFIG_SILENT_CONSOLE=y
  CONFIG_DEFAULT_FDT_FILE="rk3288-veyron-minnie.dtb"
@@@ -44,7 -45,7 +45,6 @@@ CONFIG_CMD_REGULATOR=
  # CONFIG_SPL_EFI_PARTITION is not set
  CONFIG_SPL_PARTITION_UUIDS=y
  CONFIG_SPL_OF_CONTROL=y
--CONFIG_DEFAULT_DEVICE_TREE="rk3288-veyron-minnie"
  CONFIG_OF_SPL_REMOVE_PROPS="pinctrl-0 pinctrl-names clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents"
  CONFIG_SPL_OF_PLATDATA=y
  CONFIG_SYS_RELOC_GD_ENV_ADDR=y

diff --cc configs/chromebook_samus_tpl_defconfig
index 4b1dddb72bb1022d9420f7bb66aac3e89329feea,422bcfd8af4136984a5babe901a2be7f368393da..e54a4ff6a6f3fd230b3045464bea3a17dfb5cc71
--- 1/configs/chromebook_samus_tpl_defconfig
--- 2/configs/chromebook_samus_tpl_defconfig
+++ b/configs/chromebook_samus_tpl_defconfig
@@@ -4,7 -4,7 +4,8 @@@ CONFIG_SYS_MALLOC_F_LEN=0x1a0
  CONFIG_ENV_SIZE=0x1000
  CONFIG_ENV_OFFSET=0x3F8000
  CONFIG_ENV_SECT_SIZE=0x1000
+ CONFIG_SPL_DM_SPI=y
 +CONFIG_SPL_TEXT_BASE=0xffe70000
  CONFIG_NR_DRAM_BANKS=8
  CONFIG_DEBUG_UART_BOARD_INIT=y
  CONFIG_DEBUG_UART_BASE=0x3f8
@@@ -17,6 -18,6 +18,7 @@@ CONFIG_HAVE_REFCODE=
  CONFIG_SMP=y
  CONFIG_HAVE_VGA_BIOS=y
  CONFIG_X86_OFFSET_U_BOOT=0xfff00000
++CONFIG_DEFAULT_DEVICE_TREE="chromebook_samus"
  CONFIG_BOOTSTAGE=y
  CONFIG_BOOTSTAGE_REPORT=y
  CONFIG_SHOW_BOOT_PROGRESS=y
@@@ -31,6 -32,8 +33,7 @@@ CONFIG_BLOBLIST_SIZE=0x100
  CONFIG_BLOBLIST_ADDR=0xff7c0000
  CONFIG_HANDOFF=y
  CONFIG_SPL_SEPARATE_BSS=y
 -CONFIG_SPL_DM_SPI=y
+ CONFIG_SPL_DM_SPI_FLASH=y
  CONFIG_SPL_NET_SUPPORT=y
  CONFIG_SPL_PCI=y
  CONFIG_SPL_PCH_SUPPORT=y
@@@ -61,7 -66,7 +66,6 @@@ CONFIG_MAC_PARTITION=
  CONFIG_ISO_PARTITION=y
  CONFIG_EFI_PARTITION=y
  # CONFIG_SPL_EFI_PARTITION is not set
--CONFIG_DEFAULT_DEVICE_TREE="chromebook_samus"
  CONFIG_SYS_RELOC_GD_ENV_ADDR=y
  # CONFIG_NET is not set
  CONFIG_REGMAP=y

diff --cc configs/chromebook_speedy_defconfig
index 18b4df985963eb21d451248b8279dbe712cd16b3,f930ba6179f39063dc00b8a8429150eadd8cc911..09c87a9f7670799c1b2a5bee36349fb61d02e1e1
--- 1/configs/chromebook_speedy_defconfig
--- 2/configs/chromebook_speedy_defconfig
+++ b/configs/chromebook_speedy_defconfig
@@@ -13,8 -13,9 +13,9 @@@ CONFIG_DEBUG_UART_BASE=0xff69000
  CONFIG_DEBUG_UART_CLOCK=24000000
  CONFIG_SPL_SPI_FLASH_SUPPORT=y
  CONFIG_SPL_SPI_SUPPORT=y
 -CONFIG_SPL_TEXT_BASE=0xff704000
  CONFIG_SPL_PAYLOAD="u-boot.img"
  CONFIG_DEBUG_UART=y
++CONFIG_DEFAULT_DEVICE_TREE="rk3288-veyron-speedy"
  CONFIG_USE_PREBOOT=y
  CONFIG_SILENT_CONSOLE=y
  CONFIG_DEFAULT_FDT_FILE="rk3288-veyron-speedy.dtb"
@@@ -43,7 -44,7 +44,6 @@@ CONFIG_CMD_REGULATOR=
  # CONFIG_SPL_EFI_PARTITION is not set
  CONFIG_SPL_PARTITION_UUIDS=y
  CONFIG_SPL_OF_CONTROL=y
--CONFIG_DEFAULT_DEVICE_TREE="rk3288-veyron-speedy"
  CONFIG_OF_SPL_REMOVE_PROPS="pinctrl-0 pinctrl-names clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents"
  CONFIG_SPL_OF_PLATDATA=y
  CONFIG_SYS_RELOC_GD_ENV_ADDR=y

diff --cc configs/cm_t43_defconfig
index 567d9802dec3e9839710df8f3e4aa221c9b2fdd6,98c50954b6bd37966425c2ebefaea080b7d79613..c13a4748b5ec43c847e37f4e7add1b878329e76f
--- 1/configs/cm_t43_defconfig
--- 2/configs/cm_t43_defconfig
+++ b/configs/cm_t43_defconfig
@@@ -8,7 -8,7 +8,8 @@@ CONFIG_ENV_OFFSET=0xC000
  CONFIG_ENV_SECT_SIZE=0x10000
  CONFIG_SYS_SPI_U_BOOT_OFFS=0x40000
  CONFIG_DM_GPIO=y
+ CONFIG_SPL_DM_SPI=y
 +CONFIG_SPL_TEXT_BASE=0x40300350
  CONFIG_AM43XX=y
  CONFIG_TARGET_CM_T43=y
  CONFIG_SPL_MMC_SUPPORT=y
@@@ -18,6 -18,7 +19,7 @@@ CONFIG_SPL_FS_FAT=
  CONFIG_SPL_LIBDISK_SUPPORT=y
  CONFIG_SPL_SPI_FLASH_SUPPORT=y
  CONFIG_SPL_SPI_SUPPORT=y
 -CONFIG_SPL_TEXT_BASE=0x40300350
++CONFIG_DEFAULT_DEVICE_TREE="am437x-cm-t43"
  CONFIG_DISTRO_DEFAULTS=y
  # CONFIG_USE_BOOTCOMMAND is not set
  CONFIG_SYS_CONSOLE_INFO_QUIET=y
@@@ -49,7 -51,7 +52,6 @@@ CONFIG_CMD_USB=
  CONFIG_CMD_EXT4_WRITE=y
  CONFIG_CMD_MTDPARTS=y
  CONFIG_OF_CONTROL=y
--CONFIG_DEFAULT_DEVICE_TREE="am437x-cm-t43"
  CONFIG_ENV_IS_IN_SPI_FLASH=y
  CONFIG_SYS_RELOC_GD_ENV_ADDR=y
  CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y

diff --cc configs/colibri_imx6_defconfig
Simple merge

diff --cc configs/corvus_defconfig
Simple merge

diff --cc configs/da850evm_defconfig
index cd4c3748eba948c5fa76e26b536ce6cd9c7351eb,2e87637f7e4d4b91b8fb226dc51c02ecaff334dc..0df267df378fa4613cd42caca87a0f81adc263ab
--- 1/configs/da850evm_defconfig
--- 2/configs/da850evm_defconfig
+++ b/configs/da850evm_defconfig
@@@ -18,6 -18,7 +18,7 @@@ CONFIG_NR_DRAM_BANKS=
  CONFIG_SPL=y
  CONFIG_SPL_SPI_FLASH_SUPPORT=y
  CONFIG_SPL_SPI_SUPPORT=y
 -CONFIG_SPL_TEXT_BASE=0x80000000
++CONFIG_DEFAULT_DEVICE_TREE="da850-evm"
  CONFIG_SYS_EXTRA_OPTIONS="MAC_ADDR_IN_SPIFLASH"
  CONFIG_BOOTDELAY=3
  CONFIG_DEFAULT_FDT_FILE="da850-evm.dtb"
@@@ -49,7 -52,7 +52,6 @@@ CONFIG_MTDPARTS_DEFAULT="mtdparts=spi0.
  CONFIG_CMD_DIAG=y
  CONFIG_OF_CONTROL=y
  CONFIG_SPL_OF_CONTROL=y
--CONFIG_DEFAULT_DEVICE_TREE="da850-evm"
  CONFIG_ENV_IS_IN_SPI_FLASH=y
  CONFIG_SYS_RELOC_GD_ENV_ADDR=y
  CONFIG_DM=y

diff --cc configs/da850evm_nand_defconfig
index af8fb72118d4d1df156b454c16ee0b7888ac00f6,2306422d6147d8b107b746a1778dfe1f510fb327..127664eef0b0c5823af17027baa9289b9fadb7fd
--- 1/configs/da850evm_nand_defconfig
--- 2/configs/da850evm_nand_defconfig
+++ b/configs/da850evm_nand_defconfig
@@@ -9,13 -9,11 +9,13 @@@ CONFIG_SPL_LIBGENERIC_SUPPORT=
  CONFIG_SYS_MALLOC_F_LEN=0x800
  CONFIG_ENV_SIZE=0x20000
  CONFIG_ENV_OFFSET=0x0
- CONFIG_SYS_SPI_U_BOOT_OFFS=0x8000
  CONFIG_DM_GPIO=y
 -CONFIG_SPL_DM_SPI=y
 +CONFIG_SPL_TEXT_BASE=0x80000000
  CONFIG_SPL_SERIAL_SUPPORT=y
  CONFIG_SPL=y
 -CONFIG_SPL_TEXT_BASE=0x80000000
 +CONFIG_SPL_SPI_FLASH_SUPPORT=y
 +CONFIG_SPL_SPI_SUPPORT=y
++CONFIG_DEFAULT_DEVICE_TREE="da850-evm"
  CONFIG_SYS_EXTRA_OPTIONS="MAC_ADDR_IN_SPIFLASH"
  CONFIG_BOOTDELAY=3
  CONFIG_DEFAULT_FDT_FILE="da850-evm.dtb"
@@@ -45,7 -43,7 +45,6 @@@ CONFIG_MTDPARTS_DEFAULT="mtdparts=nand5
  CONFIG_CMD_DIAG=y
  CONFIG_OF_CONTROL=y
  CONFIG_SPL_OF_CONTROL=y
--CONFIG_DEFAULT_DEVICE_TREE="da850-evm"
  CONFIG_ENV_IS_IN_NAND=y
  CONFIG_SYS_RELOC_GD_ENV_ADDR=y
  CONFIG_DM=y

diff --cc configs/deneb_defconfig
Simple merge

diff --cc configs/devkit8000_defconfig
Simple merge

diff --cc configs/dra7xx_evm_defconfig
index c8b1eed0cb8a00c1a182fad3e2fc4cae3909c1e0,022dfaeb3784d477b1f7c0617be13013feefd625..12f08ae6f938704634160b9722b52a10469dcb9c
--- 1/configs/dra7xx_evm_defconfig
--- 2/configs/dra7xx_evm_defconfig
+++ b/configs/dra7xx_evm_defconfig
@@@ -4,7 -4,7 +4,8 @@@ CONFIG_TI_COMMON_CMD_OPTIONS=
  CONFIG_SYS_MALLOC_F_LEN=0x18000
  CONFIG_SYS_SPI_U_BOOT_OFFS=0x40000
  CONFIG_DM_GPIO=y
+ CONFIG_SPL_DM_SPI=y
 +CONFIG_SPL_TEXT_BASE=0x40300000
  CONFIG_OMAP54XX=y
  CONFIG_TARGET_DRA7XX_EVM=y
  CONFIG_NR_DRAM_BANKS=2
@@@ -13,7 -13,8 +14,8 @@@ CONFIG_ENV_OFFSET_REDUND=0x28000
  CONFIG_SPL_SPI_FLASH_SUPPORT=y
  CONFIG_SPL_SPI_SUPPORT=y
  CONFIG_ARMV7_LPAE=y
 -CONFIG_SPL_TEXT_BASE=0x40300000
  CONFIG_AHCI=y
++CONFIG_DEFAULT_DEVICE_TREE="dra7-evm"
  CONFIG_DISTRO_DEFAULTS=y
  CONFIG_SPL_LOAD_FIT=y
  CONFIG_OF_BOARD_SETUP=y
@@@ -27,6 -28,6 +29,7 @@@ CONFIG_BOARD_EARLY_INIT_F=
  CONFIG_SPL_SYS_MALLOC_SIMPLE=y
  CONFIG_SPL_SEPARATE_BSS=y
  CONFIG_SPL_DMA=y
++CONFIG_SPL_DM_SPI_FLASH=y
  CONFIG_SPL_OS_BOOT=y
  CONFIG_SPL_RAM_SUPPORT=y
  CONFIG_SPL_SPI_LOAD=y
@@@ -42,7 -43,7 +45,6 @@@ CONFIG_MTDIDS_DEFAULT="nand0=nand.0
  CONFIG_MTDPARTS_DEFAULT="mtdparts=nand.0:256k(NAND.SPL),256k(NAND.SPL.backup1),256k(NAND.SPL.backup2),256k(NAND.SPL.backup3),256k(NAND.u-boot-spl-os),2m(NAND.u-boot),128k(NAND.u-boot-env),128k(NAND.u-boot-env.backup1),8m(NAND.kernel),-(NAND.file-system)"
  CONFIG_OF_CONTROL=y
  CONFIG_SPL_OF_CONTROL=y
--CONFIG_DEFAULT_DEVICE_TREE="dra7-evm"
  CONFIG_OF_LIST="dra7-evm dra72-evm dra72-evm-revc dra71-evm dra76-evm"
  CONFIG_SPL_MULTI_DTB_FIT=y
  CONFIG_SPL_MULTI_DTB_FIT_UNCOMPRESS_SZ=0xA000

diff --cc configs/dra7xx_hs_evm_usb_defconfig
index 00d00b2d8063450121bbbe84580021c933725310,91e286189236e1cb4ddbfb65478affac31b0979a..4178473ddf26026a0a6df7643966c0c9096eb265
--- 1/configs/dra7xx_hs_evm_usb_defconfig
--- 2/configs/dra7xx_hs_evm_usb_defconfig
+++ b/configs/dra7xx_hs_evm_usb_defconfig
@@@ -6,7 -6,7 +6,8 @@@ CONFIG_TI_COMMON_CMD_OPTIONS=
  CONFIG_SYS_MALLOC_F_LEN=0x18000
  CONFIG_SYS_SPI_U_BOOT_OFFS=0x40000
  CONFIG_DM_GPIO=y
+ CONFIG_SPL_DM_SPI=y
 +CONFIG_SPL_TEXT_BASE=0x40306D50
  CONFIG_OMAP54XX=y
  CONFIG_TI_SECURE_EMIF_REGION_START=0xbdb00000
  CONFIG_TI_SECURE_EMIF_TOTAL_REGION_SIZE=0x02000000
@@@ -18,7 -18,8 +19,8 @@@ CONFIG_ENV_OFFSET_REDUND=0x28000
  CONFIG_SPL_SPI_FLASH_SUPPORT=y
  CONFIG_SPL_SPI_SUPPORT=y
  CONFIG_ARMV7_LPAE=y
 -CONFIG_SPL_TEXT_BASE=0x40306D50
  CONFIG_AHCI=y
++CONFIG_DEFAULT_DEVICE_TREE="dra7-evm"
  CONFIG_DISTRO_DEFAULTS=y
  CONFIG_FIT_IMAGE_POST_PROCESS=y
  CONFIG_SPL_LOAD_FIT=y
@@@ -35,6 -36,6 +37,7 @@@ CONFIG_SPL_SYS_MALLOC_SIMPLE=
  CONFIG_SPL_SEPARATE_BSS=y
  CONFIG_SPL_DMA=y
  # CONFIG_SPL_NAND_SUPPORT is not set
++CONFIG_SPL_DM_SPI_FLASH=y
  CONFIG_SPL_RAM_SUPPORT=y
  CONFIG_SPL_SPI_LOAD=y
  CONFIG_SPL_USB_GADGET=y
@@@ -45,7 -46,7 +48,6 @@@ CONFIG_SPL_YMODEM_SUPPORT=
  CONFIG_BOOTP_DNS2=y
  CONFIG_OF_CONTROL=y
  CONFIG_SPL_OF_CONTROL=y
--CONFIG_DEFAULT_DEVICE_TREE="dra7-evm"
  CONFIG_OF_LIST="dra7-evm dra72-evm dra72-evm-revc dra71-evm dra76-evm"
  CONFIG_SPL_MULTI_DTB_FIT=y
  CONFIG_SPL_MULTI_DTB_FIT_UNCOMPRESS_SZ=0x9000

diff --cc configs/giedi_defconfig
Simple merge

diff --cc configs/gwventana_emmc_defconfig
Simple merge

diff --cc configs/gwventana_gw5904_defconfig
Simple merge

diff --cc configs/gwventana_nand_defconfig
Simple merge

diff --cc configs/imx28_xea_defconfig
Simple merge

diff --cc configs/imx8mq_evk_defconfig
Simple merge

diff --cc configs/imx8mq_phanbell_defconfig
Simple merge

diff --cc configs/imx8qm_mek_defconfig
Simple merge

diff --cc configs/imx8qxp_mek_defconfig
Simple merge

diff --cc configs/j721e_evm_a72_defconfig
index 871d49066933c7f98d3bb76252149ee8e0ba600a,7c7b9905f94f7a72038da7d84081d897e72d6e23..09a73e590dc7ff6dbce9061ff8e501953bd971e3
--- 1/configs/j721e_evm_a72_defconfig
--- 2/configs/j721e_evm_a72_defconfig
+++ b/configs/j721e_evm_a72_defconfig
@@@ -10,7 -10,7 +10,8 @@@ CONFIG_ENV_SIZE=0x2000
  CONFIG_ENV_OFFSET=0x680000
  CONFIG_SYS_SPI_U_BOOT_OFFS=0x280000
  CONFIG_DM_GPIO=y
+ CONFIG_SPL_DM_SPI=y
 +CONFIG_SPL_TEXT_BASE=0x80080000
  CONFIG_SPL_MMC_SUPPORT=y
  CONFIG_SPL_SERIAL_SUPPORT=y
  CONFIG_SPL_DRIVERS_MISC_SUPPORT=y
@@@ -22,6 -22,7 +23,7 @@@ CONFIG_SPL_LIBDISK_SUPPORT=
  CONFIG_SPL_SPI_FLASH_SUPPORT=y
  CONFIG_SPL_SPI_SUPPORT=y
  # CONFIG_PSCI_RESET is not set
 -CONFIG_SPL_TEXT_BASE=0x80080000
++CONFIG_DEFAULT_DEVICE_TREE="k3-j721e-common-proc-board"
  CONFIG_DISTRO_DEFAULTS=y
  # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
  CONFIG_SPL_LOAD_FIT=y
@@@ -36,6 -37,6 +38,7 @@@ CONFIG_SPL_DMA=
  CONFIG_SPL_ENV_SUPPORT=y
  CONFIG_SPL_I2C_SUPPORT=y
  CONFIG_SPL_DM_MAILBOX=y
++CONFIG_SPL_DM_SPI_FLASH=y
  CONFIG_SPL_DM_RESET=y
  CONFIG_SPL_POWER_SUPPORT=y
  CONFIG_SPL_POWER_DOMAIN=y
@@@ -69,7 -70,7 +72,6 @@@ CONFIG_CMD_UBI=
  # CONFIG_SPL_EFI_PARTITION is not set
  CONFIG_OF_CONTROL=y
  CONFIG_SPL_OF_CONTROL=y
--CONFIG_DEFAULT_DEVICE_TREE="k3-j721e-common-proc-board"
  CONFIG_SPL_MULTI_DTB_FIT=y
  CONFIG_SPL_MULTI_DTB_FIT_NO_COMPRESSION=y
  CONFIG_ENV_IS_IN_MMC=y

diff --cc configs/j721e_evm_r5_defconfig
index d223266ea6d19537aba9ff99fbf9c28faf5a36e4,822d1fc48699ef47b295544aefdea4fcfc4fdd3e..a06fc7c3d2f2c461b9034ba2d3a4e20936eba0ec
--- 1/configs/j721e_evm_r5_defconfig
--- 2/configs/j721e_evm_r5_defconfig
+++ b/configs/j721e_evm_r5_defconfig
@@@ -10,7 -10,7 +10,8 @@@ CONFIG_TARGET_J721E_R5_EVM=
  CONFIG_ENV_SIZE=0x20000
  CONFIG_SYS_SPI_U_BOOT_OFFS=0x80000
  CONFIG_DM_GPIO=y
+ CONFIG_SPL_DM_SPI=y
 +CONFIG_SPL_TEXT_BASE=0x41c00000
  CONFIG_SPL_MMC_SUPPORT=y
  CONFIG_SPL_SERIAL_SUPPORT=y
  CONFIG_SPL_DRIVERS_MISC_SUPPORT=y
@@@ -19,6 -19,7 +20,7 @@@ CONFIG_SPL_FS_FAT=
  CONFIG_SPL_LIBDISK_SUPPORT=y
  CONFIG_SPL_SPI_FLASH_SUPPORT=y
  CONFIG_SPL_SPI_SUPPORT=y
 -CONFIG_SPL_TEXT_BASE=0x41c00000
++CONFIG_DEFAULT_DEVICE_TREE="k3-j721e-r5-common-proc-board"
  # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
  CONFIG_SPL_LOAD_FIT=y
  CONFIG_USE_BOOTCOMMAND=y
@@@ -34,6 -35,6 +36,7 @@@ CONFIG_SPL_ENV_SUPPORT=
  CONFIG_SPL_FS_EXT4=y
  CONFIG_SPL_I2C_SUPPORT=y
  CONFIG_SPL_DM_MAILBOX=y
++CONFIG_SPL_DM_SPI_FLASH=y
  CONFIG_SPL_DM_RESET=y
  CONFIG_SPL_POWER_SUPPORT=y
  CONFIG_SPL_POWER_DOMAIN=y
@@@ -57,7 -58,7 +60,6 @@@ CONFIG_CMD_TIME=
  CONFIG_CMD_FAT=y
  CONFIG_OF_CONTROL=y
  CONFIG_SPL_OF_CONTROL=y
--CONFIG_DEFAULT_DEVICE_TREE="k3-j721e-r5-common-proc-board"
  CONFIG_SYS_RELOC_GD_ENV_ADDR=y
  CONFIG_DM=y
  CONFIG_SPL_DM=y

diff --cc configs/j721e_hs_evm_a72_defconfig
index 65bd51821ee84770b952a487dcaca4ce6b516b5c,0bfa4ff23d402c48ccb2fe49e47b2aa75dd0f341..9b5bc6cf54c8d9faef77cb4a6966a662ed389757
--- 1/configs/j721e_hs_evm_a72_defconfig
--- 2/configs/j721e_hs_evm_a72_defconfig
+++ b/configs/j721e_hs_evm_a72_defconfig
@@@ -9,7 -9,7 +9,8 @@@ CONFIG_TARGET_J721E_A72_EVM=
  CONFIG_ENV_SIZE=0x20000
  CONFIG_ENV_OFFSET=0x680000
  CONFIG_SYS_SPI_U_BOOT_OFFS=0x280000
+ CONFIG_SPL_DM_SPI=y
 +CONFIG_SPL_TEXT_BASE=0x80080000
  CONFIG_SPL_MMC_SUPPORT=y
  CONFIG_SPL_SERIAL_SUPPORT=y
  CONFIG_SPL_DRIVERS_MISC_SUPPORT=y
@@@ -21,6 -21,7 +22,7 @@@ CONFIG_SPL_LIBDISK_SUPPORT=
  CONFIG_SPL_SPI_FLASH_SUPPORT=y
  CONFIG_SPL_SPI_SUPPORT=y
  # CONFIG_PSCI_RESET is not set
 -CONFIG_SPL_TEXT_BASE=0x80080000
++CONFIG_DEFAULT_DEVICE_TREE="k3-j721e-common-proc-board"
  CONFIG_DISTRO_DEFAULTS=y
  # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
  CONFIG_FIT_IMAGE_POST_PROCESS=y
@@@ -62,7 -64,7 +65,6 @@@ CONFIG_CMD_UBI=
  # CONFIG_SPL_EFI_PARTITION is not set
  CONFIG_OF_CONTROL=y
  CONFIG_SPL_OF_CONTROL=y
--CONFIG_DEFAULT_DEVICE_TREE="k3-j721e-common-proc-board"
  CONFIG_SPL_MULTI_DTB_FIT=y
  CONFIG_SPL_MULTI_DTB_FIT_NO_COMPRESSION=y
  CONFIG_ENV_IS_IN_MMC=y

diff --cc configs/j721e_hs_evm_r5_defconfig
index 77eab7c1262d6dfc4fc440395cbdde34b37df40a,b1ee47557544a299cf134b2dda00e4eb22922fb0..1aa899e63c09aebfdc3a20b0451007186067a797
--- 1/configs/j721e_hs_evm_r5_defconfig
--- 2/configs/j721e_hs_evm_r5_defconfig
+++ b/configs/j721e_hs_evm_r5_defconfig
@@@ -11,7 -11,7 +11,8 @@@ CONFIG_ENV_SIZE=0x2000
  CONFIG_ENV_OFFSET=0x680000
  CONFIG_SYS_SPI_U_BOOT_OFFS=0x80000
  CONFIG_DM_GPIO=y
+ CONFIG_SPL_DM_SPI=y
 +CONFIG_SPL_TEXT_BASE=0x41c00000
  CONFIG_SPL_MMC_SUPPORT=y
  CONFIG_SPL_SERIAL_SUPPORT=y
  CONFIG_SPL_DRIVERS_MISC_SUPPORT=y
@@@ -21,6 -21,7 +22,7 @@@ CONFIG_SPL_FS_FAT=
  CONFIG_SPL_LIBDISK_SUPPORT=y
  CONFIG_SPL_SPI_FLASH_SUPPORT=y
  CONFIG_SPL_SPI_SUPPORT=y
 -CONFIG_SPL_TEXT_BASE=0x41c00000
++CONFIG_DEFAULT_DEVICE_TREE="k3-j721e-r5-common-proc-board"
  # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
  CONFIG_SPL_LOAD_FIT=y
  CONFIG_SPL_FIT_IMAGE_POST_PROCESS=y
@@@ -53,7 -55,7 +56,6 @@@ CONFIG_CMD_TIME=
  CONFIG_CMD_FAT=y
  CONFIG_OF_CONTROL=y
  CONFIG_SPL_OF_CONTROL=y
--CONFIG_DEFAULT_DEVICE_TREE="k3-j721e-r5-common-proc-board"
  CONFIG_ENV_IS_IN_MMC=y
  CONFIG_SYS_REDUNDAND_ENVIRONMENT=y
  CONFIG_SYS_RELOC_GD_ENV_ADDR=y

diff --cc configs/lion-rk3368_defconfig
index d5996bd211f5120e159ec7f1dc91816fa910cc1b,45ff1714791bca83d4ce591d05b3a3a777fffde0..3feaad11be23529c8dfaee6908ec54586b532c80
--- 1/configs/lion-rk3368_defconfig
--- 2/configs/lion-rk3368_defconfig
+++ b/configs/lion-rk3368_defconfig
@@@ -15,8 -15,9 +15,9 @@@ CONFIG_DEBUG_UART_BASE=0xFF18000
  CONFIG_DEBUG_UART_CLOCK=24000000
  CONFIG_SPL_SPI_FLASH_SUPPORT=y
  CONFIG_SPL_SPI_SUPPORT=y
 -CONFIG_SPL_TEXT_BASE=0x00000000
  CONFIG_SMBIOS_PRODUCT_NAME="sheep_rk3368"
  CONFIG_DEBUG_UART=y
++CONFIG_DEFAULT_DEVICE_TREE="rk3368-lion"
  CONFIG_ANDROID_BOOT_IMAGE=y
  CONFIG_FIT=y
  CONFIG_FIT_VERBOSE=y
@@@ -45,7 -46,7 +46,6 @@@ CONFIG_CMD_MTDPARTS=
  CONFIG_SPL_OF_CONTROL=y
  CONFIG_TPL_OF_CONTROL=y
  CONFIG_OF_LIVE=y
--CONFIG_DEFAULT_DEVICE_TREE="rk3368-lion"
  CONFIG_OF_SPL_REMOVE_PROPS="pinctrl-0 pinctrl-names interrupt-parent"
  CONFIG_TPL_OF_PLATDATA=y
  CONFIG_ENV_IS_IN_MMC=y

diff --cc configs/ls1021aiot_sdcard_defconfig
Simple merge

diff --cc configs/ls1021aqds_sdcard_qspi_defconfig
Simple merge

diff --cc configs/mx6cuboxi_defconfig
Simple merge

diff --cc configs/omap4_panda_defconfig
index 9e8fbed5e6143dbaf9dccc172ff7d288ebc8d0cb,f8d37f472857f05b4877f373c70b5f194fc66b31..b21e79ceafb2ae4640ce9ba221771fe32e9f0e00
--- 1/configs/omap4_panda_defconfig
--- 2/configs/omap4_panda_defconfig
+++ b/configs/omap4_panda_defconfig
@@@ -1,9 -1,10 +1,10 @@@
  CONFIG_ARM=y
  CONFIG_ARCH_OMAP2PLUS=y
 +CONFIG_SPL_TEXT_BASE=0x40300000
  CONFIG_OMAP44XX=y
  CONFIG_TARGET_OMAP4_PANDA=y
+ CONFIG_DEFAULT_DEVICE_TREE="omap4-panda"
  CONFIG_SPL=y
 -CONFIG_SPL_TEXT_BASE=0x40300000
  CONFIG_DISTRO_DEFAULTS=y
  CONFIG_BOOTCOMMAND="if test ${boot_fit} -eq 1; then run update_to_fit; fi; run findfdt; run init_console; run envboot; run distro_bootcmd"
  CONFIG_SYS_CONSOLE_IS_IN_ENV=y

diff --cc configs/omap4_sdp4430_defconfig
index 5361b67273f5a0a25a29e97cbcf4b2112a2a5251,e9a8a907868eb25928bd2498e10ef9c3f23c1b99..0ed6b0cb36d83e50d6e2e77dd4540ebd3b950a9d
--- 1/configs/omap4_sdp4430_defconfig
--- 2/configs/omap4_sdp4430_defconfig
+++ b/configs/omap4_sdp4430_defconfig
@@@ -3,11 -3,12 +3,12 @@@ CONFIG_ARM=
  # CONFIG_SPL_USE_ARCH_MEMSET is not set
  CONFIG_ARCH_OMAP2PLUS=y
  CONFIG_ENV_OFFSET=0xE0000
 +CONFIG_SPL_TEXT_BASE=0x40300000
  CONFIG_OMAP44XX=y
  CONFIG_TARGET_OMAP4_SDP4430=y
+ CONFIG_DEFAULT_DEVICE_TREE="omap4-sdp"
  CONFIG_CMD_BAT=y
  CONFIG_SPL=y
 -CONFIG_SPL_TEXT_BASE=0x40300000
  CONFIG_DISTRO_DEFAULTS=y
  CONFIG_BOOTCOMMAND="if test ${boot_fit} -eq 1; then run update_to_fit; fi; run findfdt; run init_console; run envboot; run distro_bootcmd"
  CONFIG_SYS_CONSOLE_IS_IN_ENV=y

diff --cc configs/omap5_uevm_defconfig
index 9c7c8d50c936a95ed95ba33cd934411438c7c7cd,0029e70439847b3aec7a2d5b10aaae7a7f6dbd18..317c4848d3db525454c34f66a77a98a667624003
--- 1/configs/omap5_uevm_defconfig
--- 2/configs/omap5_uevm_defconfig
+++ b/configs/omap5_uevm_defconfig
@@@ -1,8 -1,8 +1,9 @@@
  CONFIG_ARM=y
  CONFIG_ARCH_OMAP2PLUS=y
 +CONFIG_SPL_TEXT_BASE=0x40300000
  CONFIG_OMAP54XX=y
  CONFIG_TARGET_OMAP5_UEVM=y
+ CONFIG_DEFAULT_DEVICE_TREE="omap5-uevm"
  CONFIG_OMAP_PLATFORM_RESET_TIME_MAX_USEC=16296
  CONFIG_SPL=y
  CONFIG_ENV_OFFSET_REDUND=0x280000

diff --cc configs/omapl138_lcdk_defconfig
Simple merge

diff --cc configs/pico-imx6_defconfig
Simple merge

diff --cc configs/pico-imx8mq_defconfig
Simple merge

diff --cc configs/picosam9g45_defconfig
Simple merge

diff --cc configs/puma-rk3399_defconfig
index 917ac26f080db856e43997b3483a5a8f88b54a9c,8a0ae32c655a5d68c6591cda2bcc6a8e5eeee02d..3c5a1dc2999687f4210024170941b5cc9f0ab19f
--- 1/configs/puma-rk3399_defconfig
--- 2/configs/puma-rk3399_defconfig
+++ b/configs/puma-rk3399_defconfig
@@@ -13,7 -13,8 +13,8 @@@ CONFIG_DEBUG_UART_BASE=0xFF18000
  CONFIG_DEBUG_UART_CLOCK=24000000
  CONFIG_SPL_SPI_FLASH_SUPPORT=y
  CONFIG_SPL_SPI_SUPPORT=y
 -CONFIG_SPL_TEXT_BASE=0xff8c2000
  CONFIG_DEBUG_UART=y
++CONFIG_DEFAULT_DEVICE_TREE="rk3399-puma-haikou"
  CONFIG_DEFAULT_FDT_FILE="rockchip/rk3399-puma-haikou.dtb"
  CONFIG_MISC_INIT_R=y
  CONFIG_DISPLAY_BOARDINFO_LATE=y
@@@ -38,7 -39,7 +39,6 @@@ CONFIG_CMD_PMIC=
  CONFIG_CMD_REGULATOR=y
  CONFIG_SPL_OF_CONTROL=y
  CONFIG_OF_LIVE=y
--CONFIG_DEFAULT_DEVICE_TREE="rk3399-puma-haikou"
  CONFIG_OF_SPL_REMOVE_PROPS="pinctrl-0 pinctrl-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents"
  CONFIG_ENV_IS_IN_MMC=y
  CONFIG_SYS_RELOC_GD_ENV_ADDR=y

diff --cc configs/qemu-x86_64_defconfig
index f69b4689b66f18d9c89b80b8633d658db7b1425a,ec126b2d9ae1260c5563bd9b8f0167d68a03c578..dd4ae62a309ea74cb47898a7358b145840f850b5
--- 1/configs/qemu-x86_64_defconfig
--- 2/configs/qemu-x86_64_defconfig
+++ b/configs/qemu-x86_64_defconfig
@@@ -3,7 -3,7 +3,8 @@@ CONFIG_SYS_TEXT_BASE=0x111000
  CONFIG_SYS_MALLOC_F_LEN=0x1000
  CONFIG_ENV_SIZE=0x40000
  CONFIG_MAX_CPUS=2
+ CONFIG_SPL_DM_SPI=y
 +CONFIG_SPL_TEXT_BASE=0xfffd0000
  CONFIG_NR_DRAM_BANKS=8
  CONFIG_DEBUG_UART_BASE=0x3f8
  CONFIG_DEBUG_UART_CLOCK=1843200
@@@ -15,6 -16,6 +16,7 @@@ CONFIG_GENERATE_PIRQ_TABLE=
  CONFIG_GENERATE_MP_TABLE=y
  CONFIG_GENERATE_ACPI_TABLE=y
  CONFIG_X86_OFFSET_U_BOOT=0xfff00000
++CONFIG_DEFAULT_DEVICE_TREE="qemu-x86_i440fx"
  CONFIG_DISTRO_DEFAULTS=y
  CONFIG_BUILD_ROM=y
  CONFIG_FIT=y
@@@ -47,7 -49,7 +50,6 @@@ CONFIG_CMD_TIME=
  CONFIG_CMD_QFW=y
  CONFIG_CMD_BOOTSTAGE=y
  CONFIG_CMD_EXT4_WRITE=y
--CONFIG_DEFAULT_DEVICE_TREE="qemu-x86_i440fx"
  CONFIG_SYS_RELOC_GD_ENV_ADDR=y
  CONFIG_REGMAP=y
  CONFIG_SYSCON=y

diff --cc configs/riotboard_spl_defconfig
Simple merge

diff --cc configs/sama5d27_wlsom1_ek_qspiflash_defconfig
index dda8d768a61665d3611928fed10aea110d4ae0c9,cf949cd7419e302a947ea0a091fe4c6fe54ecd87..3ed804b5eb40e6c72fd776516115e411cfbce5ff
--- 1/configs/sama5d27_wlsom1_ek_qspiflash_defconfig
--- 2/configs/sama5d27_wlsom1_ek_qspiflash_defconfig
+++ b/configs/sama5d27_wlsom1_ek_qspiflash_defconfig
@@@ -9,7 -9,7 +9,8 @@@ CONFIG_SYS_MALLOC_F_LEN=0x200
  CONFIG_ENV_SECT_SIZE=0x1000
  CONFIG_SYS_SPI_U_BOOT_OFFS=0x40000
  CONFIG_DM_GPIO=y
+ CONFIG_SPL_DM_SPI=y
 +CONFIG_SPL_TEXT_BASE=0x200000
  CONFIG_SPL_SERIAL_SUPPORT=y
  CONFIG_SPL_DRIVERS_MISC_SUPPORT=y
  CONFIG_SPL=y
@@@ -18,7 -18,8 +19,8 @@@ CONFIG_DEBUG_UART_BASE=0xf801c00
  CONFIG_DEBUG_UART_CLOCK=82000000
  CONFIG_SPL_SPI_FLASH_SUPPORT=y
  CONFIG_SPL_SPI_SUPPORT=y
 -CONFIG_SPL_TEXT_BASE=0x200000
  CONFIG_DEBUG_UART=y
++CONFIG_DEFAULT_DEVICE_TREE="at91-sama5d27_wlsom1_ek"
  CONFIG_ENV_VARS_UBOOT_CONFIG=y
  CONFIG_FIT=y
  CONFIG_SYS_EXTRA_OPTIONS="SAMA5D2"
@@@ -48,7 -50,7 +51,6 @@@ CONFIG_CMD_EXT4=
  CONFIG_CMD_FAT=y
  CONFIG_OF_CONTROL=y
  CONFIG_SPL_OF_CONTROL=y
--CONFIG_DEFAULT_DEVICE_TREE="at91-sama5d27_wlsom1_ek"
  CONFIG_OF_SPL_REMOVE_PROPS="interrupts interrupt-parent dmas dma-names"
  CONFIG_ENV_IS_IN_SPI_FLASH=y
  CONFIG_USE_ENV_SPI_BUS=y

diff --cc configs/sama5d2_xplained_spiflash_defconfig
index 047e98b72cf84b9e58d31d65fb98ea107dadda04,320175b517a8afea73e534bfe2229c8292ea786a..d292c1e90719e648c909b0545b26e3496a124470
--- 1/configs/sama5d2_xplained_spiflash_defconfig
--- 2/configs/sama5d2_xplained_spiflash_defconfig
+++ b/configs/sama5d2_xplained_spiflash_defconfig
@@@ -12,7 -12,7 +12,8 @@@ CONFIG_ENV_OFFSET=0x600
  CONFIG_ENV_SECT_SIZE=0x1000
  CONFIG_SYS_SPI_U_BOOT_OFFS=0x10000
  CONFIG_DM_GPIO=y
+ CONFIG_SPL_DM_SPI=y
 +CONFIG_SPL_TEXT_BASE=0x200000
  CONFIG_SPL_SERIAL_SUPPORT=y
  CONFIG_SPL_DRIVERS_MISC_SUPPORT=y
  CONFIG_NR_DRAM_BANKS=1
@@@ -22,7 -22,8 +23,8 @@@ CONFIG_DEBUG_UART_BASE=0xf802000
  CONFIG_DEBUG_UART_CLOCK=83000000
  CONFIG_SPL_SPI_FLASH_SUPPORT=y
  CONFIG_SPL_SPI_SUPPORT=y
 -CONFIG_SPL_TEXT_BASE=0x200000
  CONFIG_DEBUG_UART=y
++CONFIG_DEFAULT_DEVICE_TREE="at91-sama5d2_xplained"
  CONFIG_ENV_VARS_UBOOT_CONFIG=y
  CONFIG_FIT=y
  CONFIG_SPI_BOOT=y
@@@ -31,6 -32,6 +33,7 @@@ CONFIG_USE_BOOTARGS=
  CONFIG_BOOTARGS="console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p1 rw rootwait"
  CONFIG_MISC_INIT_R=y
  # CONFIG_DISPLAY_BOARDINFO is not set
++CONFIG_SPL_DM_SPI_FLASH=y
  CONFIG_SPL_SPI_LOAD=y
  CONFIG_HUSH_PARSER=y
  CONFIG_CMD_BOOTZ=y
@@@ -45,7 -46,7 +48,6 @@@ CONFIG_CMD_EXT4=
  CONFIG_CMD_FAT=y
  CONFIG_OF_CONTROL=y
  CONFIG_SPL_OF_CONTROL=y
--CONFIG_DEFAULT_DEVICE_TREE="at91-sama5d2_xplained"
  CONFIG_OF_SPL_REMOVE_PROPS="interrupts interrupt-parent dmas dma-names"
  CONFIG_ENV_IS_IN_SPI_FLASH=y
  CONFIG_SYS_RELOC_GD_ENV_ADDR=y

diff --cc configs/sama5d3xek_spiflash_defconfig
index bacae5bb63363427920a376a9a85de215fcbc671,8db078abaf7366d72df5cfb6a9c09594b9adb50c..7c6e994edd17d9058aa40d8ee664c85ed5df517f
--- 1/configs/sama5d3xek_spiflash_defconfig
--- 2/configs/sama5d3xek_spiflash_defconfig
+++ b/configs/sama5d3xek_spiflash_defconfig
@@@ -12,7 -12,7 +12,8 @@@ CONFIG_ENV_OFFSET=0x600
  CONFIG_ENV_SECT_SIZE=0x1000
  CONFIG_SYS_SPI_U_BOOT_OFFS=0x10000
  CONFIG_DM_GPIO=y
+ CONFIG_SPL_DM_SPI=y
 +CONFIG_SPL_TEXT_BASE=0x300000
  CONFIG_SPL_SERIAL_SUPPORT=y
  CONFIG_SPL_DRIVERS_MISC_SUPPORT=y
  CONFIG_NR_DRAM_BANKS=1
@@@ -22,7 -22,9 +23,8 @@@ CONFIG_DEBUG_UART_BASE=0xffffee0
  CONFIG_DEBUG_UART_CLOCK=132000000
  CONFIG_SPL_SPI_FLASH_SUPPORT=y
  CONFIG_SPL_SPI_SUPPORT=y
 -CONFIG_SPL_TEXT_BASE=0x300000
 -CONFIG_SPL_DM_SPI=y
  CONFIG_DEBUG_UART=y
++CONFIG_DEFAULT_DEVICE_TREE="sama5d36ek"
  CONFIG_ENV_VARS_UBOOT_CONFIG=y
  CONFIG_FIT=y
  CONFIG_SPI_BOOT=y
@@@ -46,7 -49,7 +49,6 @@@ CONFIG_CMD_PING=
  CONFIG_CMD_FAT=y
  CONFIG_OF_CONTROL=y
  CONFIG_SPL_OF_CONTROL=y
--CONFIG_DEFAULT_DEVICE_TREE="sama5d36ek"
  CONFIG_OF_SPL_REMOVE_PROPS="interrupts interrupt-parent dmas dma-names"
  CONFIG_ENV_IS_IN_SPI_FLASH=y
  CONFIG_SYS_RELOC_GD_ENV_ADDR=y

diff --cc configs/sama5d4_xplained_spiflash_defconfig
index 31326398f2b4e8b0c9ca7a62bd495bd66eaae6cb,4239c050304dd0445c7ae12949507ae70e948648..5d523249fbdcf72b4b33124ca88cccba6695a6e6
--- 1/configs/sama5d4_xplained_spiflash_defconfig
--- 2/configs/sama5d4_xplained_spiflash_defconfig
+++ b/configs/sama5d4_xplained_spiflash_defconfig
@@@ -12,7 -12,7 +12,8 @@@ CONFIG_ENV_OFFSET=0x600
  CONFIG_ENV_SECT_SIZE=0x1000
  CONFIG_SYS_SPI_U_BOOT_OFFS=0x10000
  CONFIG_DM_GPIO=y
+ CONFIG_SPL_DM_SPI=y
 +CONFIG_SPL_TEXT_BASE=0x200000
  CONFIG_SPL_SERIAL_SUPPORT=y
  CONFIG_SPL_DRIVERS_MISC_SUPPORT=y
  CONFIG_NR_DRAM_BANKS=1
@@@ -22,7 -22,8 +23,8 @@@ CONFIG_DEBUG_UART_BASE=0xfc00c00
  CONFIG_DEBUG_UART_CLOCK=100000000
  CONFIG_SPL_SPI_FLASH_SUPPORT=y
  CONFIG_SPL_SPI_SUPPORT=y
 -CONFIG_SPL_TEXT_BASE=0x200000
  CONFIG_DEBUG_UART=y
++CONFIG_DEFAULT_DEVICE_TREE="at91-sama5d4_xplained"
  CONFIG_ENV_VARS_UBOOT_CONFIG=y
  CONFIG_FIT=y
  CONFIG_SPI_BOOT=y
@@@ -31,6 -32,6 +33,7 @@@ CONFIG_USE_BOOTARGS=
  CONFIG_BOOTARGS="console=ttyS0,115200 earlyprintk mtdparts=atmel_nand:256k(bootstrap)ro,768k(uboot)ro,256K(env_redundant),256k(env),512k(dtb),6M(kernel)ro,-(rootfs) rootfstype=ubifs ubi.mtd=6 root=ubi0:rootfs"
  CONFIG_MISC_INIT_R=y
  # CONFIG_DISPLAY_BOARDINFO is not set
++CONFIG_SPL_DM_SPI_FLASH=y
  CONFIG_SPL_SPI_LOAD=y
  CONFIG_HUSH_PARSER=y
  CONFIG_CMD_BOOTZ=y
@@@ -44,7 -45,7 +47,6 @@@ CONFIG_CMD_PING=
  CONFIG_CMD_FAT=y
  CONFIG_OF_CONTROL=y
  CONFIG_SPL_OF_CONTROL=y
--CONFIG_DEFAULT_DEVICE_TREE="at91-sama5d4_xplained"
  CONFIG_OF_SPL_REMOVE_PROPS="interrupts interrupt-parent dma-names dmas"
  CONFIG_ENV_IS_IN_SPI_FLASH=y
  CONFIG_SYS_RELOC_GD_ENV_ADDR=y

diff --cc configs/sama5d4ek_spiflash_defconfig
index 552157cb463caec0fcc26c33bf4cd9f9cb032967,3e5b2fd8b6164def0e0c66dbc12b5af8c9a06ebd..ce623a80865e63a66cdd27670ca2465dec916b11
--- 1/configs/sama5d4ek_spiflash_defconfig
--- 2/configs/sama5d4ek_spiflash_defconfig
+++ b/configs/sama5d4ek_spiflash_defconfig
@@@ -12,7 -12,7 +12,8 @@@ CONFIG_ENV_OFFSET=0x600
  CONFIG_ENV_SECT_SIZE=0x1000
  CONFIG_SYS_SPI_U_BOOT_OFFS=0x10000
  CONFIG_DM_GPIO=y
+ CONFIG_SPL_DM_SPI=y
 +CONFIG_SPL_TEXT_BASE=0x200000
  CONFIG_SPL_SERIAL_SUPPORT=y
  CONFIG_SPL_DRIVERS_MISC_SUPPORT=y
  CONFIG_NR_DRAM_BANKS=1
@@@ -22,7 -22,8 +23,8 @@@ CONFIG_DEBUG_UART_BASE=0xfc00c00
  CONFIG_DEBUG_UART_CLOCK=88000000
  CONFIG_SPL_SPI_FLASH_SUPPORT=y
  CONFIG_SPL_SPI_SUPPORT=y
 -CONFIG_SPL_TEXT_BASE=0x200000
  CONFIG_DEBUG_UART=y
++CONFIG_DEFAULT_DEVICE_TREE="at91-sama5d4ek"
  CONFIG_ENV_VARS_UBOOT_CONFIG=y
  CONFIG_FIT=y
  CONFIG_SPI_BOOT=y
@@@ -30,6 -31,6 +32,7 @@@ CONFIG_BOOTDELAY=
  CONFIG_USE_BOOTARGS=y
  CONFIG_BOOTARGS="console=ttyS0,115200 earlyprintk mtdparts=atmel_nand:256k(bootstrap)ro,768k(uboot)ro,256K(env_redundant),256k(env),512k(dtb),6M(kernel)ro,-(rootfs) rootfstype=ubifs ubi.mtd=6 root=ubi0:rootfs"
  # CONFIG_DISPLAY_BOARDINFO is not set
++CONFIG_SPL_DM_SPI_FLASH=y
  CONFIG_SPL_SPI_LOAD=y
  CONFIG_HUSH_PARSER=y
  CONFIG_CMD_BOOTZ=y
@@@ -44,7 -45,7 +47,6 @@@ CONFIG_CMD_PING=
  CONFIG_CMD_FAT=y
  CONFIG_OF_CONTROL=y
  CONFIG_SPL_OF_CONTROL=y
--CONFIG_DEFAULT_DEVICE_TREE="at91-sama5d4ek"
  CONFIG_OF_SPL_REMOVE_PROPS="interrupts interrupt-parent dma-names dmas"
  CONFIG_ENV_IS_IN_SPI_FLASH=y
  CONFIG_SYS_RELOC_GD_ENV_ADDR=y

diff --cc configs/sandbox64_defconfig
Simple merge

diff --cc configs/sandbox_defconfig
Simple merge

diff --cc configs/sandbox_flattree_defconfig
Simple merge

diff --cc configs/sandbox_spl_defconfig
Simple merge

diff --cc configs/sifive_fu540_defconfig
Simple merge

diff --cc configs/socfpga_agilex_defconfig
index 0340a5672c6f222789fdd43872dace5daf77ec03,755541dc2266e750976ef5c9a11c28f8bc52c5be..2885c60d24ee56ee992bc08a4ad7c7ee6341bdee
--- 1/configs/socfpga_agilex_defconfig
--- 2/configs/socfpga_agilex_defconfig
+++ b/configs/socfpga_agilex_defconfig
@@@ -11,7 -11,10 +11,10 @@@ CONFIG_NR_DRAM_BANKS=
  CONFIG_TARGET_SOCFPGA_AGILEX_SOCDK=y
  CONFIG_IDENT_STRING="socfpga_agilex"
  CONFIG_SPL_FS_FAT=y
 -CONFIG_SPL_TEXT_BASE=0xFFE00000
++CONFIG_DEFAULT_DEVICE_TREE="socfpga_agilex_socdk"
  CONFIG_BOOTDELAY=5
+ CONFIG_USE_BOOTARGS=y
+ CONFIG_BOOTARGS="earlycon"
  CONFIG_SPL_CACHE=y
  CONFIG_SPL_SPI_LOAD=y
  CONFIG_HUSH_PARSER=y
@@@ -32,7 -35,7 +35,6 @@@ CONFIG_CMD_EXT4=
  CONFIG_CMD_FAT=y
  CONFIG_CMD_FS_GENERIC=y
  CONFIG_OF_EMBED=y
--CONFIG_DEFAULT_DEVICE_TREE="socfpga_agilex_socdk"
  CONFIG_ENV_IS_IN_MMC=y
  CONFIG_NET_RANDOM_ETHADDR=y
  CONFIG_SPL_DM_SEQ_ALIAS=y

diff --cc configs/socfpga_arria10_defconfig
index 6865510cc128591097078feb98672e51b7ee9277,5d1b7657723d06bc222c15967d39814a5def75a4..625b597bbdeff4056669dfafb885e189d86a4468
--- 1/configs/socfpga_arria10_defconfig
--- 2/configs/socfpga_arria10_defconfig
+++ b/configs/socfpga_arria10_defconfig
@@@ -8,6 -8,7 +8,7 @@@ CONFIG_SPL_DRIVERS_MISC_SUPPORT=
  CONFIG_TARGET_SOCFPGA_ARRIA10_SOCDK=y
  CONFIG_IDENT_STRING="socfpga_arria10"
  CONFIG_SPL_FS_FAT=y
 -CONFIG_SPL_TEXT_BASE=0xFFE00000
++CONFIG_DEFAULT_DEVICE_TREE="socfpga_arria10_socdk_sdmmc"
  CONFIG_DISTRO_DEFAULTS=y
  CONFIG_FIT=y
  CONFIG_SPL_FIT=y
@@@ -31,7 -32,7 +32,6 @@@ CONFIG_CMD_USB=
  CONFIG_CMD_CACHE=y
  CONFIG_CMD_EXT4_WRITE=y
  CONFIG_MTDIDS_DEFAULT="nor0=ff705000.spi.0"
--CONFIG_DEFAULT_DEVICE_TREE="socfpga_arria10_socdk_sdmmc"
  CONFIG_OF_SPL_REMOVE_PROPS="interrupts interrupt-parent dmas dma-names"
  CONFIG_ENV_IS_IN_MMC=y
  CONFIG_SYS_RELOC_GD_ENV_ADDR=y

diff --cc configs/socfpga_arria5_defconfig
index d289731d26ebd0845771a91bd44f5db84c79132d,2ff9e8bc81cc850382f31de58e7f2447f5407f1f..535a9433b7a1b7fb3e0a4246754bd135cee39c94
--- 1/configs/socfpga_arria5_defconfig
--- 2/configs/socfpga_arria5_defconfig
+++ b/configs/socfpga_arria5_defconfig
@@@ -4,8 -4,9 +4,9 @@@ CONFIG_ENV_SIZE=0x200
  CONFIG_ENV_OFFSET=0x4400
  CONFIG_SYS_SPI_U_BOOT_OFFS=0x40000
  CONFIG_DM_GPIO=y
 -CONFIG_SPL_DM_SPI=y
 -CONFIG_TARGET_SOCFPGA_ARRIA5_SOCDK=y
  CONFIG_SPL_TEXT_BASE=0xFFFF0000
 +CONFIG_TARGET_SOCFPGA_ARRIA5_SOCDK=y
++CONFIG_DEFAULT_DEVICE_TREE="socfpga_arria5_socdk"
  CONFIG_DISTRO_DEFAULTS=y
  CONFIG_FIT=y
  # CONFIG_USE_BOOTCOMMAND is not set
@@@ -34,7 -35,7 +35,6 @@@ CONFIG_MTDPARTS_DEFAULT="mtdparts=ff705
  CONFIG_CMD_UBI=y
  # CONFIG_ISO_PARTITION is not set
  # CONFIG_EFI_PARTITION is not set
--CONFIG_DEFAULT_DEVICE_TREE="socfpga_arria5_socdk"
  CONFIG_ENV_IS_IN_MMC=y
  CONFIG_SYS_RELOC_GD_ENV_ADDR=y
  CONFIG_SPL_DM_SEQ_ALIAS=y

diff --cc configs/socfpga_cyclone5_defconfig
index 75d33742f94b72e774dc1c5021606bd145a55075,0ef320ce6ee0f7d11d7a1423e58133f1f8da6487..1729f5f2e232483eb4c3180c776c92a014f01e2d
--- 1/configs/socfpga_cyclone5_defconfig
--- 2/configs/socfpga_cyclone5_defconfig
+++ b/configs/socfpga_cyclone5_defconfig
@@@ -4,8 -4,9 +4,9 @@@ CONFIG_ENV_SIZE=0x200
  CONFIG_ENV_OFFSET=0x4400
  CONFIG_SYS_SPI_U_BOOT_OFFS=0x40000
  CONFIG_DM_GPIO=y
 -CONFIG_SPL_DM_SPI=y
 -CONFIG_TARGET_SOCFPGA_CYCLONE5_SOCDK=y
  CONFIG_SPL_TEXT_BASE=0xFFFF0000
 +CONFIG_TARGET_SOCFPGA_CYCLONE5_SOCDK=y
++CONFIG_DEFAULT_DEVICE_TREE="socfpga_cyclone5_socdk"
  CONFIG_DISTRO_DEFAULTS=y
  CONFIG_FIT=y
  # CONFIG_USE_BOOTCOMMAND is not set
@@@ -34,7 -35,7 +35,6 @@@ CONFIG_MTDPARTS_DEFAULT="mtdparts=ff705
  CONFIG_CMD_UBI=y
  # CONFIG_ISO_PARTITION is not set
  # CONFIG_EFI_PARTITION is not set
--CONFIG_DEFAULT_DEVICE_TREE="socfpga_cyclone5_socdk"
  CONFIG_ENV_IS_IN_MMC=y
  CONFIG_SYS_RELOC_GD_ENV_ADDR=y
  CONFIG_SPL_DM_SEQ_ALIAS=y

diff --cc configs/socfpga_dbm_soc1_defconfig
index f697666729b8a4982761622b9364412871c4c0c7,960d80dbca91bca33a08c7d19afcdbf8c03f60b0..c34b34851db85dc4dd62adb3d8dee5bc663d54a3
--- 1/configs/socfpga_dbm_soc1_defconfig
--- 2/configs/socfpga_dbm_soc1_defconfig
+++ b/configs/socfpga_dbm_soc1_defconfig
@@@ -4,8 -4,9 +4,9 @@@ CONFIG_ENV_SIZE=0x200
  CONFIG_ENV_OFFSET=0x4400
  CONFIG_SYS_SPI_U_BOOT_OFFS=0x40000
  CONFIG_DM_GPIO=y
 -CONFIG_SPL_DM_SPI=y
 -CONFIG_TARGET_SOCFPGA_DEVBOARDS_DBM_SOC1=y
  CONFIG_SPL_TEXT_BASE=0xFFFF0000
 +CONFIG_TARGET_SOCFPGA_DEVBOARDS_DBM_SOC1=y
++CONFIG_DEFAULT_DEVICE_TREE="socfpga_cyclone5_dbm_soc1"
  CONFIG_FIT=y
  CONFIG_USE_BOOTARGS=y
  CONFIG_BOOTARGS="console=ttyS0,115200"
@@@ -39,7 -40,7 +40,6 @@@ CONFIG_CMD_EXT4=
  CONFIG_CMD_EXT4_WRITE=y
  CONFIG_CMD_FAT=y
  CONFIG_CMD_FS_GENERIC=y
--CONFIG_DEFAULT_DEVICE_TREE="socfpga_cyclone5_dbm_soc1"
  CONFIG_ENV_IS_IN_MMC=y
  CONFIG_SYS_RELOC_GD_ENV_ADDR=y
  CONFIG_DFU_MMC=y

diff --cc configs/socfpga_de0_nano_soc_defconfig
index 79a5004491813ae49ae08b33e733196b4dff4e4e,3fc0b04269bee7f1137e7d9e7f16860f5c96bda8..bbaf82a2eadc4bdcf9c98f4b29c788aa58823f44
--- 1/configs/socfpga_de0_nano_soc_defconfig
--- 2/configs/socfpga_de0_nano_soc_defconfig
+++ b/configs/socfpga_de0_nano_soc_defconfig
@@@ -4,8 -4,9 +4,9 @@@ CONFIG_ENV_SIZE=0x200
  CONFIG_ENV_OFFSET=0x4400
  CONFIG_SYS_SPI_U_BOOT_OFFS=0x40000
  CONFIG_DM_GPIO=y
 -CONFIG_SPL_DM_SPI=y
 -CONFIG_TARGET_SOCFPGA_TERASIC_DE0_NANO=y
  CONFIG_SPL_TEXT_BASE=0xFFFF0000
 +CONFIG_TARGET_SOCFPGA_TERASIC_DE0_NANO=y
++CONFIG_DEFAULT_DEVICE_TREE="socfpga_cyclone5_de0_nano_soc"
  CONFIG_DISTRO_DEFAULTS=y
  CONFIG_FIT=y
  # CONFIG_USE_BOOTCOMMAND is not set
@@@ -35,7 -36,7 +36,6 @@@ CONFIG_MTDPARTS_DEFAULT="mtdparts=ff705
  CONFIG_CMD_UBI=y
  # CONFIG_ISO_PARTITION is not set
  # CONFIG_EFI_PARTITION is not set
--CONFIG_DEFAULT_DEVICE_TREE="socfpga_cyclone5_de0_nano_soc"
  CONFIG_ENV_IS_IN_MMC=y
  CONFIG_SYS_RELOC_GD_ENV_ADDR=y
  CONFIG_DFU_MMC=y

diff --cc configs/socfpga_de10_nano_defconfig
index f453170319847bd4acea0249843571b673515913,18d914e15b1397b562e0a5f819dfc52b83b96774..a83641227a72cabda8ed5225aa275b795971e02c
--- 1/configs/socfpga_de10_nano_defconfig
--- 2/configs/socfpga_de10_nano_defconfig
+++ b/configs/socfpga_de10_nano_defconfig
@@@ -4,8 -4,9 +4,9 @@@ CONFIG_ENV_SIZE=0x200
  CONFIG_ENV_OFFSET=0x4400
  CONFIG_SYS_SPI_U_BOOT_OFFS=0x40000
  CONFIG_DM_GPIO=y
 -CONFIG_SPL_DM_SPI=y
 -CONFIG_TARGET_SOCFPGA_TERASIC_DE10_NANO=y
  CONFIG_SPL_TEXT_BASE=0xFFFF0000
 +CONFIG_TARGET_SOCFPGA_TERASIC_DE10_NANO=y
++CONFIG_DEFAULT_DEVICE_TREE="socfpga_cyclone5_de10_nano"
  CONFIG_DISTRO_DEFAULTS=y
  CONFIG_FIT=y
  # CONFIG_USE_BOOTCOMMAND is not set
@@@ -32,7 -33,7 +33,6 @@@ CONFIG_CMD_EXT4_WRITE=
  CONFIG_MTDIDS_DEFAULT="nor0=ff705000.spi.0"
  # CONFIG_ISO_PARTITION is not set
  # CONFIG_EFI_PARTITION is not set
--CONFIG_DEFAULT_DEVICE_TREE="socfpga_cyclone5_de10_nano"
  CONFIG_ENV_IS_IN_MMC=y
  CONFIG_SYS_RELOC_GD_ENV_ADDR=y
  CONFIG_DFU_MMC=y

diff --cc configs/socfpga_de1_soc_defconfig
index 9a0d4e3f67775c802ebfe28f8c4f418f051d2536,8301bc3987f377e636b63ed34110f16610c659a4..45495a7cdafeda02a3b5f126cf4d64a2b16e1cd1
--- 1/configs/socfpga_de1_soc_defconfig
--- 2/configs/socfpga_de1_soc_defconfig
+++ b/configs/socfpga_de1_soc_defconfig
@@@ -3,8 -3,9 +3,9 @@@ CONFIG_ARCH_SOCFPGA=
  CONFIG_ENV_SIZE=0x2000
  CONFIG_ENV_OFFSET=0x4400
  CONFIG_DM_GPIO=y
 -CONFIG_SPL_DM_SPI=y
 -CONFIG_TARGET_SOCFPGA_TERASIC_DE1_SOC=y
  CONFIG_SPL_TEXT_BASE=0xFFFF0000
 +CONFIG_TARGET_SOCFPGA_TERASIC_DE1_SOC=y
++CONFIG_DEFAULT_DEVICE_TREE="socfpga_cyclone5_de1_soc"
  CONFIG_DISTRO_DEFAULTS=y
  CONFIG_FIT=y
  # CONFIG_USE_BOOTCOMMAND is not set
@@@ -31,7 -32,7 +32,6 @@@ CONFIG_CMD_EXT4_WRITE=
  CONFIG_MTDIDS_DEFAULT="nor0=ff705000.spi.0"
  # CONFIG_ISO_PARTITION is not set
  # CONFIG_EFI_PARTITION is not set
--CONFIG_DEFAULT_DEVICE_TREE="socfpga_cyclone5_de1_soc"
  CONFIG_ENV_IS_IN_MMC=y
  CONFIG_SYS_RELOC_GD_ENV_ADDR=y
  CONFIG_DWAPB_GPIO=y

diff --cc configs/socfpga_is1_defconfig
index f444572bec2ae99a94192c52d5319b3a8a4fa5a3,1128826dbc4d2a27362cf1983d66aef96945b482..5d58a6cf668535752e7e1f94e94ad34c75d8b180
--- 1/configs/socfpga_is1_defconfig
--- 2/configs/socfpga_is1_defconfig
+++ b/configs/socfpga_is1_defconfig
@@@ -5,9 -5,10 +5,10 @@@ CONFIG_ENV_OFFSET=0x10000
  CONFIG_ENV_SECT_SIZE=0x10000
  CONFIG_SYS_SPI_U_BOOT_OFFS=0x40000
  CONFIG_DM_GPIO=y
 -CONFIG_SPL_DM_SPI=y
 +CONFIG_SPL_TEXT_BASE=0xFFFF0000
  CONFIG_SYS_BOOTCOUNT_ADDR=0xfffffff8
  CONFIG_TARGET_SOCFPGA_IS1=y
 -CONFIG_SPL_TEXT_BASE=0xFFFF0000
++CONFIG_DEFAULT_DEVICE_TREE="socfpga_cyclone5_is1"
  CONFIG_DISTRO_DEFAULTS=y
  CONFIG_FIT=y
  CONFIG_USE_BOOTARGS=y
@@@ -34,7 -35,7 +35,6 @@@ CONFIG_MTDPARTS_DEFAULT="mtdparts=ff705
  CONFIG_CMD_UBI=y
  # CONFIG_ISO_PARTITION is not set
  # CONFIG_EFI_PARTITION is not set
--CONFIG_DEFAULT_DEVICE_TREE="socfpga_cyclone5_is1"
  CONFIG_ENV_IS_IN_SPI_FLASH=y
  CONFIG_SYS_RELOC_GD_ENV_ADDR=y
  CONFIG_SPL_DM_SEQ_ALIAS=y

diff --cc configs/socfpga_mcvevk_defconfig
index 76b781bf583053264ce7d505761b363bc9c2ef40,979d76fda87b453bcf3439e701438121bdd07066..312dbc9fd4b25e2bbf7d2da18f8c5d7f81dc7936
--- 1/configs/socfpga_mcvevk_defconfig
--- 2/configs/socfpga_mcvevk_defconfig
+++ b/configs/socfpga_mcvevk_defconfig
@@@ -4,8 -4,9 +4,9 @@@ CONFIG_ENV_SIZE=0x200
  CONFIG_ENV_OFFSET=0x4400
  CONFIG_SYS_SPI_U_BOOT_OFFS=0x40000
  CONFIG_DM_GPIO=y
 -CONFIG_SPL_DM_SPI=y
 -CONFIG_TARGET_SOCFPGA_ARIES_MCVEVK=y
  CONFIG_SPL_TEXT_BASE=0xFFFF0000
 +CONFIG_TARGET_SOCFPGA_ARIES_MCVEVK=y
++CONFIG_DEFAULT_DEVICE_TREE="socfpga_cyclone5_mcvevk"
  CONFIG_DISTRO_DEFAULTS=y
  CONFIG_FIT=y
  CONFIG_USE_BOOTARGS=y
@@@ -32,7 -33,7 +33,6 @@@ CONFIG_CMD_CACHE=
  CONFIG_CMD_EXT4_WRITE=y
  # CONFIG_ISO_PARTITION is not set
  # CONFIG_EFI_PARTITION is not set
--CONFIG_DEFAULT_DEVICE_TREE="socfpga_cyclone5_mcvevk"
  CONFIG_ENV_IS_IN_MMC=y
  CONFIG_SYS_RELOC_GD_ENV_ADDR=y
  CONFIG_DFU_MMC=y

diff --cc configs/socfpga_secu1_defconfig
Simple merge

diff --cc configs/socfpga_sockit_defconfig
index 74fd618865560ca16b59cbe8a9920c7ae844ed77,d814fd7baa7604d3ec04660dbc304ab314b3d66f..336512991c74bca0ab81762f4a1132eb0ec4792d
--- 1/configs/socfpga_sockit_defconfig
--- 2/configs/socfpga_sockit_defconfig
+++ b/configs/socfpga_sockit_defconfig
@@@ -4,8 -4,9 +4,9 @@@ CONFIG_ENV_SIZE=0x200
  CONFIG_ENV_OFFSET=0x4400
  CONFIG_SYS_SPI_U_BOOT_OFFS=0x40000
  CONFIG_DM_GPIO=y
 -CONFIG_SPL_DM_SPI=y
 -CONFIG_TARGET_SOCFPGA_TERASIC_SOCKIT=y
  CONFIG_SPL_TEXT_BASE=0xFFFF0000
 +CONFIG_TARGET_SOCFPGA_TERASIC_SOCKIT=y
++CONFIG_DEFAULT_DEVICE_TREE="socfpga_cyclone5_sockit"
  CONFIG_DISTRO_DEFAULTS=y
  CONFIG_FIT=y
  # CONFIG_USE_BOOTCOMMAND is not set
@@@ -34,7 -35,7 +35,6 @@@ CONFIG_MTDPARTS_DEFAULT="mtdparts=ff705
  CONFIG_CMD_UBI=y
  # CONFIG_ISO_PARTITION is not set
  # CONFIG_EFI_PARTITION is not set
--CONFIG_DEFAULT_DEVICE_TREE="socfpga_cyclone5_sockit"
  CONFIG_ENV_IS_IN_MMC=y
  CONFIG_SYS_RELOC_GD_ENV_ADDR=y
  CONFIG_SPL_DM_SEQ_ALIAS=y

diff --cc configs/socfpga_socrates_defconfig
index 6bf0f3ef50c84af1cbba203e53dfca3934bcb26d,f8dfec613f25549216f90aa9bad407d102f3f042..a8b4192b0b020c1788a795191bed01df9606eb5e
--- 1/configs/socfpga_socrates_defconfig
--- 2/configs/socfpga_socrates_defconfig
+++ b/configs/socfpga_socrates_defconfig
@@@ -4,8 -4,9 +4,9 @@@ CONFIG_ENV_SIZE=0x200
  CONFIG_ENV_OFFSET=0x4400
  CONFIG_SYS_SPI_U_BOOT_OFFS=0x40000
  CONFIG_DM_GPIO=y
 -CONFIG_SPL_DM_SPI=y
 -CONFIG_TARGET_SOCFPGA_EBV_SOCRATES=y
  CONFIG_SPL_TEXT_BASE=0xFFFF0000
 +CONFIG_TARGET_SOCFPGA_EBV_SOCRATES=y
++CONFIG_DEFAULT_DEVICE_TREE="socfpga_cyclone5_socrates"
  CONFIG_DISTRO_DEFAULTS=y
  CONFIG_FIT=y
  # CONFIG_USE_BOOTCOMMAND is not set
@@@ -35,7 -36,7 +36,6 @@@ CONFIG_MTDPARTS_DEFAULT="mtdparts=ff705
  CONFIG_CMD_UBI=y
  # CONFIG_ISO_PARTITION is not set
  # CONFIG_EFI_PARTITION is not set
--CONFIG_DEFAULT_DEVICE_TREE="socfpga_cyclone5_socrates"
  CONFIG_ENV_IS_IN_MMC=y
  CONFIG_SYS_RELOC_GD_ENV_ADDR=y
  CONFIG_SPL_DM_SEQ_ALIAS=y

diff --cc configs/socfpga_sr1500_defconfig
index f5da5ac63f75305d73d5bffcfc83dc285ea044c7,328100f70eba5012f3d6c4b0f2ccfa6f051fa544..4e9087e7d3d0c6752b1f1c56c90d8dc2248b6104
--- 1/configs/socfpga_sr1500_defconfig
--- 2/configs/socfpga_sr1500_defconfig
+++ b/configs/socfpga_sr1500_defconfig
@@@ -9,6 -9,7 +9,7 @@@ CONFIG_SPL_TEXT_BASE=0xFFFF000
  CONFIG_SYS_BOOTCOUNT_ADDR=0xfffffff8
  CONFIG_TARGET_SOCFPGA_SR1500=y
  CONFIG_ENV_OFFSET_REDUND=0xF0000
 -CONFIG_SPL_TEXT_BASE=0xFFFF0000
++CONFIG_DEFAULT_DEVICE_TREE="socfpga_cyclone5_sr1500"
  CONFIG_DISTRO_DEFAULTS=y
  CONFIG_FIT=y
  # CONFIG_USE_BOOTCOMMAND is not set
@@@ -40,7 -41,7 +41,6 @@@ CONFIG_MTDPARTS_DEFAULT="mtdparts=ff705
  CONFIG_CMD_UBI=y
  # CONFIG_ISO_PARTITION is not set
  # CONFIG_EFI_PARTITION is not set
--CONFIG_DEFAULT_DEVICE_TREE="socfpga_cyclone5_sr1500"
  CONFIG_ENV_IS_IN_SPI_FLASH=y
  CONFIG_SYS_REDUNDAND_ENVIRONMENT=y
  CONFIG_SYS_RELOC_GD_ENV_ADDR=y

diff --cc configs/socfpga_stratix10_defconfig
index 71f52efb7addb3120d1bed724c3245f5c6e52324,587745f4e813302f8fdbe1569f6421b553dc9bd5..9ae6ef6df7f5b14b415fc922a4a310eb6125d6b6
--- 1/configs/socfpga_stratix10_defconfig
--- 2/configs/socfpga_stratix10_defconfig
+++ b/configs/socfpga_stratix10_defconfig
@@@ -11,7 -11,12 +11,12 @@@ CONFIG_NR_DRAM_BANKS=
  CONFIG_TARGET_SOCFPGA_STRATIX10_SOCDK=y
  CONFIG_IDENT_STRING="socfpga_stratix10"
  CONFIG_SPL_FS_FAT=y
 -CONFIG_SPL_TEXT_BASE=0xFFE00000
++CONFIG_DEFAULT_DEVICE_TREE="socfpga_stratix10_socdk"
+ CONFIG_OPTIMIZE_INLINING=y
+ CONFIG_SPL_OPTIMIZE_INLINING=y
  CONFIG_BOOTDELAY=5
+ CONFIG_USE_BOOTARGS=y
+ CONFIG_BOOTARGS="earlycon"
  CONFIG_SPL_SPI_LOAD=y
  CONFIG_HUSH_PARSER=y
  CONFIG_SYS_PROMPT="SOCFPGA_STRATIX10 # "
@@@ -32,7 -37,7 +37,6 @@@ CONFIG_CMD_EXT4=
  CONFIG_CMD_FAT=y
  CONFIG_CMD_FS_GENERIC=y
  CONFIG_OF_EMBED=y
--CONFIG_DEFAULT_DEVICE_TREE="socfpga_stratix10_socdk"
  CONFIG_ENV_IS_IN_MMC=y
  CONFIG_SYS_RELOC_GD_ENV_ADDR=y
  CONFIG_NET_RANDOM_ETHADDR=y

diff --cc configs/socfpga_vining_fpga_defconfig
index bd25564dbc300b806f62855e5e7de555ef808a5e,37190ba04580e9aa3c6e713daee391403ea0545e..152ac31b7ddfe7f3a92d277b18b89b90ed3c50a4
--- 1/configs/socfpga_vining_fpga_defconfig
--- 2/configs/socfpga_vining_fpga_defconfig
+++ b/configs/socfpga_vining_fpga_defconfig
@@@ -5,9 -5,10 +5,10 @@@ CONFIG_ENV_OFFSET=0x10000
  CONFIG_ENV_SECT_SIZE=0x10000
  CONFIG_SYS_SPI_U_BOOT_OFFS=0x40000
  CONFIG_DM_GPIO=y
 -CONFIG_SPL_DM_SPI=y
 +CONFIG_SPL_TEXT_BASE=0xFFFF0000
  CONFIG_TARGET_SOCFPGA_SOFTING_VINING_FPGA=y
  CONFIG_ENV_OFFSET_REDUND=0x110000
 -CONFIG_SPL_TEXT_BASE=0xFFFF0000
++CONFIG_DEFAULT_DEVICE_TREE="socfpga_cyclone5_vining_fpga"
  CONFIG_DISTRO_DEFAULTS=y
  CONFIG_FIT=y
  CONFIG_BOOTDELAY=5
@@@ -43,7 -44,7 +44,6 @@@ CONFIG_MTDPARTS_DEFAULT="mtdparts=ff705
  CONFIG_CMD_UBI=y
  # CONFIG_ISO_PARTITION is not set
  # CONFIG_EFI_PARTITION is not set
--CONFIG_DEFAULT_DEVICE_TREE="socfpga_cyclone5_vining_fpga"
  CONFIG_ENV_IS_IN_SPI_FLASH=y
  CONFIG_SYS_REDUNDAND_ENVIRONMENT=y
  CONFIG_SYS_RELOC_GD_ENV_ADDR=y

diff --cc configs/stm32mp15_basic_defconfig
index 3bd8434d2690ea8c57b120fd5a1033f1e2d05b62,f0abc89a43bb999e5edfec957dd3d002c1f638e9..ecdbac65ffc92ad42b1a88fc449ccc026a598df8
--- 1/configs/stm32mp15_basic_defconfig
--- 2/configs/stm32mp15_basic_defconfig
+++ b/configs/stm32mp15_basic_defconfig
@@@ -4,7 -4,7 +4,8 @@@ CONFIG_SYS_MALLOC_F_LEN=0x300
  CONFIG_ENV_OFFSET=0x280000
  CONFIG_ENV_SECT_SIZE=0x40000
  CONFIG_SYS_SPI_U_BOOT_OFFS=0x80000
+ CONFIG_SPL_DM_SPI=y
 +CONFIG_SPL_TEXT_BASE=0x2FFC2500
  CONFIG_SPL_MMC_SUPPORT=y
  CONFIG_SPL=y
  CONFIG_TARGET_ST_STM32MP15x=y
@@@ -13,6 -13,7 +14,7 @@@ CONFIG_ENV_OFFSET_REDUND=0x2C000
  CONFIG_SPL_SPI_FLASH_SUPPORT=y
  CONFIG_SPL_SPI_SUPPORT=y
  # CONFIG_ARMV7_VIRT is not set
 -CONFIG_SPL_TEXT_BASE=0x2FFC2500
++CONFIG_DEFAULT_DEVICE_TREE="stm32mp157c-ev1"
  CONFIG_DISTRO_DEFAULTS=y
  CONFIG_FIT=y
  CONFIG_BOOTCOMMAND="run bootcmd_stm32mp"
@@@ -20,7 -21,7 +22,9 @@@ CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_PA
  CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_PARTITION=3
  CONFIG_SPL_I2C_SUPPORT=y
  CONFIG_SPL_MTD_SUPPORT=y
++CONFIG_SPL_DM_SPI_FLASH=y
  CONFIG_SPL_POWER_SUPPORT=y
++CONFIG_SPL_SPI_FLASH_MTD=y
  CONFIG_SYS_PROMPT="STM32MP> "
  # CONFIG_CMD_ELF is not set
  # CONFIG_CMD_EXPORTENV is not set
@@@ -50,7 -51,7 +54,6 @@@ CONFIG_CMD_EXT4_WRITE=
  CONFIG_CMD_MTDPARTS=y
  CONFIG_CMD_UBI=y
  # CONFIG_SPL_DOS_PARTITION is not set
--CONFIG_DEFAULT_DEVICE_TREE="stm32mp157c-ev1"
  CONFIG_OF_SPL_REMOVE_PROPS="interrupts interrupt-names interrupts-extended interrupt-controller \\\#interrupt-cells interrupt-parent dmas dma-names assigned-clocks assigned-clock-rates assigned-clock-parents hwlocks"
  CONFIG_ENV_IS_NOWHERE=y
  CONFIG_ENV_IS_IN_EXT4=y
@@@ -96,7 -98,7 +99,6 @@@ CONFIG_SPI_FLASH_STMICRO=
  CONFIG_SPI_FLASH_WINBOND=y
  # CONFIG_SPI_FLASH_USE_4K_SECTORS is not set
  CONFIG_SPI_FLASH_MTD=y
--CONFIG_SPL_SPI_FLASH_MTD=y
  CONFIG_PHY_REALTEK=y
  CONFIG_DM_ETH=y
  CONFIG_DWC_ETH_QOS=y

diff --cc configs/stm32mp15_dhcom_basic_defconfig
index a0481fb9a2f4913f6badf13aa78f0ddcb287e404,be5926d03a83f68652b3dda472e39533f101c83b..cd9ba108b39db3e198b591c5f5a428f02338a678
--- 1/configs/stm32mp15_dhcom_basic_defconfig
--- 2/configs/stm32mp15_dhcom_basic_defconfig
+++ b/configs/stm32mp15_dhcom_basic_defconfig
@@@ -3,13 -3,14 +3,15 @@@ CONFIG_ARCH_STM32MP=
  CONFIG_SYS_MALLOC_F_LEN=0x3000
  CONFIG_ENV_SIZE=0x4000
  CONFIG_SYS_SPI_U_BOOT_OFFS=0x80000
+ CONFIG_SPL_DM_SPI=y
 +CONFIG_SPL_TEXT_BASE=0x2FFC2500
  CONFIG_SPL_MMC_SUPPORT=y
  CONFIG_SPL=y
  CONFIG_TARGET_DH_STM32MP1_PDK2=y
  CONFIG_SPL_SPI_FLASH_SUPPORT=y
  CONFIG_SPL_SPI_SUPPORT=y
  # CONFIG_ARMV7_VIRT is not set
 -CONFIG_SPL_TEXT_BASE=0x2FFC2500
++CONFIG_DEFAULT_DEVICE_TREE="stm32mp15xx-dhcom-pdk2"
  CONFIG_DISTRO_DEFAULTS=y
  CONFIG_FIT=y
  CONFIG_SPL_LOAD_FIT=y
@@@ -21,7 -22,7 +23,9 @@@ CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_PA
  CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_PARTITION=3
  CONFIG_SPL_I2C_SUPPORT=y
  CONFIG_SPL_MTD_SUPPORT=y
++CONFIG_SPL_DM_SPI_FLASH=y
  CONFIG_SPL_POWER_SUPPORT=y
++CONFIG_SPL_SPI_FLASH_MTD=y
  CONFIG_SYS_PROMPT="STM32MP> "
  # CONFIG_CMD_ELF is not set
  # CONFIG_CMD_EXPORTENV is not set
@@@ -52,7 -53,7 +56,6 @@@ CONFIG_CMD_REGULATOR=
  CONFIG_CMD_EXT4_WRITE=y
  CONFIG_CMD_MTDPARTS=y
  # CONFIG_SPL_DOS_PARTITION is not set
--CONFIG_DEFAULT_DEVICE_TREE="stm32mp15xx-dhcom-pdk2"
  CONFIG_OF_SPL_REMOVE_PROPS="interrupts interrupt-names interrupts-extended interrupt-controller \\\#interrupt-cells interrupt-parent dmas dma-names assigned-clocks assigned-clock-rates assigned-clock-parents hwlocks"
  CONFIG_ENV_IS_IN_SPI_FLASH=y
  CONFIG_USE_ENV_SPI_BUS=y
@@@ -98,7 -100,7 +101,6 @@@ CONFIG_SPI_FLASH_STMICRO=
  CONFIG_SPI_FLASH_WINBOND=y
  # CONFIG_SPI_FLASH_USE_4K_SECTORS is not set
  CONFIG_SPI_FLASH_MTD=y
--CONFIG_SPL_SPI_FLASH_MTD=y
  CONFIG_DM_ETH=y
  CONFIG_DWC_ETH_QOS=y
  CONFIG_KS8851_MLL=y

diff --cc configs/stm32mp15_dhcor_basic_defconfig
index 695e666aa2b180d7f62f9b8ed3866d8e226151b3,0344f07daeeb995ab10b8ae06b0131e2a947a132..94361f3b10123ecafe64bd298472d620d31a5b4c
--- 1/configs/stm32mp15_dhcor_basic_defconfig
--- 2/configs/stm32mp15_dhcor_basic_defconfig
+++ b/configs/stm32mp15_dhcor_basic_defconfig
@@@ -3,13 -3,14 +3,15 @@@ CONFIG_ARCH_STM32MP=
  CONFIG_SYS_MALLOC_F_LEN=0x3000
  CONFIG_ENV_SIZE=0x4000
  CONFIG_SYS_SPI_U_BOOT_OFFS=0x80000
+ CONFIG_SPL_DM_SPI=y
 +CONFIG_SPL_TEXT_BASE=0x2FFC2500
  CONFIG_SPL_MMC_SUPPORT=y
  CONFIG_SPL=y
  CONFIG_TARGET_DH_STM32MP1_PDK2=y
  CONFIG_SPL_SPI_FLASH_SUPPORT=y
  CONFIG_SPL_SPI_SUPPORT=y
  # CONFIG_ARMV7_VIRT is not set
 -CONFIG_SPL_TEXT_BASE=0x2FFC2500
++CONFIG_DEFAULT_DEVICE_TREE="stm32mp15xx-dhcor-avenger96"
  CONFIG_DISTRO_DEFAULTS=y
  CONFIG_FIT=y
  CONFIG_SPL_LOAD_FIT=y
@@@ -21,7 -22,7 +23,9 @@@ CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_PA
  CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_PARTITION=3
  CONFIG_SPL_I2C_SUPPORT=y
  CONFIG_SPL_MTD_SUPPORT=y
++CONFIG_SPL_DM_SPI_FLASH=y
  CONFIG_SPL_POWER_SUPPORT=y
++CONFIG_SPL_SPI_FLASH_MTD=y
  CONFIG_SYS_PROMPT="STM32MP> "
  # CONFIG_CMD_ELF is not set
  # CONFIG_CMD_EXPORTENV is not set
@@@ -50,7 -51,7 +54,6 @@@ CONFIG_CMD_REGULATOR=
  CONFIG_CMD_EXT4_WRITE=y
  CONFIG_CMD_MTDPARTS=y
  # CONFIG_SPL_DOS_PARTITION is not set
--CONFIG_DEFAULT_DEVICE_TREE="stm32mp15xx-dhcor-avenger96"
  CONFIG_OF_SPL_REMOVE_PROPS="interrupts interrupt-names interrupts-extended interrupt-controller \\\#interrupt-cells interrupt-parent dmas dma-names assigned-clocks assigned-clock-rates assigned-clock-parents hwlocks"
  CONFIG_ENV_IS_IN_SPI_FLASH=y
  CONFIG_USE_ENV_SPI_BUS=y
@@@ -94,7 -96,7 +97,6 @@@ CONFIG_SPI_FLASH_STMICRO=
  CONFIG_SPI_FLASH_WINBOND=y
  # CONFIG_SPI_FLASH_USE_4K_SECTORS is not set
  CONFIG_SPI_FLASH_MTD=y
--CONFIG_SPL_SPI_FLASH_MTD=y
  CONFIG_DM_ETH=y
  CONFIG_DWC_ETH_QOS=y
  CONFIG_PHY=y

diff --cc configs/ti816x_evm_defconfig
Simple merge

diff --cc configs/wb45n_defconfig
Simple merge

diff --cc configs/wb50n_defconfig
Simple merge

diff --cc configs/x530_defconfig
Simple merge