All ZNEO configurations converted to use the mconf/Kconfig tool

git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5401 42af7a65-404d-4744-a932-0658087f49c3

ChangeLog

@@ -3712,3 +3712,7 @@
 	  From Freddie Chopin.
 	* z8encore000zco/ostest and z8f64200100kit/ostest:  Can now be modified to
 	  support the Windows native builds (see corresponding README.txt files).
+	* configures/z16f2800100zcog - All configurations updated to use the ZDS-II
+	  5.0.1 toolchain.
+	* configures/z16f2800100zcog - All configurations updated to use Kconfig/mconf
+	  configuration tools.

arch/Kconfig

@@ -111,6 +111,10 @@ config ARCH_DMA
 	bool
 	default n
 
+config ARCH_IRQPRIO
+	bool
+	default n
+
 config ARCH_STACKDUMP
 	bool "Dump stack on assertions"
 	default n

arch/arm/Kconfig

@@ -46,6 +46,7 @@ config ARCH_CHIP_KINETIS
 	bool "Freescale Kinetis"
 	select ARCH_CORTEXM4
 	select ARCH_HAVE_MPU
+	select ARCH_IRQPRIO
 	---help---
 		Freescale Kinetis Architectures (ARM Cortex-M4)
 
@@ -53,6 +54,7 @@ config ARCH_CHIP_LM3S
 	bool "TI Stellaris"
 	select ARCH_CORTEXM3
 	select ARCH_HAVE_MPU
+	select ARCH_IRQPRIO
 	---help---
 		TI Stellaris LMS3 architecutres (ARM Cortex-M3)
 
@@ -60,6 +62,7 @@ config ARCH_CHIP_LPC17XX
 	bool "NXP LPC17xx"
 	select ARCH_CORTEXM3
 	select ARCH_HAVE_MPU
+	select ARCH_IRQPRIO
 	---help---
 		NXP LPC17xx architectures (ARM Cortex-M3)
 
@@ -91,6 +94,7 @@ config ARCH_CHIP_LPC43XX
 	select ARCH_HAVE_CMNVECTOR
 	select ARMV7M_CMNVECTOR
 	select ARCH_HAVE_MPU
+	select ARCH_IRQPRIO
 	---help---
 		NPX LPC43XX architectures (ARM Cortex-M4).
 
@@ -98,6 +102,7 @@ config ARCH_CHIP_SAM3U
 	bool "Atmel AT91SAM3U"
 	select ARCH_CORTEXM3
 	select ARCH_HAVE_MPU
+	select ARCH_IRQPRIO
 	---help---
 		Atmel AT91SAM3U architectures (ARM Cortex-M3)
 
@@ -222,12 +227,6 @@ config PAGING
 		If set =y in your configation file, this setting will enable the on-demand
 		paging feature as described in http://www.nuttx.org/NuttXDemandPaging.html.
 
-config ARCH_IRQPRIO
-	bool "Interrupt priority"
-	default y		if ARCH_CORTEXM3 || ARCH_CORTEXM4
-	---help---
-		Select if your board supports interrupt prioritization.
-
 config BOARD_LOOPSPERMSEC
 	int "Delay loops per millisecond"
 	default 5000

arch/mips/Kconfig

@@ -10,6 +10,8 @@ choice
 
 config ARCH_CHIP_PIC32MX
 	bool "PIC32MX"
+	select ARCH_MIPS32
+	select ARCH_IRQPRIO
 	---help---
 		Microchip PIC32MX320F032H (MIPS32)
 
@@ -17,7 +19,7 @@ endchoice
 
 config ARCH_MIPS32
 	bool
-	default y		if ARCH_CHIP_PIC32MX
+	default n
 
 config ARCH_FAMILY
 	string
@@ -27,12 +29,6 @@ config ARCH_CHIP
 	string
 	default "pic32mx"	if ARCH_CHIP_PIC32MX
 
-config ARCH_IRQPRIO
-	bool "Interrupt priority"
-	default y		if ARCH_CHIP_PIC32MX
-	---help---
-		Select if your board supports interrupt prioritization.
-
 config BOARD_LOOPSPERMSEC
 	int "Delay loops per millisecond"
 	default 5000

arch/z16/Kconfig

@@ -12,21 +12,29 @@ choice
 
 config ARCH_CHIP_Z16F2810
 	bool "Z16F2810"
