mirror of
https://github.com/AsahiLinux/u-boot
synced 2024-11-11 15:37:23 +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
97 lines
2.2 KiB
Text
97 lines
2.2 KiB
Text
CONFIG_ARM=y
|
|
CONFIG_SPL_SKIP_LOWLEVEL_INIT=y
|
|
CONFIG_ARCH_CPU_INIT=y
|
|
CONFIG_SPL_SYS_THUMB_BUILD=y
|
|
CONFIG_ARCH_MVEBU=y
|
|
CONFIG_SYS_TEXT_BASE=0x00800000
|
|
CONFIG_SPL_GPIO=y
|
|
CONFIG_SPL_LIBCOMMON_SUPPORT=y
|
|
CONFIG_SPL_LIBGENERIC_SUPPORT=y
|
|
CONFIG_SYS_MALLOC_F_LEN=0x2000
|
|
CONFIG_NR_DRAM_BANKS=2
|
|
CONFIG_SYS_MEMTEST_START=0x00800000
|
|
CONFIG_SYS_MEMTEST_END=0x00ffffff
|
|
CONFIG_TARGET_TURRIS_OMNIA=y
|
|
CONFIG_ENV_SIZE=0x10000
|
|
CONFIG_ENV_OFFSET=0xF0000
|
|
CONFIG_ENV_SECT_SIZE=0x10000
|
|
CONFIG_DM_GPIO=y
|
|
CONFIG_DEFAULT_DEVICE_TREE="armada-385-turris-omnia"
|
|
CONFIG_SPL_TEXT_BASE=0x40000030
|
|
CONFIG_SPL_SERIAL=y
|
|
CONFIG_SPL=y
|
|
CONFIG_DEBUG_UART_BASE=0xd0012000
|
|
CONFIG_DEBUG_UART_CLOCK=250000000
|
|
CONFIG_DEBUG_UART=y
|
|
CONFIG_AHCI=y
|
|
CONFIG_DISTRO_DEFAULTS=y
|
|
CONFIG_SYS_LOAD_ADDR=0x800000
|
|
CONFIG_FIT=y
|
|
CONFIG_FIT_VERBOSE=y
|
|
CONFIG_OF_BOARD_SETUP=y
|
|
CONFIG_BOOTDELAY=3
|
|
CONFIG_USE_PREBOOT=y
|
|
CONFIG_SYS_CONSOLE_INFO_QUIET=y
|
|
# CONFIG_DISPLAY_BOARDINFO is not set
|
|
CONFIG_DISPLAY_BOARDINFO_LATE=y
|
|
CONFIG_MISC_INIT_R=y
|
|
CONFIG_SPL_BOARD_INIT=y
|
|
CONFIG_SPL_I2C=y
|
|
CONFIG_CMD_MEMTEST=y
|
|
CONFIG_SYS_ALT_MEMTEST=y
|
|
CONFIG_CMD_SHA1SUM=y
|
|
CONFIG_CMD_LZMADEC=y
|
|
CONFIG_CMD_GPIO=y
|
|
CONFIG_CMD_GPT=y
|
|
CONFIG_CMD_I2C=y
|
|
CONFIG_CMD_MMC=y
|
|
CONFIG_CMD_MTD=y
|
|
CONFIG_CMD_PCI=y
|
|
CONFIG_CMD_SATA=y
|
|
CONFIG_CMD_SPI=y
|
|
CONFIG_CMD_USB=y
|
|
CONFIG_CMD_WDT=y
|
|
CONFIG_CMD_TFTPPUT=y
|
|
CONFIG_CMD_CACHE=y
|
|
CONFIG_CMD_TIME=y
|
|
CONFIG_CMD_AES=y
|
|
CONFIG_CMD_HASH=y
|
|
CONFIG_CMD_BTRFS=y
|
|
CONFIG_CMD_FS_UUID=y
|
|
# CONFIG_SPL_PARTITION_UUIDS is not set
|
|
CONFIG_ENV_OVERWRITE=y
|
|
CONFIG_USE_ENV_SPI_MAX_HZ=y
|
|
CONFIG_ENV_SPI_MAX_HZ=40000000
|
|
CONFIG_SYS_RELOC_GD_ENV_ADDR=y
|
|
CONFIG_SPL_OF_TRANSLATE=y
|
|
CONFIG_AHCI_PCI=y
|
|
CONFIG_AHCI_MVEBU=y
|
|
# CONFIG_MVEBU_GPIO is not set
|
|
CONFIG_DM_PCA953X=y
|
|
CONFIG_MMC_SDHCI=y
|
|
CONFIG_MMC_SDHCI_MV=y
|
|
CONFIG_MTD=y
|
|
CONFIG_DM_MTD=y
|
|
CONFIG_SF_DEFAULT_MODE=0x0
|
|
CONFIG_SF_DEFAULT_SPEED=40000000
|
|
CONFIG_SPI_FLASH_MACRONIX=y
|
|
CONFIG_SPI_FLASH_SPANSION=y
|
|
CONFIG_SPI_FLASH_MTD=y
|
|
CONFIG_PHY_MARVELL=y
|
|
CONFIG_PHY_GIGE=y
|
|
CONFIG_MVNETA=y
|
|
CONFIG_MII=y
|
|
CONFIG_NVME=y
|
|
CONFIG_PCI=y
|
|
CONFIG_PCI_MVEBU=y
|
|
CONFIG_DM_RTC=y
|
|
CONFIG_RTC_ARMADA38X=y
|
|
CONFIG_SCSI=y
|
|
CONFIG_DEBUG_UART_SHIFT=2
|
|
CONFIG_SYS_NS16550=y
|
|
CONFIG_KIRKWOOD_SPI=y
|
|
CONFIG_USB=y
|
|
CONFIG_USB_XHCI_HCD=y
|
|
CONFIG_USB_EHCI_HCD=y
|
|
CONFIG_WDT=y
|
|
CONFIG_WDT_ORION=y
|