z8 configurations all converted to use mconf tool

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

ChangeLog

@@ -3706,4 +3706,5 @@
 	  -Wstrict-prototypes (From Denis Cariki).
 	* arch/arm/src/calapyso/calypso_keypad.c:  Add Calypso keypad driver.  From
 	  Denis Cariki.
-
+	* z8encore000zco/ostest and z8f64200100kit/ostest:  Converted to use Kconfig/
+	  mconf configuration tool.

arch/Kconfig

@@ -117,6 +117,12 @@ config ARCH_STACKDUMP
 	---help---
 		Enable to do stack dumps after assertions
 
+config ENDIAN_BIG
+	bool "Big Endian Architecture"
+	default n
+	---help---
+		Select if architecture operates using big-endian byte ordering.
+
 comment "Board Settings"
 
 config BOARD_LOOPSPERMSEC

arch/z80/Kconfig

@@ -13,56 +13,62 @@ config ARCH_CHIP_Z80
 	---help---
 		Classic ZiLOG z80 chip
 
-config ARCH_CHIP_Z8F640X
-	bool "Z8F640X"
-	select ARCH_CHIP_Z8
-	---help---
-		ZiLOG Z8F640X (z8 Encore)
-
 config ARCH_CHIP_Z8F6403
 	bool "Z8F6403"
 	select ARCH_CHIP_Z8
+	select ARCH_CHIP_Z8F640X
+	select ENDIAN_BIG
+	select HAVE_LOWUARTINIT
 	---help---
 		ZiLOG Z8F6403 (z8 Encore)
 
-config ARCH_CHIP_Z8F642X
-	bool "Z8F642X"
-	select ARCH_CHIP_Z8
-	---help---
-		ZiLOG Z8F642X (z8 Encore)
-
 config ARCH_CHIP_Z8F6423
 	bool "Z8F6423"
 	select ARCH_CHIP_Z8
+	select ARCH_CHIP_Z8F642X
+	select ENDIAN_BIG
+	select HAVE_LOWUARTINIT
 	---help---
 		ZiLOG Z8F6423 (z8 Encore)
 
 config ARCH_CHIP_EZ80F91
 	bool "EZ80F91"
 	select ARCH_CHIP_EZ80
+	select HAVE_LOWUARTINIT
 	---help---
 		ZiLOG EZ80F91 (ez80 Acclaim)
 
 config ARCH_CHIP_EZ80F92
 	bool "EZ80F92"
 	select ARCH_CHIP_EZ80
+	select HAVE_LOWUARTINIT
 	---help---
 		ZiLOG EZ80F92 (ez80 Acclaim)
 
 config ARCH_CHIP_EZ80F93
 	bool "EZ80F93"
 	select ARCH_CHIP_EZ80
+	select HAVE_LOWUARTINIT
 	---help---
 		ZiLOG EZ80F93 (ez80 Acclaim)
 
 endchoice
 
+config ARCH_CHIP_Z8F642X
+	bool
+
+config ARCH_CHIP_Z8F640X
+	bool
+
 config ARCH_CHIP_Z8
 	bool
 
 config ARCH_CHIP_EZ80
 	bool
 
+config HAVE_LOWUARTINIT
+	bool
+
 config ARCH_CHIP
 	string
 	default "z80"		if ARCH_CHIP_Z80

arch/z80/src/ez80/Kconfig

@@ -31,13 +31,6 @@ config EZ80_EMAC
 
 endmenu
 
-config HAVE_LOWUARTINIT
-	bool "Low UART Init"
-	default y if !EZ80_UART0 && !EZ80_UART1 && !EZ80_UART2
-	default n if EZ80_UART0 || EZ80_UART1 || EZ80_UART2
-	---help---
-		Provides low-level UART initialization logic as up_lowuartinit (only needed if there is no serial driver).
-
 if EZ80_EMAC
 
 config EZ80_FIAD

arch/z80/src/z8/Kconfig

@@ -4,4 +4,17 @@
 #
 
 if ARCH_CHIP_Z8
+
+# UART0/1 always enabled
+
+config Z8_UART0
+	bool
+	default y
+	select ARCH_HAVE_UART0
+
+config Z8_UART1
+	bool
+	default y
+	select ARCH_HAVE_UART1
+
 endif

