From: Tom Rini <trini@konsulko.com>
Date: Mon, 4 Apr 2022 12:26:55 +0000 (-0400)
Subject: Merge tag 'u-boot-at91-2022.07-a' of https://source.denx.de/u-boot/custodians/u-boot... 
X-Git-Url: http://git.dujemihanovic.xyz/img/sics.gif?a=commitdiff_plain;h=8221c52d88fbe84ca9692dc23827e21403c952e8;p=u-boot.git

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

First set of u-boot-at91 features for the 2022.07 cycle:

This feature set includes the new driver for the Atmel TCB timer,
alignment in DT for sama7g5 and sama7g5ek board, one Kconfig conversion
for external reset, and the usage of Galois tables from ROM for sama5d2
device.
---

8221c52d88fbe84ca9692dc23827e21403c952e8
diff --cc configs/sama7g5ek_mmc1_defconfig
index d78455bbfd,4ad8115d3a..559a699fa5
--- a/configs/sama7g5ek_mmc1_defconfig
+++ b/configs/sama7g5ek_mmc1_defconfig
@@@ -4,9 -4,11 +4,9 @@@ CONFIG_SYS_TEXT_BASE=0x66f0000
  CONFIG_SYS_MALLOC_F_LEN=0x11000
  CONFIG_TARGET_SAMA7G5EK=y
  CONFIG_NR_DRAM_BANKS=1
 -CONFIG_SYS_MEMTEST_START=0x60000000
 -CONFIG_SYS_MEMTEST_END=0x70000000
  CONFIG_ENV_SIZE=0x4000
  CONFIG_DM_GPIO=y
- CONFIG_DEFAULT_DEVICE_TREE="sama7g5ek"
+ CONFIG_DEFAULT_DEVICE_TREE="at91-sama7g5ek"
  CONFIG_DEBUG_UART_BOARD_INIT=y
  CONFIG_DEBUG_UART_BASE=0xe1824200
  CONFIG_DEBUG_UART_CLOCK=200000000
diff --cc configs/sama7g5ek_mmc_defconfig
index 3721eba7ba,7bbe6565ef..94ded8a121
--- a/configs/sama7g5ek_mmc_defconfig
+++ b/configs/sama7g5ek_mmc_defconfig
@@@ -4,9 -4,11 +4,9 @@@ CONFIG_SYS_TEXT_BASE=0x66f0000
  CONFIG_SYS_MALLOC_F_LEN=0x11000
  CONFIG_TARGET_SAMA7G5EK=y
  CONFIG_NR_DRAM_BANKS=1
 -CONFIG_SYS_MEMTEST_START=0x60000000
 -CONFIG_SYS_MEMTEST_END=0x70000000
  CONFIG_ENV_SIZE=0x4000
  CONFIG_DM_GPIO=y
- CONFIG_DEFAULT_DEVICE_TREE="sama7g5ek"
+ CONFIG_DEFAULT_DEVICE_TREE="at91-sama7g5ek"
  CONFIG_DEBUG_UART_BOARD_INIT=y
  CONFIG_DEBUG_UART_BASE=0xe1824200
  CONFIG_DEBUG_UART_CLOCK=200000000