Create AVR32 Kconfig files; reshuffled lots of configuration names

18 files changed, 25 insertions, 23 deletions

diff --git a/nuttx/arch/avr/include/irq.h b/nuttx/arch/avr/include/irq.h
index de9981cd5..ac3b4b6ca 100644
--- a/nuttx/arch/avr/include/irq.h
+++ b/nuttx/arch/avr/include/irq.h
@@ -56,7 +56,7 @@
  * save structure and irqsave()/irqrestore() macros
  */
 
-#ifdef CONFIG_ARCH_AVR32
+#ifdef CONFIG_ARCH_FAMILY_AVR32
 # include <arch/avr32/irq.h>
 #else
 # include <arch/avr/irq.h>
diff --git a/nuttx/arch/avr/include/limits.h b/nuttx/arch/avr/include/limits.h
index 2089bf937..8c3f7f760 100644
--- a/nuttx/arch/avr/include/limits.h
+++ b/nuttx/arch/avr/include/limits.h
@@ -46,7 +46,7 @@
 
 /* Include AVR architecture-specific limits */
 
-#ifdef CONFIG_ARCH_AVR32
+#ifdef CONFIG_ARCH_FAMILY_AVR32
 # include <arch/avr32/limits.h>
 #else
 # include <arch/avr/limits.h>
diff --git a/nuttx/arch/avr/include/syscall.h b/nuttx/arch/avr/include/syscall.h
index aa6c501d1..104ca8327 100644
--- a/nuttx/arch/avr/include/syscall.h
+++ b/nuttx/arch/avr/include/syscall.h
@@ -46,7 +46,7 @@
 
 /* Include AVR architecture-specific syscall macros */
 
-#ifdef CONFIG_ARCH_AVR32
+#ifdef CONFIG_ARCH_FAMILY_AVR32
 # include <arch/avr32/syscall.h>
 #else
 # include <arch/avr/syscall.h>
diff --git a/nuttx/arch/avr/include/types.h b/nuttx/arch/avr/include/types.h
index 8089c96c1..bd7af18cf 100644
--- a/nuttx/arch/avr/include/types.h
+++ b/nuttx/arch/avr/include/types.h
@@ -46,7 +46,7 @@
 
 /* Include AVR architecture-specific types definitions */
 
-#ifdef CONFIG_ARCH_AVR32
+#ifdef CONFIG_ARCH_FAMILY_AVR32
 # include <arch/avr32/types.h>
 #else
 # include <arch/avr/types.h>
diff --git a/nuttx/arch/avr/src/Makefile b/nuttx/arch/avr/src/Makefile
index c3d2f9816..2220bbfde 100644
--- a/nuttx/arch/avr/src/Makefile
+++ b/nuttx/arch/avr/src/Makefile
@@ -36,9 +36,9 @@
 -include $(TOPDIR)/Make.defs
 -include chip/Make.defs
 
-ifeq ($(CONFIG_ARCH_AVR32),y)
+ifeq ($(CONFIG_ARCH_FAMILY_AVR32),y)
 ARCH_SUBDIR = avr32
-else ifeq ($(CONFIG_ARCH_AVR),y)
+else ifeq ($(CONFIG_ARCH_FAMILY_AVR),y)
 ARCH_SUBDIR = avr
 endif
 
diff --git a/nuttx/arch/avr/src/common/up_internal.h b/nuttx/arch/avr/src/common/up_internal.h
index 9f1172e62..77d75afeb 100644
--- a/nuttx/arch/avr/src/common/up_internal.h
+++ b/nuttx/arch/avr/src/common/up_internal.h
@@ -46,7 +46,7 @@
 #  include <stdint.h>
 #endif
 
-#ifdef CONFIG_ARCH_AVR32
+#ifdef CONFIG_ARCH_FAMILY_AVR32
 # include "avr32_internal.h"
 #else
 # include "avr_internal.h"
diff --git a/nuttx/configs/amber/README.txt b/nuttx/configs/amber/README.txt
index fe5f3b8b2..5e8abd136 100644
--- a/nuttx/configs/amber/README.txt
+++ b/nuttx/configs/amber/README.txt
@@ -385,7 +385,7 @@ Amber Web Server Configuration Options
 
     CONFIG_ARCH_architecture - For use in C code:
 
