Convert configs/z80sim/ostest to Kconfig/mconf tool

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

ChangeLog

@@ -3726,4 +3726,9 @@
 	  to avoid the value zero.  Suggested by Freddie Chopin.
 	* tools/b16.c:  Fixed precision math conversion utility.
 	* graphics/nxglib/nxglib_splitlinex.c:  Fix the "fat, flat line bug"
+	* arch/z80/src/*/Toolchain.defs:  Add dummy Toolchain.defs files for the
+	  z80 family.
+	* configs/z80sim/ostest:  Converted to build with the Kconfig/mconf tool.
+	  Current configuration failed to build for me (Ubuntu 12.10, SDCC 3.2.0
+	  pre-built for Linux) due to a glibc memory corruptionerror in SDCC.
 

arch/z80/src/z80/Kconfig

@@ -4,4 +4,19 @@
 #
 
 if ARCH_CHIP_Z80
+
+choice
+        prompt "Toolchain Selection"
+        default Z80_TOOLCHAIN_SDCCW if HOST_WINDOWS
+        default Z80_TOOLCHAIN_SDCCL if !HOST_WINDOWS
+
+config Z80_TOOLCHAIN_SDCCL
+        bool "SDCC for Linux, MAC OSX, or Cygwin"
+
+config Z80_TOOLCHAIN_SDCCW
+        bool "SDCC for Windows"
+        depends on HOST_WINDOWS
+
+endchoice
+
 endif

arch/z80/src/z80/Toolchain.defs

@@ -44,19 +44,19 @@
 # built to run on Windows as a POSIX toolchain.  The various SDCC options are
 # selected in the NuttX configuration with:
 #
-#  CONFIG_SDCC_POSIX=y   : SDCC for Linux, MAC OSX or Cygwin
-#  CONFIG_SDCC_WINDOWS=y : SDCC for Win32
+#  CONFIG_Z80_TOOLCHAIN_SDCCL=y : SDCC for Linux, MAC OSX or Cygwin
+#  CONFIG_Z80_TOOLCHAIN_SDCCW=y : SDCC for Win32
 #
 
 ifeq ($(filter y, \
-      $(CONFIG_SDCC_POSIX) \
+      $(CONFIG_Z80_TOOLCHAIN_SDCCL) \
     ),y)
-  CONFIG_Z80_TOOLCHAIN ?= POSIX
+  CONFIG_Z80_TOOLCHAIN ?= SDCCPOSIX
 endif
 ifeq ($(filter y, \
-      $(CONFIG_SDCC_WINDOWS) \
+      $(CONFIG_Z80_TOOLCHAIN_SDCCW) \
     ),y)
-  CONFIG_Z80_TOOLCHAIN ?= WINDOWS
+  CONFIG_Z80_TOOLCHAIN ?= SDCCWIN32
 endif
 
 # SDCC toolchain under Linux, MAC OSX or Cygwin
@@ -66,7 +66,7 @@ endif
 
 # SDCC  toolchain under Windows/Cygwin
 
-ifeq ($(CONFIG_AVR_TOOLCHAIN),WINAVR)
+ifeq ($(CONFIG_AVR_TOOLCHAIN),SDCCWIN32)
   ifneq ($(CONFIG_WINDOWS_NATIVE),y)
     WINTOOL = y
   endif

configs/Kconfig

@@ -565,6 +565,7 @@ config ARCH_BOARD_Z16F2800100ZCOG
 config ARCH_BOARD_Z80SIM
 	bool "Z80 Instruction Set Simulator"
 	depends on ARCH_CHIP_Z80
+	select ARCH_HAVE_UART
 	---help---
 		z80 Microcontroller.  This port uses a Z80 instruction set simulator.
 		That simulator can be found in the NuttX SVN at

configs/xtrs/README.txt

@@ -94,8 +94,8 @@ site: http://sourceforge.net/projects/sdcc/files/ .  Pre-built binaries are
 available for Linux, MAC OSX, and for Win32.  Various SDCC options can be
 selected with:
 
-  CONFIG_SDCC_POSIX=y   : SDCC for Linux, MAC OSX or Cygwin (see below)
-  CONFIG_SDCC_WINDOWS=y : SDCC for Win32
+  CONFIG_Z80_TOOLCHAIN_SDCCL=y : SDCC for Linux, MAC OSX or Cygwin (see below)
+  CONFIG_Z80_TOOLCHAIN_SDCCW=y : SDCC for Win32
 
 Building the SDCC toolchain
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^

configs/z80sim/README.txt

@@ -30,6 +30,23 @@ Configuring NuttX
        cd -
        . ./setenv.sh
 
+    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 current configuration is untested.  When last attempted
+       on Ubuntu 12.10 with SDCC 3.2.0, the build failed with the
+       following internal error:
+
+       *** glibc detected *** sdcclib: malloc(): memory corruption: 0x09f09768 ***
+
   nsh
 
     This configuration file builds NSH (examples/nsh).  This
@@ -67,8 +84,8 @@ site: http://sourceforge.net/projects/sdcc/files/ .  Pre-built binaries are
 available for Linux, MAC OSX, and for Win32.  Various SDCC options can be
 selected with:
 
-  CONFIG_SDCC_POSIX=y   : SDCC for Linux, MAC OSX or Cygwin (see below)
-  CONFIG_SDCC_WINDOWS=y : SDCC for Win32
+  CONFIG_Z80_TOOLCHAIN_SDCCL=y : SDCC for Linux, MAC OSX or Cygwin (see below)
+  CONFIG_Z80_TOOLCHAIN_SDCCW=y : SDCC for Win32
 
 Building the SDCC toolchain
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^

configs/z80sim/ostest/appconfig

@@ -1,39 +0,0 @@
-############################################################################
-# configs/z80sim/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
-