Merge tag 'u-boot-atmel-2020.10-a' of https://gitlab.denx.de/u-boot/custodians/u...

First set of u-boot-atmel features for 2020.10 cycle

diff --combined arch/arm/Kconfig
index fb1e38d,3ba7e33..760e901
--- 1/arch/arm/Kconfig
--- 2/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@@ -532,6 -532,7 +532,7 @@@ choic
  config ARCH_AT91
        bool "Atmel AT91"
        select SPL_BOARD_INIT if SPL && !TARGET_SMARTWEB
+       select SPL_SEPARATE_BSS if SPL
  
  config TARGET_EDB93XX
        bool "Support edb93xx"
@@@ -549,7 -550,6 +550,7 @@@ config TARGET_GPLUG
  config ARCH_DAVINCI
        bool "TI DaVinci"
        select CPU_ARM926EJS
 +      select SPL_DM_SPI if SPL
        imply CMD_SAVES
        help
          Support for TI's DaVinci platform.
@@@ -567,8 -567,6 +568,8 @@@ config ARCH_MVEB
        select DM_SERIAL
        select DM_SPI
        select DM_SPI_FLASH
 +      select SPL_DM_SPI if SPL
 +      select SPL_DM_SPI_FLASH if SPL
        select OF_CONTROL
        select OF_SEPARATE
        select SPI
@@@ -876,11 -874,11 +877,11 @@@ config ARCH_MX7UL
  config ARCH_MX7
        bool "Freescale MX7"
        select ARCH_MISC_INIT
 -      select BOARD_EARLY_INIT_F
        select CPU_V7A
        select SYS_FSL_HAS_SEC if IMX_HAB
        select SYS_FSL_SEC_COMPAT_4
        select SYS_FSL_SEC_LE
 +      imply BOARD_EARLY_INIT_F
        imply MXC_GPIO
        imply SYS_THUMB_BUILD
  
@@@ -988,8 -986,6 +989,8 @@@ config ARCH_SOCFPG
        imply FAT_WRITE
        imply SPL
        imply SPL_DM
 +      imply SPL_DM_SPI
 +      imply SPL_DM_SPI_FLASH
        imply SPL_LIBDISK_SUPPORT
        imply SPL_MMC_SUPPORT
        imply SYS_MMCSD_RAW_MODE_U_BOOT_USE_PARTITION
@@@ -1098,8 -1094,6 +1099,8 @@@ config ARCH_ZYN
        select SPL_BOARD_INIT if SPL
        select SPL_CLK if SPL
        select SPL_DM if SPL
 +      select SPL_DM_SPI if SPL
 +      select SPL_DM_SPI_FLASH if SPL
        select SPL_OF_CONTROL if SPL
        select SPL_SEPARATE_BSS if SPL
        select SUPPORT_SPL
@@@ -1138,8 -1132,6 +1139,8 @@@ config ARCH_ZYNQM
        select OF_CONTROL
        select SPL_BOARD_INIT if SPL
        select SPL_CLK if SPL
 +      select SPL_DM_SPI if SPI
 +      select SPL_DM_SPI_FLASH if SPL_DM_SPI
        select SPL_DM_MAILBOX if SPL
        select SPL_FIRMWARE if SPL
        select SPL_SEPARATE_BSS if SPL
@@@ -1456,8 -1448,6 +1457,8 @@@ config TARGET_LS1021AQD
        select SUPPORT_SPL
        select SYS_FSL_DDR
        select FSL_DDR_INTERACTIVE
 +      select DM_SPI_FLASH if FSL_DSPI || FSL_QSPI
 +      select SPI_FLASH_DATAFLASH if FSL_DSPI || FSL_QSPI
        imply SCSI
  
  config TARGET_LS1021ATWR
@@@ -1471,7 -1461,6 +1472,7 @@@
        select CPU_V7_HAS_VIRT
        select LS1_DEEP_SLEEP
        select SUPPORT_SPL
 +      select DM_SPI_FLASH if FSL_DSPI || FSL_QSPI
        imply SCSI
  
  config TARGET_LS1021ATSN
