3 files changed, 5 insertions, 5 deletions
diff --git a/nuttx/configs/sam3u-ek/README.txt b/nuttx/configs/sam3u-ek/README.txt
index b94e668ef..cec4cb47f 100755
--- a/nuttx/configs/sam3u-ek/README.txt
+++ b/nuttx/configs/sam3u-ek/README.txt
@@ -114,7 +114,7 @@ IDEs
      before trying to create your project.  This is necessary to create
      certain auto-generated files and directories that will be needed.
   3) Set up include pathes:  You will need include/, arch/arm/src/sam3u,
-     arch/arm/src/common, arch/arm/src/cortexm3, and sched/.
+     arch/arm/src/common, arch/arm/src/armv7-m, and sched/.
   4) All assembly files need to have the definition option -D __ASSEMBLY__
      on the command line.
 
diff --git a/nuttx/configs/sam3u-ek/knsh/defconfig b/nuttx/configs/sam3u-ek/knsh/defconfig
index ddf6a23ff..5378ec024 100755
--- a/nuttx/configs/sam3u-ek/knsh/defconfig
+++ b/nuttx/configs/sam3u-ek/knsh/defconfig
@@ -100,9 +100,9 @@ CONFIG_SAM3U_BUILDROOT=y
 #
 # Cortex-M3 features
 #
-# CONFIG_CORTEXM3_MPU - Enabled the MPU
+# CONFIG_ARMV7M_MPU - Enabled the MPU
 #
-CONFIG_CORTEXM3_MPU=y
+CONFIG_ARMV7M_MPU=y
 
 #
 #  Individual subsystems can be enabled:
diff --git a/nuttx/configs/sam3u-ek/src/Makefile b/nuttx/configs/sam3u-ek/src/Makefile
index d40fd3926..2bfa7693e 100755
--- a/nuttx/configs/sam3u-ek/src/Makefile
+++ b/nuttx/configs/sam3u-ek/src/Makefile
@@ -59,9 +59,9 @@ ARCH_SRCDIR	= $(TOPDIR)/arch/$(CONFIG_ARCH)/src
 ifeq ($(WINTOOL),y)
   CFLAGS	+= -I "${shell cygpath -w $(ARCH_SRCDIR)/chip}" \
   		   -I "${shell cygpath -w $(ARCH_SRCDIR)/common}" \
-  		   -I "${shell cygpath -w $(ARCH_SRCDIR)/cortexm3}"
+  		   -I "${shell cygpath -w $(ARCH_SRCDIR)/armv7-m}"
 else
-  CFLAGS	+= -I$(ARCH_SRCDIR)/chip -I$(ARCH_SRCDIR)/common -I$(ARCH_SRCDIR)/cortexm3
+  CFLAGS	+= -I$(ARCH_SRCDIR)/chip -I$(ARCH_SRCDIR)/common -I$(ARCH_SRCDIR)/armv7-m
 endif
 
 all: libboard$(LIBEXT)