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 ac5d9d0,cefed5b..dce50dc
--- 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 0c3165f,154154c..2ecc990
--- 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 45faab6,3f2f4e4..918ff4d
--- 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 8f1eb66,1446646..09c8b74
--- 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 7311c2d,373eb4b..bc3da74
--- 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 ab601d9,6e83f33..ead4a59
--- 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 eedd9a6,22719fc..59b94f9
--- 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 8115d13,b8093ca..dad96d2
--- 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 815d549,79f9b5a..ef3a03b
--- 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 21573ef,6523921..e32de90
--- 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 07dac7c,3e760e7..7828e2d
--- 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 c9711e0,f33ab19..49d5768
--- 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 4b1dddb,422bcfd..e54a4ff
--- 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 18b4df9,f930ba6..09c87a9
--- 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 567d980,98c5095..c13a474
--- 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 cd4c374,2e87637..0df267d
--- 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 af8fb72,2306422..127664e
--- 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 c8b1eed,022dfae..12f08ae
--- 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 00d00b2,91e2861..4178473
--- 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 871d490,7c7b990..09a73e5
--- 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 d223266,822d1fc..a06fc7c
--- 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 65bd518,0bfa4ff..9b5bc6c
--- 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 77eab7c,b1ee475..1aa899e
--- 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 d5996bd,45ff171..3feaad1
--- 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 9e8fbed,f8d37f4..b21e79c
--- 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 5361b67,e9a8a90..0ed6b0c
--- 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 9c7c8d5,0029e70..317c484
--- 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 917ac26,8a0ae32..3c5a1dc
--- 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 f69b468,ec126b2..dd4ae62
--- 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 dda8d76,cf949cd..3ed804b
--- 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 047e98b,320175b..d292c1e
--- 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 bacae5b,8db078a..7c6e994
--- 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 3132639,4239c05..5d52324
--- 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 552157c,3e5b2fd..ce623a8
--- 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 0340a56,755541d..2885c60
--- 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 6865510,5d1b765..625b597
--- 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 d289731,2ff9e8b..535a943
--- 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 75d3374,0ef320c..1729f5f
--- 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 f697666,960d80d..c34b348
--- 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 79a5004,3fc0b04..bbaf82a
--- 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 f453170,18d914e..a836412
--- 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 9a0d4e3,8301bc3..45495a7
--- 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 f444572,1128826..5d58a6c
--- 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 76b781b,979d76f..312dbc9
--- 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 74fd618,d814fd7..3365129
--- 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 6bf0f3e,f8dfec6..a8b4192
--- 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 f5da5ac,328100f..4e9087e
--- 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 71f52ef,587745f..9ae6ef6
--- 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 bd25564,37190ba..152ac31
--- 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 3bd8434,f0abc89..ecdbac6
--- 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 a0481fb,be5926d..cd9ba10
--- 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 695e666,0344f07..94361f3
--- 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