mirror of
https://github.com/brain-hackers/u-boot-brain
synced 2024-06-09 23:36:03 +09:00
73fb2c32f7
-----BEGIN PGP SIGNATURE----- iQGzBAABCgAdFiEEGjx/cOCPqxcHgJu/FHw5/5Y0tywFAmDaJXgACgkQFHw5/5Y0 tyySmwwAkW7GVAv+bXSd+8u1IsScl0QrSCoBdfHpdMcAME3gZmXqxClxskfbYJR/ 3IByQFlsn7j8HruR/49+etk0i0Pc4HNfynTLuAy+77/lh+h3Pnru/VPBhQqR7KW0 NN5STn91QWLl74vRmx5wmEfSMhg7LTE1US8Rh6UXAd2dAiPd+hUawIR9D0Pq5Gzm nn7HvamDYspFUgSYYl8h1RtRQ9VqAFpnnPphpLkvX6323uCQwccXu5pnj1fLfGfj iO2Q+bDcwpEdUosox/LM1BdMoaSA+opOjk/e72y9V84+Jk6D+Jn5zQEpF5TJnTyI Yi2+NuJWS5xFWk1dnJrbGt0HpWM2oO12dZZ7eYy/FdsPJiWAS0ppRuxHVb868vjD ulca7acFPUjGyo3vBw1S0iVmPCBFGHBoyg3QLrUHYbpISeBeoa2w2cDxQl90ahw/ TgRx+yutKfwkBPfILwDylNOgCGRwvLfroRyMEMiQ3gTSOCBmBX/yMv1k8tb9ZvPZ /WVsK6dw =F7x1 -----END PGP SIGNATURE----- gpgsig -----BEGIN PGP SIGNATURE----- iQIzBAABCgAdFiEEdQaENiSDAlGTDEbB7G51OISzHs0FAmDbKXIACgkQ7G51OISz Hs0VJw/+LRufCgQnZ2OsEE2y9cgMDECvFuiprmOCeCD4+z8vitrWhYhd/dv39LLQ C8ONhHdCbIsw1ivyKeD2ir8O2DU28a0C0x/zHplwtrL9pFd6XVbj9flf8GBi9FR3 21y75kvwKScNIJ1iSGxwzcbVTr5VO3rfshDOoH6m68gHc4uqEUG0sZDooUydm1kp Xhtsbc5ew/2DbCrdPV0qrUDQ59uKck8jGXKRoKlJBHrL3MOBKExx2epql0Igiv9R TAunyiCdTzWF+B0OVY/JWTuu5cHCpYJdp/wV7aP/1lKeFj7W81qc+AyynnXld0hh mzxgl3Xl4Uh3nvMXU0+3FU53HuxCgCHfbIStNejedFqtXsA+QGOzpXaB65ZpNThI PDBNleGlWJdeDTYDj6XMP6mN4UwbHSoKHnrtfEpJBFVewjJ/qMV39+FPWVcfQvqb uZ+/UzUwnkOfS8yew97McfMJJwRLDZZwAMa/8RtoeUxutdLONJwGH2+z6fpHA5+B M7J83J7ygDJ9S4Lj3yHwGsXwFaIJNUyApnxnuS0kJY49AoPe1VGyPxvtcFVSkeMl dT/OQ5tbaLbr+6knkSoInQ0rYsTDcuj+RHz7sTth91t+vTbyOY0zq4zarhV18i6p /8f3jospJraK1ZDGAN4KniHvE/QsKJKJNv2yrkqS9tTQYjEKInM= =Vcvn -----END PGP SIGNATURE----- Merge tag 'v2021.07-rc5' into 2021.07+fslc Prepare v2021.07-rc5 Conflicts (manual resolve): - configs/imx8mm_evk_defconfig: - configs/imx8mn_ddr4_evk_defconfig: - configs/imx8mn_evk_defconfig: - configs/imx8mp_evk_defconfig: Drop our local change, which are incuded in the commit2bba78076b("configs: Resync with savedefconfig") from upstream. - configs/mx6sabresd_defconfig: Merge changes from commit2f7d3890b6("mx6sabre_common: Dynamically change the video output") with upstream commit2bba78076b("configs: Resync with savedefconfig"). Link: https://lore.kernel.org/u-boot/20210628194137.GU9516@bill-the-cat/ Signed-off-by: Andrey Zhizhikin <andrey.z@gmail.com>
123 lines
3.0 KiB
Plaintext
123 lines
3.0 KiB
Plaintext
CONFIG_ARM=y
|
|
CONFIG_ARCH_MX6=y
|
|
CONFIG_SYS_TEXT_BASE=0x17800000
|
|
CONFIG_SPL_GPIO_SUPPORT=y
|
|
CONFIG_SPL_LIBCOMMON_SUPPORT=y
|
|
CONFIG_SPL_LIBGENERIC_SUPPORT=y
|
|
CONFIG_SYS_MALLOC_F_LEN=0x4000
|
|
CONFIG_NR_DRAM_BANKS=1
|
|
CONFIG_ENV_SIZE=0x2000
|
|
CONFIG_ENV_OFFSET=0xC0000
|
|
CONFIG_MX6QDL=y
|
|
CONFIG_TARGET_MX6SABRESD=y
|
|
CONFIG_DM_GPIO=y
|
|
CONFIG_DEFAULT_DEVICE_TREE="imx6q-sabresd"
|
|
CONFIG_SPL_TEXT_BASE=0x00908000
|
|
CONFIG_SPL_MMC_SUPPORT=y
|
|
CONFIG_SPL_SERIAL_SUPPORT=y
|
|
CONFIG_SPL=y
|
|
CONFIG_SPL_LIBDISK_SUPPORT=y
|
|
CONFIG_CMD_HDMIDETECT=y
|
|
CONFIG_FIT=y
|
|
CONFIG_SPL_FIT_PRINT=y
|
|
CONFIG_SPL_LOAD_FIT=y
|
|
# CONFIG_USE_SPL_FIT_GENERATOR is not set
|
|
CONFIG_SUPPORT_RAW_INITRD=y
|
|
CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg"
|
|
# CONFIG_CONSOLE_MUX is not set
|
|
CONFIG_SYS_CONSOLE_IS_IN_ENV=y
|
|
CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
|
|
CONFIG_SPL_LEGACY_IMAGE_SUPPORT=y
|
|
CONFIG_SPL_SEPARATE_BSS=y
|
|
CONFIG_SPL_FIT_IMAGE_TINY=y
|
|
CONFIG_SPL_USB_HOST_SUPPORT=y
|
|
CONFIG_SPL_USB_GADGET=y
|
|
CONFIG_SPL_USB_SDP_SUPPORT=y
|
|
CONFIG_SPL_WATCHDOG_SUPPORT=y
|
|
CONFIG_HUSH_PARSER=y
|
|
CONFIG_CMD_BOOTZ=y
|
|
CONFIG_CMD_SPL=y
|
|
CONFIG_CMD_SPL_WRITE_SIZE=0x20000
|
|
# CONFIG_CMD_FLASH is not set
|
|
CONFIG_CMD_GPIO=y
|
|
CONFIG_CMD_I2C=y
|
|
CONFIG_CMD_MMC=y
|
|
CONFIG_CMD_PART=y
|
|
CONFIG_CMD_PCI=y
|
|
CONFIG_CMD_USB=y
|
|
CONFIG_CMD_USB_SDP=y
|
|
CONFIG_CMD_USB_MASS_STORAGE=y
|
|
CONFIG_CMD_DHCP=y
|
|
CONFIG_CMD_MII=y
|
|
CONFIG_CMD_PING=y
|
|
CONFIG_CMD_BMP=y
|
|
CONFIG_CMD_CACHE=y
|
|
CONFIG_CMD_EXT2=y
|
|
CONFIG_CMD_EXT4=y
|
|
CONFIG_CMD_EXT4_WRITE=y
|
|
CONFIG_CMD_FAT=y
|
|
CONFIG_CMD_FS_GENERIC=y
|
|
# CONFIG_SPL_DOS_PARTITION is not set
|
|
CONFIG_EFI_PARTITION=y
|
|
# CONFIG_SPL_EFI_PARTITION is not set
|
|
CONFIG_OF_CONTROL=y
|
|
CONFIG_SPL_OF_CONTROL=y
|
|
CONFIG_OF_LIST="imx6q-sabresd imx6qp-sabresd imx6dl-sabresd"
|
|
CONFIG_MULTI_DTB_FIT=y
|
|
CONFIG_SPL_MULTI_DTB_FIT=y
|
|
CONFIG_SPL_OF_LIST="imx6dl-sabresd imx6q-sabresd imx6qp-sabresd"
|
|
CONFIG_SPL_MULTI_DTB_FIT_NO_COMPRESSION=y
|
|
CONFIG_ENV_OVERWRITE=y
|
|
CONFIG_ENV_IS_IN_MMC=y
|
|
CONFIG_SYS_RELOC_GD_ENV_ADDR=y
|
|
CONFIG_SYS_MMC_ENV_DEV=1
|
|
CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
|
|
CONFIG_BOUNCE_BUFFER=y
|
|
CONFIG_USB_FUNCTION_FASTBOOT=y
|
|
CONFIG_FASTBOOT_BUF_ADDR=0x12000000
|
|
CONFIG_FASTBOOT_BUF_SIZE=0x10000000
|
|
CONFIG_FASTBOOT_FLASH=y
|
|
CONFIG_FASTBOOT_FLASH_MMC_DEV=2
|
|
CONFIG_SUPPORT_EMMC_BOOT=y
|
|
CONFIG_FSL_USDHC=y
|
|
CONFIG_MTD=y
|
|
CONFIG_DM_SPI_FLASH=y
|
|
CONFIG_SF_DEFAULT_MODE=0
|
|
CONFIG_SF_DEFAULT_SPEED=20000000
|
|
CONFIG_SPI_FLASH_STMICRO=y
|
|
CONFIG_PHYLIB=y
|
|
CONFIG_PHY_ATHEROS=y
|
|
CONFIG_DM_ETH=y
|
|
CONFIG_FEC_MXC=y
|
|
CONFIG_RGMII=y
|
|
CONFIG_MII=y
|
|
CONFIG_PCI=y
|
|
CONFIG_DM_PCI=y
|
|
CONFIG_PINCTRL=y
|
|
CONFIG_PINCTRL_IMX6=y
|
|
CONFIG_DM_REGULATOR=y
|
|
CONFIG_DM_REGULATOR_FIXED=y
|
|
CONFIG_MXC_UART=y
|
|
CONFIG_SPI=y
|
|
CONFIG_DM_SPI=y
|
|
CONFIG_MXC_SPI=y
|
|
CONFIG_IMX_THERMAL=y
|
|
CONFIG_USB=y
|
|
CONFIG_DM_USB=y
|
|
CONFIG_USB_GADGET=y
|
|
CONFIG_USB_GADGET_MANUFACTURER="FSL"
|
|
CONFIG_USB_GADGET_VENDOR_NUM=0x0525
|
|
CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
|
|
CONFIG_CI_UDC=y
|
|
CONFIG_USB_HOST_ETHER=y
|
|
CONFIG_USB_ETHER_ASIX=y
|
|
CONFIG_DM_VIDEO=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_SPLASH_SCREEN_ALIGN=y
|
|
CONFIG_VIDEO_BMP_RLE8=y
|
|
CONFIG_BMP_16BPP=y
|