configs/Kconfig

@@ -573,20 +573,20 @@ config ARCH_BOARD_Z80SIM
 		(verified with version 2.6.0).
 
 config ARCH_BOARD_Z8ENCORE000ZCO
-	bool "ZiLOG z8encore000zco Development Kit"
+	bool "ZiLOG Z8ENCORE000ZCO Development Kit"
 	depends on ARCH_CHIP_Z8F6403
 	select ARCH_HAVE_LEDS
 	---help---
-		z8Encore! Microcontroller.  This port use the ZiLOG z8encore000zco
+		z8Encore! Microcontroller.  This port use the ZiLOG Z8ENCORE000ZCO
 		development kit, Z8F6403 part, and the Zilog ZDS-II Windows command line
 		tools.  The development environment is Cygwin under WinXP.
 
-config ARCH_BOARD_Z8F64200100KI
+config ARCH_BOARD_Z8F64200100KIT
 	bool "ZiLOG Z8F64200100KIT Development Kit"
-	depends on ARCH_CHIP_Z8F642X
+	depends on ARCH_CHIP_Z8F6423
 	select ARCH_HAVE_LEDS
 	---help---
-		z8Encore! Microcontroller.  This port use the Zilog z8f64200100kit
+		z8Encore! Microcontroller.  This port use the Zilog Z8F64200100KIT
 		development kit, Z8F6423 part, and the Zilog ZDS-II Windows command line
 		tools.  The development environment is Cygwin under WinXP.
 
@@ -669,7 +669,7 @@ config ARCH_BOARD
 	default "z16f2800100zcog"     if ARCH_BOARD_Z16F2800100ZCOG
 	default "z80sim"              if ARCH_BOARD_Z80SIM
 	default "z8encore000zco"      if ARCH_BOARD_Z8ENCORE000ZCO
-	default "z8f64200100kit"      if ARCH_BOARD_Z8F64200100KI
+	default "z8f64200100kit"      if ARCH_BOARD_Z8F64200100KIT
 	default "sim"                 if ARCH_BOARD_SIM
 	default ""                    if ARCH_BOARD_CUSTOM
 
@@ -902,7 +902,7 @@ endif
 if ARCH_BOARD_Z8ENCORE000ZCO
 source "configs/z8encore000zco/Kconfig"
 endif
-if ARCH_BOARD_Z8F64200100KI
+if ARCH_BOARD_Z8F64200100KIT
 source "configs/z8f64200100kit/Kconfig"
 endif
 if ARCH_BOARD_SIM

configs/ez80f910200kitg/ostest/Make.defs

@@ -36,7 +36,14 @@
 include $(TOPDIR)/.config
 include $(TOPDIR)/tools/Config.mk
 
-# These are the directories where the ZDS-II toolchain is installed
+# These are the directories where the ZDS-II toolchain is installed.  NOTE
+# that short 8.3 path names are used in order to avoid spaces.  On my machine
+# I have:
+#
+# C:\PROGRA~1\ = C:\Profram Files\
+# C:\PROGRA~2\ = C:\Program Files (x86)\
+#
+# Your PC may be configured differently.
 
 ZDSVERSION := 5.1.1
 
@@ -57,7 +64,7 @@ ifeq ($(CONFIG_WINDOWS_NATIVE),y)
   ARCHUSRINCLUDES = -usrinc:.
 else
   WINTOOL := y
-  ZDSINSTALLDIR := C:/Program Files (x86)/ZiLOG/ZDSII_eZ80Acclaim!_$(ZDSVERSION)
+  ZDSINSTALLDIR := C:/PROGRA~2/ZiLOG/ZDSII_eZ80Acclaim!_$(ZDSVERSION)
   INSTALLDIR = ${shell cygpath -u "$(ZDSINSTALLDIR)"}
   ZDSBINDIR := $(INSTALLDIR)/bin
   ZDSSTDINCDIR := $(INSTALLDIR)/include/std

configs/ez80f910200zco/dhcpd/Make.defs

@@ -36,7 +36,14 @@
 include $(TOPDIR)/.config
 include $(TOPDIR)/tools/Config.mk
 
