diff --git a/configs/stm3210e-eval/src/up_nsh.c b/configs/stm3210e-eval/src/up_nsh.c index 177d93993d0..4eb0e8e8677 100755 --- a/configs/stm3210e-eval/src/up_nsh.c +++ b/configs/stm3210e-eval/src/up_nsh.c @@ -62,6 +62,25 @@ # undef CONFIG_EXAMPLES_NSH_HAVEUSBDEV #endif +/* MMC/SD is on SPI1 */ + +#ifndef CONFIG_STM32_SPI1 +# undef CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO +# undef CONFIG_EXAMPLES_NSH_MMCSDSLOTNO +#endif + +#if defined(CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO) && CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO != 0 +# error MMC/SD is on SPI1 +# undef CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO +# undef CONFIG_EXAMPLES_NSH_MMCSDSLOTNO +#endif + +#if defined(CONFIG_EXAMPLES_NSH_MMCSDSLOTNO) && CONFIG_EXAMPLES_NSH_MMCSDSLOTNO != 0 +# error "Only one MMC/SD slot" +# undef CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO +# undef CONFIG_EXAMPLES_NSH_MMCSDSLOTNO +#endif + /* Can't support MMC/SD features if mountpoints are disabled */ #if defined(CONFIG_DISABLE_MOUNTPOINT) @@ -102,7 +121,7 @@ int nsh_archinitialize(void) { -#if defined(CONFIG_STM32_SPI1) || defined(CONFIG_STM32_SPI2) +#ifdef CONFIG_STM32_SPI1 FAR struct spi_dev_s *spi; int ret; diff --git a/configs/stm3210e-eval/src/up_spi.c b/configs/stm3210e-eval/src/up_spi.c index bfad4c5aeb6..756f1a8ae66 100755 --- a/configs/stm3210e-eval/src/up_spi.c +++ b/configs/stm3210e-eval/src/up_spi.c @@ -169,7 +169,6 @@ void weak_function stm32_spiinitialize(void) void stm32_spi1select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, boolean selected) { spidbg("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert"); - uint32 pinset; if (devid == SPIDEV_MMCSD) {