sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Create AVR32 Kconfig files; reshuffled lots of configuration names

Browse Source
This commit is contained in:
Gregory Nutt 2014-03-05 11:25:36 -06:00
parent 1a996691a8
commit 8e06aa47d6
18 changed files with 25 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/avr/include/irq.h
View File

@ -56,7 +56,7 @@
* save structure and irqsave()/irqrestore() macros * save structure and irqsave()/irqrestore() macros
*/ */
#ifdef CONFIG_ARCH_AVR32 #ifdef CONFIG_ARCH_FAMILY_AVR32
# include <arch/avr32/irq.h> # include <arch/avr32/irq.h>
#else #else
# include <arch/avr/irq.h> # include <arch/avr/irq.h>

2
arch/avr/include/limits.h
View File

@ -46,7 +46,7 @@
/* Include AVR architecture-specific limits */ /* Include AVR architecture-specific limits */
#ifdef CONFIG_ARCH_AVR32 #ifdef CONFIG_ARCH_FAMILY_AVR32
# include <arch/avr32/limits.h> # include <arch/avr32/limits.h>
#else #else
# include <arch/avr/limits.h> # include <arch/avr/limits.h>

2
arch/avr/include/syscall.h
View File

@ -46,7 +46,7 @@
/* Include AVR architecture-specific syscall macros */ /* Include AVR architecture-specific syscall macros */
#ifdef CONFIG_ARCH_AVR32 #ifdef CONFIG_ARCH_FAMILY_AVR32
# include <arch/avr32/syscall.h> # include <arch/avr32/syscall.h>
#else #else
# include <arch/avr/syscall.h> # include <arch/avr/syscall.h>

2
arch/avr/include/types.h
View File

@ -46,7 +46,7 @@
/* Include AVR architecture-specific types definitions */ /* Include AVR architecture-specific types definitions */
#ifdef CONFIG_ARCH_AVR32 #ifdef CONFIG_ARCH_FAMILY_AVR32
# include <arch/avr32/types.h> # include <arch/avr32/types.h>
#else #else
# include <arch/avr/types.h> # include <arch/avr/types.h>

4
arch/avr/src/Makefile
View File

@ -36,9 +36,9 @@
-include $(TOPDIR)/Make.defs -include $(TOPDIR)/Make.defs
-include chip/Make.defs -include chip/Make.defs
ifeq ($(CONFIG_ARCH_AVR32),y) ifeq ($(CONFIG_ARCH_FAMILY_AVR32),y)
ARCH_SUBDIR = avr32 ARCH_SUBDIR = avr32
else ifeq ($(CONFIG_ARCH_AVR),y) else ifeq ($(CONFIG_ARCH_FAMILY_AVR),y)
ARCH_SUBDIR = avr ARCH_SUBDIR = avr
endif endif

2
arch/avr/src/common/up_internal.h
View File

@ -46,7 +46,7 @@
# include <stdint.h> # include <stdint.h>
#endif #endif
#ifdef CONFIG_ARCH_AVR32 #ifdef CONFIG_ARCH_FAMILY_AVR32
# include "avr32_internal.h" # include "avr32_internal.h"
#else #else
# include "avr_internal.h" # include "avr_internal.h"

2
configs/amber/README.txt
View File