@@@ -1496,7 -1485,6 +1497,7 @@@ config TARGET_LS1021AIO
        select CPU_V7_HAS_NONSEC
        select CPU_V7_HAS_VIRT
        select SUPPORT_SPL
 +      select DM_SPI_FLASH if FSL_DSPI || FSL_QSPI
        imply SCSI
        help
          Support for Freescale LS1021AIOT platform.
@@@ -1514,8 -1502,6 +1515,8 @@@ config TARGET_LS1043AQD
        select BOARD_LATE_INIT
        select SUPPORT_SPL
        select FSL_DDR_INTERACTIVE if !SPL
 +      select FSL_DSPI if !SPL_NO_DSPI
 +      select DM_SPI_FLASH if FSL_DSPI
        imply SCSI
        imply SCSI_AHCI
        help
@@@ -1530,8 -1516,6 +1531,8 @@@ config TARGET_LS1043ARD
        select BOARD_EARLY_INIT_F
        select BOARD_LATE_INIT
        select SUPPORT_SPL
 +      select FSL_DSPI if !SPL_NO_DSPI
 +      select DM_SPI_FLASH if FSL_DSPI
        help
          Support for Freescale LS1043ARDB platform.
  
@@@ -1697,8 -1681,6 +1698,8 @@@ config ARCH_ROCKCHI
        select OF_CONTROL
        select SPI
        select SPL_DM if SPL
 +      select SPL_DM_SPI if SPL
 +      select SPL_DM_SPI_FLASH if SPL
        select SYS_MALLOC_F
        select SYS_THUMB_BUILD if !ARM64
        imply ADC
@@@ -1924,6 -1906,7 +1925,6 @@@ source "board/hisilicon/hikey/Kconfig
  source "board/hisilicon/hikey960/Kconfig"
  source "board/hisilicon/poplar/Kconfig"
  source "board/isee/igep003x/Kconfig"
 -source "board/phytec/pcm051/Kconfig"
  source "board/silica/pengwyn/Kconfig"
  source "board/spear/spear300/Kconfig"
  source "board/spear/spear310/Kconfig"
@@@ -1949,3 -1932,5 +1950,3 @@@ config SPL_LDSCRIP
        default "arch/arm/cpu/arm926ejs/mxs/u-boot-spl.lds" if (ARCH_MX23 || ARCH_MX28) && !SPL_FRAMEWORK
        default "arch/arm/cpu/arm1136/u-boot-spl.lds" if CPU_ARM1136
        default "arch/arm/cpu/armv8/u-boot-spl.lds" if ARM64
 -
 -

diff --combined configs/gardena-smart-gateway-at91sam_defconfig
index 54589af,83f7d6c..7dfd076
--- 1/configs/gardena-smart-gateway-at91sam_defconfig
--- 2/configs/gardena-smart-gateway-at91sam_defconfig
+++ b/configs/gardena-smart-gateway-at91sam_defconfig
@@@ -9,7 -9,6 +9,7 @@@ CONFIG_SPL_LIBGENERIC_SUPPORT=
  CONFIG_SYS_MALLOC_F_LEN=0x2000
  CONFIG_ENV_SIZE=0x10000
  CONFIG_DM_GPIO=y
 +CONFIG_SPL_TEXT_BASE=0x300000
  CONFIG_SPL_SERIAL_SUPPORT=y
  CONFIG_SPL_SYS_MALLOC_F_LEN=0x1000
  CONFIG_NR_DRAM_BANKS=1
@@@ -17,6 -16,7 +17,6 @@@ CONFIG_SPL=
  CONFIG_DEBUG_UART_BOARD_INIT=y
  CONFIG_DEBUG_UART_BASE=0xfffff200
  CONFIG_DEBUG_UART_CLOCK=132000000
 -CONFIG_SPL_TEXT_BASE=0x300000
  CONFIG_DEBUG_UART=y
  CONFIG_FIT=y
  CONFIG_NAND_BOOT=y
