From: Tom Rini <trini@konsulko.com>
Date: Wed, 22 Sep 2021 18:55:16 +0000 (-0400)
Subject: Merge tag 'u-boot-at91-2022.01-a' of https://source.denx.de/u-boot/custodians/u-boot... 
X-Git-Url: http://git.dujemihanovic.xyz/?a=commitdiff_plain;h=7b57e56739ed2c550d17a072a7f4c8326c0c83dc;p=u-boot.git

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

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

This feature set includes : the support for CPU driver for arm926
(sam9x60 device); changes required for OP-TEE boot for sama5d2_xplained
and sama5d27_som1_ek boards; QSPI boot configuration for sama5d2_icp;
starting to remove old Kconfig unused symbols from config_whitelist.txt
(work will take more time); also small fixes and updates in mach, DT,
configs, etc.
---

7b57e56739ed2c550d17a072a7f4c8326c0c83dc
diff --cc configs/sama5d2_icp_qspiflash_defconfig
index 0000000000,c3dd464d7f..bf442bff2a
mode 000000,100644..100644
--- a/configs/sama5d2_icp_qspiflash_defconfig
+++ b/configs/sama5d2_icp_qspiflash_defconfig
@@@ -1,0 -1,103 +1,104 @@@
+ CONFIG_ARM=y
+ CONFIG_ARCH_CPU_INIT=y
+ CONFIG_ARCH_AT91=y
+ CONFIG_SYS_TEXT_BASE=0x26f00000
+ CONFIG_TARGET_SAMA5D2_ICP=y
+ CONFIG_SYS_MALLOC_F_LEN=0x2000
+ CONFIG_SYS_MEMTEST_START=0x20000000
+ CONFIG_SYS_MEMTEST_END=0x40000000
+ CONFIG_ENV_SIZE=0x4000
+ CONFIG_DM_GPIO=y
+ CONFIG_DEFAULT_DEVICE_TREE="at91-sama5d2_icp"
+ CONFIG_DEBUG_UART_BOARD_INIT=y
+ CONFIG_DEBUG_UART_BASE=0xf801c000
+ CONFIG_DEBUG_UART_CLOCK=83000000
+ CONFIG_DEBUG_UART=y
+ CONFIG_ENV_VARS_UBOOT_CONFIG=y
++CONFIG_SYS_LOAD_ADDR=0x22000000
+ CONFIG_SYS_BOOT_GET_CMDLINE=y
+ CONFIG_SYS_BOOT_GET_KBD=y
+ CONFIG_FIT=y
+ CONFIG_SYS_EXTRA_OPTIONS="SAMA5D2"
+ CONFIG_QSPI_BOOT=y
+ CONFIG_SD_BOOT=y
+ CONFIG_BOOTDELAY=3
+ CONFIG_USE_BOOTARGS=y
+ CONFIG_BOOTARGS="console=ttyS0,115200 earlycon earlyprintk=serial,ttyS0, ignore_loglevel root=/dev/mmcblk0p2 memtest=0 rootfstype=ext4 rw rootwait"
+ CONFIG_DISPLAY_BOARDINFO_LATE=y
+ CONFIG_HUSH_PARSER=y
+ CONFIG_CMD_CONFIG=y
+ CONFIG_CMD_BOOTZ=y
+ # CONFIG_CMD_IMI is not set
+ CONFIG_CMD_EEPROM=y
+ CONFIG_CMD_MEMINFO=y
+ CONFIG_CMD_MEMTEST=y
+ CONFIG_SYS_ALT_MEMTEST=y
+ CONFIG_CMD_CLK=y
+ CONFIG_CMD_DM=y
+ CONFIG_CMD_GPIO=y
+ CONFIG_CMD_I2C=y
+ # CONFIG_CMD_LOADS is not set
+ CONFIG_CMD_MMC=y
+ CONFIG_CMD_SDRAM=y
+ CONFIG_CMD_SF_TEST=y
+ CONFIG_CMD_USB=y
+ CONFIG_CMD_DHCP=y
+ CONFIG_CMD_PING=y
+ CONFIG_CMD_GETTIME=y
+ CONFIG_CMD_TIMER=y
+ CONFIG_CMD_EXT4=y
+ CONFIG_CMD_FAT=y
+ CONFIG_OF_CONTROL=y
+ CONFIG_ENV_IS_IN_SPI_FLASH=y
+ CONFIG_USE_ENV_SPI_BUS=y
+ CONFIG_ENV_SPI_BUS=2
+ CONFIG_USE_ENV_SPI_CS=y
+ CONFIG_ENV_SPI_CS=0
+ CONFIG_USE_ENV_SPI_MAX_HZ=y
+ CONFIG_ENV_SPI_MAX_HZ=66000000
+ CONFIG_USE_ENV_SPI_MODE=y
+ CONFIG_ENV_SPI_MODE=0x0
+ CONFIG_SYS_RELOC_GD_ENV_ADDR=y
+ CONFIG_DM=y
+ CONFIG_CLK=y
+ CONFIG_CLK_AT91=y
+ CONFIG_AT91_UTMI=y
+ CONFIG_AT91_H32MX=y
+ CONFIG_AT91_GENERIC_CLK=y
+ CONFIG_ATMEL_PIO4=y
+ CONFIG_DM_I2C=y
+ CONFIG_SYS_I2C_AT91=y
+ CONFIG_I2C_EEPROM=y
+ CONFIG_MICROCHIP_FLEXCOM=y
+ CONFIG_MMC_SDHCI=y
+ CONFIG_MMC_SDHCI_ATMEL=y
+ CONFIG_MTD=y
+ CONFIG_DM_SPI_FLASH=y
+ CONFIG_SF_DEFAULT_BUS=2
+ CONFIG_SF_DEFAULT_SPEED=66000000
+ CONFIG_SPI_FLASH_SFDP_SUPPORT=y
+ CONFIG_SPI_FLASH_ATMEL=y
+ CONFIG_SPI_FLASH_MACRONIX=y
+ CONFIG_SPI_FLASH_SPANSION=y
+ CONFIG_SPI_FLASH_STMICRO=y
+ CONFIG_SPI_FLASH_SST=y
+ CONFIG_DM_ETH=y
+ CONFIG_MACB=y
+ CONFIG_PINCTRL=y
+ CONFIG_PINCTRL_AT91PIO4=y
+ CONFIG_DM_SERIAL=y
+ CONFIG_DEBUG_UART_ANNOUNCE=y
+ CONFIG_ATMEL_USART=y
+ CONFIG_SPI=y
+ CONFIG_DM_SPI=y
+ CONFIG_ATMEL_QSPI=y
+ CONFIG_TIMER=y
+ CONFIG_ATMEL_PIT_TIMER=y
+ CONFIG_USB=y
+ CONFIG_USB_EHCI_HCD=y
+ CONFIG_USB_STORAGE=y
+ CONFIG_USB_GADGET=y
+ CONFIG_USB_GADGET_ATMEL_USBA=y
+ CONFIG_OF_LIBFDT_OVERLAY=y
+ CONFIG_SPL_OF_LIBFDT=y
+ # CONFIG_EFI_LOADER_HII is not set