-# These are the directories where the ZDS-II toolchain is installed
+# These are the directories where the ZDS-II toolchain is installed.  NOTE
+# that short 8.3 path names are used in order to avoid spaces.  On my machine
+# I have:
+#
+# C:\PROGRA~1\ = C:\Profram Files\
+# C:\PROGRA~2\ = C:\Program Files (x86)\
+#
+# Your PC may be configured differently.
 
 ZDSVERSION := 5.1.1
 
@@ -57,7 +64,7 @@ ifeq ($(CONFIG_WINDOWS_NATIVE),y)
   ARCHUSRINCLUDES = -usrinc:.
 else
   WINTOOL := y
-  ZDSINSTALLDIR := C:/Program Files (x86)/ZiLOG/ZDSII_eZ80Acclaim!_$(ZDSVERSION)
+  ZDSINSTALLDIR := C:/PROGRA~2/ZiLOG/ZDSII_eZ80Acclaim!_$(ZDSVERSION)
   INSTALLDIR = ${shell cygpath -u "$(ZDSINSTALLDIR)"}
   ZDSBINDIR := $(INSTALLDIR)/bin
   ZDSSTDINCDIR := $(INSTALLDIR)/include/std

configs/ez80f910200zco/httpd/Make.defs

@@ -36,7 +36,14 @@
 include $(TOPDIR)/.config
 include $(TOPDIR)/tools/Config.mk
 
-# These are the directories where the ZDS-II toolchain is installed
+# These are the directories where the ZDS-II toolchain is installed.  NOTE
+# that short 8.3 path names are used in order to avoid spaces.  On my machine
+# I have:
+#
+# C:\PROGRA~1\ = C:\Profram Files\
+# C:\PROGRA~2\ = C:\Program Files (x86)\
+#
+# Your PC may be configured differently.
 
 ZDSVERSION := 5.1.1
 
@@ -57,7 +64,7 @@ ifeq ($(CONFIG_WINDOWS_NATIVE),y)
   ARCHUSRINCLUDES = -usrinc:.
 else
   WINTOOL := y
-  ZDSINSTALLDIR := C:/Program Files (x86)/ZiLOG/ZDSII_eZ80Acclaim!_$(ZDSVERSION)
+  ZDSINSTALLDIR := C:/PROGRA~2/ZiLOG/ZDSII_eZ80Acclaim!_$(ZDSVERSION)
   INSTALLDIR = ${shell cygpath -u "$(ZDSINSTALLDIR)"}
   ZDSBINDIR := $(INSTALLDIR)/bin
   ZDSSTDINCDIR := $(INSTALLDIR)/include/std

configs/ez80f910200zco/nettest/Make.defs

@@ -36,7 +36,14 @@
 include $(TOPDIR)/.config
 include $(TOPDIR)/tools/Config.mk
 
-# These are the directories where the ZDS-II toolchain is installed
+# These are the directories where the ZDS-II toolchain is installed.  NOTE
+# that short 8.3 path names are used in order to avoid spaces.  On my machine
+# I have:
+#
+# C:\PROGRA~1\ = C:\Profram Files\
+# C:\PROGRA~2\ = C:\Program Files (x86)\
+#
+# Your PC may be configured differently.
 
 ZDSVERSION := 5.1.1
 
@@ -57,7 +64,7 @@ ifeq ($(CONFIG_WINDOWS_NATIVE),y)
   ARCHUSRINCLUDES = -usrinc:.
 else
   WINTOOL := y
-  ZDSINSTALLDIR := C:/Program Files (x86)/ZiLOG/ZDSII_eZ80Acclaim!_$(ZDSVERSION)
+  ZDSINSTALLDIR := C:/PROGRA~2/ZiLOG/ZDSII_eZ80Acclaim!_$(ZDSVERSION)
   INSTALLDIR = ${shell cygpath -u "$(ZDSINSTALLDIR)"}
   ZDSBINDIR := $(INSTALLDIR)/bin
   ZDSSTDINCDIR := $(INSTALLDIR)/include/std

configs/ez80f910200zco/nsh/Make.defs

@@ -36,7 +36,14 @@
 include $(TOPDIR)/.config
 include $(TOPDIR)/tools/Config.mk
 
