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
94 lines
2.1 KiB
Plaintext
94 lines
2.1 KiB
Plaintext
CONFIG_ARM=y
|
|
CONFIG_ARCH_MX6=y
|
|
CONFIG_SYS_TEXT_BASE=0x17800000
|
|
CONFIG_SPL_GPIO=y
|
|
CONFIG_SPL_LIBCOMMON_SUPPORT=y
|
|
CONFIG_SPL_LIBGENERIC_SUPPORT=y
|
|
CONFIG_NR_DRAM_BANKS=1
|
|
CONFIG_ENV_SIZE=0x4000
|
|
CONFIG_ENV_OFFSET=0x80000
|
|
CONFIG_MX6Q=y
|
|
CONFIG_MX6_DDRCAL=y
|
|
CONFIG_TARGET_KOSAGI_NOVENA=y
|
|
CONFIG_SYS_I2C_MXC_I2C1=y
|
|
CONFIG_SYS_I2C_MXC_I2C2=y
|
|
CONFIG_SYS_I2C_MXC_I2C3=y
|
|
CONFIG_SYS_MALLOC_LEN=0x4000000
|
|
CONFIG_DEFAULT_DEVICE_TREE="imx6q-novena"
|
|
CONFIG_SPL_TEXT_BASE=0x00908000
|
|
CONFIG_SPL_MMC=y
|
|
CONFIG_SPL_SERIAL=y
|
|
CONFIG_SPL=y
|
|
CONFIG_ENV_OFFSET_REDUND=0x84000
|
|
CONFIG_SPL_FS_FAT=y
|
|
CONFIG_SPL_LIBDISK_SUPPORT=y
|
|
CONFIG_CMD_HDMIDETECT=y
|
|
CONFIG_AHCI=y
|
|
CONFIG_DISTRO_DEFAULTS=y
|
|
CONFIG_FIT=y
|
|
CONFIG_USE_BOOTARGS=y
|
|
CONFIG_BOOTARGS="console=ttymxc1,115200 "
|
|
CONFIG_BOOTCOMMAND="run distro_bootcmd ; run net_nfs"
|
|
CONFIG_BOARD_EARLY_INIT_F=y
|
|
CONFIG_MISC_INIT_R=y
|
|
CONFIG_SPL_FS_EXT4=y
|
|
CONFIG_SPL_I2C=y
|
|
CONFIG_SPL_WATCHDOG=y
|
|
CONFIG_CMD_ASKENV=y
|
|
CONFIG_CMD_EEPROM=y
|
|
CONFIG_SYS_I2C_EEPROM_BUS=2
|
|
CONFIG_SYS_I2C_EEPROM_ADDR_LEN=2
|
|
CONFIG_CMD_GPIO=y
|
|
CONFIG_CMD_I2C=y
|
|
CONFIG_CMD_MMC=y
|
|
CONFIG_CMD_PCI=y
|
|
CONFIG_CMD_SATA=y
|
|
CONFIG_CMD_USB=y
|
|
CONFIG_CMD_CACHE=y
|
|
CONFIG_CMD_TIME=y
|
|
CONFIG_CMD_EXT4_WRITE=y
|
|
# CONFIG_SPL_PARTITION_UUIDS is not set
|
|
CONFIG_ENV_OVERWRITE=y
|
|
CONFIG_ENV_IS_IN_MMC=y
|
|
CONFIG_SYS_REDUNDAND_ENVIRONMENT=y
|
|
CONFIG_SYS_RELOC_GD_ENV_ADDR=y
|
|
CONFIG_VERSION_VARIABLE=y
|
|
CONFIG_NETCONSOLE=y
|
|
CONFIG_DM=y
|
|
CONFIG_BOUNCE_BUFFER=y
|
|
CONFIG_DWC_AHSATA=y
|
|
CONFIG_SYS_I2C_LEGACY=y
|
|
CONFIG_SPL_SYS_I2C_LEGACY=y
|
|
CONFIG_SYS_I2C_MXC=y
|
|
CONFIG_FSL_USDHC=y
|
|
CONFIG_PHYLIB=y
|
|
CONFIG_PHY_MICREL=y
|
|
CONFIG_PHY_MICREL_KSZ90X1=y
|
|
CONFIG_FEC_MXC=y
|
|
CONFIG_RGMII=y
|
|
CONFIG_MII=y
|
|
CONFIG_PINCTRL=y
|
|
CONFIG_PINCTRL_IMX6=y
|
|
CONFIG_POWER_LEGACY=y
|
|
CONFIG_POWER_I2C=y
|
|
CONFIG_MXC_UART=y
|
|
CONFIG_DM_THERMAL=y
|
|
CONFIG_IMX_THERMAL=y
|
|
CONFIG_USB=y
|
|
CONFIG_USB_KEYBOARD=y
|
|
CONFIG_SYS_USB_EVENT_POLL_VIA_CONTROL_EP=y
|
|
CONFIG_USB_HOST_ETHER=y
|
|
CONFIG_USB_ETHER_ASIX=y
|
|
CONFIG_USB_ETHER_SMSC95XX=y
|
|
CONFIG_USB_GADGET=y
|
|
CONFIG_CI_UDC=y
|
|
CONFIG_USB_ETHER=y
|
|
CONFIG_USB_ETH_CDC=y
|
|
# CONFIG_VIDEO_BPP8 is not set
|
|
# CONFIG_VIDEO_BPP32 is not set
|
|
CONFIG_SYS_WHITE_ON_BLACK=y
|
|
CONFIG_VIDEO_IPUV3=y
|
|
CONFIG_SPLASH_SCREEN=y
|
|
CONFIG_VIDEO_BMP_RLE8=y
|
|
CONFIG_BMP_16BPP=y
|