-       CONFIG_ARCH_ATMEGA=y
+       CONFIG_ARCH_CHIP_ATMEGA=y
 
     CONFIG_ARCH_CHIP - Identifies the arch/*/chip subdirectory
 
diff --git a/nuttx/configs/amber/hello/defconfig b/nuttx/configs/amber/hello/defconfig
index b3aeb0274..f814a179a 100644
--- a/nuttx/configs/amber/hello/defconfig
+++ b/nuttx/configs/amber/hello/defconfig
@@ -76,7 +76,7 @@ CONFIG_ARCH_CHIP_ATMEGA128=y
 # CONFIG_ARCH_CHIP_AT90USB1287 is not set
 # CONFIG_ARCH_CHIP_AT32UC3B0256 is not set
 CONFIG_ARCH_FAMILY_AVR=y
-CONFIG_ARCH_ATMEGA=y
+CONFIG_ARCH_CHIP_ATMEGA=y
 
 #
 # AVR Configuration Options
diff --git a/nuttx/configs/amber/src/Makefile b/nuttx/configs/amber/src/Makefile
index ed62de056..73d2ea2c7 100644
--- a/nuttx/configs/amber/src/Makefile
+++ b/nuttx/configs/amber/src/Makefile
@@ -49,10 +49,10 @@ SRCS		= $(ASRCS) $(CSRCS)
 OBJS		= $(AOBJS) $(COBJS)
 
 ARCH_SRCDIR	= $(TOPDIR)/arch/$(CONFIG_ARCH)/src
-ifeq ($(CONFIG_ARCH_AVR32),y)
+ifeq ($(CONFIG_ARCH_FAMILY_AVR32),y)
 ARCH_SUBDIR	= avr32
 endif
-ifeq ($(CONFIG_ARCH_AVR),y)
+ifeq ($(CONFIG_ARCH_FAMILY_AVR),y)
 ARCH_SUBDIR	= avr
 endif
 
diff --git a/nuttx/configs/avr32dev1/nsh/defconfig b/nuttx/configs/avr32dev1/nsh/defconfig
index 62971c274..15431a483 100644
--- a/nuttx/configs/avr32dev1/nsh/defconfig
+++ b/nuttx/configs/avr32dev1/nsh/defconfig
@@ -37,8 +37,11 @@
 #
 CONFIG_ARCH="avr"
 CONFIG_ARCH_AVR=y
-CONFIG_ARCH_AVR32=y
+CONFIG_ARCH_FAMILY_AVR32=y
 CONFIG_ARCH_CHIP="at32uc3"
+CONFIG_ARCH_CHIP_AT32UC3=y
+CONFIG_ARCH_CHIP_AT32UC3B=y
+CONFIG_ARCH_CHIP_AT32UC3B0=y
 CONFIG_ARCH_CHIP_AT32UC3B0256=y
 CONFIG_ENDIAN_BIG=y
 CONFIG_ARCH_BOARD="avr32dev1"
@@ -47,7 +50,6 @@ CONFIG_BOARD_LOOPSPERMSEC=1140
 CONFIG_RAM_SIZE=32768
 CONFIG_RAM_START=0x00000000
 CONFIG_ARCH_NOINTC=y
-CONFIG_ARCH_IRQPRIO=y
 CONFIG_ARCH_INTERRUPTSTACK=0
 CONFIG_ARCH_STACKDUMP=y
 CONFIG_ARCH_LEDS=y
diff --git a/nuttx/configs/micropendous3/README.txt b/nuttx/configs/micropendous3/README.txt
index c2b99f7b6..074905ed9 100644
--- a/nuttx/configs/micropendous3/README.txt
+++ b/nuttx/configs/micropendous3/README.txt
@@ -398,7 +398,7 @@ Micropendous3 Configuration Options
 
     CONFIG_ARCH_architecture - For use in C code:
 
-       CONFIG_ARCH_AT90USB=y
+       CONFIG_ARCH_CHIP_AT90USB=y
 
     CONFIG_ARCH_CHIP - Identifies the arch/*/chip subdirectory
 
diff --git a/nuttx/configs/micropendous3/hello/defconfig b/nuttx/configs/micropendous3/hello/defconfig
index 7043c69a7..b06d0e34d 100644
--- a/nuttx/configs/micropendous3/hello/defconfig
+++ b/nuttx/configs/micropendous3/hello/defconfig
@@ -76,7 +76,7 @@ CONFIG_ARCH_CHIP_AT90USB647=y
 # CONFIG_ARCH_CHIP_AT90USB1287 is not set
 # CONFIG_ARCH_CHIP_AT32UC3B0256 is not set
 CONFIG_ARCH_FAMILY_AVR=y
-CONFIG_ARCH_AT90USB=y
+CONFIG_ARCH_CHIP_AT90USB=y
 
 #
 # AVR Configuration Options
