From: Tom Rini <trini@konsulko.com>
Date: Thu, 17 Jun 2021 15:46:44 +0000 (-0400)
Subject: Merge tag 'u-boot-atmel-2021.10-a' of https://source.denx.de/u-boot/custodians/u... 
X-Git-Url: http://git.dujemihanovic.xyz/?a=commitdiff_plain;h=a94b2aad05d52cbd49012ccd900bcbcf29f9bc22;p=u-boot.git

Merge tag 'u-boot-atmel-2021.10-a' of https://source.denx.de/u-boot/custodians/u-boot-atmel into next

First set of u-boot-atmel features for the 2021.10 cycle:

This feature set converts the boards pm9261 and pm9263 Ethernet support
to DM; enables hash command for all SAM boards; fixes the NAND pmecc
bit-flips correction; adds Falcon boot for sama5d3_xplained board; and
other minor adjustments.
---

a94b2aad05d52cbd49012ccd900bcbcf29f9bc22
diff --cc configs/sam9x60ek_mmc_defconfig
index d65dbc1e1a,8189997938..e5b5226324
--- a/configs/sam9x60ek_mmc_defconfig
+++ b/configs/sam9x60ek_mmc_defconfig
@@@ -45,8 -49,14 +49,13 @@@ CONFIG_DM_I2C=
  CONFIG_SYS_I2C_AT91=y
  CONFIG_I2C_EEPROM=y
  CONFIG_MICROCHIP_FLEXCOM=y
 -CONFIG_DM_MMC=y
  CONFIG_MMC_SDHCI=y
  CONFIG_MMC_SDHCI_ATMEL=y
+ CONFIG_MTD=y
+ CONFIG_MTD_RAW_NAND=y
+ CONFIG_NAND_ATMEL=y
+ CONFIG_ATMEL_NAND_HW_PMECC=y
+ CONFIG_PMECC_CAP=8
  CONFIG_PHY_MICREL=y
  CONFIG_DM_ETH=y
  CONFIG_MACB=y