mirror of
https://github.com/AsahiLinux/u-boot
synced 2024-12-12 06:12:58 +00:00
56c4046038
This change allows more fine tuning of driver model based SPI support in
SPL and TPL. It is now possible to explicitly enable/disable the DM_SPI
support in SPL and TPL via Kconfig option.
Before this change it was necessary to use:
/* SPI Flash Configs */
#if defined(CONFIG_SPL_BUILD)
#undef CONFIG_DM_SPI
#undef CONFIG_DM_SPI_FLASH
#undef CONFIG_SPI_FLASH_MTD
#endif
in the ./include/configs/<board>.h, which is error prone and shall be
avoided when we strive to switch to Kconfig.
The goal of this patch:
Provide distinction for DM_SPI support in both U-Boot proper and SPL (TPL).
Valid use case is when U-Boot proper wants to use DM_SPI, but SPL must
still support non DM driver.
Another use case is the conversion of non DM/DTS SPI driver to support
DM/DTS. When such driver needs to work in both SPL and U-Boot proper, the
distinction is needed in Kconfig (also if SPL version of the driver
supports OF_PLATDATA).
In the end of the day one would have to support following use cases (in
single driver file - e.g. mxs_spi.c):
- U-Boot proper driver supporting DT/DTS
- U-Boot proper driver without DT/DTS support (deprecated)
- SPL driver without DT/DTS support
- SPL (and TPL) driver with DT/DTS (when the SoC has enough resources to
run full blown DT/DTS)
- SPL driver with DT/DTS and SPL_OF_PLATDATA (when one have constrained
environment with no fitImage and OF_LIBFDT support).
Some boards do require SPI support (with DM) in SPL (TPL) and some only
have DM_SPI{_FLASH} defined to allow compiling SPL.
This patch converts #ifdef CONFIG_DM_SPI* to #if CONFIG_IS_ENABLED(DM_SPI)
and provides corresponding defines in Kconfig.
Signed-off-by: Lukasz Majewski <lukma@denx.de>
Tested-by: Adam Ford <aford173@gmail.com> #da850-evm
Signed-off-by: Hou Zhiqiang <Zhiqiang.Hou@nxp.com>
[trini: Fixup a few platforms]
Signed-off-by: Tom Rini <trini@konsulko.com>
78 lines
1.9 KiB
Text
78 lines
1.9 KiB
Text
CONFIG_ARM=y
|
|
CONFIG_SYS_DCACHE_OFF=y
|
|
CONFIG_ARCH_CPU_INIT=y
|
|
CONFIG_ARCH_KEYSTONE=y
|
|
CONFIG_ISW_ENTRY_ADDR=0xC200000
|
|
CONFIG_SYS_TEXT_BASE=0xC000000
|
|
CONFIG_TI_COMMON_CMD_OPTIONS=y
|
|
CONFIG_SPL_LIBCOMMON_SUPPORT=y
|
|
CONFIG_SPL_LIBGENERIC_SUPPORT=y
|
|
CONFIG_TARGET_K2HK_EVM=y
|
|
CONFIG_ENV_SIZE=0x40000
|
|
CONFIG_ENV_OFFSET=0x100000
|
|
CONFIG_SYS_SPI_U_BOOT_OFFS=0x10000
|
|
CONFIG_SPL_DM_SPI=y
|
|
CONFIG_SPL_SERIAL_SUPPORT=y
|
|
CONFIG_NR_DRAM_BANKS=2
|
|
CONFIG_SPL=y
|
|
CONFIG_SPL_SPI_FLASH_SUPPORT=y
|
|
CONFIG_SPL_SPI_SUPPORT=y
|
|
CONFIG_DISTRO_DEFAULTS=y
|
|
CONFIG_OF_BOARD_SETUP=y
|
|
# CONFIG_USE_BOOTCOMMAND is not set
|
|
CONFIG_SYS_CONSOLE_INFO_QUIET=y
|
|
CONFIG_VERSION_VARIABLE=y
|
|
CONFIG_BOARD_EARLY_INIT_F=y
|
|
CONFIG_SPL_I2C_SUPPORT=y
|
|
CONFIG_SPL_DM_SPI_FLASH=y
|
|
CONFIG_SPL_POWER_SUPPORT=y
|
|
CONFIG_SPL_SPI_LOAD=y
|
|
CONFIG_CMD_MX_CYCLIC=y
|
|
# CONFIG_CMD_FLASH is not set
|
|
# CONFIG_CMD_GPIO is not set
|
|
# CONFIG_CMD_GPT is not set
|
|
# CONFIG_CMD_MMC is not set
|
|
CONFIG_CMD_NAND=y
|
|
# CONFIG_CMD_SETEXPR is not set
|
|
CONFIG_BOOTP_DNS2=y
|
|
CONFIG_MTDIDS_DEFAULT="nand0=davinci_nand.0"
|
|
CONFIG_MTDPARTS_DEFAULT="mtdparts=davinci_nand.0:1024k(bootloader)ro,512k(params)ro,-(ubifs)"
|
|
CONFIG_CMD_UBI=y
|
|
CONFIG_OF_CONTROL=y
|
|
CONFIG_SPL_OF_CONTROL=y
|
|
CONFIG_DEFAULT_DEVICE_TREE="keystone-k2hk-evm"
|
|
CONFIG_ENV_IS_IN_NAND=y
|
|
CONFIG_SYS_RELOC_GD_ENV_ADDR=y
|
|
CONFIG_NET_RANDOM_ETHADDR=y
|
|
CONFIG_DM=y
|
|
CONFIG_SPL_DM=y
|
|
CONFIG_SYS_I2C_DAVINCI=y
|
|
CONFIG_TI_AEMIF=y
|
|
CONFIG_MISC=y
|
|
# CONFIG_MMC is not set
|
|
CONFIG_MTD=y
|
|
CONFIG_MTD_RAW_NAND=y
|
|
CONFIG_SYS_NAND_USE_FLASH_BBT=y
|
|
CONFIG_NAND_DAVINCI=y
|
|
CONFIG_DM_SPI_FLASH=y
|
|
CONFIG_SF_DEFAULT_SPEED=30000000
|
|
CONFIG_SPI_FLASH_STMICRO=y
|
|
CONFIG_PHYLIB=y
|
|
CONFIG_PHY_MARVELL=y
|
|
CONFIG_DM_ETH=y
|
|
CONFIG_MII=y
|
|
CONFIG_DRIVER_TI_KEYSTONE_NET=y
|
|
CONFIG_PHY=y
|
|
CONFIG_NOP_PHY=y
|
|
CONFIG_KEYSTONE_USB_PHY=y
|
|
CONFIG_DM_SERIAL=y
|
|
CONFIG_SYS_NS16550=y
|
|
CONFIG_SPI=y
|
|
CONFIG_DM_SPI=y
|
|
CONFIG_DAVINCI_SPI=y
|
|
CONFIG_USB=y
|
|
CONFIG_DM_USB=y
|
|
CONFIG_USB_XHCI_HCD=y
|
|
CONFIG_USB_XHCI_DWC3=y
|
|
CONFIG_USB_DWC3=y
|
|
CONFIG_USB_DWC3_GENERIC=y
|