diff --git a/nuttx/configs/micropendous3/src/Makefile b/nuttx/configs/micropendous3/src/Makefile
index 31a8f540a..cb9a902a1 100644
--- a/nuttx/configs/micropendous3/src/Makefile
+++ b/nuttx/configs/micropendous3/src/Makefile
@@ -49,10 +49,10 @@ SRCS		= $(ASRCS) $(CSRCS)
 OBJS		= $(AOBJS) $(COBJS)
 
 ARCH_SRCDIR	= $(TOPDIR)/arch/$(CONFIG_ARCH)/src
-ifeq ($(CONFIG_ARCH_AVR32),y)
+ifeq ($(CONFIG_ARCH_FAMILY_AVR32),y)
 ARCH_SUBDIR	= avr32
 endif
-ifeq ($(CONFIG_ARCH_AVR),y)
+ifeq ($(CONFIG_ARCH_FAMILY_AVR),y)
 ARCH_SUBDIR	= avr
 endif
 
diff --git a/nuttx/configs/teensy/README.txt b/nuttx/configs/teensy/README.txt
index 88904669c..e5e3d751b 100644
--- a/nuttx/configs/teensy/README.txt
+++ b/nuttx/configs/teensy/README.txt
@@ -401,7 +401,7 @@ Teensy++ Configuration Options
 
     CONFIG_ARCH_architecture - For use in C code:
 
-       CONFIG_ARCH_AT90USB=y
+       CONFIG_ARCH_CHIP_AT90USB=y
 
     CONFIG_ARCH_CHIP - Identifies the arch/*/chip subdirectory
 
diff --git a/nuttx/configs/teensy/hello/defconfig b/nuttx/configs/teensy/hello/defconfig
index 5711fd400..3484ba794 100644
--- a/nuttx/configs/teensy/hello/defconfig
+++ b/nuttx/configs/teensy/hello/defconfig
@@ -76,7 +76,7 @@ CONFIG_ARCH_CHIP_AT90USB1286=y
 # CONFIG_ARCH_CHIP_AT90USB1287 is not set
 # CONFIG_ARCH_CHIP_AT32UC3B0256 is not set
 CONFIG_ARCH_FAMILY_AVR=y
-CONFIG_ARCH_AT90USB=y
+CONFIG_ARCH_CHIP_AT90USB=y
 
 #
 # AVR Configuration Options
diff --git a/nuttx/configs/teensy/nsh/defconfig b/nuttx/configs/teensy/nsh/defconfig
index d3f3c9c3b..6ddd7ab09 100644
--- a/nuttx/configs/teensy/nsh/defconfig
+++ b/nuttx/configs/teensy/nsh/defconfig
@@ -76,7 +76,7 @@ CONFIG_ARCH_CHIP_AT90USB1286=y
 # CONFIG_ARCH_CHIP_AT90USB1287 is not set
 # CONFIG_ARCH_CHIP_AT32UC3B0256 is not set
 CONFIG_ARCH_FAMILY_AVR=y
-CONFIG_ARCH_AT90USB=y
+CONFIG_ARCH_CHIP_AT90USB=y
 
 #
 # AVR Configuration Options
diff --git a/nuttx/configs/teensy/src/Makefile b/nuttx/configs/teensy/src/Makefile
index 42d7d7843..00707cae7 100644
--- a/nuttx/configs/teensy/src/Makefile
+++ b/nuttx/configs/teensy/src/Makefile
@@ -55,10 +55,10 @@ SRCS		= $(ASRCS) $(CSRCS)
 OBJS		= $(AOBJS) $(COBJS)
 
 ARCH_SRCDIR	= $(TOPDIR)/arch/$(CONFIG_ARCH)/src
-ifeq ($(CONFIG_ARCH_AVR32),y)
+ifeq ($(CONFIG_ARCH_FAMILY_AVR32),y)
 ARCH_SUBDIR	= avr32
 endif
-ifeq ($(CONFIG_ARCH_AVR),y)
+ifeq ($(CONFIG_ARCH_FAMILY_AVR),y)
 ARCH_SUBDIR	= avr
 endif
 
diff --git a/nuttx/configs/teensy/usbmsc/defconfig b/nuttx/configs/teensy/usbmsc/defconfig
index 87cd9b593..061737c27 100644
--- a/nuttx/configs/teensy/usbmsc/defconfig
+++ b/nuttx/configs/teensy/usbmsc/defconfig
@@ -76,7 +76,7 @@ CONFIG_ARCH_CHIP_AT90USB1286=y
 # CONFIG_ARCH_CHIP_AT90USB1287 is not set
 # CONFIG_ARCH_CHIP_AT32UC3B0256 is not set
 CONFIG_ARCH_FAMILY_AVR=y
-CONFIG_ARCH_AT90USB=y
+CONFIG_ARCH_CHIP_AT90USB=y
 
 #
 # AVR Configuration Options