@ -385,7 +385,7 @@ Amber Web Server Configuration Options
CONFIG_ARCH_architecture - For use in C code: 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 CONFIG_ARCH_CHIP - Identifies the arch/*/chip subdirectory

2
configs/amber/hello/defconfig
View File

@ -76,7 +76,7 @@ CONFIG_ARCH_CHIP_ATMEGA128=y
# CONFIG_ARCH_CHIP_AT90USB1287 is not set # CONFIG_ARCH_CHIP_AT90USB1287 is not set
# CONFIG_ARCH_CHIP_AT32UC3B0256 is not set # CONFIG_ARCH_CHIP_AT32UC3B0256 is not set
CONFIG_ARCH_FAMILY_AVR=y CONFIG_ARCH_FAMILY_AVR=y
CONFIG_ARCH_ATMEGA=y CONFIG_ARCH_CHIP_ATMEGA=y
# #
# AVR Configuration Options # AVR Configuration Options

4
configs/amber/src/Makefile
View File

@ -49,10 +49,10 @@ SRCS = $(ASRCS) $(CSRCS)
OBJS = $(AOBJS) $(COBJS) OBJS = $(AOBJS) $(COBJS)
ARCH_SRCDIR = $(TOPDIR)/arch/$(CONFIG_ARCH)/src ARCH_SRCDIR = $(TOPDIR)/arch/$(CONFIG_ARCH)/src
ifeq ($(CONFIG_ARCH_AVR32),y) ifeq ($(CONFIG_ARCH_FAMILY_AVR32),y)
ARCH_SUBDIR = avr32 ARCH_SUBDIR = avr32
endif endif
ifeq ($(CONFIG_ARCH_AVR),y) ifeq ($(CONFIG_ARCH_FAMILY_AVR),y)
ARCH_SUBDIR = avr ARCH_SUBDIR = avr
endif endif

6
configs/avr32dev1/nsh/defconfig
View File

@ -37,8 +37,11 @@
# #
CONFIG_ARCH="avr" CONFIG_ARCH="avr"
CONFIG_ARCH_AVR=y CONFIG_ARCH_AVR=y
CONFIG_ARCH_AVR32=y CONFIG_ARCH_FAMILY_AVR32=y
CONFIG_ARCH_CHIP="at32uc3" 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_ARCH_CHIP_AT32UC3B0256=y
CONFIG_ENDIAN_BIG=y CONFIG_ENDIAN_BIG=y
CONFIG_ARCH_BOARD="avr32dev1" CONFIG_ARCH_BOARD="avr32dev1"
@ -47,7 +50,6 @@ CONFIG_BOARD_LOOPSPERMSEC=1140
CONFIG_RAM_SIZE=32768 CONFIG_RAM_SIZE=32768
CONFIG_RAM_START=0x00000000 CONFIG_RAM_START=0x00000000
CONFIG_ARCH_NOINTC=y CONFIG_ARCH_NOINTC=y
CONFIG_ARCH_IRQPRIO=y
CONFIG_ARCH_INTERRUPTSTACK=0 CONFIG_ARCH_INTERRUPTSTACK=0
CONFIG_ARCH_STACKDUMP=y CONFIG_ARCH_STACKDUMP=y
CONFIG_ARCH_LEDS=y CONFIG_ARCH_LEDS=y

2
configs/micropendous3/README.txt
View File

@ -398,7 +398,7 @@ Micropendous3 Configuration Options
CONFIG_ARCH_architecture - For use in C code: 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 CONFIG_ARCH_CHIP - Identifies the arch/*/chip subdirectory

2
configs/micropendous3/hello/defconfig
View File

@ -76,7 +76,7 @@ CONFIG_ARCH_CHIP_AT90USB647=y
# CONFIG_ARCH_CHIP_AT90USB1287 is not set # CONFIG_ARCH_CHIP_AT90USB1287 is not set
# CONFIG_ARCH_CHIP_AT32UC3B0256 is not set # CONFIG_ARCH_CHIP_AT32UC3B0256 is not set
CONFIG_ARCH_FAMILY_AVR=y CONFIG_ARCH_FAMILY_AVR=y
CONFIG_ARCH_AT90USB=y CONFIG_ARCH_CHIP_AT90USB=y
# #
# AVR Configuration Options # AVR Configuration Options

4
configs/micropendous3/src/Makefile
View File