@@@ -26,7 -26,6 +26,6 @@@ CONFIG_BOOTARGS="console=ttyS0,115200 e
  CONFIG_SYS_CONSOLE_IS_IN_ENV=y
  CONFIG_SYS_CONSOLE_INFO_QUIET=y
  CONFIG_SPL_SYS_MALLOC_SIMPLE=y
- CONFIG_SPL_SEPARATE_BSS=y
  # CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR is not set
  CONFIG_SPL_NAND_SUPPORT=y
  CONFIG_HUSH_PARSER=y

diff --combined configs/sama5d27_som1_ek_mmc1_defconfig
index 8b3196e,23b021e..aeaaa1c
--- 1/configs/sama5d27_som1_ek_mmc1_defconfig
--- 2/configs/sama5d27_som1_ek_mmc1_defconfig
+++ b/configs/sama5d27_som1_ek_mmc1_defconfig
@@@ -9,7 -9,6 +9,7 @@@ CONFIG_SPL_LIBGENERIC_SUPPORT=
  CONFIG_SYS_MALLOC_F_LEN=0x2000
  CONFIG_ENV_SIZE=0x4000
  CONFIG_DM_GPIO=y
 +CONFIG_SPL_TEXT_BASE=0x200000
  CONFIG_SPL_MMC_SUPPORT=y
  CONFIG_SPL_SERIAL_SUPPORT=y
  CONFIG_SPL_DRIVERS_MISC_SUPPORT=y
@@@ -19,6 -18,7 +19,6 @@@ CONFIG_DEBUG_UART_BASE=0xf802000
  CONFIG_DEBUG_UART_CLOCK=82000000
  CONFIG_SPL_FS_FAT=y
  CONFIG_SPL_LIBDISK_SUPPORT=y
 -CONFIG_SPL_TEXT_BASE=0x200000
  CONFIG_DEBUG_UART=y
  CONFIG_ENV_VARS_UBOOT_CONFIG=y
  CONFIG_FIT=y
@@@ -29,7 -29,6 +29,6 @@@ CONFIG_USE_BOOTARGS=
  CONFIG_BOOTARGS="console=ttyS0,115200 earlyprintk root=/dev/mmcblk1p2 rw rootwait"
  CONFIG_MISC_INIT_R=y
  # CONFIG_DISPLAY_BOARDINFO is not set
- CONFIG_SPL_SEPARATE_BSS=y
  CONFIG_HUSH_PARSER=y
  CONFIG_CMD_BOOTZ=y
  # CONFIG_CMD_FLASH is not set

diff --combined configs/sama5d27_som1_ek_mmc_defconfig
index 7e606fc,f42ee8f..f394001
--- 1/configs/sama5d27_som1_ek_mmc_defconfig
--- 2/configs/sama5d27_som1_ek_mmc_defconfig
+++ b/configs/sama5d27_som1_ek_mmc_defconfig
@@@ -9,7 -9,6 +9,7 @@@ CONFIG_SPL_LIBGENERIC_SUPPORT=
  CONFIG_SYS_MALLOC_F_LEN=0x2000
  CONFIG_ENV_SIZE=0x4000
  CONFIG_DM_GPIO=y
 +CONFIG_SPL_TEXT_BASE=0x200000
  CONFIG_SPL_MMC_SUPPORT=y
  CONFIG_SPL_SERIAL_SUPPORT=y
  CONFIG_SPL_DRIVERS_MISC_SUPPORT=y
@@@ -20,6 -19,7 +20,6 @@@ CONFIG_DEBUG_UART_BASE=0xf802000
  CONFIG_DEBUG_UART_CLOCK=82000000
  CONFIG_SPL_FS_FAT=y
  CONFIG_SPL_LIBDISK_SUPPORT=y
 -CONFIG_SPL_TEXT_BASE=0x200000
  CONFIG_DEBUG_UART=y
  CONFIG_ENV_VARS_UBOOT_CONFIG=y
  CONFIG_FIT=y
