sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

configs/nucleo-l476rg: Fix some confusional in conditional logic introduced by a recent patch.

Browse Source
This commit is contained in:
Gregory Nutt 2018-06-27 13:13:45 -06:00
parent 06c7b9a5bc
commit 5f6293b93d
2 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
configs/nucleo-l476rg/src/nucleo-l476rg.h
View File

@ -57,7 +57,7 @@
#define HAVE_RTC_DRIVER 1 #define HAVE_RTC_DRIVER 1
#define HAVE_MMCSD_SPI 1 #define HAVE_MMCSD_SPI 1
#define HAVE_MMCSD 1 #define HAVE_MMCSD_SDIO 1
#if !defined(CONFIG_FS_PROCFS) #if !defined(CONFIG_FS_PROCFS)
# undef HAVE_PROC # undef HAVE_PROC
@ -76,12 +76,12 @@
#if !defined(CONFIG_STM32L4_SPI1) || !defined(CONFIG_MMCSD) || \ #if !defined(CONFIG_STM32L4_SPI1) || !defined(CONFIG_MMCSD) || \
!defined(CONFIG_MMCSD_SPI) !defined(CONFIG_MMCSD_SPI)
# undef HAVE_MMCSD # undef HAVE_MMCSD_SPI
#endif #endif
#if !defined(CONFIG_STM32L4_SDIO) || !defined(CONFIG_MMCSD) || \ #if !defined(CONFIG_STM32L4_SDIO) || !defined(CONFIG_MMCSD) || \
!defined(CONFIG_MMCSD_SDIO) !defined(CONFIG_MMCSD_SDIO)
# undef HAVE_MMCSD # undef HAVE_MMCSD_SDIO
#endif #endif
/* LED. User LD2: the green LED is a user LED connected to Arduino signal D13 /* LED. User LD2: the green LED is a user LED connected to Arduino signal D13
@ -139,12 +139,6 @@
GPIO_EXTI | GPIO_SPEED_50MHz) GPIO_EXTI | GPIO_SPEED_50MHz)
#endif #endif
#ifdef HAVE_MMCSD
# define GPIO_SPI_CS_SD_CARD_OFF \
(GPIO_INPUT | GPIO_PULLDOWN | GPIO_SPEED_2MHz | \
GPIO_PORTB | GPIO_PIN5)
#endif
/* SPI chip selects */ /* SPI chip selects */
#ifdef CONFIG_MMCSD_SPI #ifdef CONFIG_MMCSD_SPI
@ -285,7 +279,7 @@ extern struct spi_dev_s *g_spi1;
#ifdef CONFIG_STM32L4_SPI2 #ifdef CONFIG_STM32L4_SPI2
extern struct spi_dev_s *g_spi2; extern struct spi_dev_s *g_spi2;
#endif #endif
#ifdef HAVE_MMCSD #ifdef HAVE_MMCSD_SDIO
extern struct sdio_dev_s *g_sdio; extern struct sdio_dev_s *g_sdio;
#endif #endif

2
configs/nucleo-l476rg/src/stm32_appinit.c
View File

@ -153,7 +153,7 @@ int board_app_initialize(uintptr_t arg)
} }
#endif #endif
#ifdef HAVE_MMCSD #ifdef HAVE_MMCSD_SDIO
/* First, get an instance of the SDIO interface */ /* First, get an instance of the SDIO interface */
g_sdio = sdio_initialize(CONFIG_NSH_MMCSDSLOTNO); g_sdio = sdio_initialize(CONFIG_NSH_MMCSDSLOTNO);