mirror of
https://github.com/AsahiLinux/u-boot
synced 2024-09-22 15:42:04 +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
80 lines
2.1 KiB
Text
80 lines
2.1 KiB
Text
CONFIG_ARM=y
|
|
CONFIG_ARCH_CPU_INIT=y
|
|
# CONFIG_SPL_USE_ARCH_MEMCPY is not set
|
|
# CONFIG_SPL_USE_ARCH_MEMSET is not set
|
|
CONFIG_ARCH_OMAP2PLUS=y
|
|
CONFIG_TI_COMMON_CMD_OPTIONS=y
|
|
CONFIG_DEFAULT_DEVICE_TREE="am335x-boneblack"
|
|
CONFIG_AM33XX=y
|
|
CONFIG_SPL=y
|
|
CONFIG_ENV_OFFSET_REDUND=0x280000
|
|
CONFIG_DISTRO_DEFAULTS=y
|
|
CONFIG_FIT_SIGNATURE=y
|
|
CONFIG_FIT_VERBOSE=y
|
|
CONFIG_SYS_EXTRA_OPTIONS="EMMC_BOOT"
|
|
CONFIG_AUTOBOOT_KEYED=y
|
|
CONFIG_AUTOBOOT_PROMPT="Press SPACE to abort autoboot in %d seconds\n"
|
|
CONFIG_AUTOBOOT_DELAY_STR="d"
|
|
CONFIG_AUTOBOOT_STOP_STR=" "
|
|
CONFIG_BOOTCOMMAND="run findfdt; run init_console; run finduuid; run distro_bootcmd"
|
|
CONFIG_SYS_CONSOLE_INFO_QUIET=y
|
|
CONFIG_ARCH_MISC_INIT=y
|
|
CONFIG_SPL_MUSB_NEW=y
|
|
# CONFIG_SPL_NAND_SUPPORT is not set
|
|
CONFIG_SPL_NET=y
|
|
CONFIG_SPL_NET_VCI_STRING="AM33xx U-Boot SPL"
|
|
CONFIG_SPL_OS_BOOT=y
|
|
CONFIG_SPL_USB_GADGET=y
|
|
CONFIG_SPL_USB_ETHER=y
|
|
CONFIG_CMD_SPL=y
|
|
CONFIG_SYS_I2C_EEPROM_ADDR_LEN=2
|
|
# CONFIG_CMD_FLASH is not set
|
|
# CONFIG_CMD_SETEXPR is not set
|
|
CONFIG_BOOTP_DNS2=y
|
|
CONFIG_OF_CONTROL=y
|
|
CONFIG_SPL_OF_CONTROL=y
|
|
CONFIG_ENV_OVERWRITE=y
|
|
CONFIG_ENV_IS_IN_MMC=y
|
|
CONFIG_SYS_REDUNDAND_ENVIRONMENT=y
|
|
CONFIG_SYS_RELOC_GD_ENV_ADDR=y
|
|
CONFIG_SYS_MMC_ENV_DEV=1
|
|
CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
|
|
CONFIG_VERSION_VARIABLE=y
|
|
CONFIG_BOOTP_SEND_HOSTNAME=y
|
|
# CONFIG_SPL_BLK is not set
|
|
CONFIG_BOOTCOUNT_LIMIT=y
|
|
CONFIG_DFU_MMC=y
|
|
CONFIG_DFU_RAM=y
|
|
CONFIG_USB_FUNCTION_FASTBOOT=y
|
|
CONFIG_DM_I2C=y
|
|
CONFIG_MISC=y
|
|
CONFIG_SYS_I2C_EEPROM_ADDR=0x50
|
|
# CONFIG_SPL_DM_MMC is not set
|
|
CONFIG_MMC_OMAP_HS=y
|
|
CONFIG_MTD=y
|
|
CONFIG_DM_SPI_FLASH=y
|
|
CONFIG_SF_DEFAULT_SPEED=24000000
|
|
CONFIG_SPI_FLASH_WINBOND=y
|
|
CONFIG_PHY_ATHEROS=y
|
|
CONFIG_PHY_SMSC=y
|
|
CONFIG_DM_ETH=y
|
|
CONFIG_PHY_GIGE=y
|
|
CONFIG_MII=y
|
|
CONFIG_DRIVER_TI_CPSW=y
|
|
CONFIG_SPI=y
|
|
CONFIG_DM_SPI=y
|
|
CONFIG_OMAP3_SPI=y
|
|
CONFIG_TIMER=y
|
|
CONFIG_OMAP_TIMER=y
|
|
CONFIG_USB=y
|
|
CONFIG_DM_USB_GADGET=y
|
|
CONFIG_SPL_DM_USB_GADGET=y
|
|
CONFIG_USB_MUSB_HOST=y
|
|
CONFIG_USB_MUSB_GADGET=y
|
|
CONFIG_USB_MUSB_TI=y
|
|
CONFIG_USB_GADGET=y
|
|
CONFIG_USB_GADGET_MANUFACTURER="Texas Instruments"
|
|
CONFIG_USB_GADGET_VENDOR_NUM=0x0451
|
|
CONFIG_USB_GADGET_PRODUCT_NUM=0xd022
|
|
CONFIG_USB_ETHER=y
|
|
CONFIG_LZO=y
|