From 034d4bae4d118facfe7af8b4f921f3af89342527 Mon Sep 17 00:00:00 2001
From: patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>
Date: Thu, 29 Nov 2012 18:44:02 +0000
Subject: 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
---
 nuttx/arch/Kconfig              |  4 ++++
 nuttx/arch/arm/Kconfig          | 11 +++++------
 nuttx/arch/mips/Kconfig         | 10 +++-------
 nuttx/arch/z16/Kconfig          | 11 +++++++++--
 nuttx/arch/z16/src/z16f/Kconfig | 12 ++++++++++++
 5 files changed, 33 insertions(+), 15 deletions(-)

(limited to 'nuttx/arch')

diff --git a/nuttx/arch/Kconfig b/nuttx/arch/Kconfig
index 5cee40628..6e55a5744 100644
--- a/nuttx/arch/Kconfig
+++ b/nuttx/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
diff --git a/nuttx/arch/arm/Kconfig b/nuttx/arch/arm/Kconfig
index 3233918ca..9fa73782d 100644
--- a/nuttx/arch/arm/Kconfig
+++ b/nuttx/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
diff --git a/nuttx/arch/mips/Kconfig b/nuttx/arch/mips/Kconfig
index c642f7152..772b6f663 100644
--- a/nuttx/arch/mips/Kconfig
+++ b/nuttx/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
diff --git a/nuttx/arch/z16/Kconfig b/nuttx/arch/z16/Kconfig
index a806e6ed1..52ea95c29 100644
--- a/nuttx/arch/z16/Kconfig
+++ b/nuttx/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
diff --git a/nuttx/arch/z16/src/z16f/Kconfig b/nuttx/arch/z16/src/z16f/Kconfig
index 826720ee7..5efc061a5 100644
--- a/nuttx/arch/z16/src/z16f/Kconfig
+++ b/nuttx/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
-- 
cgit v1.2.3