@@@ -30,7 -30,6 +30,6 @@@ CONFIG_USE_BOOTARGS=
  CONFIG_BOOTARGS="console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rw rootwait"
  CONFIG_MISC_INIT_R=y
  # CONFIG_DISPLAY_BOARDINFO is not set
- CONFIG_SPL_SEPARATE_BSS=y
  CONFIG_HUSH_PARSER=y
  CONFIG_CMD_BOOTZ=y
  # CONFIG_CMD_FLASH is not set

diff --combined configs/sama5d27_som1_ek_qspiflash_defconfig
index e97a0fa,bc0c7f9..f1e10ce
--- 1/configs/sama5d27_som1_ek_qspiflash_defconfig
--- 2/configs/sama5d27_som1_ek_qspiflash_defconfig
+++ b/configs/sama5d27_som1_ek_qspiflash_defconfig
@@@ -9,7 -9,6 +9,7 @@@ CONFIG_SPL_LIBGENERIC_SUPPORT=
  CONFIG_SYS_MALLOC_F_LEN=0x2000
  CONFIG_ENV_SECT_SIZE=0x1000
  CONFIG_DM_GPIO=y
 +CONFIG_SPL_TEXT_BASE=0x200000
  CONFIG_SPL_MMC_SUPPORT=y
  CONFIG_SPL_SERIAL_SUPPORT=y
  CONFIG_SPL_DRIVERS_MISC_SUPPORT=y
@@@ -20,6 -19,7 +20,6 @@@ CONFIG_DEBUG_UART_BASE=0xf802000
  CONFIG_DEBUG_UART_CLOCK=82000000
  CONFIG_SPL_FS_FAT=y
  CONFIG_SPL_LIBDISK_SUPPORT=y
 -CONFIG_SPL_TEXT_BASE=0x200000
  CONFIG_DEBUG_UART=y
  CONFIG_ENV_VARS_UBOOT_CONFIG=y
  CONFIG_FIT=y
@@@ -30,7 -30,6 +30,6 @@@ CONFIG_USE_BOOTARGS=
  CONFIG_BOOTARGS="console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rw rootwait"
  CONFIG_MISC_INIT_R=y
  # CONFIG_DISPLAY_BOARDINFO is not set
- CONFIG_SPL_SEPARATE_BSS=y
  CONFIG_HUSH_PARSER=y
  CONFIG_CMD_BOOTZ=y
  # CONFIG_CMD_FLASH is not set

diff --combined configs/sama5d27_wlsom1_ek_mmc_defconfig
index b64b4dc,8be0a40..7b12a35
--- 1/configs/sama5d27_wlsom1_ek_mmc_defconfig
--- 2/configs/sama5d27_wlsom1_ek_mmc_defconfig
+++ b/configs/sama5d27_wlsom1_ek_mmc_defconfig
@@@ -8,7 -8,6 +8,7 @@@ CONFIG_SPL_LIBGENERIC_SUPPORT=
  CONFIG_SYS_MALLOC_F_LEN=0x2000
  CONFIG_ENV_SIZE=0x4000
  CONFIG_DM_GPIO=y
 +CONFIG_SPL_TEXT_BASE=0x200000
  CONFIG_SPL_MMC_SUPPORT=y
  CONFIG_SPL_SERIAL_SUPPORT=y
  CONFIG_SPL_DRIVERS_MISC_SUPPORT=y
@@@ -18,6 -17,7 +18,6 @@@ CONFIG_DEBUG_UART_BASE=0xf801c00
  CONFIG_DEBUG_UART_CLOCK=82000000
  CONFIG_SPL_FS_FAT=y
  CONFIG_SPL_LIBDISK_SUPPORT=y
 -CONFIG_SPL_TEXT_BASE=0x200000
  CONFIG_DEBUG_UART=y
  CONFIG_ENV_VARS_UBOOT_CONFIG=y
  CONFIG_FIT=y
