mirror of
https://github.com/AsahiLinux/u-boot
synced 2024-11-07 05:34:28 +00:00
ab2f757eb0
Update mvebu SPL boot selection mechanism for the move to driver model usage by ensuring that the required driver support for SPI and MMC booting is available in SPL when the respective boot method is selected. Previously, all mvebu boards selected a boot method (implicitly MVEBU_SPL_BOOT_DEVICE_SPI for many) even if SPL booting wasn't used. This changes mvebu boot method selection to depend on SPL usage which resolves the issue with aarch64 boards which don't use SPL getting an implicit boot device selection resulting in unmet dependencies. The 32-bit arm boards do use SPL, but I'm led to conclude that most aren't intentionally using the MVEBU_SPL_BOOT_DEVICE selection since none have SPL_DM_SPI enabled in their defconfig even though they still implicitly select the SPI boot method. This also results in the new addition of SPL_GPIO_SUPPORT to helios4. The mainline dts for helios4 includes the cd-gpios entry for sdhci with identical addresses as the clearfog dts. I don't have a helios4 board to confirm, but based on the current source conclude that the board itself is either wired to pull the signal low for eMMC, or the default MMC boot isn't fully functional in mainline. In either case, as far as I can tell, including the GPIO support will at least cause no regression. Tested on SolidRun ClearFog devices. Signed-off-by: Joel Johnson <mrjoel@lixil.net> Reviewed-by: Stefan Roese <sr@denx.de>
81 lines
1.8 KiB
Text
81 lines
1.8 KiB
Text
CONFIG_ARM=y
|
|
CONFIG_ARCH_CPU_INIT=y
|
|
CONFIG_SPL_SYS_THUMB_BUILD=y
|
|
CONFIG_ARCH_MVEBU=y
|
|
CONFIG_SYS_TEXT_BASE=0x00800000
|
|
CONFIG_SPL_GPIO_SUPPORT=y
|
|
CONFIG_SPL_LIBCOMMON_SUPPORT=y
|
|
CONFIG_SPL_LIBGENERIC_SUPPORT=y
|
|
CONFIG_SYS_MALLOC_F_LEN=0x2000
|
|
CONFIG_TARGET_TURRIS_OMNIA=y
|
|
CONFIG_ENV_SIZE=0x10000
|
|
CONFIG_ENV_SECT_SIZE=0x10000
|
|
CONFIG_ENV_OFFSET=0xF0000
|
|
CONFIG_DM_GPIO=y
|
|
CONFIG_SPL_SERIAL_SUPPORT=y
|
|
CONFIG_NR_DRAM_BANKS=2
|
|
CONFIG_SPL=y
|
|
CONFIG_DEBUG_UART_BASE=0xd0012000
|
|
CONFIG_DEBUG_UART_CLOCK=250000000
|
|
CONFIG_DEBUG_UART=y
|
|
CONFIG_AHCI=y
|
|
CONFIG_SPL_TEXT_BASE=0x40000030
|
|
CONFIG_DISTRO_DEFAULTS=y
|
|
CONFIG_FIT=y
|
|
CONFIG_FIT_VERBOSE=y
|
|
CONFIG_BOOTDELAY=3
|
|
CONFIG_USE_PREBOOT=y
|
|
CONFIG_SYS_CONSOLE_INFO_QUIET=y
|
|
CONFIG_MISC_INIT_R=y
|
|
# CONFIG_DISPLAY_BOARDINFO is not set
|
|
CONFIG_DISPLAY_BOARDINFO_LATE=y
|
|
CONFIG_SPL_I2C_SUPPORT=y
|
|
CONFIG_SYS_SPI_U_BOOT_OFFS=0x24000
|
|
CONFIG_CMD_MEMTEST=y
|
|
CONFIG_SYS_ALT_MEMTEST=y
|
|
CONFIG_CMD_SHA1SUM=y
|
|
CONFIG_CMD_LZMADEC=y
|
|
CONFIG_CMD_GPIO=y
|
|
CONFIG_CMD_I2C=y
|
|
CONFIG_CMD_MMC=y
|
|
CONFIG_CMD_PCI=y
|
|
CONFIG_CMD_SATA=y
|
|
CONFIG_CMD_SPI=y
|
|
CONFIG_CMD_USB=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_SPL_PARTITION_UUIDS is not set
|
|
CONFIG_DEFAULT_DEVICE_TREE="armada-385-turris-omnia"
|
|
CONFIG_USE_ENV_SPI_MAX_HZ=y
|
|
CONFIG_ENV_SPI_MAX_HZ=50000000
|
|
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_DM_MMC=y
|
|
CONFIG_MMC_SDHCI=y
|
|
CONFIG_MMC_SDHCI_MV=y
|
|
CONFIG_SPI_FLASH_MACRONIX=y
|
|
CONFIG_SPI_FLASH_SPANSION=y
|
|
CONFIG_PHY_MARVELL=y
|
|
CONFIG_PHY_GIGE=y
|
|
CONFIG_MVNETA=y
|
|
CONFIG_MII=y
|
|
CONFIG_PCI=y
|
|
CONFIG_PCI_MVEBU=y
|
|
CONFIG_SCSI=y
|
|
CONFIG_DEBUG_UART_SHIFT=2
|
|
CONFIG_SYS_NS16550=y
|
|
CONFIG_KIRKWOOD_SPI=y
|
|
CONFIG_USB=y
|
|
CONFIG_DM_USB=y
|
|
CONFIG_USB_XHCI_HCD=y
|
|
CONFIG_USB_EHCI_HCD=y
|
|
CONFIG_WDT=y
|
|
CONFIG_WDT_ORION=y
|