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-strp711/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-strp711/src')
| -rw-r--r-- | nuttx/configs/olimex-strp711/src/up_nsh.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/nuttx/configs/olimex-strp711/src/up_nsh.c b/nuttx/configs/olimex-strp711/src/up_nsh.c index e6d2d349e..249898933 100644 --- a/nuttx/configs/olimex-strp711/src/up_nsh.c +++ b/nuttx/configs/olimex-strp711/src/up_nsh.c @@ -56,9 +56,9 @@ /* PORT and SLOT number probably depend on the board configuration */ #ifdef CONFIG_ARCH_BOARD_OLIMEX_STRP711 -# define CONFIG_NSH_HAVEUSBDEV 1 +# define NSH_HAVEUSBDEV 1 # ifdef CONFIG_STR71X_BSPI1 -# define CONFIG_NSH_HAVEMMCSD 1 +# define NSH_HAVEMMCSD 1 # if !defined(CONFIG_NSH_MMCSDSPIPORTNO) || CONFIG_NSH_MMCSDSPIPORTNO != 1 # error "The Olimex STR-P711 MMC/SD is on BSPI1" # undef CONFIG_NSH_MMCSDSPIPORTNO @@ -70,25 +70,25 @@ # define CONFIG_NSH_MMCSDSLOTNO 0 # endif # else -# undef CONFIG_NSH_HAVEMMCSD +# undef NSH_HAVEMMCSD # endif #else /* Add configuration for new STR71x boards here */ # error "Unrecognized STR71x board" -# undef CONFIG_NSH_HAVEUSBDEV -# undef CONFIG_NSH_HAVEMMCSD +# undef NSH_HAVEUSBDEV +# undef NSH_HAVEMMCSD #endif /* Can't support USB features if USB is not enabled */ #ifndef CONFIG_USBDEV -# undef CONFIG_NSH_HAVEUSBDEV +# undef NSH_HAVEUSBDEV #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 @@ -128,7 +128,7 @@ int nsh_archinitialize(void) FAR struct spi_dev_s *spi; int ret; -#ifdef CONFIG_NSH_HAVEMMCSD +#ifdef NSH_HAVEMMCSD /* Get the SPI port */ |