@@@ -28,7 -28,6 +28,6 @@@ CONFIG_USE_BOOTARGS=
  CONFIG_MISC_INIT_R=y
  # CONFIG_DISPLAY_BOARDINFO is not set
  CONFIG_DISPLAY_BOARDINFO_LATE=y
- CONFIG_SPL_SEPARATE_BSS=y
  CONFIG_SPL_DISPLAY_PRINT=y
  # CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR is not set
  CONFIG_SPL_AT91_MCK_BYPASS=y

diff --combined configs/sama5d27_wlsom1_ek_qspiflash_defconfig
index 3ed804b,eba1e48..ce07883
--- 1/configs/sama5d27_wlsom1_ek_qspiflash_defconfig
--- 2/configs/sama5d27_wlsom1_ek_qspiflash_defconfig
+++ b/configs/sama5d27_wlsom1_ek_qspiflash_defconfig
@@@ -9,8 -9,6 +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
@@@ -19,8 -17,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"
@@@ -31,10 -29,8 +31,9 @@@ CONFIG_USE_BOOTARGS=
  CONFIG_MISC_INIT_R=y
  # CONFIG_DISPLAY_BOARDINFO is not set
  CONFIG_DISPLAY_BOARDINFO_LATE=y
- CONFIG_SPL_SEPARATE_BSS=y
  CONFIG_SPL_DISPLAY_PRINT=y
  # CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR is not set
 +CONFIG_SPL_DM_SPI_FLASH=y
  CONFIG_SPL_SPI_LOAD=y
  CONFIG_SPL_AT91_MCK_BYPASS=y
  CONFIG_HUSH_PARSER=y
@@@ -51,6 -47,7 +50,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 --combined configs/sama5d2_icp_mmc_defconfig
index 8f3efd8,d582450..4f84c31
--- 1/configs/sama5d2_icp_mmc_defconfig
--- 2/configs/sama5d2_icp_mmc_defconfig
+++ b/configs/sama5d2_icp_mmc_defconfig
@@@ -25,9 -25,7 +25,8 @@@ CONFIG_SYS_EXTRA_OPTIONS="SAMA5D2
  CONFIG_SD_BOOT=y
  CONFIG_BOOTDELAY=3
  CONFIG_USE_BOOTARGS=y
 +CONFIG_BOOTARGS="console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rw rootwait"
  # CONFIG_DISPLAY_BOARDINFO is not set
- CONFIG_SPL_SEPARATE_BSS=y
  CONFIG_SPL_DISPLAY_PRINT=y
  # CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR is not set
  CONFIG_SPL_RAM_SUPPORT=y

diff --combined configs/sama5d2_xplained_emmc_defconfig
index 66d0289,10cb2bb..125c7ae
--- 1/configs/sama5d2_xplained_emmc_defconfig
--- 2/configs/sama5d2_xplained_emmc_defconfig
+++ b/configs/sama5d2_xplained_emmc_defconfig
@@@ -9,7 -9,6 +9,7 @@@ CONFIG_SPL_LIBGENERIC_SUPPORT=
  CONFIG_SYS_MALLOC_F_LEN=0x2000
  CONFIG_ENV_SIZE=0x4000
  CONFIG_DM_GPIO=y
 +CONFIG_SPL_TEXT_BASE=0x200000
  CONFIG_SPL_MMC_SUPPORT=y
  CONFIG_SPL_SERIAL_SUPPORT=y
  CONFIG_SPL_DRIVERS_MISC_SUPPORT=y
@@@ -19,6 -18,7 +19,6 @@@ CONFIG_DEBUG_UART_BASE=0xf802000
  CONFIG_DEBUG_UART_CLOCK=83000000
  CONFIG_SPL_FS_FAT=y
  CONFIG_SPL_LIBDISK_SUPPORT=y
 -CONFIG_SPL_TEXT_BASE=0x200000
  CONFIG_DEBUG_UART=y
  CONFIG_ENV_VARS_UBOOT_CONFIG=y
  CONFIG_FIT=y
