Merge https://gitlab.denx.de/u-boot/custodians/u-boot-ubi

[trini: Migrate sama5d27_som1_ek_qspiflash/sama5d2_xplained_qspiflash
        for CONFIG_ENV_SECT_SIZE]
Signed-off-by: Tom Rini <trini@konsulko.com>

diff --cc configs/sama5d27_som1_ek_mmc1_defconfig
Simple merge

diff --cc configs/sama5d27_som1_ek_mmc_defconfig
Simple merge

diff --cc configs/sama5d27_som1_ek_qspiflash_defconfig
index 128b6645f6d98e6285c5462429b5a1ebef01c89f,0000000000000000000000000000000000000000..3226e0e2a56f392ab8ec6d89948851a1c31ed381
mode 100644,000000..100644
--- 1/configs/sama5d27_som1_ek_qspiflash_defconfig
--- /dev/null
+++ b/configs/sama5d27_som1_ek_qspiflash_defconfig
@@@ -1,101 -1,0 +1,102 @@@
 +CONFIG_ARM=y
 +CONFIG_ARCH_AT91=y
 +CONFIG_SYS_TEXT_BASE=0x23f00000
 +CONFIG_TARGET_SAMA5D27_SOM1_EK=y
 +CONFIG_SPL_GPIO_SUPPORT=y
 +CONFIG_SPL_LIBCOMMON_SUPPORT=y
 +CONFIG_SPL_LIBGENERIC_SUPPORT=y
 +CONFIG_SYS_MALLOC_F_LEN=0x2000
 +CONFIG_SPL_MMC_SUPPORT=y
 +CONFIG_SPL_SERIAL_SUPPORT=y
 +CONFIG_SPL_DRIVERS_MISC_SUPPORT=y
 +CONFIG_NR_DRAM_BANKS=1
 +CONFIG_SPL=y
 +CONFIG_DEBUG_UART_BOARD_INIT=y
 +CONFIG_DEBUG_UART_BASE=0xf8020000
 +CONFIG_DEBUG_UART_CLOCK=82000000
 +CONFIG_SPL_FS_FAT=y
 +CONFIG_SPL_LIBDISK_SUPPORT=y
 +CONFIG_DEBUG_UART=y
 +CONFIG_ENV_VARS_UBOOT_CONFIG=y
 +CONFIG_FIT=y
 +CONFIG_SYS_EXTRA_OPTIONS="SAMA5D2"
 +CONFIG_QSPI_BOOT=y
 +CONFIG_BOOTDELAY=3
 +CONFIG_USE_BOOTARGS=y
 +CONFIG_BOOTARGS="console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rw rootwait"
 +CONFIG_MISC_INIT_R=y
 +# CONFIG_DISPLAY_BOARDINFO is not set
 +CONFIG_SPL_TEXT_BASE=0x200000
 +CONFIG_SPL_SEPARATE_BSS=y
 +CONFIG_HUSH_PARSER=y
 +CONFIG_CMD_BOOTZ=y
 +# CONFIG_CMD_FLASH is not set
 +CONFIG_CMD_I2C=y
 +# CONFIG_CMD_LOADS is not set
 +CONFIG_CMD_MMC=y
 +CONFIG_CMD_SF=y
 +CONFIG_CMD_USB=y
 +CONFIG_CMD_DHCP=y
 +CONFIG_CMD_PING=y
 +CONFIG_CMD_EXT4=y
 +CONFIG_CMD_FAT=y
 +CONFIG_OF_CONTROL=y
 +CONFIG_SPL_OF_CONTROL=y
 +CONFIG_DEFAULT_DEVICE_TREE="at91-sama5d27_som1_ek"
 +CONFIG_OF_SPL_REMOVE_PROPS="interrupts interrupt-parent dmas dma-names"
 +CONFIG_ENV_IS_IN_SPI_FLASH=y
