mirror of
https://github.com/AsahiLinux/u-boot
synced 2024-11-17 10:18:38 +00:00
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
45 lines
1.1 KiB
Text
45 lines
1.1 KiB
Text
CONFIG_ARM=y
|
|
CONFIG_ARCH_MX6=y
|
|
CONFIG_SYS_TEXT_BASE=0x17800000
|
|
CONFIG_SPL_LIBCOMMON_SUPPORT=y
|
|
CONFIG_SPL_LIBGENERIC_SUPPORT=y
|
|
CONFIG_NR_DRAM_BANKS=1
|
|
CONFIG_SYS_MEMTEST_START=0x10000000
|
|
CONFIG_SYS_MEMTEST_END=0x20000000
|
|
CONFIG_ENV_SIZE=0x2000
|
|
CONFIG_MX6QDL=y
|
|
CONFIG_MX6_DDRCAL=y
|
|
CONFIG_TARGET_MX6MEMCAL=y
|
|
CONFIG_SYS_MALLOC_LEN=0x4000000
|
|
CONFIG_SPL_TEXT_BASE=0x00908000
|
|
CONFIG_SPL_SERIAL=y
|
|
CONFIG_SPL=y
|
|
CONFIG_SUPPORT_RAW_INITRD=y
|
|
CONFIG_SPL_USB_HOST=y
|
|
CONFIG_SPL_WATCHDOG=y
|
|
CONFIG_HUSH_PARSER=y
|
|
# CONFIG_CMD_BOOTD is not set
|
|
# CONFIG_CMD_BOOTM is not set
|
|
# CONFIG_CMD_ELF is not set
|
|
# CONFIG_CMD_IMI is not set
|
|
# CONFIG_CMD_XIMG 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_MEMINFO=y
|
|
CONFIG_CMD_MEMTEST=y
|
|
# CONFIG_CMD_FUSE is not set
|
|
# CONFIG_CMD_LOADB is not set
|
|
# CONFIG_CMD_LOADS is not set
|
|
CONFIG_CMD_CACHE=y
|
|
CONFIG_ENV_OVERWRITE=y
|
|
CONFIG_SYS_RELOC_GD_ENV_ADDR=y
|
|
# CONFIG_NET is not set
|
|
CONFIG_DM=y
|
|
CONFIG_BOUNCE_BUFFER=y
|
|
# CONFIG_MMC is not set
|
|
CONFIG_FSL_USDHC=y
|
|
CONFIG_MXC_UART=y
|
|
CONFIG_OF_LIBFDT=y
|