@@@ -28,7 -28,6 +28,6 @@@ CONFIG_BOOTDELAY=
  CONFIG_USE_BOOTARGS=y
  CONFIG_BOOTARGS="console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rw rootwait"
  # CONFIG_DISPLAY_BOARDINFO is not set
- CONFIG_SPL_SEPARATE_BSS=y
  CONFIG_HUSH_PARSER=y
  CONFIG_CMD_BOOTZ=y
  # CONFIG_CMD_FLASH is not set

diff --combined configs/sama5d2_xplained_mmc_defconfig
index 5a755b1,042bd33..c66d63f
--- 1/configs/sama5d2_xplained_mmc_defconfig
--- 2/configs/sama5d2_xplained_mmc_defconfig
+++ b/configs/sama5d2_xplained_mmc_defconfig
@@@ -9,7 -9,6 +9,7 @@@ CONFIG_SPL_LIBGENERIC_SUPPORT=
  CONFIG_SYS_MALLOC_F_LEN=0x2000
  CONFIG_ENV_SIZE=0x4000
  CONFIG_DM_GPIO=y
 +CONFIG_SPL_TEXT_BASE=0x200000
  CONFIG_SPL_MMC_SUPPORT=y
  CONFIG_SPL_SERIAL_SUPPORT=y
  CONFIG_SPL_DRIVERS_MISC_SUPPORT=y
@@@ -20,6 -19,7 +20,6 @@@ CONFIG_DEBUG_UART_BASE=0xf802000
  CONFIG_DEBUG_UART_CLOCK=83000000
  CONFIG_SPL_FS_FAT=y
  CONFIG_SPL_LIBDISK_SUPPORT=y
 -CONFIG_SPL_TEXT_BASE=0x200000
  CONFIG_DEBUG_UART=y
  CONFIG_ENV_VARS_UBOOT_CONFIG=y
  CONFIG_FIT=y
@@@ -30,7 -30,6 +30,6 @@@ CONFIG_USE_BOOTARGS=
  CONFIG_BOOTARGS="console=ttyS0,115200 earlyprintk root=/dev/mmcblk1p2 rw rootwait"
  CONFIG_MISC_INIT_R=y
  # CONFIG_DISPLAY_BOARDINFO is not set
- CONFIG_SPL_SEPARATE_BSS=y
  CONFIG_HUSH_PARSER=y
  CONFIG_CMD_BOOTZ=y
  # CONFIG_CMD_FLASH is not set

diff --combined configs/sama5d2_xplained_qspiflash_defconfig
index 13746a9,0157263..bd771c6
--- 1/configs/sama5d2_xplained_qspiflash_defconfig
--- 2/configs/sama5d2_xplained_qspiflash_defconfig
+++ b/configs/sama5d2_xplained_qspiflash_defconfig
@@@ -9,7 -9,6 +9,7 @@@ CONFIG_SPL_LIBGENERIC_SUPPORT=
  CONFIG_SYS_MALLOC_F_LEN=0x2000
  CONFIG_ENV_SECT_SIZE=0x1000
  CONFIG_DM_GPIO=y
 +CONFIG_SPL_TEXT_BASE=0x200000
  CONFIG_SPL_MMC_SUPPORT=y
  CONFIG_SPL_SERIAL_SUPPORT=y
  CONFIG_SPL_DRIVERS_MISC_SUPPORT=y
@@@ -20,6 -19,7 +20,6 @@@ CONFIG_DEBUG_UART_BASE=0xf802000
  CONFIG_DEBUG_UART_CLOCK=83000000
  CONFIG_SPL_FS_FAT=y
  CONFIG_SPL_LIBDISK_SUPPORT=y
 -CONFIG_SPL_TEXT_BASE=0x200000
  CONFIG_DEBUG_UART=y
  CONFIG_ENV_VARS_UBOOT_CONFIG=y
  CONFIG_FIT=y