++CONFIG_ENV_SECT_SIZE=0x1000
 +CONFIG_DM=y
 +CONFIG_SPL_DM=y
 +CONFIG_SPL_DM_SEQ_ALIAS=y
 +CONFIG_CLK=y
 +CONFIG_SPL_CLK=y
 +CONFIG_CLK_AT91=y
 +CONFIG_AT91_UTMI=y
 +CONFIG_AT91_H32MX=y
 +CONFIG_AT91_GENERIC_CLK=y
 +CONFIG_DM_GPIO=y
 +CONFIG_ATMEL_PIO4=y
 +CONFIG_DM_I2C=y
 +CONFIG_SYS_I2C_AT91=y
 +CONFIG_I2C_EEPROM=y
 +CONFIG_DM_MMC=y
 +CONFIG_MMC_SDHCI=y
 +CONFIG_MMC_SDHCI_ATMEL=y
 +CONFIG_DM_SPI_FLASH=y
 +CONFIG_SPI_FLASH=y
 +CONFIG_SF_DEFAULT_SPEED=66000000
 +CONFIG_SPI_FLASH_ATMEL=y
 +CONFIG_SPI_FLASH_MACRONIX=y
 +CONFIG_SPI_FLASH_SPANSION=y
 +CONFIG_SPI_FLASH_STMICRO=y
 +CONFIG_SPI_FLASH_SST=y
 +CONFIG_DM_ETH=y
 +CONFIG_MACB=y
 +CONFIG_PINCTRL=y
 +CONFIG_SPL_PINCTRL=y
 +CONFIG_PINCTRL_AT91PIO4=y
 +CONFIG_DM_SERIAL=y
 +CONFIG_DEBUG_UART_ATMEL=y
 +CONFIG_DEBUG_UART_ANNOUNCE=y
 +CONFIG_ATMEL_USART=y
 +CONFIG_SPI=y
 +CONFIG_DM_SPI=y
 +CONFIG_ATMEL_QSPI=y
 +CONFIG_TIMER=y
 +CONFIG_SPL_TIMER=y
 +CONFIG_ATMEL_PIT_TIMER=y
 +CONFIG_USB=y
 +CONFIG_DM_USB=y
 +CONFIG_USB_EHCI_HCD=y
 +CONFIG_USB_STORAGE=y
 +CONFIG_USB_GADGET=y
 +CONFIG_USB_GADGET_ATMEL_USBA=y
 +CONFIG_DM_VIDEO=y
 +CONFIG_ATMEL_HLCD=y
 +CONFIG_W1=y
 +CONFIG_W1_GPIO=y
 +CONFIG_W1_EEPROM=y
 +CONFIG_W1_EEPROM_DS24XXX=y
 +CONFIG_FAT_WRITE=y
 +CONFIG_OF_LIBFDT_OVERLAY=y

diff --cc configs/sama5d2_xplained_emmc_defconfig
Simple merge

diff --cc configs/sama5d2_xplained_mmc_defconfig
Simple merge

