diff options
| author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2012-09-08 13:56:21 +0000 |
|---|---|---|
| committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2012-09-08 13:56:21 +0000 |
| commit | b4420923cb149a5a8164bb06794e12b88203d97c (patch) | |
| tree | 0622029fef5305661e1a27dbc8a8d6b7db1cf79a /nuttx/configs/olimex-lpc1766stk/src | |
| parent | a386a5f0c85cd610b0d8a952c2a28f4038094fa4 (diff) | |
| download | px4-nuttx-b4420923cb149a5a8164bb06794e12b88203d97c.tar.gz px4-nuttx-b4420923cb149a5a8164bb06794e12b88203d97c.tar.bz2 px4-nuttx-b4420923cb149a5a8164bb06794e12b88203d97c.zip | |
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
Diffstat (limited to 'nuttx/configs/olimex-lpc1766stk/src')
| -rw-r--r-- | nuttx/configs/olimex-lpc1766stk/src/up_nsh.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/nuttx/configs/olimex-lpc1766stk/src/up_nsh.c b/nuttx/configs/olimex-lpc1766stk/src/up_nsh.c index 57789676c..036350ded 100644 --- a/nuttx/configs/olimex-lpc1766stk/src/up_nsh.c +++ b/nuttx/configs/olimex-lpc1766stk/src/up_nsh.c @@ -61,8 +61,8 @@ /* PORT and SLOT number probably depend on the board configuration */ #ifdef CONFIG_ARCH_BOARD_LPC1766STK -# define CONFIG_NSH_HAVEMMCSD 1 -# define CONFIG_NSH_HAVEUSBHOST 1 +# define NSH_HAVEMMCSD 1 +# define NSH_HAVEUSBHOST 1 # if !defined(CONFIG_NSH_MMCSDSPIPORTNO) || CONFIG_NSH_MMCSDSPIPORTNO != 1 # error "The LPC1766-STK MMC/SD is on SSP1" # undef CONFIG_NSH_MMCSDSPIPORTNO @@ -75,18 +75,18 @@ # endif # ifndef CONFIG_LPC17_SSP1 # warning "CONFIG_LPC17_SSP1 is not enabled" -# undef CONFIG_NSH_HAVEMMCSD +# undef NSH_HAVEMMCSD # endif #else # error "Unrecognized board" -# undef CONFIG_NSH_HAVEMMCSD -# undef CONFIG_NSH_HAVEUSBHOST +# undef NSH_HAVEMMCSD +# undef NSH_HAVEUSBHOST #endif /* Can't support MMC/SD features if mountpoints are disabled */ #if defined(CONFIG_DISABLE_MOUNTPOINT) -# undef CONFIG_NSH_HAVEMMCSD +# undef NSH_HAVEMMCSD #endif #ifndef CONFIG_NSH_MMCSDMINOR @@ -108,10 +108,10 @@ #endif #if !defined(CONFIG_USBHOST) || !defined(CONFIG_LPC17_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 @@ -140,7 +140,7 @@ * Private Data ****************************************************************************/ -#ifdef CONFIG_NSH_HAVEUSBHOST +#ifdef NSH_HAVEUSBHOST static struct usbhost_driver_s *g_drvr; #endif @@ -156,7 +156,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; @@ -197,7 +197,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 *ssp; @@ -257,7 +257,7 @@ errout: * ****************************************************************************/ -#ifdef CONFIG_NSH_HAVEUSBHOST +#ifdef NSH_HAVEUSBHOST static int nsh_usbhostinitialize(void) { int pid; |