Convert configs/pirelli_dpl10/nsh_highram to use the kconfig-frontends tools

ChangeLog

@@ -4670,4 +4670,7 @@
 	  capability (when possible) and to use 4KB sectors for the erase block
 	  size when the part supports it (Ken Pettit, 2013-5-3).
 	* configs/pirelli_dpl10: Adds a configuration for the pirelli phone
-	  (from Alan Alan Carvalho de Assis, 2013-5-3).
+	  (from Craig Comstock via Alan Alan Carvalho de Assis, 2013-5-3).
+	* arch/arm/src/calypso:  Fix some compilation warnings (2013-5-5).
+	* configs/pirelli_dpl10/nsh_highram:  Converted to use the
+	  kconfig-frontends tools (2013-5-5).

arch/arm/src/calypso/Kconfig

@@ -4,3 +4,109 @@
 #
 
 comment "Calypso Configuration Options"
+
+menu "Modem UART Configuration"
+
+config UART_MODEM_BAUD
+	int "Modem UART BAUD"
+	default 115200
+
+config UART_MODEM_PARITY
+	int "Modem UART parity"
+	default 0
+	---help---
+		Modem UART parity.  0=None, 1=Odd, 2=Even.  Default: None
+
+config UART_MODEM_BITS
+	int "Modem UART number of bits"
+	default 8
+	---help---
+		Modem UART number of bits.  Default: 8
+
+config UART_MODEM_2STOP
+	int "Modem UART two stop bits"
+	default 0
+	---help---
+		0=1 stop bit, 1=Two stop bits.  Default: 1 stop bit
+
+config UART_MODEM_RXBUFSIZE
+	int "Modem UART Rx buffer size"
+	default 256
+	---help---
+		Modem UART Rx buffer size.  Default: 256
+
+config UART_MODEM_TXBUFSIZE
+	int "Modem UART Tx buffer size"
+	default 256
+	---help---
+		Modem UART Tx buffer size.  Default: 256
+
+config UART_MODEM_HWFLOWCONTROL
+	bool "Hardware flow control"
+	default n
+	---help---
+		Enabled Modem UART hardware flow control. Default: n
+
+endmenu
+
+menu "IrDA UART Configuration"
+
+config UART_IRDA_BAUD
+	int "IrDA UART BAUD"
+	default 115200
+
+config UART_IRDA_PARITY
+	int "IrDA UART parity"
+	default 0
+	---help---
+		IrDA UART parity.  0=None, 1=Odd, 2=Even.  Default: None
+
+config UART_IRDA_BITS
+	int "IrDA UART number of bits"
+	default 8
+	---help---
+		IrDA UART number of bits.  Default: 8
+
+config UART_IRDA_2STOP
+	int "IrDA UART two stop bits"
+	default 0
+	---help---
+		0=1 stop bit, 1=Two stop bits.  Default: 1 stop bit
+
+config UART_IRDA_RXBUFSIZE
+	int "IrDA UART Rx buffer size"
+	default 256
+	---help---
+		IrDA UART Rx buffer size.  Default: 256
+
+config UART_IRDA_TXBUFSIZE
+	int "IrDA UART Tx buffer size"
+	default 256
+	---help---
+		IrDA UART Tx buffer size.  Default: 256
+
+config UART_IRDA_HWFLOWCONTROL
+	bool "Hardware flow control"
+	default n
+	---help---
+		Enabled IrDA UART hardware flow control. Default: n
+
+endmenu
+
+choice
+	prompt "Serial Console Selection"
+	default SERIAL_CONSOLE_NONE
+
+config SERCOMM_CONSOLE
+	bool "SERCOMM console"
+
+config SERIAL_MODEM_CONSOLE
+	bool "Serial console on modem UART"
+
+config SERIAL_IRDA_CONSOLE
+	bool "Serial console on IrDA UART"
+
+config SERIAL_CONSOLE_NONE
+	bool "No serial console"
+
+endchoice

configs/compal_e88/nsh_highram/defconfig