diff --cc configs/sama5d2_xplained_qspiflash_defconfig
index 1bf04936f748b53d91609398090d533dd00588a9,0000000000000000000000000000000000000000..6832283247941f382a1e886ad77d9ead5a233dcc
mode 100644,000000..100644
--- 1/configs/sama5d2_xplained_qspiflash_defconfig
--- /dev/null
+++ b/configs/sama5d2_xplained_qspiflash_defconfig
@@@ -1,101 -1,0 +1,102 @@@
 +CONFIG_ARM=y
 +CONFIG_ARCH_AT91=y
 +CONFIG_SYS_TEXT_BASE=0x26f00000
 +CONFIG_TARGET_SAMA5D2_XPLAINED=y
 +CONFIG_SPL_GPIO_SUPPORT=y
 +CONFIG_SPL_LIBCOMMON_SUPPORT=y
 +CONFIG_SPL_LIBGENERIC_SUPPORT=y
 +CONFIG_SYS_MALLOC_F_LEN=0x2000
 +CONFIG_SPL_MMC_SUPPORT=y
 +CONFIG_SPL_SERIAL_SUPPORT=y
 +CONFIG_SPL_DRIVERS_MISC_SUPPORT=y
 +CONFIG_NR_DRAM_BANKS=1
 +CONFIG_SPL=y
 +CONFIG_DEBUG_UART_BOARD_INIT=y
 +CONFIG_DEBUG_UART_BASE=0xf8020000
 +CONFIG_DEBUG_UART_CLOCK=83000000
 +CONFIG_SPL_FS_FAT=y
 +CONFIG_SPL_LIBDISK_SUPPORT=y
 +CONFIG_DEBUG_UART=y
 +CONFIG_ENV_VARS_UBOOT_CONFIG=y
 +CONFIG_FIT=y
 +CONFIG_SYS_EXTRA_OPTIONS="SAMA5D2,SYS_USE_MMC"
 +CONFIG_QSPI_BOOT=y
 +CONFIG_BOOTDELAY=3
 +CONFIG_USE_BOOTARGS=y
 +CONFIG_BOOTARGS="console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p1 rw rootwait"
 +CONFIG_MISC_INIT_R=y
 +# CONFIG_DISPLAY_BOARDINFO is not set
 +CONFIG_SPL_TEXT_BASE=0x200000
 +CONFIG_SPL_SEPARATE_BSS=y
 +CONFIG_HUSH_PARSER=y
 +CONFIG_CMD_BOOTZ=y
 +# CONFIG_CMD_FLASH is not set
 +CONFIG_CMD_I2C=y
 +# CONFIG_CMD_LOADS is not set
 +CONFIG_CMD_MMC=y
 +CONFIG_CMD_SF=y
 +CONFIG_CMD_USB=y
 +CONFIG_CMD_DHCP=y
 +CONFIG_CMD_PING=y
 +CONFIG_CMD_EXT4=y
 +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_ENV_SECT_SIZE=0x1000
 +CONFIG_DM=y
 +CONFIG_SPL_DM=y
 +CONFIG_SPL_DM_SEQ_ALIAS=y
 +CONFIG_CLK=y
 +CONFIG_SPL_CLK=y
 +CONFIG_CLK_AT91=y
 +CONFIG_AT91_UTMI=y
 +CONFIG_AT91_H32MX=y
 +CONFIG_AT91_GENERIC_CLK=y
 +CONFIG_DM_GPIO=y
 +CONFIG_ATMEL_PIO4=y
 +CONFIG_DM_I2C=y
 +CONFIG_SYS_I2C_AT91=y
 +CONFIG_I2C_EEPROM=y
 +CONFIG_DM_MMC=y
 +CONFIG_MMC_SDHCI=y
 +CONFIG_MMC_SDHCI_ATMEL=y
 +CONFIG_DM_SPI_FLASH=y
 +CONFIG_SPI_FLASH=y
 +CONFIG_SF_DEFAULT_SPEED=30000000
 +CONFIG_SPI_FLASH_ATMEL=y
 +CONFIG_SPI_FLASH_MACRONIX=y
 +CONFIG_SPI_FLASH_SPANSION=y
 +CONFIG_SPI_FLASH_STMICRO=y
 +CONFIG_SPI_FLASH_SST=y
 +CONFIG_DM_ETH=y
 +CONFIG_MACB=y
 +CONFIG_PINCTRL=y
 +CONFIG_SPL_PINCTRL=y
 +CONFIG_PINCTRL_AT91PIO4=y
 +CONFIG_DM_SERIAL=y
 +CONFIG_DEBUG_UART_ATMEL=y
 +CONFIG_DEBUG_UART_ANNOUNCE=y
 +CONFIG_ATMEL_USART=y
 +CONFIG_SPI=y
 +CONFIG_DM_SPI=y
 +CONFIG_ATMEL_QSPI=y
 +CONFIG_TIMER=y
 +CONFIG_SPL_TIMER=y
 +CONFIG_ATMEL_PIT_TIMER=y
 +CONFIG_USB=y
 +CONFIG_DM_USB=y
 +CONFIG_USB_EHCI_HCD=y
 +CONFIG_USB_STORAGE=y
 +CONFIG_USB_GADGET=y
 +CONFIG_USB_GADGET_ATMEL_USBA=y
 +CONFIG_DM_VIDEO=y
 +CONFIG_ATMEL_HLCD=y
 +CONFIG_W1=y
 +CONFIG_W1_GPIO=y
 +CONFIG_W1_EEPROM=y
 +CONFIG_W1_EEPROM_DS24XXX=y
 +CONFIG_FAT_WRITE=y
 +CONFIG_OF_LIBFDT_OVERLAY=y

diff --cc configs/sama5d2_xplained_spiflash_defconfig
Simple merge

diff --cc include/configs/at91-sama5_common.h
index fc46540a10abbcaba4a28b38e6e0b2d500156fa0,b9c6a27a3378c016b75d8cf166cc56d9281fce90..1b8373fbc64ab28407200599c04cd451c814d3bf
--- 1/include/configs/at91-sama5_common.h
--- 2/include/configs/at91-sama5_common.h
+++ b/include/configs/at91-sama5_common.h
@@@ -72,14 -67,6 +67,13 @@@
                                        "sf read 0x21000000 0x60000 0xc000; "   \
                                        "sf read 0x22000000 0x6c000 0x394000; " \
                                        "bootz 0x22000000 - 0x21000000"
- #define CONFIG_ENV_SECT_SIZE          0x1000
 +#elif CONFIG_QSPI_BOOT
 +#define CONFIG_ENV_OFFSET             0x140000
 +#define CONFIG_ENV_SIZE                       0x20000
 +#define CONFIG_BOOTCOMMAND            "sf probe 0; "                                  \
 +                                      "sf read 0x21000000 0x180000 0x80000; "         \
 +                                      "sf read 0x22000000 0x200000 0x600000; "        \
 +                                      "bootz 0x22000000 - 0x21000000"
  #endif
  
  #endif