@@@ -30,7 -30,6 +30,6 @@@ 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_SEPARATE_BSS=y
  CONFIG_HUSH_PARSER=y
  CONFIG_CMD_BOOTZ=y
  # CONFIG_CMD_FLASH is not set

diff --combined configs/sama5d3_xplained_mmc_defconfig
index 790ded0,9d1aaed..9eaa476
--- 1/configs/sama5d3_xplained_mmc_defconfig
--- 2/configs/sama5d3_xplained_mmc_defconfig
+++ b/configs/sama5d3_xplained_mmc_defconfig
@@@ -9,7 -9,6 +9,7 @@@ CONFIG_SPL_LIBGENERIC_SUPPORT=
  CONFIG_SYS_MALLOC_F_LEN=0x2000
  CONFIG_ENV_SIZE=0x4000
  CONFIG_DM_GPIO=y
 +CONFIG_SPL_TEXT_BASE=0x300000
  CONFIG_SPL_MMC_SUPPORT=y
  CONFIG_SPL_SERIAL_SUPPORT=y
  CONFIG_SPL_DRIVERS_MISC_SUPPORT=y
@@@ -20,6 -19,7 +20,6 @@@ CONFIG_DEBUG_UART_BASE=0xffffee0
  CONFIG_DEBUG_UART_CLOCK=132000000
  CONFIG_SPL_FS_FAT=y
  CONFIG_SPL_LIBDISK_SUPPORT=y
 -CONFIG_SPL_TEXT_BASE=0x300000
  CONFIG_DEBUG_UART=y
  CONFIG_ENV_VARS_UBOOT_CONFIG=y
  CONFIG_FIT=y
@@@ -28,7 -28,6 +28,6 @@@ CONFIG_BOOTDELAY=
  CONFIG_USE_BOOTARGS=y
  CONFIG_BOOTARGS="console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rw rootwait"
  # CONFIG_DISPLAY_BOARDINFO is not set
- CONFIG_SPL_SEPARATE_BSS=y
  CONFIG_HUSH_PARSER=y
  CONFIG_CMD_BOOTZ=y
  # CONFIG_CMD_FLASH is not set

diff --combined configs/sama5d3xek_mmc_defconfig
index 0263cf1,ff2a828..22e6ab8
--- 1/configs/sama5d3xek_mmc_defconfig
--- 2/configs/sama5d3xek_mmc_defconfig
+++ b/configs/sama5d3xek_mmc_defconfig
@@@ -9,7 -9,6 +9,7 @@@ CONFIG_SPL_LIBGENERIC_SUPPORT=
  CONFIG_SYS_MALLOC_F_LEN=0x2000
  CONFIG_ENV_SIZE=0x4000
  CONFIG_DM_GPIO=y
 +CONFIG_SPL_TEXT_BASE=0x300000
  CONFIG_SPL_MMC_SUPPORT=y
  CONFIG_SPL_SERIAL_SUPPORT=y
  CONFIG_SPL_DRIVERS_MISC_SUPPORT=y
@@@ -20,6 -19,7 +20,6 @@@ CONFIG_DEBUG_UART_BASE=0xffffee0
  CONFIG_DEBUG_UART_CLOCK=132000000
  CONFIG_SPL_FS_FAT=y
  CONFIG_SPL_LIBDISK_SUPPORT=y
 -CONFIG_SPL_TEXT_BASE=0x300000
  CONFIG_DEBUG_UART=y
  CONFIG_ENV_VARS_UBOOT_CONFIG=y
  CONFIG_FIT=y
@@@ -30,7 -30,6 +30,6 @@@ CONFIG_BOOTARGS="console=ttyS0,115200 e
  # CONFIG_CONSOLE_MUX is not set
  CONFIG_SYS_CONSOLE_IS_IN_ENV=y
  # CONFIG_DISPLAY_BOARDINFO is not set
