summaryrefslogtreecommitdiff
path: root/nuttx/configs/amber
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/configs/amber
parentcceae2d83701fcc9def3fc6ec3a91ee3c0d03c21 (diff)
downloadpx4-nuttx-5b0c816bc8364380317aa3fe59ffb5a10b73d13c.tar.gz
px4-nuttx-5b0c816bc8364380317aa3fe59ffb5a10b73d13c.tar.bz2
px4-nuttx-5b0c816bc8364380317aa3fe59ffb5a10b73d13c.zip
Create AVR32 Kconfig files; reshuffled lots of configuration names
Diffstat (limited to 'nuttx/configs/amber')
-rw-r--r--nuttx/configs/amber/README.txt2
-rw-r--r--nuttx/configs/amber/hello/defconfig2
-rw-r--r--nuttx/configs/amber/src/Makefile4
3 files changed, 4 insertions, 4 deletions
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