Merge tag 'u-boot-atmel-2020.10-a' of https://gitlab.denx.de/u-boot/custodians/u...
authorTom Rini <trini@konsulko.com>
Tue, 7 Jul 2020 16:55:57 +0000 (12:55 -0400)
committerTom Rini <trini@konsulko.com>
Tue, 7 Jul 2020 16:55:57 +0000 (12:55 -0400)
First set of u-boot-atmel features for 2020.10 cycle

15 files changed:
1  2 
arch/arm/Kconfig
configs/gardena-smart-gateway-at91sam_defconfig
configs/sama5d27_som1_ek_mmc1_defconfig
configs/sama5d27_som1_ek_mmc_defconfig
configs/sama5d27_som1_ek_qspiflash_defconfig
configs/sama5d27_wlsom1_ek_mmc_defconfig
configs/sama5d27_wlsom1_ek_qspiflash_defconfig
configs/sama5d2_icp_mmc_defconfig
configs/sama5d2_xplained_emmc_defconfig
configs/sama5d2_xplained_mmc_defconfig
configs/sama5d2_xplained_qspiflash_defconfig
configs/sama5d3_xplained_mmc_defconfig
configs/sama5d3xek_mmc_defconfig
configs/sama5d4_xplained_mmc_defconfig
configs/sama5d4ek_mmc_defconfig

Simple merge
@@@ -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
@@@ -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
Simple merge
Simple merge