Rename sam3u/ architecture directories to sam34/ to include the SAM4L

7 files changed, 9 insertions, 9 deletions

diff --git a/nuttx/configs/sam3u-ek/README.txt b/nuttx/configs/sam3u-ek/README.txt
index 212229d97..fbda5d92c 100644
--- a/nuttx/configs/sam3u-ek/README.txt
+++ b/nuttx/configs/sam3u-ek/README.txt
@@ -108,13 +108,13 @@ IDEs
   2) Start the NuttX build at least one time from the Cygwin command line
      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,
+  3) Set up include pathes:  You will need include/, arch/arm/src/sam34,
      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.
 
   Startup files will probably cause you some headaches.  The NuttX startup file
-  is arch/arm/src/sam3u/sam_vectors.S.  You may need to build NuttX
+  is arch/arm/src/sam34/sam_vectors.S.  You may need to build NuttX
   one time from the Cygwin command line in order to obtain the pre-built
   startup object needed by RIDE.
 
@@ -256,7 +256,7 @@ SAM3U-EK-specific Configuration Options
 
     CONFIG_ARCH_CHIP - Identifies the arch/*/chip subdirectory
 
-       CONFIG_ARCH_CHIP=sam3u
+       CONFIG_ARCH_CHIP="sam34"
 
     CONFIG_ARCH_CHIP_name - For use in C code to identify the exact
        chip:
diff --git a/nuttx/configs/sam3u-ek/knsh/defconfig b/nuttx/configs/sam3u-ek/knsh/defconfig
index 3156086f1..82bb5d021 100644
--- a/nuttx/configs/sam3u-ek/knsh/defconfig
+++ b/nuttx/configs/sam3u-ek/knsh/defconfig
@@ -83,7 +83,7 @@ CONFIG_ARCH_CHIP_SAM34=y
 # CONFIG_ARCH_CHIP_STR71X is not set
 CONFIG_ARCH_CORTEXM3=y
 CONFIG_ARCH_FAMILY="armv7-m"
-CONFIG_ARCH_CHIP="sam3u"
+CONFIG_ARCH_CHIP="sam34"
 # CONFIG_ARMV7M_USEBASEPRI is not set
 CONFIG_ARCH_HAVE_MPU=y
 CONFIG_ARMV7M_MPU=y
diff --git a/nuttx/configs/sam3u-ek/nsh/defconfig b/nuttx/configs/sam3u-ek/nsh/defconfig
index 271b9cef1..ef2475c1b 100644
--- a/nuttx/configs/sam3u-ek/nsh/defconfig
+++ b/nuttx/configs/sam3u-ek/nsh/defconfig
@@ -78,7 +78,7 @@ CONFIG_ARCH_CHIP_SAM34=y
 # CONFIG_ARCH_CHIP_STR71X is not set
 CONFIG_ARCH_CORTEXM3=y
 CONFIG_ARCH_FAMILY="armv7-m"
-CONFIG_ARCH_CHIP="sam3u"
+CONFIG_ARCH_CHIP="sam34"
 # CONFIG_ARMV7M_USEBASEPRI is not set
 CONFIG_ARCH_HAVE_MPU=y
 # CONFIG_ARMV7M_MPU is not set
diff --git a/nuttx/configs/sam3u-ek/nx/defconfig b/nuttx/configs/sam3u-ek/nx/defconfig
index 573178aaa..7329bd2a4 100644
--- a/nuttx/configs/sam3u-ek/nx/defconfig
+++ b/nuttx/configs/sam3u-ek/nx/defconfig
@@ -78,7 +78,7 @@ CONFIG_ARCH_CHIP_SAM34=y
 # CONFIG_ARCH_CHIP_STR71X is not set
 CONFIG_ARCH_CORTEXM3=y
 CONFIG_ARCH_FAMILY="armv7-m"
-CONFIG_ARCH_CHIP="sam3u"
+CONFIG_ARCH_CHIP="sam34"
 # CONFIG_ARMV7M_USEBASEPRI is not set
 CONFIG_ARCH_HAVE_MPU=y
 # CONFIG_ARMV7M_MPU is not set
diff --git a/nuttx/configs/sam3u-ek/ostest/defconfig b/nuttx/configs/sam3u-ek/ostest/defconfig
index 3425e77f8..9152a0528 100644
--- a/nuttx/configs/sam3u-ek/ostest/defconfig
+++ b/nuttx/configs/sam3u-ek/ostest/defconfig
@@ -78,7 +78,7 @@ CONFIG_ARCH_CHIP_SAM34=y
 # CONFIG_ARCH_CHIP_STR71X is not set
 CONFIG_ARCH_CORTEXM3=y
 CONFIG_ARCH_FAMILY="armv7-m"
-CONFIG_ARCH_CHIP="sam3u"
+CONFIG_ARCH_CHIP="sam34"
 # CONFIG_ARMV7M_USEBASEPRI is not set
 CONFIG_ARCH_HAVE_MPU=y
 # CONFIG_ARMV7M_MPU is not set
diff --git a/nuttx/configs/sam3u-ek/src/up_mmcsd.c b/nuttx/configs/sam3u-ek/src/up_mmcsd.c
index 92934752f..0c1c5a9ad 100644
--- a/nuttx/configs/sam3u-ek/src/up_mmcsd.c
+++ b/nuttx/configs/sam3u-ek/src/up_mmcsd.c
@@ -54,7 +54,7 @@
 /* This needs to be extended.  The card detect GPIO must be configured as an interrupt.
  * when the interrupt indicating that a card has been inserted or removed is received,
  * this function must call sio_mediachange() to handle that event.  See
- * arch/arm/src/sam3u/sam_hsmci.h for more information.
+ * arch/arm/src/sam34/sam_hsmci.h for more information.
  */
 
 #ifdef GPIO_MCI_CD
diff --git a/nuttx/configs/sam3u-ek/touchscreen/defconfig b/nuttx/configs/sam3u-ek/touchscreen/defconfig
index e0c6e49f3..f2d933864 100644
--- a/nuttx/configs/sam3u-ek/touchscreen/defconfig
+++ b/nuttx/configs/sam3u-ek/touchscreen/defconfig
@@ -78,7 +78,7 @@ CONFIG_ARCH_CHIP_SAM34=y
 # CONFIG_ARCH_CHIP_STR71X is not set
 CONFIG_ARCH_CORTEXM3=y
 CONFIG_ARCH_FAMILY="armv7-m"
-CONFIG_ARCH_CHIP="sam3u"
+CONFIG_ARCH_CHIP="sam34"
 # CONFIG_ARMV7M_USEBASEPRI is not set
 CONFIG_ARCH_HAVE_MPU=y
 # CONFIG_ARMV7M_MPU is not set