Message ID | 1551277238-604-5-git-send-email-patrick.delaunay@st.com |
---|---|
State | Accepted |
Commit | 9309aad084bba4cb86f61d4108c4e6152ef6cf7d |
Delegated to: | Tom Rini |
Headers | show |
Series | Migrate SPI defines to Kconfig | expand |
On Wed, Feb 27, 2019 at 03:20:35PM +0100, Patrick Delaunay wrote: > Define the function board_spi_cs_gpio only when needed, > only called in drivers/spi/mxc_spi.c. > That avoid compilation issue for tqma6s_wru4_mmc_defconfig > when CONFIG_SF_DEFAULT_BUS and CONFIG_SF_DEFAULT_CS are not > defined (CMD_SF not defined) after migration in KConfig. > > Signed-off-by: Patrick Delaunay <patrick.delaunay@st.com> Applied to u-boot/master, thanks!
diff --git a/board/tqc/tqma6/tqma6.c b/board/tqc/tqma6/tqma6.c index 816672e..372a17c 100644 --- a/board/tqc/tqma6/tqma6.c +++ b/board/tqc/tqma6/tqma6.c @@ -155,11 +155,13 @@ __weak void tqma6_iomuxc_spi(void) ARRAY_SIZE(tqma6_ecspi1_pads)); } +#if defined(CONFIG_SF_DEFAULT_BUS) && defined(CONFIG_SF_DEFAULT_CS) int board_spi_cs_gpio(unsigned bus, unsigned cs) { return ((bus == CONFIG_SF_DEFAULT_BUS) && (cs == CONFIG_SF_DEFAULT_CS)) ? TQMA6_SF_CS_GPIO : -1; } +#endif static struct i2c_pads_info tqma6_i2c3_pads = { /* I2C3: on board LM75, M24C64, */
Define the function board_spi_cs_gpio only when needed, only called in drivers/spi/mxc_spi.c. That avoid compilation issue for tqma6s_wru4_mmc_defconfig when CONFIG_SF_DEFAULT_BUS and CONFIG_SF_DEFAULT_CS are not defined (CMD_SF not defined) after migration in KConfig. Signed-off-by: Patrick Delaunay <patrick.delaunay@st.com> --- board/tqc/tqma6/tqma6.c | 2 ++ 1 file changed, 2 insertions(+)