summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGregory Nutt <gnutt@nuttx.org>2014-03-01 12:12:07 -0600
committerGregory Nutt <gnutt@nuttx.org>2014-03-01 12:12:07 -0600
commiteb68a41ac6216d038e5c3b56d3c39d6516714de8 (patch)
tree5d6ae26cbd8a20ac65a38d58337ed6cd2d5ba1ca
parentd9a83782704fb7781c378d53f71f1296bb17c77d (diff)
downloadnuttx-eb68a41ac6216d038e5c3b56d3c39d6516714de8.tar.gz
nuttx-eb68a41ac6216d038e5c3b56d3c39d6516714de8.tar.bz2
nuttx-eb68a41ac6216d038e5c3b56d3c39d6516714de8.zip
configs/ubw32/nsh converted to use the kconfig-frontends tools
-rw-r--r--nuttx/ChangeLog2
-rw-r--r--nuttx/configs/ubw32/README.txt69
-rw-r--r--nuttx/configs/ubw32/nsh/defconfig222
3 files changed, 57 insertions, 236 deletions
diff --git a/nuttx/ChangeLog b/nuttx/ChangeLog
index 43d6b8313..0b3b83e07 100644
--- a/nuttx/ChangeLog
+++ b/nuttx/ChangeLog
@@ -6720,4 +6720,6 @@
kconfig-frontends tools (2014-3-1)
* configs/pic32mx7mmb/nsh: Configuration converted to use the
kconfig-frontends tools (2014-3-1).
+ * configs/ubw32/nsh: Configuration converted to use the kconfig-frontends
+ tools (2014-3-1).
diff --git a/nuttx/configs/ubw32/README.txt b/nuttx/configs/ubw32/README.txt
index 9cca13704..ff0642f37 100644
--- a/nuttx/configs/ubw32/README.txt
+++ b/nuttx/configs/ubw32/README.txt
@@ -580,48 +580,57 @@ selected as follow:
Where <subdir> is one of the following:
nsh:
- ====
- Description.
- ------------
+
This is the NuttShell (NSH) using the NSH startup logic at
apps/examples/nsh.
- Serial Output.
- --------------
- The OS test produces all of its test output on the serial console.
- This configuration has UART1 enabled as a serial console.
+ NOTES:
+
+ 1. This configuration uses the mconf-based configuration tool. To
+ change this configurations using that tool, you should:
+
+ a. Build and install the kconfig-mconf tool. See nuttx/README.txt
+ and misc/tools/
+
+ b. Execute 'make menuconfig' in nuttx/ in order to start the
+ reconfiguration process.
- TX -- J4 pin 31: U1TX/RF8
- RX -- J4 pin 30: U1RX/RF2
- GND -- J4 pin 40: GND
- Vcc -- J4 pin 39: 5V
+ 2. Serial Output
+
+ The OS test produces all of its test output on the serial console.
+ This configuration has UART1 enabled as a serial console.
+
+ TX -- J4 pin 31: U1TX/RF8
+ RX -- J4 pin 30: U1RX/RF2
+ GND -- J4 pin 40: GND
+ Vcc -- J4 pin 39: 5V
- USB Configuations.
- -----------------
- Several USB device configurations can be enabled and included
- as NSH built-in built in functions.
+ 3. USB Configuations
+
+ Several USB device configurations can be enabled and included
+ as NSH built-in built in functions.
- All USB device configurations require the following basic setup in
- your NuttX configuration file to enable USB device support:
+ All USB device configurations require the following basic setup in
+ your NuttX configuration file to enable USB device support:
- CONFIG_USBDEV=y : Enable basic USB device support
- CONFIG_PIC32MX_USBDEV=y : Enable PIC32 USB device support
+ CONFIG_USBDEV=y : Enable basic USB device support
+ CONFIG_PIC32MX_USBDEV=y : Enable PIC32 USB device support
- examples/usbterm - This option can be enabled by uncommenting
- the following line in the appconfig file:
+ examples/usbterm - This option can be enabled by adding the
+ following to the NuttX configuration file:
- CONFIGURED_APPS += examples/usbterm
+ CONFIG_EXAMPLES_USBTERM=y
- And by enabling one of the USB serial devices:
+ And by enabling one of the USB serial devices:
- CONFIG_PL2303=y : Enable the Prolifics PL2303 emulation
- CONFIG_CDCACM=y : or the CDC/ACM serial driver (not both)
+ CONFIG_PL2303=y : Enable the Prolifics PL2303 emulation
+ CONFIG_CDCACM=y : or the CDC/ACM serial driver (not both)
- system/cdcacm - The system/cdcacm program can be included as an
- function by uncommenting the following line in the appconfig file:
+ system/cdcacm - The system/cdcacm program can be included as an
+ function by adding the following to the NuttX configuration file:
- CONFIGURED_APPS += system/cdcacm
+ CONFIG_SYSTEM_CDCACM=y
- and defining the following in your .config file:
+ and defining the following in your .config file:
- CONFIG_CDCACM=y : Enable the CDCACM device
+ CONFIG_CDCACM=y : Enable the CDCACM device
diff --git a/nuttx/configs/ubw32/nsh/defconfig b/nuttx/configs/ubw32/nsh/defconfig
index a07fbf34d..531b57cf9 100644
--- a/nuttx/configs/ubw32/nsh/defconfig
+++ b/nuttx/configs/ubw32/nsh/defconfig
@@ -32,6 +32,18 @@
# POSSIBILITY OF SUCH DAMAGE.
#
############################################################################
+
+CONFIG_EXAMPLES_NSH=y
+CONFIG_NSH_READLINE=y
+# CONFIG_NSH_CLE is not set
+CONFIG_SYSTEM_READLINE=y
+# CONFIG_SYSTEM_CLE is not set
+CONFIG_NSH_LIBRARY=y
+
+CONFIG_HOST_WINDOWS=y
+CONFIG_WINDOWS_CYGWIN=y
+
+############################################################################
#
# Architecture Selection
#
@@ -65,10 +77,10 @@ CONFIG_ARCH_RAMFUNCS=n
#
# Identify toolchain and linker options
#
-CONFIG_PIC32MX_MICROCHIPW=n
-CONFIG_PIC32MX_MICROCHIPL=n
-CONFIG_PIC32MX_MICROCHIPW_LITE=y
-CONFIG_PIC32MX_MICROCHIPL_LITE=n
+CONFIG_MIPS32_TOOLCHAIN_MICROCHIPW=n
+CONFIG_MIPS32_TOOLCHAIN_MICROCHIPL=n
+CONFIG_MIPS32_TOOLCHAIN_MICROCHIPW_LITE=y
+CONFIG_MIPS32_TOOLCHAIN_MICROCHIPL_LITE=n
#
# Individual subsystems can be enabled:
@@ -120,25 +132,18 @@ CONFIG_PIC32MX_ICESEL=1
# PIC32MX specific serial device driver settings
#
CONFIG_UART1_SERIAL_CONSOLE=y
-CONFIG_UART2_SERIAL_CONSOLE=n
CONFIG_UART1_TXBUFSIZE=256
-CONFIG_UART2_TXBUFSIZE=256
CONFIG_UART1_RXBUFSIZE=256
-CONFIG_UART2_RXBUFSIZE=256
CONFIG_UART1_BAUD=115200
-CONFIG_UART2_BAUD=115200
CONFIG_UART1_BITS=8
-CONFIG_UART2_BITS=8
CONFIG_UART1_PARITY=0
-CONFIG_UART2_PARITY=0
CONFIG_UART1_2STOP=0
-CONFIG_UART2_2STOP=0
#
# General build options
@@ -171,28 +176,13 @@ CONFIG_JULIAN_TIME=n
CONFIG_DEV_CONSOLE=y
CONFIG_DEV_LOWCONSOLE=n
CONFIG_MUTEX_TYPES=n
-CONFIG_PRIORITY_INHERITANCE=n
-CONFIG_SEM_PREALLOCHOLDERS=0
-CONFIG_SEM_NNESTPRIO=0
CONFIG_FDCLONE_DISABLE=n
CONFIG_FDCLONE_STDIO=n
CONFIG_SDCLONE_DISABLE=y
-CONFIG_SCHED_WORKQUEUE=n
-CONFIG_SCHED_WORKPRIORITY=192
-CONFIG_SCHED_WORKPERIOD=50000
-CONFIG_SCHED_WORKSTACKSIZE=1024
-CONFIG_SIG_SIGWORK=17
CONFIG_SCHED_WAITPID=y
CONFIG_SCHED_ATEXIT=n
#
-# Settings for nxflat
-#
-CONFIG_NXFLAT=n
-CONFIG_NXFLAT_DUMPBUFFER=n
-CONFIG_SYMTAB_ORDEREDBYNAME=y
-
-#
# The following can be used to disable categories of
# APIs supported by the OS. If the compiler supports
# weak functions, then it should not be necessary to
@@ -271,15 +261,12 @@ CONFIG_FS_ROMFS=n
#
CONFIG_MMCSD=y
-CONFIG_MMCSD_SPI=y
-CONFIG_MTD=y
#
# SPI-based MMC/SD driver
#
CONFIG_MMCSD_NSLOTS=1
CONFIG_MMCSD_READONLY=n
-CONFIG_MMCSD_SPICLOCK=12500000
#
# Block driver buffering
@@ -295,130 +282,6 @@ CONFIG_MMCSD_MMCSUPPORT=n
CONFIG_MMCSD_HAVECARDDETECT=n
#
-# TCP/IP and UDP support via uIP
-#
-CONFIG_NET=n
-CONFIG_NET_IPv6=n
-CONFIG_NSOCKET_DESCRIPTORS=0
-CONFIG_NET_SOCKOPTS=y
-CONFIG_NET_BUFSIZE=420
-CONFIG_NET_TCP=n
-CONFIG_NET_TCP_CONNS=40
-CONFIG_NET_MAX_LISTENPORTS=40
-CONFIG_NET_UDP=n
-CONFIG_NET_UDP_CHECKSUMS=y
-#CONFIG_NET_UDP_CONNS=10
-CONFIG_NET_ICMP=n
-CONFIG_NET_ICMP_PING=n
-#CONFIG_NET_PINGADDRCONF=0
-CONFIG_NET_STATISTICS=y
-#CONFIG_NET_RECEIVE_WINDOW=
-#CONFIG_NET_ARPTAB_SIZE=8
-CONFIG_NET_BROADCAST=n
-
-#
-# UIP Network Utilities
-#
-CONFIG_NET_DHCP_LIGHT=n
-CONFIG_NET_RESOLV_ENTRIES=4
-
-#
-# USB Device Configuration
-#
-CONFIG_USBDEV=n
-CONFIG_USBDEV_ISOCHRONOUS=n
-CONFIG_USBDEV_DUALSPEED=n
-CONFIG_USBDEV_SELFPOWERED=y
-CONFIG_USBDEV_REMOTEWAKEUP=n
-CONFIG_USBDEV_MAXPOWER=100
-CONFIG_USBDEV_TRACE=n
-CONFIG_USBDEV_TRACE_NRECORDS=128
-
-#
-# USB Serial Device Configuration
-#
-CONFIG_PL2303=n
-CONFIG_PL2303_EPINTIN=1
-CONFIG_PL2303_EPBULKOUT=2
-CONFIG_PL2303_EPBULKIN=5
-CONFIG_PL2303_NWRREQS=4
-CONFIG_PL2303_NRDREQS=4
-CONFIG_PL2303_VENDORID=0x067b
-CONFIG_PL2303_PRODUCTID=0x2303
-CONFIG_PL2303_VENDORSTR="Nuttx"
-CONFIG_PL2303_PRODUCTSTR="USBdev Serial"
-CONFIG_PL2303_RXBUFSIZE=512
-CONFIG_PL2303_TXBUFSIZE=512
-
-#
-# USB serial device class driver (Standard CDC ACM class)
-#
-CONFIG_CDCACM=n
-CONFIG_CDCACM_CONSOLE=n
-#CONFIG_CDCACM_EP0MAXPACKET
-CONFIG_CDCACM_EPINTIN=1
-#CONFIG_CDCACM_EPINTIN_FSSIZE
-#CONFIG_CDCACM_EPINTIN_HSSIZE
-CONFIG_CDCACM_EPBULKOUT=3
-#CONFIG_CDCACM_EPBULKOUT_FSSIZE
-#CONFIG_CDCACM_EPBULKOUT_HSSIZE
-CONFIG_CDCACM_EPBULKIN=2
-#CONFIG_CDCACM_EPBULKIN_FSSIZE
-#CONFIG_CDCACM_EPBULKIN_HSSIZE
-#CONFIG_CDCACM_NWRREQS
-#CONFIG_CDCACM_NRDREQS
-#CONFIG_CDCACM_VENDORID
-#CONFIG_CDCACM_VENDORSTR
-#CONFIG_CDCACM_PRODUCTID
-#CONFIG_CDCACM_PRODUCTSTR
-#CONFIG_CDCACM_RXBUFSIZE
-#CONFIG_CDCACM_TXBUFSIZE
-
-#
-# USB Storage Device Configuration
-#
-CONFIG_USBMSC=n
-CONFIG_USBMSC_EP0MAXPACKET=64
-CONFIG_USBMSC_EPBULKOUT=1
-CONFIG_USBMSC_EPBULKIN=2
-CONFIG_USBMSC_NRDREQS=8
-CONFIG_USBMSC_NWRREQS=2
-CONFIG_USBMSC_BULKINREQLEN=256
-CONFIG_USBMSC_BULKOUTREQLEN=64
-CONFIG_USBMSC_VENDORID=0x584e
-CONFIG_USBMSC_VENDORSTR="NuttX"
-CONFIG_USBMSC_PRODUCTID=0x5342
-CONFIG_USBMSC_PRODUCTSTR="USBdev Storage"
-CONFIG_USBMSC_VERSIONNO=0x0399
-CONFIG_USBMSC_REMOVABLE=y
-
-#
-# Settings for examples/uip
-#
-CONFIG_EXAMPLES_UIP_IPADDR=0x0a000002
-CONFIG_EXAMPLES_UIP_DRIPADDR=0x0a000001
-CONFIG_EXAMPLES_UIP_NETMASK=0xffffff00
-CONFIG_EXAMPLES_UIP_DHCPC=n
-
-#
-# Settings for examples/nettest
-#
-CONFIG_EXAMPLES_NETTEST_SERVER=n
-CONFIG_EXAMPLES_NETTEST_PERFORMANCE=n
-CONFIG_EXAMPLES_NETTEST_NOMAC=y
-CONFIG_EXAMPLES_NETTEST_IPADDR=0x0a000002
-CONFIG_EXAMPLES_NETTEST_DRIPADDR=0x0a000001
-CONFIG_EXAMPLES_NETTEST_NETMASK=0xffffff00
-CONFIG_EXAMPLES_NETTEST_CLIENTIP=0x0a000001
-
-#
-# Settings for examples/ostest
-#
-CONFIG_EXAMPLES_OSTEST_LOOPS=1
-CONFIG_EXAMPLES_OSTEST_STACKSIZE=2048
-CONFIG_EXAMPLES_OSTEST_NBARRIER_THREADS=3
-
-#
# Settings for apps/nshlib
#
CONFIG_BUILTIN=y
@@ -433,67 +296,14 @@ CONFIG_NSH_ROMFSETC=n
CONFIG_NSH_CONSOLE=y
CONFIG_NSH_TELNET=n
CONFIG_NSH_ARCHINIT=y
-CONFIG_NSH_IOBUFFER_SIZE=512
-CONFIG_NSH_DHCPC=n
-CONFIG_NSH_NOMAC=n
-CONFIG_NSH_IPADDR=0x0a000002
-CONFIG_NSH_DRIPADDR=0x0a000001
-CONFIG_NSH_NETMASK=0xffffff00
-CONFIG_NSH_ROMFSMOUNTPT="/etc"
-CONFIG_NSH_INITSCRIPT="init.d/rcS"
-CONFIG_NSH_ROMFSDEVNO=0
-CONFIG_NSH_ROMFSSECTSIZE=64
-CONFIG_NSH_FATDEVNO=1
-CONFIG_NSH_FATSECTSIZE=512
-CONFIG_NSH_FATNSECTORS=1024
-CONFIG_NSH_FATMOUNTPT="/tmp"
#
# Architecture-specific NSH options
#
-CONFIG_NSH_MMCSDSPIPORTNO=1
CONFIG_NSH_MMCSDSLOTNO=0
CONFIG_NSH_MMCSDMINOR=0
#
-# Settings for examples/usbserial
-#
-CONFIG_EXAMPLES_USBSERIAL_INONLY=n
-CONFIG_EXAMPLES_USBSERIAL_OUTONLY=n
-CONFIG_EXAMPLES_USBSERIAL_ONLYSMALL=n
-CONFIG_EXAMPLES_USBSERIAL_ONLYBIG=n
-
-CONFIG_EXAMPLES_USBSERIAL_TRACEINIT=n
-CONFIG_EXAMPLES_USBSERIAL_TRACECLASS=n
-CONFIG_EXAMPLES_USBSERIAL_TRACETRANSFERS=n
-CONFIG_EXAMPLES_USBSERIAL_TRACECONTROLLER=n
-CONFIG_EXAMPLES_USBSERIAL_TRACEINTERRUPTS=n
-
-#
-# Settings for system/usbmsc
-#
-CONFIG_SYSTEM_USBMSC_NLUNS=1
-CONFIG_SYSTEM_USBMSC_DEVMINOR1=0
-CONFIG_SYSTEM_USBMSC_DEVPATH1="/dev/mmcsd0"
-CONFIG_SYSTEM_USBMSC_TRACEINIT=n
-CONFIG_SYSTEM_USBMSC_TRACECLASS=n
-CONFIG_SYSTEM_USBMSC_TRACETRANSFERS=n
-CONFIG_SYSTEM_USBMSC_TRACECONTROLLER=n
-CONFIG_SYSTEM_USBMSC_TRACEINTERRUPTS=n
-
-#
-# Settings for system/cdcacm
-#
-# Configuration prequisites:
-#
-CONFIG_SYSTEM_CDCACM_DEVMINOR=0
-CONFIG_SYSTEM_CDCACM_TRACEINIT=n
-CONFIG_SYSTEM_CDCACM_TRACECLASS=n
-CONFIG_SYSTEM_CDCACM_TRACETRANSFERS=n
-CONFIG_SYSTEM_CDCACM_TRACECONTROLLER=n
-CONFIG_SYSTEM_CDCACM_TRACEINTERRUPTS=n
-
-#
# Stack and heap information
#
CONFIG_BOOT_RUNFROMFLASH=n