random-mirrors/smaeul-u-boot
1
0
Fork 0
mirror of https://github.com/smaeul/u-boot.git synced 2025-11-27 06:14:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

arm: imx6: cm_fx6: Enable DM SPI and SPI_FLASH, fix SPL build errors

Browse Source 
Enable driver model for SPI and SPI_FLASH to remove the following
compile warning on CM-FX6 SOM:
===================== WARNING ======================
This board does not use CONFIG_DM_SPI_FLASH. Please update
the board to use CONFIG_SPI_FLASH before the v2019.07 release.
====================================================

This change introduced SPL build error as shown:

In file included from include/common.h:47:0,
                 from drivers/mtd/spi/sf_probe.c:10:
drivers/mtd/spi/sf_probe.c: In function 'spi_flash_std_probe':
drivers/mtd/spi/sf_probe.c:149:54: error: dereferencing pointer to incomplete type 'struct dm_spi_slave_platdata'
scripts/Makefile.build:278: recipe for target 'spl/drivers/mtd/spi/sf_probe.o' failed
make[3]: *** [spl/drivers/mtd/spi/sf_probe.o] Error 1
scripts/Makefile.build:432: recipe for target 'spl/drivers/mtd/spi' failed
make[2]: *** [spl/drivers/mtd/spi] Error 2

Disabling DM for SPI support(SPI and SF) in SPL resolves the issue.
Target was compile tested, build was clean.

Signed-off-by: Suniel Mahesh <sunil.m@techveda.org>
This commit is contained in:
Suniel Mahesh 2019-11-27 16:17:48 +05:30 committed by Stefano Babic
parent 26d926d616
commit 1699f0e592
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configs/cm_fx6_defconfig
View File

@ -67,6 +67,7 @@ CONFIG_MTD=y
CONFIG_MTD_RAW_NAND=y CONFIG_MTD_RAW_NAND=y
CONFIG_NAND_MXS=y CONFIG_NAND_MXS=y
CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH=y
CONFIG_DM_SPI_FLASH=y
CONFIG_SF_DEFAULT_MODE=0 CONFIG_SF_DEFAULT_MODE=0
CONFIG_SF_DEFAULT_SPEED=25000000 CONFIG_SF_DEFAULT_SPEED=25000000
CONFIG_SPI_FLASH_ATMEL=y CONFIG_SPI_FLASH_ATMEL=y
@ -83,6 +84,7 @@ CONFIG_MII=y
CONFIG_DM_PMIC=y CONFIG_DM_PMIC=y
CONFIG_DM_REGULATOR=y CONFIG_DM_REGULATOR=y
CONFIG_SPI=y CONFIG_SPI=y
CONFIG_DM_SPI=y
CONFIG_MXC_SPI=y CONFIG_MXC_SPI=y
CONFIG_DM_ETH=y CONFIG_DM_ETH=y
CONFIG_USB=y CONFIG_USB=y

7
include/configs/cm_fx6.h
View File

@ -153,6 +153,13 @@
/* APBH DMA is required for NAND support */ /* APBH DMA is required for NAND support */
#endif #endif
/* SPI Flash Configs */
#if defined(CONFIG_SPL_BUILD)
#undef CONFIG_DM_SPI
#undef CONFIG_DM_SPI_FLASH
#undef CONFIG_SPI_FLASH_MTD
#endif
/* Ethernet */ /* Ethernet */
#define CONFIG_FEC_MXC #define CONFIG_FEC_MXC
#define CONFIG_FEC_MXC_PHYADDR 0 #define CONFIG_FEC_MXC_PHYADDR 0