-# These are the directories where the ZDS-II toolchain is installed
+# These are the directories where the ZDS-II toolchain is installed.  NOTE
+# that short 8.3 path names are used in order to avoid spaces.  On my machine
+# I have:
+#
+# C:\PROGRA~1\ = C:\Profram Files\
+# C:\PROGRA~2\ = C:\Program Files (x86)\
+#
+# Your PC may be configured differently.
 
 ZDSVERSION := 5.1.1
 
@@ -57,7 +64,7 @@ ifeq ($(CONFIG_WINDOWS_NATIVE),y)
   ARCHUSRINCLUDES = -usrinc:.
 else
   WINTOOL := y
-  ZDSINSTALLDIR := C:/Program Files (x86)/ZiLOG/ZDSII_eZ80Acclaim!_$(ZDSVERSION)
+  ZDSINSTALLDIR := C:/PROGRA~2/ZiLOG/ZDSII_eZ80Acclaim!_$(ZDSVERSION)
   INSTALLDIR = ${shell cygpath -u "$(ZDSINSTALLDIR)"}
   ZDSBINDIR := $(INSTALLDIR)/bin
   ZDSSTDINCDIR := $(INSTALLDIR)/include/std

configs/ez80f910200zco/ostest/Make.defs

@@ -36,7 +36,14 @@
 include $(TOPDIR)/.config
 include $(TOPDIR)/tools/Config.mk
 
-# These are the directories where the ZDS-II toolchain is installed
+# These are the directories where the ZDS-II toolchain is installed.  NOTE
+# that short 8.3 path names are used in order to avoid spaces.  On my machine
+# I have:
+#
+# C:\PROGRA~1\ = C:\Profram Files\
+# C:\PROGRA~2\ = C:\Program Files (x86)\
+#
+# Your PC may be configured differently.
 
 ZDSVERSION := 5.1.1
 
@@ -57,7 +64,7 @@ ifeq ($(CONFIG_WINDOWS_NATIVE),y)
   ARCHUSRINCLUDES = -usrinc:.
 else
   WINTOOL := y
-  ZDSINSTALLDIR := C:/Program Files (x86)/ZiLOG/ZDSII_eZ80Acclaim!_$(ZDSVERSION)
+  ZDSINSTALLDIR := C:/PROGRA~2/ZiLOG/ZDSII_eZ80Acclaim!_$(ZDSVERSION)
   INSTALLDIR = ${shell cygpath -u "$(ZDSINSTALLDIR)"}
   ZDSBINDIR := $(INSTALLDIR)/bin
   ZDSSTDINCDIR := $(INSTALLDIR)/include/std

configs/ez80f910200zco/poll/Make.defs

@@ -36,7 +36,14 @@
 include $(TOPDIR)/.config
 include $(TOPDIR)/tools/Config.mk
 
-# These are the directories where the ZDS-II toolchain is installed
+# These are the directories where the ZDS-II toolchain is installed.  NOTE
+# that short 8.3 path names are used in order to avoid spaces.  On my machine
+# I have:
+#
+# C:\PROGRA~1\ = C:\Profram Files\
+# C:\PROGRA~2\ = C:\Program Files (x86)\
+#
+# Your PC may be configured differently.
 
 ZDSVERSION := 5.1.1
 
@@ -57,7 +64,7 @@ ifeq ($(CONFIG_WINDOWS_NATIVE),y)
   ARCHUSRINCLUDES = -usrinc:.
 else
   WINTOOL := y
-  ZDSINSTALLDIR := C:/Program Files (x86)/ZiLOG/ZDSII_eZ80Acclaim!_$(ZDSVERSION)
+  ZDSINSTALLDIR := C:/PROGRA~2/ZiLOG/ZDSII_eZ80Acclaim!_$(ZDSVERSION)
   INSTALLDIR = ${shell cygpath -u "$(ZDSINSTALLDIR)"}
   ZDSBINDIR := $(INSTALLDIR)/bin
   ZDSSTDINCDIR := $(INSTALLDIR)/include/std

configs/z8encore000zco/ostest/appconfig

@@ -1,39 +0,0 @@
-############################################################################
-# configs/z8encore000zco/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/z8f64200100kit/ostest/appconfig

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