From: Tom Rini <trini@konsulko.com>
Date: Tue, 7 Jul 2020 16:55:57 +0000 (-0400)
Subject: Merge tag 'u-boot-atmel-2020.10-a' of https://gitlab.denx.de/u-boot/custodians/u... 
X-Git-Url: http://git.dujemihanovic.xyz/?a=commitdiff_plain;h=c4df37bfa916d6516d67dde6ef9d1b18b36041d3;p=u-boot.git

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

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

c4df37bfa916d6516d67dde6ef9d1b18b36041d3
diff --cc configs/sama5d27_wlsom1_ek_qspiflash_defconfig
index 3ed804b5eb,eba1e48384..ce0788310b
--- a/configs/sama5d27_wlsom1_ek_qspiflash_defconfig
+++ b/configs/sama5d27_wlsom1_ek_qspiflash_defconfig
@@@ -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
diff --cc configs/sama5d2_icp_mmc_defconfig
index 8f3efd81a0,d582450b22..4f84c3134d
--- a/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