@@ -70,7 +70,7 @@ CONFIG_UART_IRDA_PARITY=0
 CONFIG_UART_MODEM_PARITY=0
 CONFIG_UART_IRDA_2STOP=0
 CONFIG_UART_MODEM_2STOP=0
-CONFIG_STDIO_LINE_BUFFER=y
+CONFIG_STDIO_LINEBUFFER=y
 
 #
 # C5471 Ethernet Driver settings

configs/compal_e99/nsh_compalram/defconfig

@@ -73,7 +73,7 @@ CONFIG_UART_IRDA_PARITY=0
 CONFIG_UART_MODEM_PARITY=0
 CONFIG_UART_IRDA_2STOP=0
 CONFIG_UART_MODEM_2STOP=0
-CONFIG_STDIO_LINE_BUFFER=y
+CONFIG_STDIO_LINEBUFFER=y
 
 #
 # C5471 Ethernet Driver settings

configs/compal_e99/nsh_highram/defconfig

@@ -73,7 +73,7 @@ CONFIG_UART_IRDA_PARITY=0
 CONFIG_UART_MODEM_PARITY=0
 CONFIG_UART_IRDA_2STOP=0
 CONFIG_UART_MODEM_2STOP=0
-CONFIG_STDIO_LINE_BUFFER=y
+CONFIG_STDIO_LINEBUFFER=y
 
 #
 # C5471 Ethernet Driver settings

configs/pirelli_dpl10/nsh_highram/appconfig

@@ -1,43 +0,0 @@
-############################################################################
-# configs/pirelli_dpl10/nsh_highram/appconfig
-#
-#   Copyright (C) 2011, 2013 Gregory Nutt. All rights reserved.
-#   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in
-#    the documentation and/or other materials provided with the
-#    distribution.
-# 3. Neither the name NuttX nor the names of its contributors may be
-#    used to endorse or promote products derived from this software
-#    without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
-# OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
-# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-#
-############################################################################
-
-# NSH shell
-CONFIGURED_APPS += examples/nsh
-CONFIGURED_APPS += system/readline
-CONFIGURED_APPS += nshlib
-
-# Path to example in apps/examples
-CONFIGURED_APPS += examples/hello
-CONFIGURED_APPS += vsn/poweroff

configs/pirelli_dpl10/nsh_highram/setenv.sh

@@ -32,15 +32,31 @@
 # POSSIBILITY OF SUCH DAMAGE.
 #
 
-if [ "$(basename $0)" = "setenv.sh" ] ; then
+if [ "$_" = "$0" ] ; then
   echo "You must source this script, not run it!" 1>&2
   exit 1
 fi
 
-if [ -z ${PATH_ORIG} ]; then export PATH_ORIG=${PATH}; fi
-
 WD=`pwd`
-export BUILDROOT_BIN=${WD}/../buildroot/build_arm_nofpu/staging_dir/bin
-export PATH=${BUILDROOT_BIN}:/sbin:/usr/sbin:${PATH_ORIG}
+if [ ! -x "setenv.sh" ]; then
+  echo "This script must be executed from the top-level NuttX build directory"
+  exit 1
+fi
+
+if [ -z "${PATH_ORIG}" ]; then
+  export PATH_ORIG="${PATH}"
+fi
+
+# This is the Cygwin path to the location where I installed the CodeSourcery
+# toolchain under windows.  You will also have to edit this if you install
+# the CodeSourcery toolchain in any other location
+#export TOOLCHAIN_BIN="/cygdrive/c/Program Files (x86)/CodeSourcery/Sourcery G++ Lite/bin"
+
+# This is the Cygwin path to the location where I build the buildroot
+# toolchain.
+export TOOLCHAIN_BIN="${WD}/../misc/buildroot/build_arm_nofpu/staging_dir/bin"
+
+# Add the path to the toolchain to the PATH varialble
+export PATH="${TOOLCHAIN_BIN}:/sbin:/usr/sbin:${PATH_ORIG}"
 
 echo "PATH : ${PATH}"