+	select ARCH_CHIP_Z16F
+	select ARCH_IRQPRIO
 	---help---
 		ZiLOG Z16F2810
 
 config ARCH_CHIP_Z16F2811
 	bool "Z16F2811"
+	select ARCH_CHIP_Z16F
+	select ARCH_IRQPRIO
 	---help---
 		ZiLOG Z16F2811
 
 config ARCH_CHIP_Z16F3211
-	bool "Z16F321"
+	bool "Z16F3211"
+	select ARCH_CHIP_Z16F
+	select ARCH_IRQPRIO
 	---help---
 		ZiLOG Z16F321
 
 config ARCH_CHIP_Z16F6411
 	bool "Z16F6411"
+	select ARCH_CHIP_Z16F
+	select ARCH_IRQPRIO
 	---help---
 		ZiLOG Z16F6411
 
@@ -34,7 +42,6 @@ endchoice
 
 config ARCH_CHIP_Z16F
 	bool
-	default y			if ARCH_CHIP_Z16F2810 || ARCH_CHIP_Z16F2811 || ARCH_CHIP_Z16F3211 || ARCH_CHIP_Z16F6411
 
 config ARCH_CHIP
 	string

arch/z16/src/z16f/Kconfig

@@ -6,4 +6,16 @@
 if ARCH_CHIP_Z16F
 comment "Z16F Configuration Options"
 
+# UART0/1 always enabled
+
+config Z16F_UART0
+	bool
+	default y
+	select ARCH_HAVE_UART0
+
+config Z16F_UART1
+	bool
+	default y
+	select ARCH_HAVE_UART1
+
 endif

configs/Kconfig

@@ -555,7 +555,7 @@ config ARCH_BOARD_XTRS
 
 config ARCH_BOARD_Z16F2800100ZCOG
 	bool "Zilog Z16F2800100ZCOG Development Kit"
-	depends on ARCH_CHIP_Z16F281
+	depends on ARCH_CHIP_Z16F2811
 	select ARCH_HAVE_LEDS
 	---help---
 		z16f Microcontroller.  This port use the ZiLIG z16f2800100zcog

configs/cloudctrl/nsh/defconfig

@@ -569,8 +569,8 @@ CONFIG_EXAMPLES_NSH=y
 #
 # Interpreters
 #
-# CONFIG_FICL is not set
+# CONFIG_INTERPRETERS_FICL is not set
-# CONFIG_PCODE is not set
+# CONFIG_INTERPRETERS_PCODE is not set
 
 #
 # Network Utilities

configs/ez80f910200kitg/README.txt

@@ -116,8 +116,8 @@ available:
       b. You can't use setenv.sh in the native Windows environment.  Try
          scripts/setenv.bat instead.
       c. At present, the native Windows build fails at the final link stages.
-         The failure is due to problems in arch/z80/src/nuttx/linkcmd that
+         The failure is due to problems in arch/z80/src/nuttx.linkcmd that
-         is autogenerated by arch/z80/src/Makefile.zdsii.  The basic program
+         is autogenerated by arch/z80/src/Makefile.zdsii.  The basic problem
          is the spurious spaces and and carrirage returns are generated at
          the end of the lines after a line continuation (\ ^M).  If these
          trailing bad characters are manually eliminated, then the build

configs/ez80f910200kitg/ostest/defconfig

@@ -402,8 +402,8 @@ CONFIG_EXAMPLES_OSTEST_RR_RUNS=10
 #
 # Interpreters
 #
-# CONFIG_FICL is not set
+# CONFIG_INTERPRETERS_FICL is not set
-# CONFIG_PCODE is not set
+# CONFIG_INTERPRETERS_PCODE is not set
 
 #
 # Network Utilities

configs/ez80f910200zco/README.txt

@@ -130,8 +130,8 @@ ostest
       b. You can't use setenv.sh in the native Windows environment.  Try
          scripts/setenv.bat instead.
       c. At present, the native Windows build fails at the final link stages.
-         The failure is due to problems in arch/z80/src/nuttx/linkcmd that
+         The failure is due to problems in arch/z80/src/nuttx.linkcmd that
-         is autogenerated by arch/z80/src/Makefile.zdsii.  The basic program
+         is autogenerated by arch/z80/src/Makefile.zdsii.  The basic problem
          is the spurious spaces and and carrirage returns are generated at
          the end of the lines after a line continuation (\ ^M).  If these
          trailing bad characters are manually eliminated, then the build

