mirror of
https://github.com/AsahiLinux/u-boot
synced 2024-11-10 23:24:38 +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>
102 lines
2.5 KiB
Text
102 lines
2.5 KiB
Text
CONFIG_ARM=y
|
|
CONFIG_ARCH_CPU_INIT=y
|
|
CONFIG_ARCH_AT91=y
|
|
CONFIG_SYS_TEXT_BASE=0x26f00000
|
|
CONFIG_TARGET_SAMA5D4_XPLAINED=y
|
|
CONFIG_SPL_GPIO_SUPPORT=y
|
|
CONFIG_SPL_LIBCOMMON_SUPPORT=y
|
|
CONFIG_SPL_LIBGENERIC_SUPPORT=y
|
|
CONFIG_SYS_MALLOC_F_LEN=0x2000
|
|
CONFIG_ENV_SIZE=0x2000
|
|
CONFIG_ENV_OFFSET=0x6000
|
|
CONFIG_ENV_SECT_SIZE=0x1000
|
|
CONFIG_SYS_SPI_U_BOOT_OFFS=0x10000
|
|
CONFIG_DM_GPIO=y
|
|
CONFIG_SPL_DM_SPI=y
|
|
CONFIG_SPL_SERIAL_SUPPORT=y
|
|
CONFIG_SPL_DRIVERS_MISC_SUPPORT=y
|
|
CONFIG_NR_DRAM_BANKS=1
|
|
CONFIG_SPL=y
|
|
CONFIG_DEBUG_UART_BOARD_INIT=y
|
|
CONFIG_DEBUG_UART_BASE=0xfc00c000
|
|
CONFIG_DEBUG_UART_CLOCK=100000000
|
|
CONFIG_SPL_SPI_FLASH_SUPPORT=y
|
|
CONFIG_SPL_SPI_SUPPORT=y
|
|
CONFIG_SPL_TEXT_BASE=0x200000
|
|
CONFIG_DEBUG_UART=y
|
|
CONFIG_ENV_VARS_UBOOT_CONFIG=y
|
|
CONFIG_FIT=y
|
|
CONFIG_SPI_BOOT=y
|
|
CONFIG_BOOTDELAY=3
|
|
CONFIG_USE_BOOTARGS=y
|
|
CONFIG_BOOTARGS="console=ttyS0,115200 earlyprintk mtdparts=atmel_nand:256k(bootstrap)ro,768k(uboot)ro,256K(env_redundant),256k(env),512k(dtb),6M(kernel)ro,-(rootfs) rootfstype=ubifs ubi.mtd=6 root=ubi0:rootfs"
|
|
CONFIG_MISC_INIT_R=y
|
|
# CONFIG_DISPLAY_BOARDINFO is not set
|
|
CONFIG_SPL_SPI_LOAD=y
|
|
CONFIG_HUSH_PARSER=y
|
|
CONFIG_CMD_BOOTZ=y
|
|
# CONFIG_CMD_FLASH is not set
|
|
# CONFIG_CMD_LOADS is not set
|
|
CONFIG_CMD_MMC=y
|
|
CONFIG_CMD_NAND=y
|
|
CONFIG_CMD_USB=y
|
|
CONFIG_CMD_DHCP=y
|
|
CONFIG_CMD_PING=y
|
|
CONFIG_CMD_FAT=y
|
|
CONFIG_OF_CONTROL=y
|
|
CONFIG_SPL_OF_CONTROL=y
|
|
CONFIG_DEFAULT_DEVICE_TREE="at91-sama5d4_xplained"
|
|
CONFIG_OF_SPL_REMOVE_PROPS="interrupts interrupt-parent dma-names dmas"
|
|
CONFIG_ENV_IS_IN_SPI_FLASH=y
|
|
CONFIG_SYS_RELOC_GD_ENV_ADDR=y
|
|
CONFIG_DM=y
|
|
CONFIG_SPL_DM=y
|
|
CONFIG_SPL_DM_SEQ_ALIAS=y
|
|
CONFIG_CLK=y
|
|
CONFIG_SPL_CLK=y
|
|
CONFIG_CLK_AT91=y
|
|
CONFIG_AT91_UTMI=y
|
|
CONFIG_AT91_H32MX=y
|
|
CONFIG_AT91_GPIO=y
|
|
CONFIG_DM_I2C=y
|
|
CONFIG_SYS_I2C_AT91=y
|
|
CONFIG_I2C_EEPROM=y
|
|
CONFIG_DM_MMC=y
|
|
CONFIG_GENERIC_ATMEL_MCI=y
|
|
CONFIG_MTD=y
|
|
CONFIG_MTD_RAW_NAND=y
|
|
# CONFIG_SYS_NAND_USE_FLASH_BBT is not set
|
|
CONFIG_NAND_ATMEL=y
|
|
CONFIG_DM_SPI_FLASH=y
|
|
CONFIG_SPL_DM_SPI_FLASH=y
|
|
CONFIG_SF_DEFAULT_SPEED=30000000
|
|
CONFIG_SPI_FLASH_ATMEL=y
|
|
CONFIG_DM_ETH=y
|
|
CONFIG_MACB=y
|
|
CONFIG_PINCTRL=y
|
|
CONFIG_SPL_PINCTRL=y
|
|
CONFIG_PINCTRL_AT91=y
|
|
CONFIG_DM_SERIAL=y
|
|
CONFIG_DEBUG_UART_ANNOUNCE=y
|
|
CONFIG_ATMEL_USART=y
|
|
CONFIG_SPI=y
|
|
CONFIG_DM_SPI=y
|
|
CONFIG_SPL_DM_SPI=y
|
|
CONFIG_TIMER=y
|
|
CONFIG_SPL_TIMER=y
|
|
CONFIG_ATMEL_PIT_TIMER=y
|
|
CONFIG_USB=y
|
|
CONFIG_DM_USB=y
|
|
CONFIG_USB_EHCI_HCD=y
|
|
CONFIG_USB_STORAGE=y
|
|
CONFIG_USB_GADGET=y
|
|
CONFIG_USB_GADGET_ATMEL_USBA=y
|
|
CONFIG_DM_VIDEO=y
|
|
# CONFIG_VIDEO_BPP8 is not set
|
|
# CONFIG_VIDEO_BPP32 is not set
|
|
CONFIG_ATMEL_HLCD=y
|
|
CONFIG_W1=y
|
|
CONFIG_W1_GPIO=y
|
|
CONFIG_W1_EEPROM=y
|
|
CONFIG_W1_EEPROM_DS24XXX=y
|
|
CONFIG_OF_LIBFDT_OVERLAY=y
|