@ -49,10 +49,10 @@ SRCS = $(ASRCS) $(CSRCS)
OBJS = $(AOBJS) $(COBJS) OBJS = $(AOBJS) $(COBJS)
ARCH_SRCDIR = $(TOPDIR)/arch/$(CONFIG_ARCH)/src ARCH_SRCDIR = $(TOPDIR)/arch/$(CONFIG_ARCH)/src
ifeq ($(CONFIG_ARCH_AVR32),y) ifeq ($(CONFIG_ARCH_FAMILY_AVR32),y)
ARCH_SUBDIR = avr32 ARCH_SUBDIR = avr32
endif endif
ifeq ($(CONFIG_ARCH_AVR),y) ifeq ($(CONFIG_ARCH_FAMILY_AVR),y)
ARCH_SUBDIR = avr ARCH_SUBDIR = avr
endif endif

2
configs/teensy/README.txt
View File

@ -401,7 +401,7 @@ Teensy++ Configuration Options
CONFIG_ARCH_architecture - For use in C code: 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 CONFIG_ARCH_CHIP - Identifies the arch/*/chip subdirectory

2
configs/teensy/hello/defconfig
View File

@ -76,7 +76,7 @@ CONFIG_ARCH_CHIP_AT90USB1286=y
# CONFIG_ARCH_CHIP_AT90USB1287 is not set # CONFIG_ARCH_CHIP_AT90USB1287 is not set
# CONFIG_ARCH_CHIP_AT32UC3B0256 is not set # CONFIG_ARCH_CHIP_AT32UC3B0256 is not set
CONFIG_ARCH_FAMILY_AVR=y CONFIG_ARCH_FAMILY_AVR=y
CONFIG_ARCH_AT90USB=y CONFIG_ARCH_CHIP_AT90USB=y
# #
# AVR Configuration Options # AVR Configuration Options

2
configs/teensy/nsh/defconfig
View File

@ -76,7 +76,7 @@ CONFIG_ARCH_CHIP_AT90USB1286=y
# CONFIG_ARCH_CHIP_AT90USB1287 is not set # CONFIG_ARCH_CHIP_AT90USB1287 is not set
# CONFIG_ARCH_CHIP_AT32UC3B0256 is not set # CONFIG_ARCH_CHIP_AT32UC3B0256 is not set
CONFIG_ARCH_FAMILY_AVR=y CONFIG_ARCH_FAMILY_AVR=y
CONFIG_ARCH_AT90USB=y CONFIG_ARCH_CHIP_AT90USB=y
# #
# AVR Configuration Options # AVR Configuration Options

4
configs/teensy/src/Makefile
View File

@ -55,10 +55,10 @@ SRCS = $(ASRCS) $(CSRCS)
OBJS = $(AOBJS) $(COBJS) OBJS = $(AOBJS) $(COBJS)
ARCH_SRCDIR = $(TOPDIR)/arch/$(CONFIG_ARCH)/src ARCH_SRCDIR = $(TOPDIR)/arch/$(CONFIG_ARCH)/src
ifeq ($(CONFIG_ARCH_AVR32),y) ifeq ($(CONFIG_ARCH_FAMILY_AVR32),y)
ARCH_SUBDIR = avr32 ARCH_SUBDIR = avr32
endif endif
ifeq ($(CONFIG_ARCH_AVR),y) ifeq ($(CONFIG_ARCH_FAMILY_AVR),y)
ARCH_SUBDIR = avr ARCH_SUBDIR = avr
endif endif

2
configs/teensy/usbmsc/defconfig
View File

@ -76,7 +76,7 @@ CONFIG_ARCH_CHIP_AT90USB1286=y
# CONFIG_ARCH_CHIP_AT90USB1287 is not set # CONFIG_ARCH_CHIP_AT90USB1287 is not set
# CONFIG_ARCH_CHIP_AT32UC3B0256 is not set # CONFIG_ARCH_CHIP_AT32UC3B0256 is not set
CONFIG_ARCH_FAMILY_AVR=y CONFIG_ARCH_FAMILY_AVR=y
CONFIG_ARCH_AT90USB=y CONFIG_ARCH_CHIP_AT90USB=y
# #
# AVR Configuration Options # AVR Configuration Options