configs/ez80f910200zco/ostest/defconfig

@@ -410,8 +410,8 @@ CONFIG_EXAMPLES_OSTEST_RR_RUNS=10
 #
 # Interpreters
 #
-# CONFIG_FICL is not set
+# CONFIG_INTERPRETERS_FICL is not set
-# CONFIG_PCODE is not set
+# CONFIG_INTERPRETERS_PCODE is not set
 
 #
 # Network Utilities

configs/fire-stm32v2/nsh/defconfig

@@ -812,8 +812,8 @@ CONFIG_EXAMPLES_USBMSC_DEVPATH3="/dev/mmcsd2"
 #
 # Interpreters
 #
-# CONFIG_FICL is not set
+# CONFIG_INTERPRETERS_FICL is not set
-# CONFIG_PCODE is not set
+# CONFIG_INTERPRETERS_PCODE is not set
 
 #
 # Network Utilities

configs/shenzhou/nsh/defconfig

@@ -569,8 +569,8 @@ CONFIG_EXAMPLES_NSH=y
 #
 # Interpreters
 #
-# CONFIG_FICL is not set
+# CONFIG_INTERPRETERS_FICL is not set
-# CONFIG_PCODE is not set
+# CONFIG_INTERPRETERS_PCODE is not set
 
 #
 # Network Utilities

configs/shenzhou/nxwm/defconfig

@@ -841,8 +841,8 @@ CONFIG_NAMEDAPP=y
 #
 # Interpreters
 #
-# CONFIG_FICL is not set
+# CONFIG_INTERPRETERS_FICL is not set
-# CONFIG_PCODE is not set
+# CONFIG_INTERPRETERS_PCODE is not set
 
 #
 # Network Utilities

configs/shenzhou/thttpd/defconfig

@@ -741,8 +741,8 @@ CONFIG_EXAMPLES_NSH=y
 #
 # Interpreters
 #
-# CONFIG_FICL is not set
+# CONFIG_INTERPRETERS_FICL is not set
-# CONFIG_PCODE is not set
+# CONFIG_INTERPRETERS_PCODE is not set
 
 #
 # Network Utilities

configs/sim/cxxtest/defconfig

@@ -361,8 +361,8 @@ CONFIG_EXAMPLES_CXXTEST=y
 #
 # Interpreters
 #
-# CONFIG_FICL is not set
+# CONFIG_INTERPRETERS_FICL is not set
-# CONFIG_PCODE is not set
+# CONFIG_INTERPRETERS_PCODE is not set
 
 #
 # Network Utilities

configs/sim/ostest/defconfig

@@ -351,8 +351,8 @@ CONFIG_EXAMPLES_OSTEST_NBARRIER_THREADS=8
 #
 # Interpreters
 #
-# CONFIG_FICL is not set
+# CONFIG_INTERPRETERS_FICL is not set
-# CONFIG_PCODE is not set
+# CONFIG_INTERPRETERS_PCODE is not set
 
 #
 # Network Utilities

configs/stm3240g-eval/discover/defconfig

@@ -765,8 +765,8 @@ CONFIG_EXAMPLES_DISCOVER_NETMASK=0xffffff00
 #
 # Interpreters
 #
-# CONFIG_FICL is not set
+# CONFIG_INTERPRETERS_FICL is not set
-# CONFIG_PCODE is not set
+# CONFIG_INTERPRETERS_PCODE is not set
 
 #
 # Network Utilities

configs/stm3240g-eval/xmlrpc/defconfig

@@ -760,8 +760,8 @@ CONFIG_EXAMPLES_XMLRPC_NETMASK=0xffffff00
 #
 # Interpreters
 #
-# CONFIG_FICL is not set
+# CONFIG_INTERPRETERS_FICL is not set
-# CONFIG_PCODE is not set
+# CONFIG_INTERPRETERS_PCODE is not set
 
 #
 # Network Utilities

configs/stm32f100rc_generic/nsh/defconfig

@@ -490,8 +490,8 @@ CONFIG_EXAMPLES_NSH=y
 #
 # Interpreters
 #
-# CONFIG_FICL is not set
+# CONFIG_INTERPRETERS_FICL is not set
-# CONFIG_PCODE is not set
+# CONFIG_INTERPRETERS_PCODE is not set
 
 #
 # Network Utilities

