summaryrefslogtreecommitdiff
path: root/nuttx/arch/avr
diff options
context:
space:
mode:
authorGregory Nutt <gnutt@nuttx.org>2014-03-05 11:25:36 -0600
committerGregory Nutt <gnutt@nuttx.org>2014-03-05 11:25:36 -0600
commit5b0c816bc8364380317aa3fe59ffb5a10b73d13c (patch)
treecc14000e6a249e23c86a8ddd85403da0df671e4a /nuttx/arch/avr
parentcceae2d83701fcc9def3fc6ec3a91ee3c0d03c21 (diff)
downloadnuttx-5b0c816bc8364380317aa3fe59ffb5a10b73d13c.tar.gz
nuttx-5b0c816bc8364380317aa3fe59ffb5a10b73d13c.tar.bz2
nuttx-5b0c816bc8364380317aa3fe59ffb5a10b73d13c.zip
Create AVR32 Kconfig files; reshuffled lots of configuration names
Diffstat (limited to 'nuttx/arch/avr')
-rw-r--r--nuttx/arch/avr/include/irq.h2
-rw-r--r--nuttx/arch/avr/include/limits.h2
-rw-r--r--nuttx/arch/avr/include/syscall.h2
-rw-r--r--nuttx/arch/avr/include/types.h2
-rw-r--r--nuttx/arch/avr/src/Makefile4
-rw-r--r--nuttx/arch/avr/src/common/up_internal.h2
6 files changed, 7 insertions, 7 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"