diff options
42 files changed, 1295 insertions, 308 deletions
diff --git a/apps/ChangeLog.txt b/apps/ChangeLog.txt index 6d5f605c7..2ef4b67f9 100755 --- a/apps/ChangeLog.txt +++ b/apps/ChangeLog.txt @@ -310,3 +310,7 @@ files into memory before transferring them. * apps/netutils/webserver: Add ability to map a URL to CGI function. Contributed by Kate. + * apps/nshlib/nsh_mntcmds.c: The changes of 6.21 introduced holes in the + error handling: Now the number of arguments to mount can be 0 or 4. + Additional parameter checking is required to prevent mysterious errors + (submiteed by Kate). diff --git a/apps/nshlib/nsh_mntcmds.c b/apps/nshlib/nsh_mntcmds.c index b5935bdea..027046c77 100644 --- a/apps/nshlib/nsh_mntcmds.c +++ b/apps/nshlib/nsh_mntcmds.c @@ -195,9 +195,9 @@ int cmd_df(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv) defined(CONFIG_FS_READABLE) && !defined(CONFIG_NSH_DISABLE_MOUNT) int cmd_mount(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv) { - char *source; - char *target; - char *filesystem = 0; + FAR char *source; + FAR char *target; + FAR char *filesystem = NULL; bool badarg = false; int ret; @@ -208,7 +208,11 @@ int cmd_mount(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv) return mount_show(vtbl, argv[0]); } - /* Get the mount options */ + /* Get the mount options. NOTE: getopt() is not thread safe nor re-entrant. + * To keep its state proper for the next usage, it is necessary to parse to + * the end of the line even if an error occurs. If an error occurs, this + * logic just sets 'badarg' and continues. + */ int option; while ((option = getopt(argc, argv, ":t:")) != ERROR) @@ -232,14 +236,18 @@ int cmd_mount(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv) } } - /* If a bad argument was encountered, then return without processing the command */ + /* If a bad argument was encountered, then return without processing the + * command. + */ if (badarg) { return ERROR; } - /* There are two required arguments after the options */ + /* There are two required arguments after the options: the source and target + * paths. + */ if (optind + 2 < argc) { @@ -252,6 +260,16 @@ int cmd_mount(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv) return ERROR; } + /* While the above parsing for the -t argument looks nice, the -t argument + * not really optional. + */ + + if (!filesystem) + { + nsh_output(vtbl, g_fmtargrequired, argv[0]); + return ERROR; + } + /* The source and target paths might be relative to the current * working directory. */ diff --git a/apps/system/readline/Kconfig b/apps/system/readline/Kconfig index 2ed9cafd6..6482b1204 100644 --- a/apps/system/readline/Kconfig +++ b/apps/system/readline/Kconfig @@ -19,21 +19,4 @@ config READLINE_ECHO already has local echo support or you need to suppress the back-channel responses for any other reason. -choice - prompt "Newline Options" - default EOL_IS_EITHER_CRLF - -config EOL_IS_CR - bool "EOL is CR" - -config EOL_IS_LF - bool "EOL is LF" - -config EOL_IS_BOTH_CRLF - bool "EOL is CR and LF" - -config EOL_IS_EITHER_CRLF - bool "EOL is CR or LF" - -endchoice endif diff --git a/apps/system/readline/readline.c b/apps/system/readline/readline.c index bdd39e67b..ec2dc1c0a 100644 --- a/apps/system/readline/readline.c +++ b/apps/system/readline/readline.c @@ -63,13 +63,32 @@ #define CONFIG_READLINE_ECHO 1 /* Some environments may return CR as end-of-line, others LF, and others - * both. The logic here assumes either but not both. + * both. If not specified, the logic here assumes either (but not both) as + * the default. */ -#undef CONFIG_EOL_IS_CR -#undef CONFIG_EOL_IS_LF -#undef CONFIG_EOL_IS_BOTH_CRLF -#define CONFIG_EOL_IS_EITHER_CRLF 1 +#if defined(CONFIG_EOL_IS_CR) +# undef CONFIG_EOL_IS_LF +# undef CONFIG_EOL_IS_BOTH_CRLF +# undef CONFIG_EOL_IS_EITHER_CRLF +#elif defined(CONFIG_EOL_IS_LF) +# undef CONFIG_EOL_IS_CR +# undef CONFIG_EOL_IS_BOTH_CRLF +# undef CONFIG_EOL_IS_EITHER_CRLF +#elif defined(CONFIG_EOL_IS_BOTH_CRLF) +# undef CONFIG_EOL_IS_CR +# undef CONFIG_EOL_IS_LF +# undef CONFIG_EOL_IS_EITHER_CRLF +#elif defined(CONFIG_EOL_IS_EITHER_CRLF) +# undef CONFIG_EOL_IS_CR +# undef CONFIG_EOL_IS_LF +# undef CONFIG_EOL_IS_BOTH_CRLF +#else +# undef CONFIG_EOL_IS_CR +# undef CONFIG_EOL_IS_LF +# undef CONFIG_EOL_IS_BOTH_CRLF +# define CONFIG_EOL_IS_EITHER_CRLF 1 +#endif /**************************************************************************** * Private Type Declarations diff --git a/nuttx/Documentation/NuttxPortingGuide.html b/nuttx/Documentation/NuttxPortingGuide.html index 06f2c3e6f..875b78e61 100644 --- a/nuttx/Documentation/NuttxPortingGuide.html +++ b/nuttx/Documentation/NuttxPortingGuide.html @@ -4579,9 +4579,6 @@ build <code>CONFIG_FS_FAT</code>: Enable FAT file system support. </li> <li> - <code>CONFIG_FAT_SECTORSIZE</code>: Max supported sector size. - </li> - <li> <code>CONFIG_FAT_LCNAMES</code>: Enable use of the NT-style upper/lower case 8.3 file name support. </li> <li> diff --git a/nuttx/arch/arm/src/lpc17xx/Kconfig b/nuttx/arch/arm/src/lpc17xx/Kconfig index f22f67344..dc28f8c10 100644 --- a/nuttx/arch/arm/src/lpc17xx/Kconfig +++ b/nuttx/arch/arm/src/lpc17xx/Kconfig @@ -96,7 +96,7 @@ config LPC17_PLL1 config LPC17_ETHERNET bool "Ethernet" select NET - select ARCH_HAS_PHY + select ARCH_HAVE_PHY default n config LPC17_USBHOST @@ -116,27 +116,27 @@ config LPC17_USBOTG config LPC17_UART0 bool "UART0" - select ARCH_HAS_UART0 + select ARCH_HAVE_UART0 default n config LPC17_UART1 bool "UART1" - select ARCH_HAS_UART1 + select ARCH_HAVE_UART1 default n config LPC17_UART2 bool "UART2" - select ARCH_HAS_UART2 + select ARCH_HAVE_UART2 default n config LPC17_UART3 bool "UART3" - select ARCH_HAS_UART3 + select ARCH_HAVE_UART3 default n config LPC17_CAN1 bool "CAN1" - select ARCH_HAS_UART4 + select ARCH_HAVE_UART4 default n config LPC17_CAN2 diff --git a/nuttx/arch/arm/src/lpc31xx/Kconfig b/nuttx/arch/arm/src/lpc31xx/Kconfig index 53691f494..17daf94b7 100644 --- a/nuttx/arch/arm/src/lpc31xx/Kconfig +++ b/nuttx/arch/arm/src/lpc31xx/Kconfig @@ -119,7 +119,7 @@ menu "LPC31xx Peripheral Support" config LPC31_UART bool "UART" default n - select ARCH_HAS_UART + select ARCH_HAVE_UART config LPC31_SPI bool "SPI" diff --git a/nuttx/arch/arm/src/lpc43xx/Kconfig b/nuttx/arch/arm/src/lpc43xx/Kconfig index b4f19b524..0ae9f8ffe 100644 --- a/nuttx/arch/arm/src/lpc43xx/Kconfig +++ b/nuttx/arch/arm/src/lpc43xx/Kconfig @@ -269,22 +269,22 @@ config LPC43_TMR3 config LPC43_USART0 bool "USART0" - select ARCH_HAS_USART0 + select ARCH_HAVE_USART0 default n config LPC43_UART1 bool "UART1" - select ARCH_HAS_UART1 + select ARCH_HAVE_UART1 default n config LPC43_USART2 bool "USART2" - select ARCH_HAS_USART2 + select ARCH_HAVE_USART2 default n config LPC43_USART3 bool "USART3" - select ARCH_HAS_USART3 + select ARCH_HAVE_USART3 default n config LPC43_USB0 diff --git a/nuttx/arch/arm/src/stm32/Kconfig b/nuttx/arch/arm/src/stm32/Kconfig index 661f6d8f4..ef1ca63ce 100644 --- a/nuttx/arch/arm/src/stm32/Kconfig +++ b/nuttx/arch/arm/src/stm32/Kconfig @@ -11,80 +11,93 @@ choice config ARCH_CHIP_STM32F103ZET6 bool "STM32F103ZET6" select ARCH_CORTEXM3 + select STM32_STM32F10XX config ARCH_CHIP_STM32F103RET6 bool "STM32F103RET6" select ARCH_CORTEXM3 + select STM32_STM32F10XX config ARCH_CHIP_STM32F103VCT6 bool "STM32F103VCT6" select ARCH_CORTEXM3 + select STM32_STM32F10XX config ARCH_CHIP_STM32F105VBT7 bool "STM32F105VBT7" select ARCH_CORTEXM3 + select STM32_STM32F10XX + select STM32_CONNECTIVITYLINE config ARCH_CHIP_STM32F107VC bool "STM32F107VC" select ARCH_CORTEXM3 + select STM32_STM32F10XX + select STM32_CONNECTIVITYLINE config ARCH_CHIP_STM32F207IG bool "STM32F207IG" select ARCH_CORTEXM3 + select STM32_STM32F20XX config ARCH_CHIP_STM32F405RG bool "STM32F405RG" - select ARCH_CORTEXM3 + select ARCH_CORTEXM4 + select STM32_STM32F40XX config ARCH_CHIP_STM32F405VG bool "STM32F405VG" - select ARCH_CORTEXM3 + select ARCH_CORTEXM4 + select STM32_STM32F40XX config ARCH_CHIP_STM32F405ZG bool "STM32F405ZG" - select ARCH_CORTEXM3 + select ARCH_CORTEXM4 + select STM32_STM32F40XX config ARCH_CHIP_STM32F407VE bool "STM32F407VE" - select ARCH_CORTEXM3 + select ARCH_CORTEXM4 + select STM32_STM32F40XX config ARCH_CHIP_STM32F407VG bool "STM32F407VG" select ARCH_CORTEXM3 + select STM32_STM32F40XX config ARCH_CHIP_STM32F407ZE bool "STM32F407ZE" select ARCH_CORTEXM4 + select STM32_STM32F40XX config ARCH_CHIP_STM32F407ZG bool "STM32F407ZG" select ARCH_CORTEXM4 + select STM32_STM32F40XX config ARCH_CHIP_STM32F407IE bool "STM32F407IE" select ARCH_CORTEXM4 + select STM32_STM32F40XX config ARCH_CHIP_STM32F407IG bool "STM32F407IG" select ARCH_CORTEXM4 + select STM32_STM32F40XX endchoice config STM32_STM32F10XX bool - default y if ARCH_CHIP_STM32F103ZET6 || ARCH_CHIP_STM32F103RET6 || ARCH_CHIP_STM32F103VCT6 || ARCH_CHIP_STM32F105VBT7 || ARCH_CHIP_STM32F107VC config STM32_CONNECTIVITYLINE bool - default y if ARCH_CHIP_STM32F105VBT7 || ARCH_CHIP_STM32F107VC config STM32_STM32F20XX bool - default y if ARCH_CHIP_STM32F207IG config STM32_STM32F40XX bool - default y if ARCH_CHIP_STM32F405RG || ARCH_CHIP_STM32F405VG || ARCH_CHIP_STM32F405ZG || ARCH_CHIP_STM32F407VE || ARCH_CHIP_STM32F407VG || ARCH_CHIP_STM32F407ZE || ARCH_CHIP_STM32F407ZG || ARCH_CHIP_STM32F407IE || ARCH_CHIP_STM32F407IG choice prompt "Toolchain Selection" @@ -160,11 +173,13 @@ config STM32_BKPSRAM config STM32_CAN1 bool "CAN1" default n + select CAN config STM32_CAN2 bool "CAN2" default n depends on STM32_STM32F20XX || STM32_STM32F40XX + select CAN config STM32_CCMDATARAM bool "CMD/DATA RAM" @@ -192,11 +207,12 @@ config STM32_DCMI config STM32_ETHMAC bool "Ethernet MAC" default n - depends on STM32_STM32F20XX || STM32_STM32F40XX + depends on STM32_CONNECTIVITYLINE || STM32_STM32F20XX || STM32_STM32F40XX config STM32_FSMC bool "FSMC" default n + depends on !STM32_CONNECTIVITYLINE config STM32_HASH bool "HASH" @@ -219,6 +235,7 @@ config STM32_I2C3 config STM32_IWDG bool "IWDG" default n + select WATCHDOG config STM32_OTGFS bool "OTG FS" @@ -242,24 +259,29 @@ config STM32_RNG config STM32_SDIO bool "SDIO" default n + depends on !STM32_CONNECTIVITYLINE config STM32_SPI1 bool "SPI1" default n + select SPI config STM32_SPI2 bool "SPI2" default n + select SPI config STM32_SPI3 bool "SPI3" default n depends on STM32_STM32F20XX || STM32_STM32F40XX + select SPI config STM32_SPI4 bool "SPI4" default n depends on STM32_STM32F10XX + select SPI config STM32_SYSCFG bool "SYSCFG" @@ -330,43 +352,45 @@ config STM32_TIM14 config STM32_USART1 bool "USART1" - select ARCH_HAS_USART1 default n + select ARCH_HAVE_USART1 config STM32_USART2 bool "USART2" - select ARCH_HAS_USART2 default n + select ARCH_HAVE_USART2 config STM32_USART3 bool "USART3" - select ARCH_HAS_USART3 default n + select ARCH_HAVE_USART3 config STM32_UART4 bool "UART4" - select ARCH_HAS_UART4 default n + select ARCH_HAVE_UART4 config STM32_UART5 bool "UART5" - select ARCH_HAS_UART5 default n + select ARCH_HAVE_UART5 config STM32_USART6 bool "USART6" default n - select ARCH_HAS_USART6 depends on STM32_STM32F20XX || STM32_STM32F40XX + select ARCH_HAVE_USART6 config STM32_USB bool "USB Device" default n depends on STM32_STM32F10XX + select USBDEV config STM32_WWDG bool "WWDG" default n + select WATCHDOG endmenu @@ -495,18 +519,23 @@ choice config STM32_CAN1_NO_REMAP bool "No pin remapping" -config STM32_CAN1_FULL_REMAP - bool "Full pin remapping" +config CONFIG_STM32_CAN1_REMAP1 + bool "CAN1 alternate pin remapping #1" -config STM32_CAN1_PARTIAL_REMAP - bool "Partial pin remapping" +config CONFIG_STM32_CAN1_REMAP2 + bool "CAN1 alternate pin remapping #2" endchoice config STM32_CAN2_REMAP bool "CAN2 Alternate Pin Mapping" default n - depends on STM32_STM32F10XX && STM32_CAN2 + depends on STM32_CONNECTIVITYLINE && STM32_CAN2 + +config STM32_ETH_REMAP + bool "Ethernet Alternate Pin Mapping" + default n + depends on STM32_CONNECTIVITYLINE && STM32_ETHMAC choice prompt "JTAG Configuration" diff --git a/nuttx/arch/avr/Kconfig b/nuttx/arch/avr/Kconfig index 010837142..4ebd26d5f 100644 --- a/nuttx/arch/avr/Kconfig +++ b/nuttx/arch/avr/Kconfig @@ -118,10 +118,10 @@ source arch/avr/src/at32uc3/Kconfig config AVR_USART0 bool "USART0 specific serial device driver settings" - select ARCH_HAS_USART0 + select ARCH_HAVE_USART0 config AVR_USART1 bool "USART1 specific serial device driver settings" - select ARCH_HAS_USART1 + select ARCH_HAVE_USART1 endif diff --git a/nuttx/arch/mips/src/pic32mx/Kconfig b/nuttx/arch/mips/src/pic32mx/Kconfig index 74a093e3f..222c7e4de 100644 --- a/nuttx/arch/mips/src/pic32mx/Kconfig +++ b/nuttx/arch/mips/src/pic32mx/Kconfig @@ -493,32 +493,32 @@ config PIC32MX_SPI4 config PIC32MX_UART1 bool "UART1" default n - select ARCH_HAS_UART1 + select ARCH_HAVE_UART1 config PIC32MX_UART2 bool "UART2" default n - select ARCH_HAS_UART1 + select ARCH_HAVE_UART1 config PIC32MX_UART3 bool "UART3" default n - select ARCH_HAS_UART3 + select ARCH_HAVE_UART3 config PIC32MX_UART4 bool "UART4" default n - select ARCH_HAS_UART4 + select ARCH_HAVE_UART4 config PIC32MX_UART5 bool "UART5" default n - select ARCH_HAS_UART5 + select ARCH_HAVE_UART5 config PIC32MX_UART6 bool "UART6" default n - select ARCH_HAS_UART6 + select ARCH_HAVE_UART6 config PIC32MX_ADC bool "ADC1" @@ -568,7 +568,7 @@ config PIC32MX_ETHERNET bool "Ethernet" default n select NET - select ARCH_HAS_PHY + select ARCH_HAVE_PHY config PIC32MX_CTMU bool "Charge Time Measurement Unit (CMTU)" diff --git a/nuttx/configs/Kconfig b/nuttx/configs/Kconfig index 8c841e7be..77c691cfc 100644 --- a/nuttx/configs/Kconfig +++ b/nuttx/configs/Kconfig @@ -677,6 +677,27 @@ config ARCH_IRQBUTTONS ---help--- "Support interrupts on button presses and releases." +config NSH_MMCSDMINOR + int "MMC/SD minor number" + default 0 + depends on NSH_LIBRARY && MMCSD + ---help--- + If board-specific NSH start-up logic needs to mount an MMC/SD device, then the setting should be provided to identify the MMC/SD minor device number (i.e., the N in /dev/mmcsdN). Default 0 + +config NSH_MMCSDSLOTNO + int "MMC/SD slot number" + default 0 + depends on NSH_LIBRARY && MMCSD + ---help--- + If board-specific NSH start-up supports more than one MMC/SD slot, then this setting should be provided to indicate which slot should be used. Default: 0. + +config NSH_MMCSDSPIPORTNO + int "MMC/SD SPI device number" + default 0 + depends on NSH_LIBRARY && MMCSD && SPI + ---help--- + If board-specif NSH start-up logic will mount an SPI-based MMC/SD volume, then this setting may be needed to tell the board logic which SPI bus to use. Default: 0 (meaning is board-specific). + comment "Board-Specific Options" if ARCH_BOARD_AMBER diff --git a/nuttx/configs/README.txt b/nuttx/configs/README.txt index 727446d65..3a059a62a 100644 --- a/nuttx/configs/README.txt +++ b/nuttx/configs/README.txt @@ -721,7 +721,6 @@ defconfig -- This is a configuration file similar to the Linux Filesystem configuration CONFIG_FS_FAT - Enable FAT filesystem support - CONFIG_FAT_SECTORSIZE - Max supported sector size CONFIG_FAT_LCNAMES - Enable use of the NT-style upper/lower case 8.3 file name support. CONFIG_FAT_LFN - Enable FAT long file names. NOTE: Microsoft claims diff --git a/nuttx/configs/ea3131/src/up_nsh.c b/nuttx/configs/ea3131/src/up_nsh.c index 01b16194b..29ee7ed2c 100644 --- a/nuttx/configs/ea3131/src/up_nsh.c +++ b/nuttx/configs/ea3131/src/up_nsh.c @@ -61,8 +61,8 @@ /* PORT and SLOT number probably depend on the board configuration */ #ifdef CONFIG_ARCH_BOARD_EA3131 -# define CONFIG_NSH_HAVEUSBDEV 1 -# define CONFIG_NSH_HAVEMMCSD 1 +# define NSH_HAVEUSBDEV 1 +# define NSH_HAVEMMCSD 1 # if defined(CONFIG_NSH_MMCSDSLOTNO) && CONFIG_NSH_MMCSDSLOTNO != 0 # error "Only one MMC/SD slot" # undef CONFIG_NSH_MMCSDSLOTNO @@ -74,14 +74,14 @@ /* Add configuration for new LPC31XX boards here */ # error "Unrecognized LPC31XX 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 or if SDIO support @@ -89,7 +89,7 @@ */ #if defined(CONFIG_DISABLE_MOUNTPOINT) || !defined(CONFIG_LPC31_MCI) -# undef CONFIG_NSH_HAVEMMCSD +# undef NSH_HAVEMMCSD #endif #ifndef CONFIG_NSH_MMCSDMINOR @@ -126,7 +126,7 @@ int nsh_archinitialize(void) { -#ifdef CONFIG_NSH_HAVEMMCSD +#ifdef NSH_HAVEMMCSD FAR struct sdio_dev_s *sdio; int ret; diff --git a/nuttx/configs/ea3152/src/up_nsh.c b/nuttx/configs/ea3152/src/up_nsh.c index ddd0e9195..2b523b44a 100644 --- a/nuttx/configs/ea3152/src/up_nsh.c +++ b/nuttx/configs/ea3152/src/up_nsh.c @@ -61,8 +61,8 @@ /* PORT and SLOT number probably depend on the board configuration */ #ifdef CONFIG_ARCH_BOARD_EA3152 -# define CONFIG_NSH_HAVEUSBDEV 1 -# define CONFIG_NSH_HAVEMMCSD 1 +# define NSH_HAVEUSBDEV 1 +# define NSH_HAVEMMCSD 1 # if defined(CONFIG_NSH_MMCSDSLOTNO) && CONFIG_NSH_MMCSDSLOTNO != 0 # error "Only one MMC/SD slot" # undef CONFIG_NSH_MMCSDSLOTNO @@ -74,14 +74,14 @@ /* Add configuration for new LPC31XX boards here */ # error "Unrecognized LPC31XX 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 or if SDIO support @@ -89,7 +89,7 @@ */ #if defined(CONFIG_DISABLE_MOUNTPOINT) || !defined(CONFIG_LPC31_MCI) -# undef CONFIG_NSH_HAVEMMCSD +# undef NSH_HAVEMMCSD #endif #ifndef CONFIG_NSH_MMCSDMINOR @@ -126,7 +126,7 @@ int nsh_archinitialize(void) { -#ifdef CONFIG_NSH_HAVEMMCSD +#ifdef NSH_HAVEMMCSD FAR struct sdio_dev_s *sdio; int ret; diff --git a/nuttx/configs/eagle100/src/up_nsh.c b/nuttx/configs/eagle100/src/up_nsh.c index e2e6b42f2..65fd30023 100644 --- a/nuttx/configs/eagle100/src/up_nsh.c +++ b/nuttx/configs/eagle100/src/up_nsh.c @@ -56,8 +56,8 @@ /* PORT and SLOT number probably depend on the board configuration */ #ifdef CONFIG_ARCH_BOARD_EAGLE100 -# undef CONFIG_NSH_HAVEUSBDEV -# define CONFIG_NSH_HAVEMMCSD 1 +# undef NSH_HAVEUSBDEV +# define NSH_HAVEMMCSD 1 # if !defined(CONFIG_NSH_MMCSDSPIPORTNO) || CONFIG_NSH_MMCSDSPIPORTNO != 0 # error "The Eagle100 MMC/SD is on SSI0" # undef CONFIG_NSH_MMCSDSPIPORTNO @@ -71,20 +71,20 @@ #else /* Add configuration for new LM3s boards here */ # error "Unrecognized lm3s 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 diff --git a/nuttx/configs/hymini-stm32v/src/up_nsh.c b/nuttx/configs/hymini-stm32v/src/up_nsh.c index d7c4605ac..ae1ea03a6 100644 --- a/nuttx/configs/hymini-stm32v/src/up_nsh.c +++ b/nuttx/configs/hymini-stm32v/src/up_nsh.c @@ -72,8 +72,8 @@ /* PORT and SLOT number probably depend on the board configuration */ #ifdef CONFIG_ARCH_BOARD_HYMINI_STM32V -# define CONFIG_NSH_HAVEUSBDEV 1 -# define CONFIG_NSH_HAVEMMCSD 1 +# define NSH_HAVEUSBDEV 1 +# define NSH_HAVEMMCSD 1 # if defined(CONFIG_NSH_MMCSDSLOTNO) && CONFIG_NSH_MMCSDSLOTNO != 0 # error "Only one MMC/SD slot" # undef CONFIG_NSH_MMCSDSLOTNO @@ -84,14 +84,14 @@ #else /* Add configuration for new STM32 boards here */ # error "Unrecognized STM32 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 or if SDIO support @@ -99,7 +99,7 @@ */ #if defined(CONFIG_DISABLE_MOUNTPOINT) || !defined(CONFIG_STM32_SDIO) -# undef CONFIG_NSH_HAVEMMCSD +# undef NSH_HAVEMMCSD #endif #ifndef CONFIG_NSH_MMCSDMINOR @@ -136,7 +136,7 @@ int nsh_archinitialize(void) { -#ifdef CONFIG_NSH_HAVEMMCSD +#ifdef NSH_HAVEMMCSD FAR struct sdio_dev_s *sdio; int ret; @@ -146,7 +146,7 @@ int nsh_archinitialize(void) /* Mount the SDIO-based MMC/SD block driver */ -#ifdef CONFIG_NSH_HAVEMMCSD +#ifdef NSH_HAVEMMCSD /* First, get an instance of the SDIO interface */ message("nsh_archinitialize: Initializing SDIO slot %d\n", diff --git a/nuttx/configs/kwikstik-k40/src/up_nsh.c b/nuttx/configs/kwikstik-k40/src/up_nsh.c index c4e027c6b..fa4cc5fa9 100644 --- a/nuttx/configs/kwikstik-k40/src/up_nsh.c +++ b/nuttx/configs/kwikstik-k40/src/up_nsh.c @@ -61,8 +61,8 @@ /* PORT and SLOT number probably depend on the board configuration */ #ifdef CONFIG_ARCH_BOARD_KWIKSTIK_K40 -# define CONFIG_NSH_HAVEUSBDEV 1 -# define CONFIG_NSH_HAVEMMCSD 1 +# define NSH_HAVEUSBDEV 1 +# define NSH_HAVEMMCSD 1 # if defined(CONFIG_NSH_MMCSDSLOTNO) && CONFIG_NSH_MMCSDSLOTNO != 0 # error "Only one MMC/SD slot, slot 0" # undef CONFIG_NSH_MMCSDSLOTNO @@ -73,14 +73,14 @@ #else /* Add configuration for new Kinetis boards here */ # error "Unrecognized Kinetis 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 or if SDHC support @@ -88,7 +88,7 @@ */ #if defined(CONFIG_DISABLE_MOUNTPOINT) || !defined(CONFIG_KINETIS_SDHC) -# undef CONFIG_NSH_HAVEMMCSD +# undef NSH_HAVEMMCSD #endif #ifndef CONFIG_NSH_MMCSDMINOR @@ -129,7 +129,7 @@ * reduces the probability of name collistions. */ -#ifdef CONFIG_NSH_HAVEMMCSD +#ifdef NSH_HAVEMMCSD struct kinetis_nsh_s { FAR struct sdio_dev_s *sdhc; /* SDIO driver handle */ @@ -141,7 +141,7 @@ struct kinetis_nsh_s * Private Data ****************************************************************************/ -#ifdef CONFIG_NSH_HAVEMMCSD +#ifdef NSH_HAVEMMCSD static struct kinetis_nsh_s g_nsh; #endif @@ -153,7 +153,7 @@ static struct kinetis_nsh_s g_nsh; * Name: kinetis_mediachange ****************************************************************************/ -#ifdef CONFIG_NSH_HAVEMMCSD +#ifdef NSH_HAVEMMCSD static void kinetis_mediachange(void) { bool inserted; @@ -180,7 +180,7 @@ static void kinetis_mediachange(void) * Name: kinetis_cdinterrupt ****************************************************************************/ -#ifdef CONFIG_NSH_HAVEMMCSD +#ifdef NSH_HAVEMMCSD static int kinetis_cdinterrupt(int irq, FAR void *context) { /* All of the work is done by kinetis_mediachange() */ @@ -204,7 +204,7 @@ static int kinetis_cdinterrupt(int irq, FAR void *context) int nsh_archinitialize(void) { -#ifdef CONFIG_NSH_HAVEMMCSD +#ifdef NSH_HAVEMMCSD int ret; /* Configure GPIO pins. diff --git a/nuttx/configs/lm3s6965-ek/src/up_nsh.c b/nuttx/configs/lm3s6965-ek/src/up_nsh.c index 4b0697400..952ee4298 100644 --- a/nuttx/configs/lm3s6965-ek/src/up_nsh.c +++ b/nuttx/configs/lm3s6965-ek/src/up_nsh.c @@ -56,8 +56,8 @@ /* PORT and SLOT number probably depend on the board configuration */ #ifdef CONFIG_ARCH_BOARD_LM3S6965EK -# undef CONFIG_NSH_HAVEUSBDEV -# define CONFIG_NSH_HAVEMMCSD 1 +# undef NSH_HAVEUSBDEV +# define NSH_HAVEMMCSD 1 # if !defined(CONFIG_NSH_MMCSDSPIPORTNO) || CONFIG_NSH_MMCSDSPIPORTNO != 0 # error "The LM3S6965 Eval Kit MMC/SD is on SSI0" # undef CONFIG_NSH_MMCSDSPIPORTNO @@ -71,20 +71,20 @@ #else /* Add configuration for new LM3s boards here */ # error "Unrecognized lm3s 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 diff --git a/nuttx/configs/lm3s8962-ek/src/up_nsh.c b/nuttx/configs/lm3s8962-ek/src/up_nsh.c index d21edc46b..c95dce7a9 100644 --- a/nuttx/configs/lm3s8962-ek/src/up_nsh.c +++ b/nuttx/configs/lm3s8962-ek/src/up_nsh.c @@ -56,8 +56,8 @@ /* PORT and SLOT number probably depend on the board configuration */ #ifdef CONFIG_ARCH_BOARD_LM3S8962EK -# undef CONFIG_NSH_HAVEUSBDEV -# define CONFIG_NSH_HAVEMMCSD 1 +# undef NSH_HAVEUSBDEV +# define NSH_HAVEMMCSD 1 # if !defined(CONFIG_NSH_MMCSDSPIPORTNO) || CONFIG_NSH_MMCSDSPIPORTNO != 0 # error "The LM3S8962 Eval Kit MMC/SD is on SSI0" # undef CONFIG_NSH_MMCSDSPIPORTNO @@ -71,20 +71,20 @@ #else /* Add configuration for new LM3s boards here */ # error "Unrecognized lm3s 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 diff --git a/nuttx/configs/lpcxpresso-lpc1768/src/up_nsh.c b/nuttx/configs/lpcxpresso-lpc1768/src/up_nsh.c index a47181bac..0b643f276 100644 --- a/nuttx/configs/lpcxpresso-lpc1768/src/up_nsh.c +++ b/nuttx/configs/lpcxpresso-lpc1768/src/up_nsh.c @@ -56,21 +56,21 @@ /* PORT and SLOT number probably depend on the board configuration */ #ifdef CONFIG_ARCH_BOARD_LPCXPRESSO -# define CONFIG_NSH_HAVEUSBDEV 1 +# define NSH_HAVEUSBDEV 1 # ifdef CONFIG_LPC17_SSP1 -# define CONFIG_NSH_HAVEMMCSD 1 +# define NSH_HAVEMMCSD 1 # else -# undef CONFIG_NSH_HAVEMMCSD +# undef NSH_HAVEMMCSD # endif #else # error "Unrecognized board" -# undef CONFIG_NSH_HAVEUSBDEV -# undef CONFIG_NSH_HAVEMMCSD +# undef NSH_HAVEUSBDEV +# undef NSH_HAVEMMCSD #endif /* Do we have SPI support for MMC/SD? */ -#ifdef CONFIG_NSH_HAVEMMCSD +#ifdef NSH_HAVEMMCSD # if !defined(CONFIG_NSH_MMCSDSPIPORTNO) || CONFIG_NSH_MMCSDSPIPORTNO != 1 # error "The LPCXpresso MMC/SD is on SSP1" # undef CONFIG_NSH_MMCSDSPIPORTNO @@ -86,13 +86,13 @@ /* Can't support USB device features if USB device 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 @@ -137,7 +137,7 @@ int nsh_archinitialize(void) { -#ifdef CONFIG_NSH_HAVEMMCSD +#ifdef NSH_HAVEMMCSD FAR struct spi_dev_s *ssp; int ret; diff --git a/nuttx/configs/mbed/src/up_nsh.c b/nuttx/configs/mbed/src/up_nsh.c index f8c46bc81..562b67cd9 100644 --- a/nuttx/configs/mbed/src/up_nsh.c +++ b/nuttx/configs/mbed/src/up_nsh.c @@ -56,16 +56,16 @@ /* PORT and SLOT number probably depend on the board configuration */ #ifdef CONFIG_ARCH_BOARD_MBED -# define CONFIG_NSH_HAVEUSBDEV 1 +# define NSH_HAVEUSBDEV 1 #else # error "Unrecognized board" -# undef CONFIG_NSH_HAVEUSBDEV +# undef NSH_HAVEUSBDEV #endif /* Can't support USB features if USB is not enabled */ #ifndef CONFIG_USBDEV -# undef CONFIG_NSH_HAVEUSBDEV +# undef NSH_HAVEUSBDEV #endif /* Debug ********************************************************************/ diff --git a/nuttx/configs/mcu123-lpc214x/src/up_nsh.c b/nuttx/configs/mcu123-lpc214x/src/up_nsh.c index 1e1ee3c36..caef0c3b5 100644 --- a/nuttx/configs/mcu123-lpc214x/src/up_nsh.c +++ b/nuttx/configs/mcu123-lpc214x/src/up_nsh.c @@ -56,8 +56,8 @@ /* PORT and SLOT number probably depend on the board configuration */ #ifdef CONFIG_ARCH_BOARD_MCU123 -# define CONFIG_NSH_HAVEUSBDEV 1 -# define CONFIG_NSH_HAVEMMCSD 1 +# define NSH_HAVEUSBDEV 1 +# define NSH_HAVEMMCSD 1 # if !defined(CONFIG_NSH_MMCSDSPIPORTNO) || CONFIG_NSH_MMCSDSPIPORTNO != 1 # error "The LPC214x MMC/SD is on SPI1" # undef CONFIG_NSH_MMCSDSPIPORTNO @@ -71,20 +71,20 @@ #else /* Add configuration for new LPC214x boards here */ # error "Unrecognized LPC214x 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 diff --git a/nuttx/configs/mirtoo/src/up_nsh.c b/nuttx/configs/mirtoo/src/up_nsh.c index 0209fb79d..33e0692e6 100644 --- a/nuttx/configs/mirtoo/src/up_nsh.c +++ b/nuttx/configs/mirtoo/src/up_nsh.c @@ -75,8 +75,8 @@ /* Use minor device number 0 is not is provided */ -#ifndef CONFIG_NSH_SST25MINOR -# define CONFIG_NSH_SST25MINOR 0 +#ifndef CONFIG_NSH_MMCSDMINOR +# define CONFIG_NSH_MMCSDMINOR 0 #endif /* Can't support both FAT and NXFFS */ @@ -125,7 +125,7 @@ int nsh_archinitialize(void) #ifndef CONFIG_FS_NXFFS /* And finally, use the FTL layer to wrap the MTD driver as a block driver */ - ret = ftl_initialize(CONFIG_NSH_SST25MINOR, mtd); + ret = ftl_initialize(CONFIG_NSH_MMCSDMINOR, mtd); if (ret < 0) { fdbg("ERROR: Initialize the FTL layer\n"); diff --git a/nuttx/configs/nucleus2g/src/up_nsh.c b/nuttx/configs/nucleus2g/src/up_nsh.c index faf42bb51..0707eaa35 100644 --- a/nuttx/configs/nucleus2g/src/up_nsh.c +++ b/nuttx/configs/nucleus2g/src/up_nsh.c @@ -56,8 +56,8 @@ /* PORT and SLOT number probably depend on the board configuration */ #ifdef CONFIG_ARCH_BOARD_NUCLEUS2G -# define CONFIG_NSH_HAVEUSBDEV 1 -# define CONFIG_NSH_HAVEMMCSD 1 +# define NSH_HAVEUSBDEV 1 +# define NSH_HAVEMMCSD 1 # if !defined(CONFIG_NSH_MMCSDSPIPORTNO) || CONFIG_NSH_MMCSDSPIPORTNO != 0 # error "The Nucleus-2G MMC/SD is on SSP0" # undef CONFIG_NSH_MMCSDSPIPORTNO @@ -73,20 +73,20 @@ # endif #else # error "Unrecognized board" -# undef CONFIG_NSH_HAVEUSBDEV -# undef CONFIG_NSH_HAVEMMCSD +# undef NSH_HAVEUSBDEV +# undef NSH_HAVEMMCSD #endif /* Can't support USB device features if USB device 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 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; diff --git a/nuttx/configs/olimex-lpc2378/src/up_nsh.c b/nuttx/configs/olimex-lpc2378/src/up_nsh.c index d6b2445ca..9e3a0f695 100644 --- a/nuttx/configs/olimex-lpc2378/src/up_nsh.c +++ b/nuttx/configs/olimex-lpc2378/src/up_nsh.c @@ -61,19 +61,19 @@ /* PORT and SLOT number probably depend on the board configuration */ -#undef CONFIG_NSH_HAVEUSBDEV -#undef CONFIG_NSH_HAVEMMCSD +#undef NSH_HAVEUSBDEV +#undef NSH_HAVEMMCSD /* 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 diff --git a/nuttx/configs/olimex-stm32-p107/nsh/defconfig b/nuttx/configs/olimex-stm32-p107/nsh/defconfig index 728256e02..87c3e829a 100644 --- a/nuttx/configs/olimex-stm32-p107/nsh/defconfig +++ b/nuttx/configs/olimex-stm32-p107/nsh/defconfig @@ -107,7 +107,6 @@ CONFIG_STM32_PWR=y # APB1 (low speed) -CONFIG_STM32_RTC=n CONFIG_STM32_BKP=n CONFIG_STM32_TIM2=n CONFIG_STM32_TIM3=n 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 */ diff --git a/nuttx/configs/pic32-starterkit/src/up_nsh.c b/nuttx/configs/pic32-starterkit/src/up_nsh.c index 830570c6c..0f0f0dffe 100644 --- a/nuttx/configs/pic32-starterkit/src/up_nsh.c +++ b/nuttx/configs/pic32-starterkit/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 PIC32 Ethernet Starter Kit does not have an SD slot on board. If one * is added, then it must be specified by defining which SPI bus that it @@ -67,12 +67,12 @@ */ #ifndef CONFIG_PIC32MX_MMCSDSPIPORTNO -# undef CONFIG_NSH_HAVEMMCSD +# undef NSH_HAVEMMCSD #endif /* 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 */ @@ -96,23 +96,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 */ @@ -126,22 +126,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 @@ -170,7 +170,7 @@ * Private Data ****************************************************************************/ -#ifdef CONFIG_NSH_HAVEUSBHOST +#ifdef NSH_HAVEUSBHOST static struct usbhost_driver_s *g_drvr; #endif @@ -186,7 +186,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; @@ -227,7 +227,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; @@ -280,7 +280,7 @@ errout: * ****************************************************************************/ -#ifdef CONFIG_NSH_HAVEUSBHOST +#ifdef NSH_HAVEUSBHOST static int nsh_usbhostinitialize(void) { int pid; 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; diff --git a/nuttx/configs/sam3u-ek/src/up_nsh.c b/nuttx/configs/sam3u-ek/src/up_nsh.c index 842d8b762..5c8bf022d 100644 --- a/nuttx/configs/sam3u-ek/src/up_nsh.c +++ b/nuttx/configs/sam3u-ek/src/up_nsh.c @@ -62,8 +62,8 @@ /* PORT and SLOT number probably depend on the board configuration */ #ifdef CONFIG_ARCH_BOARD_SAM3UEK -# define CONFIG_NSH_HAVEUSBDEV 1 -# define CONFIG_NSH_HAVEMMCSD 1 +# define NSH_HAVEUSBDEV 1 +# define NSH_HAVEMMCSD 1 # if defined(CONFIG_NSH_MMCSDSLOTNO) && CONFIG_NSH_MMCSDSLOTNO != 0 # error "Only one MMC/SD slot" # undef CONFIG_NSH_MMCSDSLOTNO @@ -74,14 +74,14 @@ #else /* Add configuration for new SAM3U boards here */ # error "Unrecognized SAM3U 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 or if SDIO support @@ -89,7 +89,7 @@ */ #if defined(CONFIG_DISABLE_MOUNTPOINT) || !defined(CONFIG_SAM3U_HSMCI) -# undef CONFIG_NSH_HAVEMMCSD +# undef NSH_HAVEMMCSD #endif #ifndef CONFIG_NSH_MMCSDMINOR @@ -126,7 +126,7 @@ int nsh_archinitialize(void) { -#ifdef CONFIG_NSH_HAVEMMCSD +#ifdef NSH_HAVEMMCSD FAR struct sdio_dev_s *sdio; int ret; diff --git a/nuttx/configs/shenzhou/README.txt b/nuttx/configs/shenzhou/README.txt index 2479dd1da..a74cefd68 100755 --- a/nuttx/configs/shenzhou/README.txt +++ b/nuttx/configs/shenzhou/README.txt @@ -480,7 +480,6 @@ Shenzhou-specific Configuration Options APB1 (low speed) ---------------- - CONFIG_STM32_RTC CONFIG_STM32_BKP CONFIG_STM32_TIM2 CONFIG_STM32_TIM3 diff --git a/nuttx/configs/shenzhou/nsh/defconfig b/nuttx/configs/shenzhou/nsh/defconfig new file mode 100644 index 000000000..6f223c164 --- /dev/null +++ b/nuttx/configs/shenzhou/nsh/defconfig @@ -0,0 +1,883 @@ +# +# Automatically generated file; DO NOT EDIT. +# Nuttx/ Configuration +# +CONFIG_NUTTX_NEWCONFIG=y + +# +# Build Setup +# +# CONFIG_EXPERIMENTAL is not set + +# +# Build Configuration +# +# CONFIG_APPS_DIR="../apps" +# CONFIG_BUILD_2PASS is not set + +# +# Binary Output Formats +# +# CONFIG_RRLOAD_BINARY is not set +CONFIG_INTELHEX_BINARY=y +# CONFIG_MOTOROLA_SREC is not set +# CONFIG_RAW_BINARY is not set + +# +# Customize Header Files +# +# CONFIG_ARCH_STDBOOL_H is not set +# CONFIG_ARCH_MATH_H is not set +# CONFIG_ARCH_STDARG_H is not set + +# +# Debug Options +# +# CONFIG_DEBUG is not set +# CONFIG_DEBUG_SYMBOLS is not set + +# +# System Type +# +# CONFIG_ARCH_8051 is not set +CONFIG_ARCH_ARM=y +# CONFIG_ARCH_AVR is not set +# CONFIG_ARCH_HC is not set +# CONFIG_ARCH_MIPS is not set +# CONFIG_ARCH_RGMP is not set +# CONFIG_ARCH_SH is not set +# CONFIG_ARCH_SIM is not set +# CONFIG_ARCH_X86 is not set +# CONFIG_ARCH_Z16 is not set +# CONFIG_ARCH_Z80 is not set +CONFIG_ARCH="arm" +# CONFIG_ARCH_CHIP_C5471 is not set +# CONFIG_ARCH_CHIP_CALYPSO is not set +# CONFIG_ARCH_CHIP_DM320 is not set +# CONFIG_ARCH_CHIP_IMX is not set +# CONFIG_ARCH_CHIP_KINETIS is not set +# CONFIG_ARCH_CHIP_LM3S is not set +# CONFIG_ARCH_CHIP_LPC17XX is not set +# CONFIG_ARCH_CHIP_LPC214X is not set +# CONFIG_ARCH_CHIP_LPC2378 is not set +# CONFIG_ARCH_CHIP_LPC31XX is not set +# CONFIG_ARCH_CHIP_LPC43XX is not set +# CONFIG_ARCH_CHIP_SAM3U is not set +CONFIG_ARCH_CHIP_STM32=y +# CONFIG_ARCH_CHIP_STR71X is not set +CONFIG_ARCH_CORTEXM3=y +CONFIG_ARCH_FAMILY="armv7-m" +CONFIG_ARCH_CHIP="stm32" +CONFIG_ARCH_HAVE_MPU=y +# CONFIG_ARMV7M_MPU is not set +# CONFIG_ARCH_INTERRUPTSTACK is not set +CONFIG_ARCH_IRQPRIO=y +CONFIG_BOARD_LOOPSPERMSEC=5483 +# CONFIG_ARCH_CALIBRATION is not set +# CONFIG_SERIAL_TERMIOS is not set +# CONFIG_NET_MULTICAST is not set +# CONFIG_ARCH_CHIP_STM32F103ZET6 is not set +# CONFIG_ARCH_CHIP_STM32F103RET6 is not set +# CONFIG_ARCH_CHIP_STM32F103VCT6 is not set +# CONFIG_ARCH_CHIP_STM32F105VBT7 is not set +CONFIG_ARCH_CHIP_STM32F107VC=y +# CONFIG_ARCH_CHIP_STM32F207IG is not set +# CONFIG_ARCH_CHIP_STM32F405RG is not set +# CONFIG_ARCH_CHIP_STM32F405VG is not set +# CONFIG_ARCH_CHIP_STM32F405ZG is not set +# CONFIG_ARCH_CHIP_STM32F407VE is not set +# CONFIG_ARCH_CHIP_STM32F407VG is not set +# CONFIG_ARCH_CHIP_STM32F407ZE is not set +# CONFIG_ARCH_CHIP_STM32F407ZG is not set +# CONFIG_ARCH_CHIP_STM32F407IE is not set +# CONFIG_ARCH_CHIP_STM32F407IG is not set +CONFIG_STM32_STM32F10XX=y +CONFIG_STM32_CONNECTIVITYLINE=y +CONFIG_STM32_CODESOURCERYW=y +# CONFIG_STM32_CODESOURCERYL is not set +# CONFIG_STM32_ATOLLIC_LITE is not set +# CONFIG_STM32_ATOLLIC_PRO is not set +# CONFIG_STM32_DEVKITARM is not set +# CONFIG_STM32_RAISONANCE is not set +# CONFIG_STM32_BUILDROOT is not set +CONFIG_STM32_DFU=y + +# +# STM32 Peripheral Support +# +# CONFIG_STM32_ADC1 is not set +# CONFIG_STM32_ADC2 is not set +# CONFIG_STM32_ADC3 is not set +# CONFIG_STM32_CRC is not set +# CONFIG_STM32_DMA1 is not set +# CONFIG_STM32_DMA2 is not set +CONFIG_STM32_BKP=y +# CONFIG_STM32_CAN1 is not set +# CONFIG_STM32_DAC1 is not set +# CONFIG_STM32_DAC2 is not set +CONFIG_STM32_ETHMAC=y +# CONFIG_STM32_I2C1 is not set +# CONFIG_STM32_I2C2 is not set +# CONFIG_STM32_IWDG is not set +CONFIG_STM32_PWR=y +CONFIG_STM32_SPI1=y +# CONFIG_STM32_SPI2 is not set +# CONFIG_STM32_SPI4 is not set +# CONFIG_STM32_TIM1 is not set +# CONFIG_STM32_TIM2 is not set +# CONFIG_STM32_TIM3 is not set +# CONFIG_STM32_TIM4 is not set +# CONFIG_STM32_TIM5 is not set +# CONFIG_STM32_TIM6 is not set +# CONFIG_STM32_TIM7 is not set +# CONFIG_STM32_TIM8 is not set +# CONFIG_STM32_USART1 is not set +CONFIG_STM32_USART2=y +# CONFIG_STM32_USART3 is not set +# CONFIG_STM32_UART4 is not set +# CONFIG_STM32_UART5 is not set +# CONFIG_STM32_USB is not set +# CONFIG_STM32_WWDG is not set +CONFIG_STM32_SPI=y +CONFIG_STM32_USART2_REMAP=y +# CONFIG_STM32_SPI1_REMAP is not set +CONFIG_STM32_ETH_REMAP=y +# CONFIG_STM32_JTAG_DISABLE is not set +CONFIG_STM32_JTAG_FULL_ENABLE=y +# CONFIG_STM32_JTAG_NOJNTRST_ENABLE is not set +# CONFIG_STM32_JTAG_SW_ENABLE is not set +# CONFIG_STM32_FORCEPOWER is not set +# CONFIG_ARCH_BOARD_STM32_CUSTOM_CLOCKCONFIG is not set + +# +# SPI Configuration +# +# CONFIG_STM32_SPI_INTERRUPTS is not set +# CONFIG_STM32_SPI_DMA is not set + +# +# Ethernet MAC configuration +# +CONFIG_STM32_PHYADDR=1 +CONFIG_STM32_MII=y +CONFIG_STM32_MII_MCO=y +CONFIG_STM32_AUTONEG=y +CONFIG_STM32_PHYSR=16 +CONFIG_STM32_PHYSR_SPEED=0x0002 +CONFIG_STM32_PHYSR_100MBPS=0x0000 +CONFIG_STM32_PHYSR_MODE=0x0004 +CONFIG_STM32_PHYSR_FULLDUPLEX=0x0004 +# CONFIG_STM32_ETH_PTP is not set + +# +# USB Host Configuration +# + +# +# Architecture Options +# +# CONFIG_ARCH_NOINTC is not set +CONFIG_ARCH_STACKDUMP=y + +# +# Board Settings +# +CONFIG_DRAM_START=0x20000000 +CONFIG_DRAM_SIZE=65536 + +# +# Boot options +# +# CONFIG_BOOT_RUNFROMEXTSRAM is not set +CONFIG_BOOT_RUNFROMFLASH=y +# CONFIG_BOOT_RUNFROMISRAM is not set +# CONFIG_BOOT_RUNFROMSDRAM is not set +# CONFIG_BOOT_COPYTORAM is not set + +# +# Board Selection +# +# CONFIG_ARCH_BOARD_OLIMEX_STM32P107 is not set +CONFIG_ARCH_BOARD_SHENZHOU=y +# CONFIG_ARCH_BOARD_CUSTOM is not set +CONFIG_ARCH_BOARD="shenzhou" + +# +# Common Board Options +# +CONFIG_ARCH_HAVE_LEDS=y +CONFIG_ARCH_LEDS=y +CONFIG_ARCH_HAVE_BUTTONS=y +# CONFIG_ARCH_BUTTONS is not set +CONFIG_ARCH_HAVE_IRQBUTTONS=y +CONFIG_NSH_MMCSDMINOR=0 +CONFIG_NSH_MMCSDSLOTNO=0 +CONFIG_NSH_MMCSDSPIPORTNO=0 + +# +# Board-Specific Options +# + +# +# RTOS Features +# +CONFIG_MSEC_PER_TICK=10 +CONFIG_RR_INTERVAL=200 +# CONFIG_SCHED_INSTRUMENTATION is not set +CONFIG_TASK_NAME_SIZE=0 +# CONFIG_JULIAN_TIME is not set +CONFIG_START_YEAR=2012 +CONFIG_START_MONTH=9 +CONFIG_START_DAY=8 +CONFIG_DEV_CONSOLE=y +# CONFIG_DEV_LOWCONSOLE is not set +# CONFIG_MUTEX_TYPES is not set +# CONFIG_PRIORITY_INHERITANCE is not set +# CONFIG_FDCLONE_DISABLE is not set +# CONFIG_FDCLONE_STDIO is not set +CONFIG_SDCLONE_DISABLE=y +CONFIG_SCHED_WORKQUEUE=y +CONFIG_SCHED_WORKPRIORITY=192 +CONFIG_SCHED_WORKPERIOD=50000 +CONFIG_SCHED_WORKSTACKSIZE=2048 +CONFIG_SIG_SIGWORK=4 +# CONFIG_SCHED_LPWORK is not set +CONFIG_SCHED_WAITPID=y +# CONFIG_SCHED_ATEXIT is not set +# CONFIG_SCHED_ONEXIT is not set +CONFIG_USER_ENTRYPOINT="nsh_main" +CONFIG_DISABLE_OS_API=y +# CONFIG_DISABLE_CLOCK is not set +# CONFIG_DISABLE_POSIX_TIMERS is not set +# CONFIG_DISABLE_PTHREAD is not set +# CONFIG_DISABLE_SIGNALS is not set +# CONFIG_DISABLE_MQUEUE is not set +# CONFIG_DISABLE_MOUNTPOINT is not set +# CONFIG_DISABLE_ENVIRON is not set +CONFIG_DISABLE_POLL=y + +# +# Sizes of configurable things (0 disables) +# +CONFIG_MAX_TASKS=16 +CONFIG_MAX_TASK_ARGS=4 +CONFIG_NPTHREAD_KEYS=4 +CONFIG_NFILE_DESCRIPTORS=8 +CONFIG_NFILE_STREAMS=8 +CONFIG_NAME_MAX=32 +CONFIG_PREALLOC_MQ_MSGS=4 +CONFIG_MQ_MAXMSGSIZE=32 +CONFIG_MAX_WDOGPARMS=2 +CONFIG_PREALLOC_WDOGS=8 +CONFIG_PREALLOC_TIMERS=4 + +# +# Stack and heap information +# +# CONFIG_CUSTOM_STACK is not set +CONFIG_IDLETHREAD_STACKSIZE=1024 +CONFIG_USERMAIN_STACKSIZE=2048 +CONFIG_PTHREAD_STACK_MIN=256 +CONFIG_PTHREAD_STACK_DEFAULT=2048 + +# +# Device Drivers +# + +# +# Device Driver Configuration +# +CONFIG_DEV_NULL=y +# CONFIG_DEV_ZERO is not set +# CONFIG_LOOP is not set +# CONFIG_RAMDISK is not set +# CONFIG_CAN is not set +# CONFIG_PWM is not set +# CONFIG_I2C is not set +CONFIG_SPI=y +CONFIG_SPI_OWNBUS=y +CONFIG_SPI_EXCHANGE=y +CONFIG_SPI_CMDDATA=y +CONFIG_RTC=y +# CONFIG_RTC_DATETIME is not set +# CONFIG_RTC_HIRES is not set +# CONFIG_RTC_ALARM is not set +# CONFIG_WATCHDOG is not set +# CONFIG_ANALOG is not set +# CONFIG_BCH is not set +# CONFIG_INPUT is not set +# CONFIG_LCD is not set +CONFIG_MMCSD=y +CONFIG_MMCSD_NSLOTS=1 +# CONFIG_MMCSD_READONLY is not set +# CONFIG_MMCSD_MULTIBLOCK_DISABLE is not set +CONFIG_MMCSD_MMCSUPPORT=y +CONFIG_MMCSD_HAVECARDDETECT=y +CONFIG_MMCSD_SPI=y +CONFIG_MMCSD_SPICLOCK=12500000 +# CONFIG_MMCSD_SDIO is not set +# CONFIG_MTD is not set +# CONFIG_NETDEVICES is not set +# CONFIG_NET_SLIP is not set +# CONFIG_PIPES is not set +# CONFIG_PM is not set +# CONFIG_POWER is not set +# CONFIG_SENSORS is not set +# CONFIG_SERCOMM_CONSOLE is not set +CONFIG_SERIAL=y +# CONFIG_LOWLEVEL_CONSOLE is not set +# CONFIG_16550_UART is not set +CONFIG_ARCH_HAVE_USART2=y +CONFIG_MCU_SERIAL=y +CONFIG_STANDARD_SERIAL=y +CONFIG_USART2_SERIAL_CONSOLE=y +# CONFIG_NO_SERIAL_CONSOLE is not set + +# +# USART2 Configuration +# +CONFIG_USART2_RXBUFSIZE=128 +CONFIG_USART2_TXBUFSIZE=128 +CONFIG_USART2_BAUD=115200 +CONFIG_USART2_BITS=8 +CONFIG_USART2_PARITY=0 +CONFIG_USART2_2STOP=0 +# CONFIG_USBDEV is not set +# CONFIG_USBHOST is not set +# CONFIG_WIRELESS is not set + +# +# System Logging +# +# CONFIG_RAMLOG is not set + +# +# Networking support +# +CONFIG_NET=y +# CONFIG_NET_NOINTS is not set +CONFIG_NET_MULTIBUFFER=y +# CONFIG_NET_IPv6 is not set +CONFIG_NSOCKET_DESCRIPTORS=10 +CONFIG_NET_NACTIVESOCKETS=16 +CONFIG_NET_SOCKOPTS=y +CONFIG_NET_BUFSIZE=562 +# CONFIG_NET_TCPURGDATA is not set +CONFIG_NET_TCP=y +CONFIG_NET_TCP_CONNS=40 +CONFIG_NET_MAX_LISTENPORTS=40 +CONFIG_NET_TCP_READAHEAD_BUFSIZE=562 +CONFIG_NET_NTCP_READAHEAD_BUFFERS=16 +CONFIG_NET_TCP_RECVDELAY=0 +CONFIG_NET_TCPBACKLOG=y +CONFIG_NET_UDP=y +CONFIG_NET_UDP_CHECKSUMS=y +CONFIG_NET_UDP_CONNS=8 +# CONFIG_NET_BROADCAST is not set +CONFIG_NET_ICMP=y +CONFIG_NET_ICMP_PING=y +# CONFIG_NET_PINGADDRCONF is not set +# CONFIG_NET_IGMP is not set +CONFIG_NET_STATISTICS=y +CONFIG_NET_RECEIVE_WINDOW=562 +CONFIG_NET_ARPTAB_SIZE=16 +# CONFIG_NET_ARP_IPIN is not set + +# +# File systems +# + +# +# File system configuration +# +CONFIG_FS_FAT=y +CONFIG_FAT_LCNAMES=y +CONFIG_FAT_LFN=y +CONFIG_FAT_MAXFNAME=32 +# CONFIG_FS_FATTIME is not set +# CONFIG_FS_RAMMAP is not set +# CONFIG_NFS is not set +# CONFIG_FS_NXFFS is not set +# CONFIG_FS_ROMFS is not set + +# +# System Logging +# +# CONFIG_SYSLOG is not set + +# +# Memory management +# +# CONFIG_MM_SMALL is not set +CONFIG_MM_REGIONS=1 + +# +# Library routines +# +CONFIG_STDIO_BUFFER_SIZE=256 +CONFIG_STDIO_LINEBUFFER=y +CONFIG_NUNGET_CHARS=2 +CONFIG_LIB_HOMEDIR="/" +# CONFIG_HAVE_LIBM is not set +# CONFIG_NOPRINTF_FIELDWIDTH is not set +# CONFIG_LIBC_FLOATINGPOINT is not set +# CONFIG_EOL_IS_CR is not set +# CONFIG_EOL_IS_LF is not set +# CONFIG_EOL_IS_BOTH_CRLF is not set +CONFIG_EOL_IS_EITHER_CRLF=y +# CONFIG_LIBC_STRERROR is not set +# CONFIG_LIBC_PERROR_STDOUT is not set +CONFIG_ARCH_LOWPUTC=y +CONFIG_LIB_SENDFILE_BUFSIZE=512 +# CONFIG_ARCH_ROMGETC is not set +# CONFIG_ARCH_OPTIMIZED_FUNCTIONS is not set +CONFIG_HAVE_CXX=y +CONFIG_HAVE_CXXINITIALIZE=y +# CONFIG_CXX_NEWLONG is not set + +# +# Application configuration +# + +# +# Named Applications +# +CONFIG_NAMEDAPP=y + +# +# Examples +# + +# +# ADC example +# +# CONFIG_EXAMPLES_ADC is not set + +# +# Buttons example +# +# CONFIG_EXAMPLES_BUTTONS is not set + +# +# CAN example +# +# CONFIG_EXAMPLES_CAN is not set + +# +# USB CDC/ACM class driver example +# +# CONFIG_EXAMPLES_CDCACM is not set + +# +# USB composite class driver example +# +# CONFIG_EXAMPLES_COMPOSITE is not set + +# +# DHCP server example +# +# CONFIG_EXAMPLES_DHCPD is not set + +# +# FTP client example +# +# CONFIG_EXAMPLES_FTPC is not set + +# +# FTP server example +# +# CONFIG_EXAMPLES_FTPD is not set + +# +# "Hello, World!" example +# +# CONFIG_EXAMPLES_HELLO is not set + +# +# "Hello, World!" C++ example +# +# CONFIG_EXAMPLES_HELLOXX is not set + +# +# USB HID keyboard example +# +# CONFIG_EXAMPLES_HIDKBD is not set + +# +# IGMP example +# +# CONFIG_EXAMPLES_IGMP is not set + +# +# LCD read/write example +# +# CONFIG_EXAMPLES_LCDRW is not set + +# +# Memory management example +# +# CONFIG_EXAMPLES_MM is not set + +# +# File system mount example +# +# CONFIG_EXAMPLES_MOUNT is not set + +# +# FreeModBus example +# +# CONFIG_EXAMPLES_MODBUS is not set + +# +# Network test example +# +# CONFIG_EXAMPLES_NETTEST is not set + +# +# NuttShell (NSH) example +# +CONFIG_EXAMPLES_NSH=y + +# +# NULL example +# +# CONFIG_EXAMPLES_NULL is not set + +# +# NX graphics example +# +# CONFIG_EXAMPLES_NX is not set + +# +# NxConsole example +# +# CONFIG_EXAMPLES_NXCONSOLE is not set + +# +# NXFFS file system example +# +# CONFIG_EXAMPLES_NXFFS is not set + +# +# NXFLAT example +# +# CONFIG_EXAMPLES_NXFLAT is not set + +# +# NX graphics "Hello, World!" example +# +# CONFIG_EXAMPLES_NXHELLO is not set + +# +# NX graphics image example +# +# CONFIG_EXAMPLES_NXIMAGE is not set + +# +# NX graphics lines example +# +# CONFIG_EXAMPLES_NXLINES is not set + +# +# NX graphics text example +# +# CONFIG_EXAMPLES_NXTEXT is not set + +# +# OS test example +# +# CONFIG_EXAMPLES_OSTEST is not set + +# +# Pascal "Hello, World!"example +# +# CONFIG_EXAMPLES_PASHELLO is not set + +# +# Pipe example +# +# CONFIG_EXAMPLES_PIPE is not set + +# +# Poll example +# +# CONFIG_EXAMPLES_POLL is not set + +# +# Pulse width modulation (PWM) example +# + +# +# Quadrature encoder example +# +# CONFIG_EXAMPLES_QENCODER is not set + +# +# RGMP example +# +# CONFIG_EXAMPLES_RGMP is not set + +# +# ROMFS example +# +# CONFIG_EXAMPLES_ROMFS is not set + +# +# sendmail example +# +# CONFIG_EXAMPLES_SENDMAIL is not set + +# +# Serial loopback example +# +# CONFIG_EXAMPLES_SERLOOP is not set + +# +# Telnet daemon example +# +# CONFIG_EXAMPLES_TELNETD is not set + +# +# THTTPD web server example +# +# CONFIG_EXAMPLES_THTTPD is not set + +# +# TIFF generation example +# +# CONFIG_EXAMPLES_TIFF is not set + +# +# Touchscreen example +# +# CONFIG_EXAMPLES_TOUCHSCREEN is not set + +# +# UDP example +# +# CONFIG_EXAMPLES_UDP is not set + +# +# uIP web server example +# +# CONFIG_EXAMPLES_UIP is not set + +# +# USB serial test example +# +# CONFIG_EXAMPLES_USBSERIAL is not set + +# +# USB mass storage class example +# +# CONFIG_EXAMPLES_USBMSC is not set + +# +# USB serial terminal example +# +# CONFIG_EXAMPLES_USBTERM is not set + +# +# Watchdog timer example +# +# CONFIG_EXAMPLES_WATCHDOG is not set + +# +# wget example +# +# CONFIG_EXAMPLES_WGET is not set + +# +# WLAN example +# +# CONFIG_EXAMPLES_WLAN is not set + +# +# Interpreters +# + +# +# Interpreters +# +# CONFIG_FICL is not set +# CONFIG_PCODE is not set + +# +# Network Utilities +# + +# +# Networking Utilities +# + +# +# DHCP client +# +# CONFIG_NETUTILS_DHCPC is not set + +# +# DHCP server +# +# CONFIG_NETUTILS_DHCPD is not set + +# +# FTP client +# +# CONFIG_NETUTILS_FTPC is not set + +# +# FTP server +# +# CONFIG_NETUTILS_FTPD is not set + +# +# Name resolution +# +# CONFIG_NETUTILS_RESOLV is not set + +# +# SMTP +# +# CONFIG_NETUTILS_SMTP is not set + +# +# TFTP client +# +CONFIG_NETUTILS_TELNETD=y + +# +# TFTP client +# +CONFIG_NETUTILS_TFTPC=y + +# +# THTTPD web server +# +# CONFIG_NETUTILS_THTTPD is not set + +# +# uIP support library +# +CONFIG_NETUTILS_UIPLIB=y + +# +# uIP web client +# +# CONFIG_NETUTILS_WEBCLIENT is not set + +# +# uIP web server +# +# CONFIG_NETUTILS_WEBSERVER is not set + +# +# ModBus +# + +# +# FreeModbus +# +# CONFIG_MODBUS is not set + +# +# NSH Library +# +CONFIG_NSH_LIBRARY=y +CONFIG_NSH_BUILTIN_APPS=y + +# +# Disable Individual commands +# +# CONFIG_NSH_DISABLE_CAT is not set +# CONFIG_NSH_DISABLE_CD is not set +# CONFIG_NSH_DISABLE_CP is not set +# CONFIG_NSH_DISABLE_DD is not set +# CONFIG_NSH_DISABLE_ECHO is not set +# CONFIG_NSH_DISABLE_EXEC is not set +# CONFIG_NSH_DISABLE_EXIT is not set +# CONFIG_NSH_DISABLE_FREE is not set +# CONFIG_NSH_DISABLE_GET is not set +# CONFIG_NSH_DISABLE_HELP is not set +# CONFIG_NSH_DISABLE_IFCONFIG is not set +# CONFIG_NSH_DISABLE_KILL is not set +# CONFIG_NSH_DISABLE_LOSETUP is not set +# CONFIG_NSH_DISABLE_LS is not set +# CONFIG_NSH_DISABLE_MB is not set +# CONFIG_NSH_DISABLE_MKDIR is not set +# CONFIG_NSH_DISABLE_MKFATFS is not set +# CONFIG_NSH_DISABLE_MKFIFO is not set +# CONFIG_NSH_DISABLE_MKRD is not set +# CONFIG_NSH_DISABLE_MH is not set +# CONFIG_NSH_DISABLE_MOUNT is not set +# CONFIG_NSH_DISABLE_MW is not set +# CONFIG_NSH_DISABLE_NSFMOUNT is not set +# CONFIG_NSH_DISABLE_PS is not set +# CONFIG_NSH_DISABLE_PING is not set +# CONFIG_NSH_DISABLE_PUT is not set +# CONFIG_NSH_DISABLE_PWD is not set +# CONFIG_NSH_DISABLE_RM is not set +# CONFIG_NSH_DISABLE_RMDIR is not set +# CONFIG_NSH_DISABLE_SET is not set +# CONFIG_NSH_DISABLE_SH is not set +# CONFIG_NSH_DISABLE_SLEEP is not set +# CONFIG_NSH_DISABLE_TEST is not set +# CONFIG_NSH_DISABLE_UMOUNT is not set +# CONFIG_NSH_DISABLE_UNSET is not set +# CONFIG_NSH_DISABLE_USLEEP is not set +# CONFIG_NSH_DISABLE_WGET is not set +# CONFIG_NSH_DISABLE_XD is not set +CONFIG_NSH_FILEIOSIZE=512 +CONFIG_NSH_LINELEN=64 +CONFIG_NSH_NESTDEPTH=3 +# CONFIG_NSH_DISABLESCRIPT is not set +# CONFIG_NSH_DISABLEBG is not set +CONFIG_NSH_CONSOLE=y +# CONFIG_NSH_CONDEV is not set +# CONFIG_NSH_ARCHINIT is not set +CONFIG_NSH_TELNET=y +CONFIG_NSH_TELNETD_PORT=23 +CONFIG_NSH_TELNETD_DAEMONPRIO=100 +CONFIG_NSH_TELNETD_DAEMONSTACKSIZE=2048 +CONFIG_NSH_TELNETD_CLIENTPRIO=100 +CONFIG_NSH_TELNETD_CLIENTSTACKSIZE=2048 +CONFIG_NSH_IOBUFFER_SIZE=512 +CONFIG_NSH_IPADDR=0x0a000002 +CONFIG_NSH_DRIPADDR=0x0a000001 +CONFIG_NSH_NETMASK=0xffffff00 +CONFIG_NSH_NOMAC=y + +# +# System NSH Add-Ons +# + +# +# Custom free memory command +# +# CONFIG_SYSTEM_FREE is not set + +# +# I2C tool +# + +# +# FLASH Program Installation +# +# CONFIG_SYSTEM_INSTALL is not set + +# +# readline() support +# +CONFIG_SYSTEM_READLINE=y +CONFIG_READLINE_ECHO=y + +# +# VSN board Add-Ons +# + +# +# VSN board add-ons +# +# CONFIG_VSN_POWEROFF is not set +# CONFIG_VSN_RAMTRON is not set +# CONFIG_VSN_SDCARD is not set +# CONFIG_VSN_SYSINFO is not set diff --git a/nuttx/configs/stm3210e-eval/src/up_nsh.c b/nuttx/configs/stm3210e-eval/src/up_nsh.c index 96e1e5e58..3e7c2013c 100644 --- a/nuttx/configs/stm3210e-eval/src/up_nsh.c +++ b/nuttx/configs/stm3210e-eval/src/up_nsh.c @@ -70,8 +70,8 @@ /* PORT and SLOT number probably depend on the board configuration */ #ifdef CONFIG_ARCH_BOARD_STM3210E_EVAL -# define CONFIG_NSH_HAVEUSBDEV 1 -# define CONFIG_NSH_HAVEMMCSD 1 +# define NSH_HAVEUSBDEV 1 +# define NSH_HAVEMMCSD 1 # if defined(CONFIG_NSH_MMCSDSLOTNO) && CONFIG_NSH_MMCSDSLOTNO != 0 # error "Only one MMC/SD slot" # undef CONFIG_NSH_MMCSDSLOTNO @@ -82,14 +82,14 @@ #else /* Add configuration for new STM32 boards here */ # error "Unrecognized STM32 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 or if SDIO support @@ -97,7 +97,7 @@ */ #if defined(CONFIG_DISABLE_MOUNTPOINT) || !defined(CONFIG_STM32_SDIO) -# undef CONFIG_NSH_HAVEMMCSD +# undef NSH_HAVEMMCSD #endif #ifndef CONFIG_NSH_MMCSDMINOR @@ -138,7 +138,7 @@ int nsh_archinitialize(void) FAR struct spi_dev_s *spi; FAR struct mtd_dev_s *mtd; #endif -#ifdef CONFIG_NSH_HAVEMMCSD +#ifdef NSH_HAVEMMCSD FAR struct sdio_dev_s *sdio; int ret; #endif @@ -177,7 +177,7 @@ int nsh_archinitialize(void) /* Mount the SDIO-based MMC/SD block driver */ -#ifdef CONFIG_NSH_HAVEMMCSD +#ifdef NSH_HAVEMMCSD /* First, get an instance of the SDIO interface */ message("nsh_archinitialize: Initializing SDIO slot %d\n", diff --git a/nuttx/configs/sure-pic32mx/src/up_nsh.c b/nuttx/configs/sure-pic32mx/src/up_nsh.c index 70d482dbe..4b68350ed 100644 --- a/nuttx/configs/sure-pic32mx/src/up_nsh.c +++ b/nuttx/configs/sure-pic32mx/src/up_nsh.c @@ -61,8 +61,8 @@ /* PORT and SLOT number probably depend on the board configuration */ #ifdef CONFIG_ARCH_BOARD_SUREPIC32MX -# 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 != 2 # error "The Sure PIC32MX MMC/SD is on SPI2" # undef CONFIG_NSH_MMCSDSPIPORTNO @@ -75,18 +75,18 @@ # endif # ifndef CONFIG_PIC32MX_SPI2 # warning "CONFIG_PIC32MX_SPI2 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_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 @@ -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 *spi; @@ -259,7 +259,7 @@ errout: * ****************************************************************************/ -#ifdef CONFIG_NSH_HAVEUSBHOST +#ifdef NSH_HAVEUSBHOST static int nsh_usbhostinitialize(void) { int pid; diff --git a/nuttx/configs/twr-k60n512/src/up_nsh.c b/nuttx/configs/twr-k60n512/src/up_nsh.c index 2079f52a0..e59265f91 100644 --- a/nuttx/configs/twr-k60n512/src/up_nsh.c +++ b/nuttx/configs/twr-k60n512/src/up_nsh.c @@ -61,8 +61,8 @@ /* PORT and SLOT number probably depend on the board configuration */ #ifdef CONFIG_ARCH_BOARD_TWR_K60N512 -# define CONFIG_NSH_HAVEUSBDEV 1 -# define CONFIG_NSH_HAVEMMCSD 1 +# define NSH_HAVEUSBDEV 1 +# define NSH_HAVEMMCSD 1 # if defined(CONFIG_NSH_MMCSDSLOTNO) && CONFIG_NSH_MMCSDSLOTNO != 0 # error "Only one MMC/SD slot, slot 0" # undef CONFIG_NSH_MMCSDSLOTNO @@ -73,14 +73,14 @@ #else /* Add configuration for new Kinetis boards here */ # error "Unrecognized Kinetis 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 or if SDHC support @@ -88,7 +88,7 @@ */ #if defined(CONFIG_DISABLE_MOUNTPOINT) || !defined(CONFIG_KINETIS_SDHC) -# undef CONFIG_NSH_HAVEMMCSD +# undef NSH_HAVEMMCSD #endif #ifndef CONFIG_NSH_MMCSDMINOR @@ -129,7 +129,7 @@ * reduces the probability of name collistions. */ -#ifdef CONFIG_NSH_HAVEMMCSD +#ifdef NSH_HAVEMMCSD struct kinetis_nsh_s { FAR struct sdio_dev_s *sdhc; /* SDIO driver handle */ @@ -141,7 +141,7 @@ struct kinetis_nsh_s * Private Data ****************************************************************************/ -#ifdef CONFIG_NSH_HAVEMMCSD +#ifdef NSH_HAVEMMCSD static struct kinetis_nsh_s g_nsh; #endif @@ -153,7 +153,7 @@ static struct kinetis_nsh_s g_nsh; * Name: kinetis_mediachange ****************************************************************************/ -#ifdef CONFIG_NSH_HAVEMMCSD +#ifdef NSH_HAVEMMCSD static void kinetis_mediachange(void) { bool inserted; @@ -190,7 +190,7 @@ static void kinetis_mediachange(void) * Name: kinetis_cdinterrupt ****************************************************************************/ -#ifdef CONFIG_NSH_HAVEMMCSD +#ifdef NSH_HAVEMMCSD static int kinetis_cdinterrupt(int irq, FAR void *context) { /* All of the work is done by kinetis_mediachange() */ @@ -214,7 +214,7 @@ static int kinetis_cdinterrupt(int irq, FAR void *context) int nsh_archinitialize(void) { -#ifdef CONFIG_NSH_HAVEMMCSD +#ifdef NSH_HAVEMMCSD int ret; /* Configure GPIO pins */ diff --git a/nuttx/drivers/serial/Kconfig b/nuttx/drivers/serial/Kconfig index 0448f1268..43869fdec 100644 --- a/nuttx/drivers/serial/Kconfig +++ b/nuttx/drivers/serial/Kconfig @@ -271,43 +271,43 @@ endif # MCU serial peripheral driver? # -config ARCH_HAS_UART +config ARCH_HAVE_UART bool -config ARCH_HAS_UART0 +config ARCH_HAVE_UART0 bool -config ARCH_HAS_UART1 +config ARCH_HAVE_UART1 bool -config ARCH_HAS_UART2 +config ARCH_HAVE_UART2 bool -config ARCH_HAS_UART3 +config ARCH_HAVE_UART3 bool -config ARCH_HAS_UART4 +config ARCH_HAVE_UART4 bool -config ARCH_HAS_UART5 +config ARCH_HAVE_UART5 bool -config ARCH_HAS_UART6 +config ARCH_HAVE_UART6 bool -config ARCH_HAS_USART0 +config ARCH_HAVE_USART0 bool -config ARCH_HAS_USART1 +config ARCH_HAVE_USART1 bool -config ARCH_HAS_USART2 +config ARCH_HAVE_USART2 bool -config ARCH_HAS_USART3 +config ARCH_HAVE_USART3 bool -config ARCH_HAS_USART4 +config ARCH_HAVE_USART4 bool -config ARCH_HAS_USART5 +config ARCH_HAVE_USART5 bool -config ARCH_HAS_USART6 +config ARCH_HAVE_USART6 bool config MCU_SERIAL bool - default y if ARCH_HAS_UART || ARCH_HAS_UART0 || ARCH_HAS_USART0 || ARCH_HAS_UART1 || ARCH_HAS_USART1 || \ - ARCH_HAS_UART2 || ARCH_HAS_USART2 || ARCH_HAS_UART3 || ARCH_HAS_USART3 || \ - ARCH_HAS_UART4 || ARCH_HAS_USART4 || ARCH_HAS_UART5 || ARCH_HAS_USART5 || ARCH_HAS_UART6 || ARCH_HAS_USART6 + default y if ARCH_HAVE_UART || ARCH_HAVE_UART0 || ARCH_HAVE_USART0 || ARCH_HAVE_UART1 || ARCH_HAVE_USART1 || \ + ARCH_HAVE_UART2 || ARCH_HAVE_USART2 || ARCH_HAVE_UART3 || ARCH_HAVE_USART3 || \ + ARCH_HAVE_UART4 || ARCH_HAVE_USART4 || ARCH_HAVE_UART5 || ARCH_HAVE_USART5 || ARCH_HAVE_UART6 || ARCH_HAVE_USART6 # # Standard serial driver configuration @@ -340,63 +340,63 @@ choice config UART_SERIAL_CONSOLE bool "UART" - depends on ARCH_HAS_UART + depends on ARCH_HAVE_UART config UART0_SERIAL_CONSOLE bool "UART0" - depends on ARCH_HAS_UART0 + depends on ARCH_HAVE_UART0 config USART0_SERIAL_CONSOLE bool "USART0" - depends on ARCH_HAS_USART0 + depends on ARCH_HAVE_USART0 config UART1_SERIAL_CONSOLE bool "UART1" - depends on ARCH_HAS_UART1 + depends on ARCH_HAVE_UART1 config USART1_SERIAL_CONSOLE bool "USART1" - depends on ARCH_HAS_USART1 + depends on ARCH_HAVE_USART1 config UART2_SERIAL_CONSOLE bool "UART2" - depends on ARCH_HAS_UART2 + depends on ARCH_HAVE_UART2 config USART2_SERIAL_CONSOLE bool "USART2" - depends on ARCH_HAS_USART2 + depends on ARCH_HAVE_USART2 config UART3_SERIAL_CONSOLE bool "UART3" - depends on ARCH_HAS_UART3 + depends on ARCH_HAVE_UART3 config USART3_SERIAL_CONSOLE bool "USART3" - depends on ARCH_HAS_USART3 + depends on ARCH_HAVE_USART3 config UART4_SERIAL_CONSOLE bool "UART4" - depends on ARCH_HAS_UART4 + depends on ARCH_HAVE_UART4 config USART4_SERIAL_CONSOLE bool "USART4" - depends on ARCH_HAS_USART4 + depends on ARCH_HAVE_USART4 config UART5_SERIAL_CONSOLE bool "UART5" - depends on ARCH_HAS_UART5 + depends on ARCH_HAVE_UART5 config USART5_SERIAL_CONSOLE bool "USART5" - depends on ARCH_HAS_USART5 + depends on ARCH_HAVE_USART5 config UART6_SERIAL_CONSOLE bool "UART6" - depends on ARCH_HAS_UART6 + depends on ARCH_HAVE_UART6 config USART6_SERIAL_CONSOLE bool "USART6" - depends on ARCH_HAS_USART6 + depends on ARCH_HAVE_USART6 config NO_SERIAL_CONSOLE bool "No serial console" @@ -404,7 +404,7 @@ config NO_SERIAL_CONSOLE endchoice menu "UART Configuration" - depends on ARCH_HAS_UART + depends on ARCH_HAVE_UART config UART_RXBUFSIZE int "receive buffer size" @@ -447,7 +447,7 @@ config UART_2STOP endmenu menu "UART0 Configuration" - depends on ARCH_HAS_UART0 + depends on ARCH_HAVE_UART0 config UART0_RXBUFSIZE int "receive buffer size" @@ -490,7 +490,7 @@ config UART0_2STOP endmenu menu "USART0 Configuration" - depends on ARCH_HAS_USART0 + depends on ARCH_HAVE_USART0 config USART0_RXBUFSIZE int "receive buffer size" @@ -533,7 +533,7 @@ config USART0_2STOP endmenu menu "UART1 Configuration" - depends on ARCH_HAS_UART1 + depends on ARCH_HAVE_UART1 config UART1_RXBUFSIZE int "receive buffer size" @@ -576,7 +576,7 @@ config UART1_2STOP endmenu menu "USART1 Configuration" - depends on ARCH_HAS_USART1 + depends on ARCH_HAVE_USART1 config USART1_RXBUFSIZE int "receive buffer size" @@ -619,7 +619,7 @@ config USART1_2STOP endmenu menu "UART2 Configuration" - depends on ARCH_HAS_UART2 + depends on ARCH_HAVE_UART2 config UART2_RXBUFSIZE int "receive buffer size" @@ -662,7 +662,7 @@ config UART2_2STOP endmenu menu "USART2 Configuration" - depends on ARCH_HAS_USART2 + depends on ARCH_HAVE_USART2 config USART2_RXBUFSIZE int "receive buffer size" @@ -705,7 +705,7 @@ config USART2_2STOP endmenu menu "UART3 Configuration" - depends on ARCH_HAS_UART3 + depends on ARCH_HAVE_UART3 config UART3_RXBUFSIZE int "receive buffer size" @@ -748,7 +748,7 @@ config UART3_2STOP endmenu menu "USART3 Configuration" - depends on ARCH_HAS_USART3 + depends on ARCH_HAVE_USART3 config USART3_RXBUFSIZE int "receive buffer size" @@ -791,7 +791,7 @@ config USART3_2STOP endmenu menu "UART4 Configuration" - depends on ARCH_HAS_UART4 + depends on ARCH_HAVE_UART4 config UART4_RXBUFSIZE int "receive buffer size" @@ -834,7 +834,7 @@ config UART4_2STOP endmenu menu "USART4 Configuration" - depends on ARCH_HAS_USART4 + depends on ARCH_HAVE_USART4 config USART4_RXBUFSIZE int "receive buffer size" @@ -877,7 +877,7 @@ config USART4_2STOP endmenu menu "UART5 Configuration" - depends on ARCH_HAS_UART5 + depends on ARCH_HAVE_UART5 config UART5_RXBUFSIZE int "receive buffer size" @@ -920,7 +920,7 @@ config UART5_2STOP endmenu menu "USART5 Configuration" - depends on ARCH_HAS_USART5 + depends on ARCH_HAVE_USART5 config USART5_RXBUFSIZE int "receive buffer size" @@ -963,7 +963,7 @@ config USART5_2STOP endmenu menu "USART6 Configuration" - depends on ARCH_HAS_USART6 + depends on ARCH_HAVE_USART6 config USART6_RXBUFSIZE int "receive buffer size" @@ -1006,7 +1006,7 @@ config USART6_2STOP endmenu menu "UART6 Configuration" - depends on ARCH_HAS_UART6 + depends on ARCH_HAVE_UART6 config UART6_RXBUFSIZE int "receive buffer size" diff --git a/nuttx/fs/fat/Kconfig b/nuttx/fs/fat/Kconfig index 30983799d..fed054b5b 100644 --- a/nuttx/fs/fat/Kconfig +++ b/nuttx/fs/fat/Kconfig @@ -11,12 +11,6 @@ config FS_FAT Enable FAT filesystem support if FS_FAT -config FAT_SECTORSIZE - int "FAT sector size" - default 512 - ---help--- - Max supported sector size - config FAT_LCNAMES bool "FAT upper/lower names" default n diff --git a/nuttx/lib/Kconfig b/nuttx/lib/Kconfig index a5b62e588..69a55d09c 100644 --- a/nuttx/lib/Kconfig +++ b/nuttx/lib/Kconfig @@ -51,6 +51,29 @@ config LIBC_FLOATINGPOINT By default, floating point support in printf, sscanf, etc. is disabled. +choice + prompt "Newline Options" + default EOL_IS_EITHER_CRLF + ---help--- + This selection determines the line terminating character that is used. + Some environments may return CR as end-of-line, others LF, and others + both. If not specified, the default is either CR or LF (but not both) + as the line terminating charactor. + +config EOL_IS_CR + bool "EOL is CR" + +config EOL_IS_LF + bool "EOL is LF" + +config EOL_IS_BOTH_CRLF + bool "EOL is CR and LF" + +config EOL_IS_EITHER_CRLF + bool "EOL is CR or LF" + +endchoice + config LIBC_STRERROR bool "Enable strerror" default n diff --git a/nuttx/lib/stdio/lib_fgets.c b/nuttx/lib/stdio/lib_fgets.c index e84e031f9..a4f9089ed 100644 --- a/nuttx/lib/stdio/lib_fgets.c +++ b/nuttx/lib/stdio/lib_fgets.c @@ -50,13 +50,32 @@ * Definitions ****************************************************************************/ /* Some environments may return CR as end-of-line, others LF, and others - * both. The logic here assumes either but not both. + * both. If not specified, the logic here assumes either (but not both) as + * the default. */ -#undef CONFIG_EOL_IS_CR -#undef CONFIG_EOL_IS_LF -#undef CONFIG_EOL_IS_BOTH_CRLF -#define CONFIG_EOL_IS_EITHER_CRLF 1 +#if defined(CONFIG_EOL_IS_CR) +# undef CONFIG_EOL_IS_LF +# undef CONFIG_EOL_IS_BOTH_CRLF +# undef CONFIG_EOL_IS_EITHER_CRLF +#elif defined(CONFIG_EOL_IS_LF) +# undef CONFIG_EOL_IS_CR +# undef CONFIG_EOL_IS_BOTH_CRLF +# undef CONFIG_EOL_IS_EITHER_CRLF +#elif defined(CONFIG_EOL_IS_BOTH_CRLF) +# undef CONFIG_EOL_IS_CR +# undef CONFIG_EOL_IS_LF +# undef CONFIG_EOL_IS_EITHER_CRLF +#elif defined(CONFIG_EOL_IS_EITHER_CRLF) +# undef CONFIG_EOL_IS_CR +# undef CONFIG_EOL_IS_LF +# undef CONFIG_EOL_IS_BOTH_CRLF +#else +# undef CONFIG_EOL_IS_CR +# undef CONFIG_EOL_IS_LF +# undef CONFIG_EOL_IS_BOTH_CRLF +# define CONFIG_EOL_IS_EITHER_CRLF 1 +#endif /**************************************************************************** * Private Type Declarations diff --git a/nuttx/net/Kconfig b/nuttx/net/Kconfig index d8e7e1b04..267045402 100644 --- a/nuttx/net/Kconfig +++ b/nuttx/net/Kconfig @@ -9,14 +9,14 @@ config NET ---help--- Enable or disable all network features -config ARCH_HAS_PHY +config ARCH_HAVE_PHY bool if NET choice prompt "Board PHY Selection" - depends on ARCH_HAS_PHY + depends on ARCH_HAVE_PHY default PHY_KS8721 config PHY_KS8721 |