From 823b8bda2b904ee91a684d1001ca1ea9ad45fbe3 Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Thu, 4 Feb 2016 14:27:44 -0600 Subject: [PATCH] There are a few things that should still depend on CONFIG_NSH_ARCHINT vs CONFIG_LIB_BOARDCTL --- configs/lm3s8962-ek/src/lm_oled.c | 1 + configs/pic32mz-starterkit/src/pic32mz-starterkit.h | 2 ++ configs/stm32f4discovery/src/stm32f4discovery.h | 6 ++++-- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/configs/lm3s8962-ek/src/lm_oled.c b/configs/lm3s8962-ek/src/lm_oled.c index 949fccec51..197a614e79 100644 --- a/configs/lm3s8962-ek/src/lm_oled.c +++ b/configs/lm3s8962-ek/src/lm_oled.c @@ -49,6 +49,7 @@ #include #include "tiva_gpio.h" +#include "tiva_ssi.h" #include "lm3s8962-ek.h" /**************************************************************************** diff --git a/configs/pic32mz-starterkit/src/pic32mz-starterkit.h b/configs/pic32mz-starterkit/src/pic32mz-starterkit.h index 54846c0b24..8528cb584d 100644 --- a/configs/pic32mz-starterkit/src/pic32mz-starterkit.h +++ b/configs/pic32mz-starterkit/src/pic32mz-starterkit.h @@ -91,6 +91,8 @@ /* Make sure that the NSH configuration uses the slot */ # if !defined(CONFIG_NSH_MMCSDSLOTNO) || CONFIG_NSH_MMCSDSLOTNO != 0 +# define CONFIG_NSH_MMCSDSLOTNO 0 +# elif CONFIG_NSH_MMCSDSLOTNO != 0 # warning "The PIC32 Starter Kit has only one slot (0)" # undef CONFIG_NSH_MMCSDSLOTNO # define CONFIG_NSH_MMCSDSLOTNO 0 diff --git a/configs/stm32f4discovery/src/stm32f4discovery.h b/configs/stm32f4discovery/src/stm32f4discovery.h index 563a0304d1..c7123c8a46 100644 --- a/configs/stm32f4discovery/src/stm32f4discovery.h +++ b/configs/stm32f4discovery/src/stm32f4discovery.h @@ -110,12 +110,14 @@ # undef HAVE_SDIO #endif -#undef SDIO_MINOR /* Any minor number, default 0 */ +#undef SDIO_MINOR /* Any minor number, default 0 */ #define SDIO_SLOTNO 0 /* Only one slot */ #ifdef HAVE_SDIO -# if defined(CONFIG_NSH_MMCSDSLOTNO) && CONFIG_NSH_MMCSDSLOTNO != 0 +# if !defined(CONFIG_NSH_MMCSDSLOTNO) +# define CONFIG_NSH_MMCSDSLOTNO SDIO_SLOTNO +# elif CONFIG_NSH_MMCSDSLOTNO != 0 # warning "Only one MMC/SD slot, slot 0" # undef CONFIG_NSH_MMCSDSLOTNO # define CONFIG_NSH_MMCSDSLOTNO SDIO_SLOTNO