Shenzhou board is first to use ONLY Kconfig for configuration

git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5114 42af7a65-404d-4744-a932-0658087f49c3

1 files changed, 16 insertions, 16 deletions

diff --git a/nuttx/configs/pic32mx7mmb/src/up_nsh.c b/nuttx/configs/pic32mx7mmb/src/up_nsh.c
index a9d26b6be..d063450d3 100644
--- a/nuttx/configs/pic32mx7mmb/src/up_nsh.c
+++ b/nuttx/configs/pic32mx7mmb/src/up_nsh.c
@@ -58,8 +58,8 @@
 /* Configuration ************************************************************/
 /* Assume that we have MMC/SD, USB host (and USB device) */
 
-#define CONFIG_NSH_HAVEMMCSD   1
-#define CONFIG_NSH_HAVEUSBHOST 1
+#define NSH_HAVEMMCSD   1
+#define NSH_HAVEUSBHOST 1
 
 /* The Mikroelektronika PIC32MX7 MMB has one SD slot on board, connected to SPI 1. */
 
@@ -69,7 +69,7 @@
 
 /* Make sure that the configuration will support the SD card */
 
-#ifdef CONFIG_NSH_HAVEMMCSD
+#ifdef NSH_HAVEMMCSD
 
    /* Make sure that the NSH configuration uses the correct SPI */
 
@@ -95,23 +95,23 @@
 
 #  if CONFIG_PIC32MX_MMCSDSPIPORTNO == 1 && !defined(CONFIG_PIC32MX_SPI1)
 #    warning "CONFIG_PIC32MX_SPI1 is not enabled"
-#    undef CONFIG_NSH_HAVEMMCSD
+#    undef NSH_HAVEMMCSD
 #  elif CONFIG_PIC32MX_MMCSDSPIPORTNO == 2 && !defined(CONFIG_PIC32MX_SPI2)
 #    warning "CONFIG_PIC32MX_SPI2 is not enabled"
-#    undef CONFIG_NSH_HAVEMMCSD
+#    undef NSH_HAVEMMCSD
 #  elif CONFIG_PIC32MX_MMCSDSPIPORTNO == 3 && !defined(CONFIG_PIC32MX_SPI3)
 #    warning "CONFIG_PIC32MX_SPI3 is not enabled"
-#    undef CONFIG_NSH_HAVEMMCSD
+#    undef NSH_HAVEMMCSD
 #  elif CONFIG_PIC32MX_MMCSDSPIPORTNO == 4 && !defined(CONFIG_PIC32MX_SPI4)
 #    warning "CONFIG_PIC32MX_SPI4 is not enabled"
-#    undef CONFIG_NSH_HAVEMMCSD
+#    undef NSH_HAVEMMCSD
 #  endif
 #endif
 
 /* Can't support MMC/SD features if mountpoints are disabled */
 
 #if defined(CONFIG_DISABLE_MOUNTPOINT)
-#  undef CONFIG_NSH_HAVEMMCSD
+#  undef NSH_HAVEMMCSD
 #endif
 
 /* Select /dev/mmcsd0 if no other minor number is provided */
@@ -125,22 +125,22 @@
 #ifdef CONFIG_USBHOST
 #  ifndef CONFIG_PIC32MX_USBHOST
 #    error "CONFIG_PIC32MX_USBHOST is not selected"
-#    undef CONFIG_NSH_HAVEUSBHOST
+#    undef NSH_HAVEUSBHOST
 #  endif
 #endif
 
 #ifdef CONFIG_PIC32MX_USBHOST
 #  ifndef CONFIG_USBHOST
 #    warning "CONFIG_USBHOST is not selected"
-#    undef CONFIG_NSH_HAVEUSBHOST
+#    undef NSH_HAVEUSBHOST
 #  endif
 #endif
 
 #if !defined(CONFIG_USBHOST) || !defined(CONFIG_PIC32MX_USBHOST)
-#  undef CONFIG_NSH_HAVEUSBHOST
+#  undef NSH_HAVEUSBHOST
 #endif
 
-#ifdef CONFIG_NSH_HAVEUSBHOST
+#ifdef NSH_HAVEUSBHOST
 #  ifndef CONFIG_USBHOST_DEFPRIO
 #    define CONFIG_USBHOST_DEFPRIO 50
 #  endif
@@ -169,7 +169,7 @@
  * Private Data
  ****************************************************************************/
 
-#ifdef CONFIG_NSH_HAVEUSBHOST
+#ifdef NSH_HAVEUSBHOST
 static struct usbhost_driver_s *g_drvr;
 #endif
 
@@ -185,7 +185,7 @@ static struct usbhost_driver_s *g_drvr;
  *
  ****************************************************************************/
 
-#ifdef CONFIG_NSH_HAVEUSBHOST
+#ifdef NSH_HAVEUSBHOST
 static int nsh_waiter(int argc, char *argv[])
 {
   bool connected = false;
@@ -226,7 +226,7 @@ static int nsh_waiter(int argc, char *argv[])
  *
  ****************************************************************************/
 
-#ifdef CONFIG_NSH_HAVEMMCSD
+#ifdef NSH_HAVEMMCSD
 static int nsh_sdinitialize(void)
 {
   FAR struct spi_dev_s *spi;
@@ -288,7 +288,7 @@ errout:
  *
  ****************************************************************************/
 
-#ifdef CONFIG_NSH_HAVEUSBHOST
+#ifdef NSH_HAVEUSBHOST
 static int nsh_usbhostinitialize(void)
 {
   int pid;