Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-06-06 16:50:55 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

drivers/mmcsd/Kconfig: three configuration settings were within ifdef/endif and led to warning: xxx selects xxxx which has unmet direct dependencies. Fix by moving settings to drivers/Kconfig and outside of the ifdef-endif. Also renamed CONFIG_SDIO_PREFLIGHT to CONFIG_ARCH_HAVE_SDIO_PREFLIGHT to follow naming of similar hidden architecture capability configurations.

Browse Source
This commit is contained in:
Gregory Nutt
2018-08-05 17:58:17 -06:00
parent c6adc4ba8e
commit 4e5cf1229c
11 changed files with 45 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
arch/arm/src/stm32/Kconfig
+1 -1
View File
@@ -2520,7 +2520,7 @@ config STM32_SDIO
depends on !STM32_CONNECTIVITYLINE && !STM32_VALUELINE
select ARCH_HAVE_SDIO
select ARCH_HAVE_SDIOWAIT_WRCOMPLETE
select SDIO_PREFLIGHT
select ARCH_HAVE_SDIO_PREFLIGHT
config STM32_SPI1
bool "SPI1"
arch/arm/src/stm32/stm32_sdio.c
+6 -6
View File
@@ -499,7 +499,7 @@ static int stm32_registercallback(FAR struct sdio_dev_s *dev,
/* DMA */
#ifdef CONFIG_STM32_SDIO_DMA
#ifdef CONFIG_SDIO_PREFLIGHT
#ifdef CONFIG_ARCH_HAVE_SDIO_PREFLIGHT
static int stm32_dmapreflight(FAR struct sdio_dev_s *dev,
FAR const uint8_t *buffer, size_t buflen);
#endif
@@ -552,13 +552,13 @@ struct stm32_dev_s g_sdiodev =
.registercallback = stm32_registercallback,
#ifdef CONFIG_SDIO_DMA
#ifdef CONFIG_STM32_SDIO_DMA
#ifdef CONFIG_SDIO_PREFLIGHT
#ifdef CONFIG_ARCH_HAVE_SDIO_PREFLIGHT
.dmapreflight = stm32_dmapreflight,
#endif
.dmarecvsetup = stm32_dmarecvsetup,
.dmasendsetup = stm32_dmasendsetup,
#else
#ifdef CONFIG_SDIO_PREFLIGHT
#ifdef CONFIG_ARCH_HAVE_SDIO_PREFLIGHT
.dmapreflight = NULL,
#endif
.dmarecvsetup = stm32_recvsetup,
@@ -2700,7 +2700,7 @@ static int stm32_registercallback(FAR struct sdio_dev_s *dev,
* OK on success; a negated errno on failure
****************************************************************************/
#if defined(CONFIG_STM32_SDIO_DMA) && defined(CONFIG_SDIO_PREFLIGHT)
#if defined(CONFIG_STM32_SDIO_DMA) && defined(CONFIG_ARCH_HAVE_SDIO_PREFLIGHT)
static int stm32_dmapreflight(FAR struct sdio_dev_s *dev,
FAR const uint8_t *buffer, size_t buflen)
{
@@ -2755,7 +2755,7 @@ static int stm32_dmarecvsetup(FAR struct sdio_dev_s *dev, FAR uint8_t *buffer,
uint32_t dblocksize;
DEBUGASSERT(priv != NULL && buffer != NULL && buflen > 0);
#ifdef CONFIG_SDIO_PREFLIGHT
#ifdef CONFIG_ARCH_HAVE_SDIO_PREFLIGHT
DEBUGASSERT(stm32_dmapreflight(dev, buffer, buflen) == 0);
#endif
@@ -2834,7 +2834,7 @@ static int stm32_dmasendsetup(FAR struct sdio_dev_s *dev,
uint32_t dblocksize;
DEBUGASSERT(priv != NULL && buffer != NULL && buflen > 0);
#ifdef CONFIG_SDIO_PREFLIGHT
#ifdef CONFIG_ARCH_HAVE_SDIO_PREFLIGHT
DEBUGASSERT(stm32_dmapreflight(dev, buffer, buflen) == 0);
#endif
arch/arm/src/stm32f0/Kconfig
+1 -1
View File
@@ -979,7 +979,7 @@ config STM32F0_SDIO
depends on !STM32F0_CONNECTIVITYLINE && !STM32F0_VALUELINE
select ARCH_HAVE_SDIO
select ARCH_HAVE_SDIOWAIT_WRCOMPLETE
select SDIO_PREFLIGHT
select ARCH_HAVE_SDIO_PREFLIGHT
config STM32F0_SPI1
bool "SPI1"
arch/arm/src/stm32f7/Kconfig
+2 -2
View File
@@ -1448,7 +1448,7 @@ config STM32F7_SDMMC1
select STM32F7_SDMMC
select ARCH_HAVE_SDIO
select ARCH_HAVE_SDIOWAIT_WRCOMPLETE
select SDIO_PREFLIGHT
select ARCH_HAVE_SDIO_PREFLIGHT
select SDIO_BLOCKSETUP
config STM32F7_SDMMC2
@@ -1458,7 +1458,7 @@ config STM32F7_SDMMC2
select STM32F7_SDMMC
select ARCH_HAVE_SDIO
select ARCH_HAVE_SDIOWAIT_WRCOMPLETE
select SDIO_PREFLIGHT
select ARCH_HAVE_SDIO_PREFLIGHT
select SDIO_BLOCKSETUP
config STM32F7_SPDIFRX
arch/arm/src/stm32f7/stm32_sdmmc.c
+7 -7
View File
@@ -555,7 +555,7 @@ static int stm32_registercallback(FAR struct sdio_dev_s *dev,
/* DMA */
#ifdef CONFIG_STM32F7_SDMMC_DMA
#ifdef CONFIG_SDIO_PREFLIGHT
#ifdef CONFIG_ARCH_HAVE_SDIO_PREFLIGHT
static int stm32_dmapreflight(FAR struct sdio_dev_s *dev,
FAR const uint8_t *buffer, size_t buflen);
#endif
@@ -607,13 +607,13 @@ struct stm32_dev_s g_sdmmcdev1 =
.registercallback = stm32_registercallback,
#ifdef CONFIG_SDIO_DMA
#ifdef CONFIG_STM32F7_SDMMC_DMA
#ifdef CONFIG_SDIO_PREFLIGHT
#ifdef CONFIG_ARCH_HAVE_SDIO_PREFLIGHT
.dmapreflight = stm32_dmapreflight,
#endif
.dmarecvsetup = stm32_dmarecvsetup,
.dmasendsetup = stm32_dmasendsetup,
#else
#ifdef CONFIG_SDIO_PREFLIGHT
#ifdef CONFIG_ARCH_HAVE_SDIO_PREFLIGHT
.dmapreflight = NULL,
#endif
.dmarecvsetup = stm32_recvsetup,
@@ -682,7 +682,7 @@ struct stm32_dev_s g_sdmmcdev2 =
.callbackenable = stm32_callbackenable,
.registercallback = stm32_registercallback,
#ifdef CONFIG_SDIO_DMA
#ifdef CONFIG_SDIO_PREFLIGHT
#ifdef CONFIG_ARCH_HAVE_SDIO_PREFLIGHT
.dmapreflight = stm32_dmapreflight,
#endif
.dmarecvsetup = stm32_dmarecvsetup,
@@ -2957,7 +2957,7 @@ static int stm32_registercallback(FAR struct sdio_dev_s *dev,
* OK on success; a negated errno on failure
****************************************************************************/
#if defined(CONFIG_STM32F7_SDMMC_DMA) && defined(CONFIG_SDIO_PREFLIGHT)
#if defined(CONFIG_STM32F7_SDMMC_DMA) && defined(CONFIG_ARCH_HAVE_SDIO_PREFLIGHT)
static int stm32_dmapreflight(FAR struct sdio_dev_s *dev,
FAR const uint8_t *buffer, size_t buflen)
{
@@ -3004,7 +3004,7 @@ static int stm32_dmarecvsetup(FAR struct sdio_dev_s *dev, FAR uint8_t *buffer,
uint32_t dblocksize;
DEBUGASSERT(priv != NULL && buffer != NULL && buflen > 0);
#ifdef CONFIG_SDIO_PREFLIGHT
#ifdef CONFIG_ARCH_HAVE_SDIO_PREFLIGHT
DEBUGASSERT(stm32_dmapreflight(dev, buffer, buflen) == 0);
#else
# if defined(CONFIG_ARMV7M_DCACHE) && !defined(CONFIG_ARMV7M_DCACHE_WRITETHROUGH)
@@ -3094,7 +3094,7 @@ static int stm32_dmasendsetup(FAR struct sdio_dev_s *dev,
uint32_t dblocksize;
DEBUGASSERT(priv != NULL && buffer != NULL && buflen > 0);
#ifdef CONFIG_SDIO_PREFLIGHT
#ifdef CONFIG_ARCH_HAVE_SDIO_PREFLIGHT
DEBUGASSERT(stm32_dmapreflight(dev, buffer, buflen) == 0);
#else
# if defined(CONFIG_ARMV7M_DCACHE) && !defined(CONFIG_ARMV7M_DCACHE_WRITETHROUGH)
arch/arm/src/stm32l4/Kconfig
+1 -1
View File
@@ -1294,7 +1294,7 @@ config STM32L4_SDMMC1
select STM32L4_SAI1PLL
select STM32L4_SDMMC
select ARCH_HAVE_SDIOWAIT_WRCOMPLETE
select SDIO_PREFLIGHT
select ARCH_HAVE_SDIO_PREFLIGHT
depends on STM32L4_HAVE_SDMMC1
config STM32L4_TIM1
arch/arm/src/stm32l4/stm32l4_sdmmc.c
+7 -7
View File
@@ -522,7 +522,7 @@ static int stm32_registercallback(FAR struct sdio_dev_s *dev,
/* DMA */
#ifdef CONFIG_STM32L4_SDMMC_DMA
#ifdef CONFIG_SDIO_PREFLIGHT
#ifdef CONFIG_ARCH_HAVE_SDIO_PREFLIGHT
static int stm32_dmapreflight(FAR struct sdio_dev_s *dev,
FAR const uint8_t *buffer, size_t buflen);
#endif
@@ -578,13 +578,13 @@ struct stm32_dev_s g_sdmmcdev1 =
#endif
#ifdef CONFIG_SDIO_DMA
#ifdef CONFIG_STM32L4_SDMMC_DMA
#ifdef CONFIG_SDIO_PREFLIGHT
#ifdef CONFIG_ARCH_HAVE_SDIO_PREFLIGHT
.dmapreflight = stm32_dmapreflight,
#endif
.dmarecvsetup = stm32_dmarecvsetup,
.dmasendsetup = stm32_dmasendsetup,
#else
#ifdef CONFIG_SDIO_PREFLIGHT
#ifdef CONFIG_ARCH_HAVE_SDIO_PREFLIGHT
.dmapreflight = NULL,
#endif
.dmarecvsetup = stm32_recvsetup,
@@ -641,7 +641,7 @@ struct stm32_dev_s g_sdmmcdev2 =
.registercallback = stm32_registercallback,
#endif
#ifdef CONFIG_SDIO_DMA
#ifdef CONFIG_SDIO_PREFLIGHT
#ifdef CONFIG_ARCH_HAVE_SDIO_PREFLIGHT
.dmapreflight = stm32_dmapreflight,
#endif
.dmarecvsetup = stm32_dmarecvsetup,
@@ -2787,7 +2787,7 @@ static int stm32_registercallback(FAR struct sdio_dev_s *dev,
* OK on success; a negated errno on failure
****************************************************************************/
#if defined(CONFIG_STM32L4_SDMMC_DMA) && defined(CONFIG_SDIO_PREFLIGHT)
#if defined(CONFIG_STM32L4_SDMMC_DMA) && defined(CONFIG_ARCH_HAVE_SDIO_PREFLIGHT)
static int stm32_dmapreflight(FAR struct sdio_dev_s *dev,
FAR const uint8_t *buffer, size_t buflen)
{
@@ -2834,7 +2834,7 @@ static int stm32_dmarecvsetup(FAR struct sdio_dev_s *dev, FAR uint8_t *buffer,
uint32_t dblocksize;
DEBUGASSERT(priv != NULL && buffer != NULL && buflen > 0);
#ifdef CONFIG_SDIO_PREFLIGHT
#ifdef CONFIG_ARCH_HAVE_SDIO_PREFLIGHT
DEBUGASSERT(stm32_dmapreflight(dev, buffer, buflen) == 0);
#else
# if defined(CONFIG_ARMV7M_DCACHE) && !defined(CONFIG_ARMV7M_DCACHE_WRITETHROUGH)
@@ -2924,7 +2924,7 @@ static int stm32_dmasendsetup(FAR struct sdio_dev_s *dev,
uint32_t dblocksize;
DEBUGASSERT(priv != NULL && buffer != NULL && buflen > 0);
#ifdef CONFIG_SDIO_PREFLIGHT
#ifdef CONFIG_ARCH_HAVE_SDIO_PREFLIGHT
DEBUGASSERT(stm32_dmapreflight(dev, buffer, buflen) == 0);
#else
# if defined(CONFIG_ARMV7M_DCACHE) && !defined(CONFIG_ARMV7M_DCACHE_WRITETHROUGH)