diff --git a/arch/avr/include/irq.h b/arch/avr/include/irq.h index de9981cd508..ac3b4b6cace 100644 --- a/arch/avr/include/irq.h +++ b/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 #else # include diff --git a/arch/avr/include/limits.h b/arch/avr/include/limits.h index 2089bf9379a..8c3f7f76079 100644 --- a/arch/avr/include/limits.h +++ b/arch/avr/include/limits.h @@ -46,7 +46,7 @@ /* Include AVR architecture-specific limits */ -#ifdef CONFIG_ARCH_AVR32 +#ifdef CONFIG_ARCH_FAMILY_AVR32 # include #else # include diff --git a/arch/avr/include/syscall.h b/arch/avr/include/syscall.h index aa6c501d1fd..104ca832720 100644 --- a/arch/avr/include/syscall.h +++ b/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 #else # include diff --git a/arch/avr/include/types.h b/arch/avr/include/types.h index 8089c96c137..bd7af18cf6d 100644 --- a/arch/avr/include/types.h +++ b/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 #else # include diff --git a/arch/avr/src/Makefile b/arch/avr/src/Makefile index c3d2f9816ec..2220bbfde28 100644 --- a/arch/avr/src/Makefile +++ b/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/arch/avr/src/common/up_internal.h b/arch/avr/src/common/up_internal.h index 9f1172e62bc..77d75afeb8c 100644 --- a/arch/avr/src/common/up_internal.h +++ b/arch/avr/src/common/up_internal.h @@ -46,7 +46,7 @@ # include #endif -#ifdef CONFIG_ARCH_AVR32 +#ifdef CONFIG_ARCH_FAMILY_AVR32 # include "avr32_internal.h" #else # include "avr_internal.h" diff --git a/configs/amber/README.txt b/configs/amber/README.txt index fe5f3b8b2c6..5e8abd136bb 100644 --- a/configs/amber/README.txt +++ b/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/configs/amber/hello/defconfig b/configs/amber/hello/defconfig index b3aeb0274a2..f814a179a97 100644 --- a/configs/amber/hello/defconfig +++ b/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/configs/amber/src/Makefile b/configs/amber/src/Makefile index ed62de056bc..73d2ea2c7f3 100644 --- a/configs/amber/src/Makefile +++ b/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/configs/avr32dev1/nsh/defconfig b/configs/avr32dev1/nsh/defconfig index 62971c2747b..15431a48302 100644 --- a/configs/avr32dev1/nsh/defconfig +++ b/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/configs/micropendous3/README.txt b/configs/micropendous3/README.txt index c2b99f7b61c..074905ed99e 100644 --- a/configs/micropendous3/README.txt +++ b/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/configs/micropendous3/hello/defconfig b/configs/micropendous3/hello/defconfig index 7043c69a750..b06d0e34d1c 100644 --- a/configs/micropendous3/hello/defconfig +++ b/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/configs/micropendous3/src/Makefile b/configs/micropendous3/src/Makefile index 31a8f540a1d..cb9a902a16e 100644 --- a/configs/micropendous3/src/Makefile +++ b/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/configs/teensy/README.txt b/configs/teensy/README.txt index 88904669c90..e5e3d751b64 100644 --- a/configs/teensy/README.txt +++ b/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/configs/teensy/hello/defconfig b/configs/teensy/hello/defconfig index 5711fd40052..3484ba79451 100644 --- a/configs/teensy/hello/defconfig +++ b/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/configs/teensy/nsh/defconfig b/configs/teensy/nsh/defconfig index d3f3c9c3b26..6ddd7ab09ed 100644 --- a/configs/teensy/nsh/defconfig +++ b/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/configs/teensy/src/Makefile b/configs/teensy/src/Makefile index 42d7d7843b3..00707cae774 100644 --- a/configs/teensy/src/Makefile +++ b/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/configs/teensy/usbmsc/defconfig b/configs/teensy/usbmsc/defconfig index 87cd9b593f2..061737c2796 100644 --- a/configs/teensy/usbmsc/defconfig +++ b/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