]> git.dujemihanovic.xyz Git - u-boot.git/commitdiff
Merge tag 'u-boot-at91-2022.07-a' of https://source.denx.de/u-boot/custodians/u-boot...
authorTom Rini <trini@konsulko.com>
Mon, 4 Apr 2022 12:26:55 +0000 (08:26 -0400)
committerTom Rini <trini@konsulko.com>
Mon, 4 Apr 2022 12:26:55 +0000 (08:26 -0400)
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.

1  2 
MAINTAINERS
arch/arm/dts/Makefile
configs/sama5d2_xplained_emmc_defconfig
configs/sama5d2_xplained_mmc_defconfig
configs/sama5d2_xplained_qspiflash_defconfig
configs/sama7g5ek_mmc1_defconfig
configs/sama7g5ek_mmc_defconfig

diff --cc MAINTAINERS
Simple merge
Simple merge
index d78455bbfd72c3453be9f0cf488c6f32cec91c6c,4ad8115d3a0a49c465476b9e26fad018646d80e6..559a699fa54749eaba649dd43a895e61f06bf34f
@@@ -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
index 3721eba7baa8d80d5e233abddc30d6b0cb714ca4,7bbe6565efb591b2051981a835357756367b2397..94ded8a12127d8a3fb6b6f64fc18b01eedb1ea73
@@@ -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