6674edaabf
-----BEGIN PGP SIGNATURE----- iQGzBAABCgAdFiEEGjx/cOCPqxcHgJu/FHw5/5Y0tywFAmFBKRgACgkQFHw5/5Y0 tyw/PwwAtGB3rBeYW4rjWuMC5WP1UDTnvZIAok5ImWumWDahjDm8Yq2VCzAe9adw EYBjuNmaNl9aQvGVqlVJeIcLku5MLuLQu2za8vhc1R8X9VTPPY+LLTcdOokOmB8y 8JiaE7fJsb1bZeV+diF9tss3B0IkUrwSJtW1d+qfdz/4UiRvwK5BhnZgzIobDldO g1Ldz/xiR2GOAXlUMwDrNAi6qNvmeAqRsQxySVrjltAV2ST7LJnOiHuWvJX6g6VS l796Hleh/kULfEW6n+1ZaTNqvVRcJ8xYSOG8w8y9u6HuPBA3JrYH1p1Eo5n7PPDv US71Iy/ncweTyfTMEBThWLqjHOQ05sVkWX/r4fj2iJRli+Og53lE1fVJ4ajIx7vz Tc76wI43i0I5lr2yTErjUG6EzDDoueqd+c8BwxihNLUK/+QG31xoCEMfC80C25ro QhYVFgiPWN0ySUD5M5tbGXODvfNNIDKXpY5oSOTVtemZtDEMpO2zBM1s/K3RV7Ud Je9Pj0Cu =Me42 -----END PGP SIGNATURE----- Merge tag 'v2021.10-rc4' into next Prepare v2021.10-rc4 Signed-off-by: Tom Rini <trini@konsulko.com> # gpg: Signature made Tue 14 Sep 2021 06:58:32 PM EDT # gpg: using RSA key 1A3C7F70E08FAB1707809BBF147C39FF9634B72C # gpg: Good signature from "Thomas Rini <trini@konsulko.com>" [ultimate] # Conflicts: # board/Arcturus/ucp1020/spl.c # cmd/mvebu/Kconfig # common/Kconfig.boot # common/image-fit.c # configs/UCP1020_defconfig # configs/sifive_unmatched_defconfig # drivers/pci/Kconfig # include/configs/UCP1020.h # include/configs/sifive-unmatched.h # lib/Makefile # scripts/config_whitelist.txt
78 lines
2.2 KiB
Plaintext
78 lines
2.2 KiB
Plaintext
CONFIG_ARM=y
|
|
CONFIG_SYS_CONFIG_NAME="zynq_cse"
|
|
CONFIG_SKIP_LOWLEVEL_INIT=y
|
|
CONFIG_SPL_SKIP_LOWLEVEL_INIT=y
|
|
CONFIG_SYS_ICACHE_OFF=y
|
|
CONFIG_SYS_DCACHE_OFF=y
|
|
CONFIG_ARCH_ZYNQ=y
|
|
CONFIG_SYS_TEXT_BASE=0xFFFC0000
|
|
CONFIG_ENV_SIZE=0x190
|
|
CONFIG_SYS_MALLOC_LEN=0x1000
|
|
CONFIG_DEFAULT_DEVICE_TREE="zynq-cse-qspi-single"
|
|
CONFIG_SPL_STACK_R_ADDR=0x200000
|
|
CONFIG_SPL=y
|
|
CONFIG_DEBUG_UART_BASE=0x0
|
|
CONFIG_DEBUG_UART_CLOCK=0
|
|
# CONFIG_ZYNQ_DDRC_INIT is not set
|
|
# CONFIG_CMD_ZYNQ is not set
|
|
CONFIG_DEBUG_UART=y
|
|
CONFIG_SYS_CUSTOM_LDSCRIPT=y
|
|
CONFIG_SYS_LDSCRIPT="arch/arm/mach-zynq/u-boot.lds"
|
|
CONFIG_SYS_LOAD_ADDR=0x0
|
|
# CONFIG_ARCH_FIXUP_FDT_MEMORY is not set
|
|
# CONFIG_AUTOBOOT is not set
|
|
CONFIG_USE_PREBOOT=y
|
|
# CONFIG_DISPLAY_CPUINFO is not set
|
|
# CONFIG_ARCH_EARLY_INIT_R is not set
|
|
# CONFIG_BOARD_LATE_INIT is not set
|
|
CONFIG_SPL_STACK_R=y
|
|
CONFIG_SPL_SPI_LOAD=y
|
|
CONFIG_SYS_SPI_U_BOOT_OFFS=0x100000
|
|
# CONFIG_CMDLINE_EDITING is not set
|
|
# CONFIG_AUTO_COMPLETE is not set
|
|
# CONFIG_SYS_LONGHELP is not set
|
|
# CONFIG_CMD_BDI is not set
|
|
# CONFIG_CMD_CONSOLE is not set
|
|
# CONFIG_CMD_BOOTD is not set
|
|
# CONFIG_CMD_BOOTM is not set
|
|
# CONFIG_CMD_ELF is not set
|
|
# CONFIG_CMD_FDT is not set
|
|
# CONFIG_CMD_GO is not set
|
|
# CONFIG_CMD_RUN is not set
|
|
# CONFIG_CMD_IMI is not set
|
|
# CONFIG_CMD_XIMG is not set
|
|
# CONFIG_CMD_SPL is not set
|
|
# CONFIG_CMD_EXPORTENV is not set
|
|
# CONFIG_CMD_IMPORTENV is not set
|
|
# CONFIG_CMD_EDITENV is not set
|
|
# CONFIG_CMD_SAVEENV is not set
|
|
# CONFIG_CMD_ENV_EXISTS is not set
|
|
# CONFIG_CMD_CRC32 is not set
|
|
# CONFIG_CMD_CLK is not set
|
|
# CONFIG_CMD_DM is not set
|
|
# CONFIG_CMD_LOADB is not set
|
|
# CONFIG_CMD_LOADS is not set
|
|
# CONFIG_CMD_ECHO is not set
|
|
# CONFIG_CMD_ITEST is not set
|
|
# CONFIG_CMD_SOURCE is not set
|
|
# CONFIG_CMD_SETEXPR is not set
|
|
# CONFIG_CMD_SLEEP is not set
|
|
CONFIG_OF_EMBED=y
|
|
CONFIG_ENV_OVERWRITE=y
|
|
CONFIG_SYS_RELOC_GD_ENV_ADDR=y
|
|
# CONFIG_NET is not set
|
|
# CONFIG_DM_WARN is not set
|
|
# CONFIG_DM_DEVICE_REMOVE is not set
|
|
CONFIG_SPL_DM_SEQ_ALIAS=y
|
|
# CONFIG_MMC is not set
|
|
CONFIG_SF_DEFAULT_SPEED=30000000
|
|
CONFIG_SPI_FLASH_ISSI=y
|
|
CONFIG_SPI_FLASH_MACRONIX=y
|
|
CONFIG_SPI_FLASH_SPANSION=y
|
|
CONFIG_SPI_FLASH_STMICRO=y
|
|
CONFIG_SPI_FLASH_WINBOND=y
|
|
# CONFIG_SPI_FLASH_USE_4K_SECTORS is not set
|
|
CONFIG_ARM_DCC=y
|
|
CONFIG_ZYNQ_QSPI=y
|
|
# CONFIG_GZIP is not set
|