configs/stm32f100rc_generic/ostest/defconfig

@@ -478,8 +478,8 @@ CONFIG_EXAMPLES_OSTEST_RR_RUNS=10
 #
 # Interpreters
 #
-# CONFIG_FICL is not set
+# CONFIG_INTERPRETERS_FICL is not set
-# CONFIG_PCODE is not set
+# CONFIG_INTERPRETERS_PCODE is not set
 
 #
 # Network Utilities

configs/stm32f4discovery/cxxtest/defconfig

@@ -489,8 +489,8 @@ CONFIG_EXAMPLES_CXXTEST=y
 #
 # Interpreters
 #
-# CONFIG_FICL is not set
+# CONFIG_INTERPRETERS_FICL is not set
-# CONFIG_PCODE is not set
+# CONFIG_INTERPRETERS_PCODE is not set
 
 #
 # Network Utilities

configs/stm32f4discovery/elf/defconfig

@@ -485,8 +485,8 @@ CONFIG_EXAMPLES_ELF_DEVPATH="/dev/ram0"
 #
 # Interpreters
 #
-# CONFIG_FICL is not set
+# CONFIG_INTERPRETERS_FICL is not set
-# CONFIG_PCODE is not set
+# CONFIG_INTERPRETERS_PCODE is not set
 
 #
 # Network Utilities

configs/stm32f4discovery/nxlines/defconfig

@@ -591,8 +591,8 @@ CONFIG_EXAMPLES_NXLINES_BPP=16
 #
 # Interpreters
 #
-# CONFIG_FICL is not set
+# CONFIG_INTERPRETERS_FICL is not set
-# CONFIG_PCODE is not set
+# CONFIG_INTERPRETERS_PCODE is not set
 
 #
 # Network Utilities

configs/stm32f4discovery/ostest/defconfig

@@ -498,8 +498,8 @@ CONFIG_EXAMPLES_OSTEST_RR_RUNS=10
 #
 # Interpreters
 #
-# CONFIG_FICL is not set
+# CONFIG_INTERPRETERS_FICL is not set
-# CONFIG_PCODE is not set
+# CONFIG_INTERPRETERS_PCODE is not set
 
 #
 # Network Utilities

configs/stm32f4discovery/winbuild/defconfig

@@ -498,8 +498,8 @@ CONFIG_EXAMPLES_OSTEST_RR_RUNS=10
 #
 # Interpreters
 #
-# CONFIG_FICL is not set
+# CONFIG_INTERPRETERS_FICL is not set
-# CONFIG_PCODE is not set
+# CONFIG_INTERPRETERS_PCODE is not set
 
 #
 # Network Utilities

configs/z16f2800100zcog/README.txt

@@ -94,13 +94,75 @@ Where <sub-directory> is the specific board configuration that you
 wish to build.  The following board-specific configurations are
 available:
 
-- ostest
+ostest
+------
+
     This builds the examples/ostest application for execution from FLASH.
     See examples/README.txt for information about ostest.
 
-- pashello
+    NOTES:
+
+    1. This configuration uses the mconf-based configuration tool.  To
+       change this configuration using that tool, you should:
+
+       a. Build and install the mconf tool.  See nuttx/README.txt and
+          misc/tools/
+
+       b. Execute 'make menuconfig' in nuttx/ in order to start the
+          reconfiguration process.
+
+    2. By default, this configuration assumes that you are using the
+       Cygwin environment on Windows.  An option is to use the native
+       CMD.exe window build as described in the top-level README.txt
+       file.  To set up that configuration:
+
+       -CONFIG_WINDOWS_CYGWIN=y
+       +CONFIG_WINDOWS_NATIVE=y
+
+       And after configuring, make sure that CONFIG_APPS_DIR uses
+       the back slash character.  For example:
+
+        CONFIG_APPS_DIR="..\apps"
+
+      NOTES:
+      
+      a. If you need to change the toolchain path used in Make.defs, you
+         will need to use the short 8.3 filenames to avoid spaces.  On my
+         PC, C:\PROGRA~1\ is is C:\Program Files\ and C:\PROGRA~2\ is
+         C:\Program Files (x86)\
+      b. You can't use setenv.sh in the native Windows environment.  Try
+         scripts/setenv.bat instead.
+      c. At present, the native Windows build fails at the final link stages.
+         The failure is due to problems in arch/z16/src/nuttx.linkcmd that
+         is autogenerated by arch/z16/src/Makefile.  The basic problem
+         is the spurious spaces and and carrirage returns are generated at
+         the end of the lines after a line continuation (\ ^M).  If these
+         trailing bad characters are manually eliminated, then the build
+         will succeed on the next try.
+
+pashello
+--------
 
     Configures to use examples/pashello for execution from FLASH
     See examples/README.txt for information about pashello.
 