- CONFIG_SPL_SEPARATE_BSS=y
  CONFIG_HUSH_PARSER=y
  CONFIG_CMD_BOOTZ=y
  # CONFIG_CMD_IMI is not set

diff --combined configs/sama5d4_xplained_mmc_defconfig
index 7d40555,58aa3da..d261d17
--- 1/configs/sama5d4_xplained_mmc_defconfig
--- 2/configs/sama5d4_xplained_mmc_defconfig
+++ b/configs/sama5d4_xplained_mmc_defconfig
@@@ -9,7 -9,6 +9,7 @@@ CONFIG_SPL_LIBGENERIC_SUPPORT=
  CONFIG_SYS_MALLOC_F_LEN=0x2000
  CONFIG_ENV_SIZE=0x4000
  CONFIG_DM_GPIO=y
 +CONFIG_SPL_TEXT_BASE=0x200000
  CONFIG_SPL_MMC_SUPPORT=y
  CONFIG_SPL_SERIAL_SUPPORT=y
  CONFIG_SPL_DRIVERS_MISC_SUPPORT=y
@@@ -20,6 -19,7 +20,6 @@@ CONFIG_DEBUG_UART_BASE=0xfc00c00
  CONFIG_DEBUG_UART_CLOCK=100000000
  CONFIG_SPL_FS_FAT=y
  CONFIG_SPL_LIBDISK_SUPPORT=y
 -CONFIG_SPL_TEXT_BASE=0x200000
  CONFIG_DEBUG_UART=y
  CONFIG_ENV_VARS_UBOOT_CONFIG=y
  CONFIG_FIT=y
@@@ -29,7 -29,6 +29,6 @@@ CONFIG_USE_BOOTARGS=
  CONFIG_BOOTARGS="console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rw rootwait"
  CONFIG_MISC_INIT_R=y
  # CONFIG_DISPLAY_BOARDINFO is not set
- CONFIG_SPL_SEPARATE_BSS=y
  CONFIG_HUSH_PARSER=y
  CONFIG_CMD_BOOTZ=y
  # CONFIG_CMD_FLASH is not set

diff --combined configs/sama5d4ek_mmc_defconfig
index 66cc429,19b6dbb..717edfc
--- 1/configs/sama5d4ek_mmc_defconfig
--- 2/configs/sama5d4ek_mmc_defconfig
+++ b/configs/sama5d4ek_mmc_defconfig
@@@ -9,7 -9,6 +9,7 @@@ CONFIG_SPL_LIBGENERIC_SUPPORT=
  CONFIG_SYS_MALLOC_F_LEN=0x2000
  CONFIG_ENV_SIZE=0x4000
  CONFIG_DM_GPIO=y
 +CONFIG_SPL_TEXT_BASE=0x200000
  CONFIG_SPL_MMC_SUPPORT=y
  CONFIG_SPL_SERIAL_SUPPORT=y
  CONFIG_SPL_DRIVERS_MISC_SUPPORT=y
@@@ -20,6 -19,7 +20,6 @@@ CONFIG_DEBUG_UART_BASE=0xfc00c00
  CONFIG_DEBUG_UART_CLOCK=88000000
  CONFIG_SPL_FS_FAT=y
  CONFIG_SPL_LIBDISK_SUPPORT=y
 -CONFIG_SPL_TEXT_BASE=0x200000
  CONFIG_DEBUG_UART=y
  CONFIG_ENV_VARS_UBOOT_CONFIG=y
  CONFIG_FIT=y
@@@ -30,7 -30,6 +30,6 @@@ CONFIG_BOOTARGS="console=ttyS0,115200 e
  # CONFIG_CONSOLE_MUX is not set
  CONFIG_SYS_CONSOLE_IS_IN_ENV=y
  # CONFIG_DISPLAY_BOARDINFO is not set
- CONFIG_SPL_SEPARATE_BSS=y
  CONFIG_HUSH_PARSER=y
  CONFIG_CMD_BOOTZ=y
  # CONFIG_CMD_IMI is not set