Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-05-21 04:52:02 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Shenzhou board is first to use ONLY Kconfig for configuration

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5114 42af7a65-404d-4744-a932-0658087f49c3
This commit is contained in:
patacongo
2012-09-08 13:56:21 +00:00
parent f39a3c9417
commit a93d7eb69e
38 changed files with 1243 additions and 280 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Documentation/NuttxPortingGuide.html
-3
View File
@@ -4578,9 +4578,6 @@ build
<li>
<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>
arch/arm/src/lpc17xx/Kconfig
+6 -6
View File
@@ -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
arch/arm/src/lpc31xx/Kconfig
+1 -1
View File
@@ -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"
arch/arm/src/lpc43xx/Kconfig
+4 -4
View File
@@ -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
arch/arm/src/stm32/Kconfig
+49 -20
View File
@@ -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"
arch/avr/Kconfig
+2 -2
View File
@@ -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
arch/mips/src/pic32mx/Kconfig
+7 -7
View File
@@ -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)"
configs/Kconfig
+21
View File
@@ -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
configs/README.txt
-1
View File
@@ -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
configs/ea3131/src/up_nsh.c
+7 -7
View File
@@ -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;
configs/ea3152/src/up_nsh.c
+7 -7
View File
@@ -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;
configs/eagle100/src/up_nsh.c
+6 -6
View File
@@ -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
configs/hymini-stm32v/src/up_nsh.c
+8 -8
View File
@@ -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",
configs/kwikstik-k40/src/up_nsh.c
+11 -11
View File
@@ -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.
configs/lm3s6965-ek/src/up_nsh.c
+6 -6
View File
@@ -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
configs/lm3s8962-ek/src/up_nsh.c
+6 -6
View File
@@ -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
configs/lpcxpresso-lpc1768/src/up_nsh.c
+9 -9
View File
@@ -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;
configs/mbed/src/up_nsh.c
+3 -3
View File
@@ -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 ********************************************************************/
configs/mcu123-lpc214x/src/up_nsh.c
+6 -6
View File
@@ -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
configs/mirtoo/src/up_nsh.c
+3 -3
View File
@@ -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");
configs/nucleus2g/src/up_nsh.c
+6 -6
View File
@@ -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
configs/olimex-lpc1766stk/src/up_nsh.c
+12 -12
View File
@@ -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;
configs/olimex-lpc2378/src/up_nsh.c
+4 -4
View File
@@ -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
configs/olimex-stm32-p107/nsh/defconfig
-1
View File
@@ -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
configs/olimex-strp711/src/up_nsh.c
+8 -8
View File
@@ -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 */
configs/pic32-starterkit/src/up_nsh.c
+17 -17
View File
@@ -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;
configs/pic32mx7mmb/src/up_nsh.c
+16 -16
View File
@@ -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;
configs/sam3u-ek/src/up_nsh.c
+7 -7
View File
@@ -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;
configs/shenzhou/README.txt
-1
View File
@@ -480,7 +480,6 @@ Shenzhou-specific Configuration Options
APB1 (low speed)
----------------
CONFIG_STM32_RTC
CONFIG_STM32_BKP
CONFIG_STM32_TIM2
CONFIG_STM32_TIM3
configs/shenzhou/nsh/defconfig
+883
View File
File diff suppressed because it is too large Load Diff
configs/stm3210e-eval/src/up_nsh.c
+8 -8
View File
@@ -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",
configs/sure-pic32mx/src/up_nsh.c
+12 -12
View File
@@ -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;
configs/twr-k60n512/src/up_nsh.c
+11 -11
View File
@@ -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 */
drivers/serial/Kconfig
+48 -48
View File
@@ -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"
fs/fat/Kconfig
-6
View File
@@ -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
lib/Kconfig
+23
View File
@@ -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
lib/stdio/lib_fgets.c
+24 -5
View File
@@ -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
net/Kconfig
+2 -2
View File
@@ -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