+    NOTES:
+
+    1. This configuration uses the mconf-based configuration tool.  To
+       change this configuration using that tool, you should:
+
+       a. Build and install the mconf tool.  See nuttx/README.txt and
+          misc/tools/
+
+       b. Execute 'make menuconfig' in nuttx/ in order to start the
+          reconfiguration process.
+
+    2. The last time I tried building this configuration, there were
+       a few undefined symbols from the PCODE logic.  It might require
+       a little TLC to get this all working again.
+
+    3. The native windows build has not been tried with this configuration
+       but should, in principle, work (see notes for the ostest configuration
+       above).
+
 Check out any README.txt files in these <sub-directory>s.

configs/z16f2800100zcog/ostest/appconfig

@@ -1,39 +0,0 @@
-############################################################################
-# configs/z16f2800100zcog/ostest/appconfig
-#
-#   Copyright (C) 2011 Gregory Nutt. All rights reserved.
-#   Author: Gregory Nutt <gnutt@nuttx.org>
-#
-# 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.
-#
-############################################################################
-
-# Path to example in apps/examples containing the user_start entry point
-
-CONFIGURED_APPS += examples/ostest
-

configs/z8encore000zco/README.txt

@@ -101,8 +101,8 @@ available:
       b. You can't use setenv.sh in the native Windows environment.  Try
          scripts/setenv.bat instead.
       c. At present, the native Windows build fails at the final link stages.
-         The failure is due to problems in arch/z80/src/nuttx/linkcmd that
+         The failure is due to problems in arch/z80/src/nuttx.linkcmd that
-         is autogenerated by arch/z80/src/Makefile.zdsii.  The basic program
+         is autogenerated by arch/z80/src/Makefile.zdsii.  The basic problem
          is the spurious spaces and and carrirage returns are generated at
          the end of the lines after a line continuation (\ ^M).  If these
          trailing bad characters are manually eliminated, then the build

configs/z8encore000zco/ostest/defconfig

@@ -397,8 +397,8 @@ CONFIG_EXAMPLES_OSTEST_RR_RUNS=10
 #
 # Interpreters
 #
-# CONFIG_FICL is not set
+# CONFIG_INTERPRETERS_FICL is not set
-# CONFIG_PCODE is not set
+# CONFIG_INTERPRETERS_PCODE is not set
 
 #
 # Network Utilities

configs/z8f64200100kit/README.txt

@@ -101,8 +101,8 @@ available:
       b. You can't use setenv.sh in the native Windows environment.  Try
          scripts/setenv.bat instead.
       c. At present, the native Windows build fails at the final link stages.
-         The failure is due to problems in arch/z80/src/nuttx/linkcmd that
+         The failure is due to problems in arch/z80/src/nuttx.linkcmd that
-         is autogenerated by arch/z80/src/Makefile.zdsii.  The basic program
+         is autogenerated by arch/z80/src/Makefile.zdsii.  The basic problem
          is the spurious spaces and and carrirage returns are generated at
          the end of the lines after a line continuation (\ ^M).  If these
          trailing bad characters are manually eliminated, then the build

configs/z8f64200100kit/ostest/defconfig

@@ -397,8 +397,8 @@ CONFIG_EXAMPLES_OSTEST_RR_RUNS=10
 #
 # Interpreters
 #
-# CONFIG_FICL is not set
+# CONFIG_INTERPRETERS_FICL is not set
-# CONFIG_PCODE is not set
+# CONFIG_INTERPRETERS_PCODE is not set
 
 #
 # Network Utilities

tools/incdir.sh

@@ -215,7 +215,7 @@ for dir in $dirlist; do
 		if [ -z "$response" ]; then
 			response="${cmdarg}'"${path}
 		else
-			response=${response}":${path}"
+			response=${response}";${path}"
 		fi
 	else
 		# Treat the first directory differently