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

65 files changed, 180 insertions, 177 deletions

diff --git a/nuttx/ChangeLog b/nuttx/ChangeLog
index 248130c1b..e9f22d4f5 100644
--- a/nuttx/ChangeLog
+++ b/nuttx/ChangeLog
@@ -4863,3 +4863,6 @@
 	  conditional compilation (CONFIG_ missing from setting name).  This
 	  affects some STM32 FLASH pre-fetch settings.  From Lorenz Meier
 	  (2013-6-2).
+	* arch/arm/include/sam34 and arch/arm/src/sam34:  The old sam3u/
+	  directories were renamed sam34/ to make room in the namespace for
+	  the SAM4L (2013-6-2).
diff --git a/nuttx/arch/arm/Kconfig b/nuttx/arch/arm/Kconfig
index 600a7e011..fdd120779 100644
--- a/nuttx/arch/arm/Kconfig
+++ b/nuttx/arch/arm/Kconfig
@@ -177,7 +177,7 @@ config ARCH_CHIP
 	default "lpc31xx"	if ARCH_CHIP_LPC31XX
 	default "lpc43xx"	if ARCH_CHIP_LPC43XX
 	default "nuc1xx"	if ARCH_CHIP_NUC1XX
-	default "sam3u"		if ARCH_CHIP_SAM34
+	default "sam34"		if ARCH_CHIP_SAM34
 	default "stm32"		if ARCH_CHIP_STM32
 	default "str71x"	if ARCH_CHIP_STR71X
 
@@ -325,7 +325,7 @@ if ARCH_CHIP_NUC1XX
 source arch/arm/src/nuc1xx/Kconfig
 endif
 if ARCH_CHIP_SAM34
-source arch/arm/src/sam3u/Kconfig
+source arch/arm/src/sam34/Kconfig
 endif
 if ARCH_CHIP_STM32
 source arch/arm/src/stm32/Kconfig
diff --git a/nuttx/arch/arm/include/sam3u/chip.h b/nuttx/arch/arm/include/sam34/chip.h
index afd475faf..9cc7d1b7c 100644
--- a/nuttx/arch/arm/include/sam3u/chip.h
+++ b/nuttx/arch/arm/include/sam34/chip.h
@@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/include/sam3u/chip.h
+ * arch/arm/include/sam34/chip.h
  *
  *   Copyright (C) 2009-2010, 2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -33,8 +33,8 @@
  *
  ************************************************************************************/
 
-#ifndef __ARCH_ARM_INCLUDE_SAM3U_CHIP_H
-#define __ARCH_ARM_INCLUDE_SAM3U_CHIP_H
+#ifndef __ARCH_ARM_INCLUDE_SAM34_CHIP_H
+#define __ARCH_ARM_INCLUDE_SAM34_CHIP_H
 
 /************************************************************************************
  * Included Files
@@ -92,4 +92,4 @@
  * Public Functions
  ************************************************************************************/
 
-#endif /* __ARCH_ARM_INCLUDE_SAM3U_CHIP_H */
+#endif /* __ARCH_ARM_INCLUDE_SAM34_CHIP_H */
diff --git a/nuttx/arch/arm/include/sam3u/irq.h b/nuttx/arch/arm/include/sam34/irq.h
index 72f460816..2c59f487a 100644
--- a/nuttx/arch/arm/include/sam3u/irq.h
+++ b/nuttx/arch/arm/include/sam34/irq.h
@@ -1,5 +1,5 @@
 /****************************************************************************************
- * arch/arm/include/sam3u/irq.h
+ * arch/arm/include/sam34/irq.h
  *
  *   Copyright (C) 2009-2011, 2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -37,8 +37,8 @@
  * only indirectly through nuttx/irq.h
  */
 
-#ifndef __ARCH_ARM_INCLUDE_SAM3U_IRQ_H
-#define __ARCH_ARM_INCLUDE_SAM3U_IRQ_H
+#ifndef __ARCH_ARM_INCLUDE_SAM34_IRQ_H
+#define __ARCH_ARM_INCLUDE_SAM34_IRQ_H
 
 /****************************************************************************************
  * Included Files
@@ -293,5 +293,5 @@ extern "C" {
 #endif
 #endif
 
-#endif /* __ARCH_ARM_INCLUDE_SAM3U_IRQ_H */
+#endif /* __ARCH_ARM_INCLUDE_SAM34_IRQ_H */
 
diff --git a/nuttx/arch/arm/src/sam3u/Kconfig b/nuttx/arch/arm/src/sam34/Kconfig
index 9cd9a019a..9cd9a019a 100644
--- a/nuttx/arch/arm/src/sam3u/Kconfig
+++ b/nuttx/arch/arm/src/sam34/Kconfig
diff --git a/nuttx/arch/arm/src/sam3u/Make.defs b/nuttx/arch/arm/src/sam34/Make.defs
index 025ad0be4..813bcbe4c 100644
--- a/nuttx/arch/arm/src/sam3u/Make.defs
+++ b/nuttx/arch/arm/src/sam34/Make.defs
@@ -1,5 +1,5 @@
 ############################################################################
-# arch/arm/src/sam3u/Make.defs
+# arch/arm/src/sam34/Make.defs
 #
 #   Copyright (C) 2009-2011, 2013 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/nuttx/arch/arm/src/sam3u/chip.h b/nuttx/arch/arm/src/sam34/chip.h
index 570c67d29..cd5f76d89 100644
--- a/nuttx/arch/arm/src/sam3u/chip.h
+++ b/nuttx/arch/arm/src/sam34/chip.h
@@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/sam3u/chip.h
+ * arch/arm/src/sam34/chip.h
  *
  *   Copyright (C) 2009-2010, 2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -33,8 +33,8 @@
  *
  ************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_SAM3U_CHIP_H
-#define __ARCH_ARM_SRC_SAM3U_CHIP_H
+#ifndef __ARCH_ARM_SRC_SAM34_CHIP_H
+#define __ARCH_ARM_SRC_SAM34_CHIP_H
 
 /************************************************************************************
  * Included Files
@@ -46,7 +46,7 @@
  * should then include this file for the proper setup.
  */
 
-#include <arch/sam3u/chip.h>
+#include <arch/sam34/chip.h>
 #include "chip/sam_memorymap.h"
 
 /************************************************************************************
@@ -65,4 +65,4 @@
  * Public Functions
  ************************************************************************************/
 
-#endif /* __ARCH_ARM_SRC_SAM3U_CHIP_H */
+#endif /* __ARCH_ARM_SRC_SAM34_CHIP_H */
diff --git a/nuttx/arch/arm/src/sam3u/chip/sam3u_memorymap.h b/nuttx/arch/arm/src/sam34/chip/sam3u_memorymap.h
index 1017a82dd..ea61f57d8 100644
--- a/nuttx/arch/arm/src/sam3u/chip/sam3u_memorymap.h
+++ b/nuttx/arch/arm/src/sam34/chip/sam3u_memorymap.h
@@ -1,5 +1,5 @@
 /************************************************************************************************
- * arch/arm/src/sam3u/chip/sam3u_memorymap.h
+ * arch/arm/src/sam34/chip/sam3u_memorymap.h
  *
  *   Copyright (C) 2009-2010, 2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -33,8 +33,8 @@
  *
  ************************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_SAM3U_SAM3U_MEMORYMAP_H
-#define __ARCH_ARM_SRC_SAM3U_SAM3U_MEMORYMAP_H
+#ifndef __ARCH_ARM_SRC_SAM34_SAM3U_MEMORYMAP_H
+#define __ARCH_ARM_SRC_SAM34_SAM3U_MEMORYMAP_H
 
 /************************************************************************************************
  * Included Files
@@ -142,4 +142,4 @@
  * Public Functions
  ************************************************************************************************/
 
-#endif /* __ARCH_ARM_SRC_SAM3U_SAM3U_MEMORYMAP_H */
+#endif /* __ARCH_ARM_SRC_SAM34_SAM3U_MEMORYMAP_H */
diff --git a/nuttx/arch/arm/src/sam3u/chip/sam3u_pinmap.h b/nuttx/arch/arm/src/sam34/chip/sam3u_pinmap.h
index 17287b05f..fbcffbfd0 100644
--- a/nuttx/arch/arm/src/sam3u/chip/sam3u_pinmap.h
+++ b/nuttx/arch/arm/src/sam34/chip/sam3u_pinmap.h
@@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/sam3u/chip/sam3u_pinmap.h
+ * arch/arm/src/sam34/chip/sam3u_pinmap.h
  *
  *   Copyright (C) 2009-2011, 2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -33,8 +33,8 @@
  *
  ************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_SAM3U_CHIP_SAM3U_PINMAP_H
-#define __ARCH_ARM_SRC_SAM3U_CHIP_SAM3U_PINMAP_H
+#ifndef __ARCH_ARM_SRC_SAM34_CHIP_SAM3U_PINMAP_H
+#define __ARCH_ARM_SRC_SAM34_CHIP_SAM3U_PINMAP_H
 
 /************************************************************************************
  * Included Files
@@ -220,4 +220,4 @@ extern "C"
 #endif
 
 #endif /* __ASSEMBLY__ */
-#endif /* __ARCH_ARM_SRC_SAM3U_CHIP_SAM3U_PINMAP_H */
+#endif /* __ARCH_ARM_SRC_SAM34_CHIP_SAM3U_PINMAP_H */
diff --git a/nuttx/arch/arm/src/sam3u/chip/sam3u_vectors.h b/nuttx/arch/arm/src/sam34/chip/sam3u_vectors.h
index cdc5948c2..d1828ddd8 100644
--- a/nuttx/arch/arm/src/sam3u/chip/sam3u_vectors.h
+++ b/nuttx/arch/arm/src/sam34/chip/sam3u_vectors.h
@@ -1,5 +1,5 @@
 /************************************************************************************************
- * arch/arm/src/sam3u/chip/sam3u_vectors.h
+ * arch/arm/src/sam34/chip/sam3u_vectors.h
  *
  *   Copyright (C) 2009-2010, 2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/nuttx/arch/arm/src/sam3u/chip/sam_adc.h b/nuttx/arch/arm/src/sam34/chip/sam_adc.h
index 0f3878402..802fdcd2c 100644
--- a/nuttx/arch/arm/src/sam3u/chip/sam_adc.h
+++ b/nuttx/arch/arm/src/sam34/chip/sam_adc.h
@@ -1,5 +1,5 @@
 /****************************************************************************************
- * arch/arm/src/sam3u/chip/sam_adc.h
+ * arch/arm/src/sam34/chip/sam_adc.h
  *
  *   Copyright (C) 2009, 2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/nuttx/arch/arm/src/sam3u/chip/sam_chipid.h b/nuttx/arch/arm/src/sam34/chip/sam_chipid.h
index 4a5138bde..1c1e972b7 100644
--- a/nuttx/arch/arm/src/sam3u/chip/sam_chipid.h
+++ b/nuttx/arch/arm/src/sam34/chip/sam_chipid.h
@@ -1,5 +1,5 @@
 /****************************************************************************************
- * arch/arm/src/sam3u/chip/sam_chipid.h
+ * arch/arm/src/sam34/chip/sam_chipid.h
  *
  *   Copyright (C) 2009, 2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -33,8 +33,8 @@
  *
  ****************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_SAM3U_CHIP_SAM_CHIPID_H
-#define __ARCH_ARM_SRC_SAM3U_CHIP_SAM_CHIPID_H
+#ifndef __ARCH_ARM_SRC_SAM34_CHIP_SAM_CHIPID_H
+#define __ARCH_ARM_SRC_SAM34_CHIP_SAM_CHIPID_H
 
 /****************************************************************************************
  * Included Files
@@ -164,4 +164,4 @@
  * Public Functions
  ****************************************************************************************/
 
-#endif /* __ARCH_ARM_SRC_SAM3U_CHIP_SAM_CHIPID_H */
+#endif /* __ARCH_ARM_SRC_SAM34_CHIP_SAM_CHIPID_H */
diff --git a/nuttx/arch/arm/src/sam3u/chip/sam_dmac.h b/nuttx/arch/arm/src/sam34/chip/sam_dmac.h
index 6d0ed1488..388383b1e 100644
--- a/nuttx/arch/arm/src/sam3u/chip/sam_dmac.h
+++ b/nuttx/arch/arm/src/sam34/chip/sam_dmac.h
@@ -1,5 +1,5 @@
 /****************************************************************************************
- * arch/arm/src/sam3u/chip/sam_dmac.h
+ * arch/arm/src/sam34/chip/sam_dmac.h
  *
  *   Copyright (C) 2009-2010, 2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -33,8 +33,8 @@
  *
  ****************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_SAM3U_CHIP_SAM_DMAC_H
-#define __ARCH_ARM_SRC_SAM3U_CHIP_SAM_DMAC_H
+#ifndef __ARCH_ARM_SRC_SAM34_CHIP_SAM_DMAC_H
+#define __ARCH_ARM_SRC_SAM34_CHIP_SAM_DMAC_H
 
 /****************************************************************************************
  * Included Files
@@ -437,4 +437,4 @@ struct dma_linklist_s
  * Public Functions
  ****************************************************************************************/
 
-#endif /* __ARCH_ARM_SRC_SAM3U_CHIP_SAM_DMAC_H */
+#endif /* __ARCH_ARM_SRC_SAM34_CHIP_SAM_DMAC_H */
diff --git a/nuttx/arch/arm/src/sam3u/chip/sam_eefc.h b/nuttx/arch/arm/src/sam34/chip/sam_eefc.h
index 5a4272167..546b6334c 100644
--- a/nuttx/arch/arm/src/sam3u/chip/sam_eefc.h
+++ b/nuttx/arch/arm/src/sam34/chip/sam_eefc.h
@@ -1,5 +1,5 @@
 /****************************************************************************************
- * arch/arm/src/sam3u/chip/sam_eefc.h
+ * arch/arm/src/sam34/chip/sam_eefc.h
  *
  *   Copyright (C) 2009, 2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -33,8 +33,8 @@
  *
  ****************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_SAM3U_CHIP_SAM_EEFC_H
-#define __ARCH_ARM_SRC_SAM3U_CHIP_SAM_EEFC_H
+#ifndef __ARCH_ARM_SRC_SAM34_CHIP_SAM_EEFC_H
+#define __ARCH_ARM_SRC_SAM34_CHIP_SAM_EEFC_H
 
 /****************************************************************************************
  * Included Files
@@ -117,4 +117,4 @@
  * Public Functions
  ****************************************************************************************/
 
-#endif /* __ARCH_ARM_SRC_SAM3U_CHIP_SAM_EEFC_H */
+#endif /* __ARCH_ARM_SRC_SAM34_CHIP_SAM_EEFC_H */
diff --git a/nuttx/arch/arm/src/sam3u/chip/sam_gpbr.h b/nuttx/arch/arm/src/sam34/chip/sam_gpbr.h
index 6a0a28133..f439be79a 100644
--- a/nuttx/arch/arm/src/sam3u/chip/sam_gpbr.h
+++ b/nuttx/arch/arm/src/sam34/chip/sam_gpbr.h
@@ -1,5 +1,5 @@
 /****************************************************************************************
- * arch/arm/src/sam3u/chip/sam_gpbr.h
+ * arch/arm/src/sam34/chip/sam_gpbr.h
  *
  *   Copyright (C) 2009, 2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -33,8 +33,8 @@
  *
  ****************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_SAM3U_CHIP_SAM_GPBR_H
-#define __ARCH_ARM_SRC_SAM3U_CHIP_SAM_GPBR_H
+#ifndef __ARCH_ARM_SRC_SAM34_CHIP_SAM_GPBR_H
+#define __ARCH_ARM_SRC_SAM34_CHIP_SAM_GPBR_H
 
 /****************************************************************************************
  * Included Files
@@ -87,4 +87,4 @@
  * Public Functions
  ****************************************************************************************/
 
-#endif /* __ARCH_ARM_SRC_SAM3U_CHIP_SAM_GPBR_H */
+#endif /* __ARCH_ARM_SRC_SAM34_CHIP_SAM_GPBR_H */
diff --git a/nuttx/arch/arm/src/sam3u/chip/sam_hsmci.h b/nuttx/arch/arm/src/sam34/chip/sam_hsmci.h
index ce9ccd7da..dfee208c3 100644
--- a/nuttx/arch/arm/src/sam3u/chip/sam_hsmci.h
+++ b/nuttx/arch/arm/src/sam34/chip/sam_hsmci.h
@@ -1,5 +1,5 @@
 /****************************************************************************************
- * arch/arm/src/sam3u/chip/sam_hsmci.h
+ * arch/arm/src/sam34/chip/sam_hsmci.h
  *
  *   Copyright (C) 2009, 2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -33,8 +33,8 @@
  *
  ****************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_SAM3U_CHIP_SAM_HSMCI_H
-#define __ARCH_ARM_SRC_SAM3U_CHIP_SAM_HSMCI_H
+#ifndef __ARCH_ARM_SRC_SAM34_CHIP_SAM_HSMCI_H
+#define __ARCH_ARM_SRC_SAM34_CHIP_SAM_HSMCI_H
 
 /****************************************************************************************
  * Included Files
@@ -294,4 +294,4 @@
  * Public Functions
  ****************************************************************************************/
 
-#endif /* __ARCH_ARM_SRC_SAM3U_CHIP_SAM_HSMCI_H */
+#endif /* __ARCH_ARM_SRC_SAM34_CHIP_SAM_HSMCI_H */
diff --git a/nuttx/arch/arm/src/sam3u/chip/sam_matrix.h b/nuttx/arch/arm/src/sam34/chip/sam_matrix.h
index fe30705e7..6fed14092 100644
--- a/nuttx/arch/arm/src/sam3u/chip/sam_matrix.h
+++ b/nuttx/arch/arm/src/sam34/chip/sam_matrix.h
@@ -1,5 +1,5 @@
 /****************************************************************************************
- * arch/arm/src/sam3u/chip/sam_matric.h
+ * arch/arm/src/sam34/chip/sam_matric.h
  *
  *   Copyright (C) 2009-2010, 2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -33,8 +33,8 @@
  *
  ****************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_SAM3U_CHIP_SAM_MATRIX_H
-#define __ARCH_ARM_SRC_SAM3U_CHIP_SAM_MATRIX_H
+#ifndef __ARCH_ARM_SRC_SAM34_CHIP_SAM_MATRIX_H
+#define __ARCH_ARM_SRC_SAM34_CHIP_SAM_MATRIX_H
 
 /****************************************************************************************
  * Included Files
@@ -211,4 +211,4 @@
  * Public Functions
  ****************************************************************************************/
 
-#endif /* __ARCH_ARM_SRC_SAM3U_CHIP_SAM_MATRIX_H */
+#endif /* __ARCH_ARM_SRC_SAM34_CHIP_SAM_MATRIX_H */
diff --git a/nuttx/arch/arm/src/sam3u/chip/sam_memorymap.h b/nuttx/arch/arm/src/sam34/chip/sam_memorymap.h
index c403aa541..ad4a6018c 100644
--- a/nuttx/arch/arm/src/sam3u/chip/sam_memorymap.h
+++ b/nuttx/arch/arm/src/sam34/chip/sam_memorymap.h
@@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/sam3u/chip/sam_memorymap.h
+ * arch/arm/src/sam34/chip/sam_memorymap.h
  *
  *   Copyright (C) 2012 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -33,8 +33,8 @@
  *
  ************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_SAM3U_CHIP_SAM_MEMORYMAP_H
-#define __ARCH_ARM_SRC_SAM3U_CHIP_SAM_MEMORYMAP_H
+#ifndef __ARCH_ARM_SRC_SAM34_CHIP_SAM_MEMORYMAP_H
+#define __ARCH_ARM_SRC_SAM34_CHIP_SAM_MEMORYMAP_H
 
 /************************************************************************************
  * Included Files
@@ -49,5 +49,5 @@
 #  Unrecognized SAM architecture
 #endif
 
-#endif /* __ARCH_ARM_SRC_SAM3U_CHIP_SAM_MEMORYMAP_H */
+#endif /* __ARCH_ARM_SRC_SAM34_CHIP_SAM_MEMORYMAP_H */
 
diff --git a/nuttx/arch/arm/src/sam3u/chip/sam_pdc.h b/nuttx/arch/arm/src/sam34/chip/sam_pdc.h
index 63f0d9719..40ae4e91a 100644
--- a/nuttx/arch/arm/src/sam3u/chip/sam_pdc.h
+++ b/nuttx/arch/arm/src/sam34/chip/sam_pdc.h
@@ -1,5 +1,5 @@
 /****************************************************************************************
- * arch/arm/src/sam3u/chip/sam_pdc.h
+ * arch/arm/src/sam34/chip/sam_pdc.h
  *
  *   Copyright (C) 2009, 2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -33,8 +33,8 @@
  *
  ****************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_SAM3U_CHIP_SAM_PDC_H
-#define __ARCH_ARM_SRC_SAM3U_CHIP_SAM_PDC_H
+#ifndef __ARCH_ARM_SRC_SAM34_CHIP_SAM_PDC_H
+#define __ARCH_ARM_SRC_SAM34_CHIP_SAM_PDC_H
 
 /****************************************************************************************
  * Included Files
@@ -100,4 +100,4 @@
  * Public Functions
  ****************************************************************************************/
 
-#endif /* __ARCH_ARM_SRC_SAM3U_CHIP_SAM_PDC_H */
+#endif /* __ARCH_ARM_SRC_SAM34_CHIP_SAM_PDC_H */
diff --git a/nuttx/arch/arm/src/sam3u/chip/sam_pinmap.h b/nuttx/arch/arm/src/sam34/chip/sam_pinmap.h
index 1de42f4a1..2adfac974 100644
--- a/nuttx/arch/arm/src/sam3u/chip/sam_pinmap.h
+++ b/nuttx/arch/arm/src/sam34/chip/sam_pinmap.h
@@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/sam3u/chip/sam_pinmap.h
+ * arch/arm/src/sam34/chip/sam_pinmap.h
  *
  *   Copyright (C) 2012 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -33,8 +33,8 @@
  *
  ************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_SAM3U_CHIP_SAM_PINMAP_H
-#define __ARCH_ARM_SRC_SAM3U_CHIP_SAM_PINMAP_H
+#ifndef __ARCH_ARM_SRC_SAM34_CHIP_SAM_PINMAP_H
+#define __ARCH_ARM_SRC_SAM34_CHIP_SAM_PINMAP_H
 
 /************************************************************************************
  * Included Files
@@ -49,5 +49,5 @@
 #  Unrecognized SAM architecture
 #endif
 
-#endif /* __ARCH_ARM_SRC_SAM3U_CHIP_SAM_PINMAP_H */
+#endif /* __ARCH_ARM_SRC_SAM34_CHIP_SAM_PINMAP_H */
 
diff --git a/nuttx/arch/arm/src/sam3u/chip/sam_pio.h b/nuttx/arch/arm/src/sam34/chip/sam_pio.h
index e708c0392..f6cef564b 100644
--- a/nuttx/arch/arm/src/sam3u/chip/sam_pio.h
+++ b/nuttx/arch/arm/src/sam34/chip/sam_pio.h
@@ -1,5 +1,5 @@
 /****************************************************************************************
- * arch/arm/src/sam3u/chip/sam_pio.h
+ * arch/arm/src/sam34/chip/sam_pio.h
  *
  *   Copyright (C) 2009, 2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -33,8 +33,8 @@
  *
  ****************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_SAM3U_CHIP_SAM_PIO_H
-#define __ARCH_ARM_SRC_SAM3U_CHIP_SAM_PIO_H
+#ifndef __ARCH_ARM_SRC_SAM34_CHIP_SAM_PIO_H
+#define __ARCH_ARM_SRC_SAM34_CHIP_SAM_PIO_H
 
 /****************************************************************************************
  * Included Files
@@ -321,4 +321,4 @@
  * Public Functions
  ****************************************************************************************/
 
-#endif /* __ARCH_ARM_SRC_SAM3U_CHIP_SAM_PIO_H */
+#endif /* __ARCH_ARM_SRC_SAM34_CHIP_SAM_PIO_H */
diff --git a/nuttx/arch/arm/src/sam3u/chip/sam_pmc.h b/nuttx/arch/arm/src/sam34/chip/sam_pmc.h
index 538df4f78..f6a98e3ee 100644
--- a/nuttx/arch/arm/src/sam3u/chip/sam_pmc.h
+++ b/nuttx/arch/arm/src/sam34/chip/sam_pmc.h
@@ -1,5 +1,5 @@
 /****************************************************************************************
- * arch/arm/src/sam3u/chip/sam_pmc.h
+ * arch/arm/src/sam34/chip/sam_pmc.h
  *
  *   Copyright (C) 2009, 2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -33,8 +33,8 @@
  *
  ****************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_SAM3U_CHIP_SAM_PMC_H
-#define __ARCH_ARM_SRC_SAM3U_CHIP_SAM_PMC_H
+#ifndef __ARCH_ARM_SRC_SAM34_CHIP_SAM_PMC_H
+#define __ARCH_ARM_SRC_SAM34_CHIP_SAM_PMC_H
 
 /****************************************************************************************
  * Included Files
@@ -312,4 +312,4 @@
  * Public Functions
  ****************************************************************************************/
 
-#endif /* __ARCH_ARM_SRC_SAM3U_CHIP_SAM_PMC_H */
+#endif /* __ARCH_ARM_SRC_SAM34_CHIP_SAM_PMC_H */
diff --git a/nuttx/arch/arm/src/sam3u/chip/sam_pwm.h b/nuttx/arch/arm/src/sam34/chip/sam_pwm.h
index d13677d56..fe3bf04a1 100644
--- a/nuttx/arch/arm/src/sam3u/chip/sam_pwm.h
+++ b/nuttx/arch/arm/src/sam34/chip/sam_pwm.h
@@ -1,5 +1,5 @@
 /****************************************************************************************
- * arch/arm/src/sam3u/chip/sam_pwm.h
+ * arch/arm/src/sam34/chip/sam_pwm.h
  *
  *   Copyright (C) 2009, 2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -33,8 +33,8 @@
  *
  ****************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_SAM3U_CHIP_SAM_PWM_H
-#define __ARCH_ARM_SRC_SAM3U_CHIP_SAM_PWM_H
+#ifndef __ARCH_ARM_SRC_SAM34_CHIP_SAM_PWM_H
+#define __ARCH_ARM_SRC_SAM34_CHIP_SAM_PWM_H
 
 /****************************************************************************************
  * Included Files
@@ -630,4 +630,4 @@
  * Public Functions
  ****************************************************************************************/
 
-#endif /* __ARCH_ARM_SRC_SAM3U_CHIP_SAM_PWM_H */
+#endif /* __ARCH_ARM_SRC_SAM34_CHIP_SAM_PWM_H */
diff --git a/nuttx/arch/arm/src/sam3u/chip/sam_rstc.h b/nuttx/arch/arm/src/sam34/chip/sam_rstc.h
index d8e1bd10f..3a620d7ef 100644
--- a/nuttx/arch/arm/src/sam3u/chip/sam_rstc.h
+++ b/nuttx/arch/arm/src/sam34/chip/sam_rstc.h
@@ -1,5 +1,5 @@
 /****************************************************************************************
- * arch/arm/src/sam3u/chip/sam_rstc.h
+ * arch/arm/src/sam34/chip/sam_rstc.h
  *
  *   Copyright (C) 2009, 2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -33,8 +33,8 @@
  *
  ****************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_SAM3U_CHIP_SAM_RSTC_H
-#define __ARCH_ARM_SRC_SAM3U_CHIP_SAM_RSTC_H
+#ifndef __ARCH_ARM_SRC_SAM34_CHIP_SAM_RSTC_H
+#define __ARCH_ARM_SRC_SAM34_CHIP_SAM_RSTC_H
 
 /****************************************************************************************
  * Included Files
@@ -99,4 +99,4 @@
  * Public Functions
  ****************************************************************************************/
 
-#endif /* __ARCH_ARM_SRC_SAM3U_CHIP_SAM_RSTC_H */
+#endif /* __ARCH_ARM_SRC_SAM34_CHIP_SAM_RSTC_H */
diff --git a/nuttx/arch/arm/src/sam3u/chip/sam_rtc.h b/nuttx/arch/arm/src/sam34/chip/sam_rtc.h
index 2ec71e477..5c0a2e15e 100644
--- a/nuttx/arch/arm/src/sam3u/chip/sam_rtc.h
+++ b/nuttx/arch/arm/src/sam34/chip/sam_rtc.h
@@ -1,5 +1,5 @@
 /****************************************************************************************
- * arch/arm/src/sam3u/chip/sam_rtc.h
+ * arch/arm/src/sam34/chip/sam_rtc.h
  *
  *   Copyright (C) 2009, 2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -33,8 +33,8 @@
  *
  ****************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_SAM3U_CHIP_SAM_RTC_H
-#define __ARCH_ARM_SRC_SAM3U_CHIP_SAM_RTC_H
+#ifndef __ARCH_ARM_SRC_SAM34_CHIP_SAM_RTC_H
+#define __ARCH_ARM_SRC_SAM34_CHIP_SAM_RTC_H
 
 /****************************************************************************************
  * Included Files
@@ -181,4 +181,4 @@
  * Public Functions
  ****************************************************************************************/
 
-#endif /* __ARCH_ARM_SRC_SAM3U_CHIP_SAM_RTC_H */
+#endif /* __ARCH_ARM_SRC_SAM34_CHIP_SAM_RTC_H */
diff --git a/nuttx/arch/arm/src/sam3u/chip/sam_rtt.h b/nuttx/arch/arm/src/sam34/chip/sam_rtt.h
index 733d84f2b..75b0d361e 100644
--- a/nuttx/arch/arm/src/sam3u/chip/sam_rtt.h
+++ b/nuttx/arch/arm/src/sam34/chip/sam_rtt.h
@@ -1,5 +1,5 @@
 /****************************************************************************************
- * arch/arm/src/sam3u/chip/sam_rtt.h
+ * arch/arm/src/sam34/chip/sam_rtt.h
  *
  *   Copyright (C) 2009, 2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -33,8 +33,8 @@
  *
  ****************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_SAM3U_CHIP_SAM_RTT_H
-#define __ARCH_ARM_SRC_SAM3U_CHIP_SAM_RTT_H
+#ifndef __ARCH_ARM_SRC_SAM34_CHIP_SAM_RTT_H
+#define __ARCH_ARM_SRC_SAM34_CHIP_SAM_RTT_H
 
 /****************************************************************************************
  * Included Files
@@ -86,4 +86,4 @@
  * Public Functions
  ****************************************************************************************/
 
-#endif /* __ARCH_ARM_SRC_SAM3U_CHIP_SAM_RTT_H */
+#endif /* __ARCH_ARM_SRC_SAM34_CHIP_SAM_RTT_H */
diff --git a/nuttx/arch/arm/src/sam3u/chip/sam_smc.h b/nuttx/arch/arm/src/sam34/chip/sam_smc.h
index da79ad12f..ba67d6608 100644
--- a/nuttx/arch/arm/src/sam3u/chip/sam_smc.h
+++ b/nuttx/arch/arm/src/sam34/chip/sam_smc.h
@@ -1,5 +1,5 @@
 /****************************************************************************************
- * arch/arm/src/sam3u/chip/sam_smc.h
+ * arch/arm/src/sam34/chip/sam_smc.h
  *
  *   Copyright (C) 2009, 2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -33,8 +33,8 @@
  *
  ****************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_SAM3U_CHIP_SAM_SMC_H
-#define __ARCH_ARM_SRC_SAM3U_CHIP_SAM_SMC_H
+#ifndef __ARCH_ARM_SRC_SAM34_CHIP_SAM_SMC_H
+#define __ARCH_ARM_SRC_SAM34_CHIP_SAM_SMC_H
 
 /****************************************************************************************
  * Included Files
@@ -429,4 +429,4 @@
  * Public Functions
  ****************************************************************************************/
 
-#endif /* __ARCH_ARM_SRC_SAM3U_CHIP_SAM_SMC_H */
+#endif /* __ARCH_ARM_SRC_SAM34_CHIP_SAM_SMC_H */
diff --git a/nuttx/arch/arm/src/sam3u/chip/sam_spi.h b/nuttx/arch/arm/src/sam34/chip/sam_spi.h
index 40c843fab..91720647f 100644
--- a/nuttx/arch/arm/src/sam3u/chip/sam_spi.h
+++ b/nuttx/arch/arm/src/sam34/chip/sam_spi.h
@@ -1,5 +1,5 @@
 /****************************************************************************************
- * arch/arm/src/sam3u/chip/sam_spi.h
+ * arch/arm/src/sam34/chip/sam_spi.h
  *
  *   Copyright (C) 2009, 2011, 2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -33,8 +33,8 @@
  *
  ****************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_SAM3U_CHIP_SAM_SPI_H
-#define __ARCH_ARM_SRC_SAM3U_CHIP_SAM_SPI_H
+#ifndef __ARCH_ARM_SRC_SAM34_CHIP_SAM_SPI_H
+#define __ARCH_ARM_SRC_SAM34_CHIP_SAM_SPI_H
 
 /****************************************************************************************
  * Included Files
@@ -186,4 +186,4 @@
  * Public Functions
  ****************************************************************************************/
 
-#endif /* __ARCH_ARM_SRC_SAM3U_CHIP_SAM_SPI_H */
+#endif /* __ARCH_ARM_SRC_SAM34_CHIP_SAM_SPI_H */
diff --git a/nuttx/arch/arm/src/sam3u/chip/sam_ssc.h b/nuttx/arch/arm/src/sam34/chip/sam_ssc.h
index 8de331ce7..552659260 100644
--- a/nuttx/arch/arm/src/sam3u/chip/sam_ssc.h
+++ b/nuttx/arch/arm/src/sam34/chip/sam_ssc.h
@@ -1,5 +1,5 @@
 /****************************************************************************************
- * arch/arm/src/sam3u/chip/sam_ssc.h
+ * arch/arm/src/sam34/chip/sam_ssc.h
  *
  *   Copyright (C) 2009, 2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -33,8 +33,8 @@
  *
  ****************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_SAM3U_CHIP_SAM_SSC_H
-#define __ARCH_ARM_SRC_SAM3U_CHIP_SAM_SSC_H
+#ifndef __ARCH_ARM_SRC_SAM34_CHIP_SAM_SSC_H
+#define __ARCH_ARM_SRC_SAM34_CHIP_SAM_SSC_H
 
 /****************************************************************************************
  * Included Files
@@ -289,4 +289,4 @@
  * Public Functions
  ****************************************************************************************/
 
-#endif /* __ARCH_ARM_SRC_SAM3U_CHIP_SAM_SSC_H */
+#endif /* __ARCH_ARM_SRC_SAM34_CHIP_SAM_SSC_H */
diff --git a/nuttx/arch/arm/src/sam3u/chip/sam_supc.h b/nuttx/arch/arm/src/sam34/chip/sam_supc.h
index 41916fc0a..1be920d0d 100644
--- a/nuttx/arch/arm/src/sam3u/chip/sam_supc.h
+++ b/nuttx/arch/arm/src/sam34/chip/sam_supc.h
@@ -1,5 +1,5 @@
 /****************************************************************************************
- * arch/arm/src/sam3u/chip/sam_supc.h
+ * arch/arm/src/sam34/chip/sam_supc.h
  *
  *   Copyright (C) 2009, 2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -33,8 +33,8 @@
  *
  ****************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_SAM3U_CHIP_SAM_SUPC_H
-#define __ARCH_ARM_SRC_SAM3U_CHIP_SAM_SUPC_H
+#ifndef __ARCH_ARM_SRC_SAM34_CHIP_SAM_SUPC_H
+#define __ARCH_ARM_SRC_SAM34_CHIP_SAM_SUPC_H
 
 /****************************************************************************************
  * Included Files
@@ -161,4 +161,4 @@
  * Public Functions
  ****************************************************************************************/
 
-#endif /* __ARCH_ARM_SRC_SAM3U_CHIP_SAM_SUPC_H */
+#endif /* __ARCH_ARM_SRC_SAM34_CHIP_SAM_SUPC_H */
diff --git a/nuttx/arch/arm/src/sam3u/chip/sam_tc.h b/nuttx/arch/arm/src/sam34/chip/sam_tc.h
index 50bee8ff1..de2046852 100644
--- a/nuttx/arch/arm/src/sam3u/chip/sam_tc.h
+++ b/nuttx/arch/arm/src/sam34/chip/sam_tc.h
@@ -1,5 +1,5 @@
 /************************************************************************************************
- * arch/arm/src/sam3u/chip/sam_tc.h
+ * arch/arm/src/sam34/chip/sam_tc.h
  *
  *   Copyright (C) 2009, 2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -33,8 +33,8 @@
  *
  ************************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_SAM3U_CHIP_SAM_TC_H
-#define __ARCH_ARM_SRC_SAM3U_CHIP_SAM_TC_H
+#ifndef __ARCH_ARM_SRC_SAM34_CHIP_SAM_TC_H
+#define __ARCH_ARM_SRC_SAM34_CHIP_SAM_TC_H
 
 /************************************************************************************************
  * Included Files
@@ -344,4 +344,4 @@
  * Public Functions
  ************************************************************************************************/
 
-#endif /* __ARCH_ARM_SRC_SAM3U_CHIP_SAM_TC_H */
+#endif /* __ARCH_ARM_SRC_SAM34_CHIP_SAM_TC_H */
diff --git a/nuttx/arch/arm/src/sam3u/chip/sam_twi.h b/nuttx/arch/arm/src/sam34/chip/sam_twi.h
index a3135f6de..056f1062e 100644
--- a/nuttx/arch/arm/src/sam3u/chip/sam_twi.h
+++ b/nuttx/arch/arm/src/sam34/chip/sam_twi.h
@@ -1,5 +1,5 @@
 /****************************************************************************************
- * arch/arm/src/sam3u/chip/sam_twi.h
+ * arch/arm/src/sam34/chip/sam_twi.h
  *
  *   Copyright (C) 2009, 2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -33,8 +33,8 @@
  *
  ****************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_SAM3U_CHIP_SAM_TWI_H
-#define __ARCH_ARM_SRC_SAM3U_CHIP_SAM_TWI_H
+#ifndef __ARCH_ARM_SRC_SAM34_CHIP_SAM_TWI_H
+#define __ARCH_ARM_SRC_SAM34_CHIP_SAM_TWI_H
 
 /****************************************************************************************
  * Included Files
@@ -189,4 +189,4 @@
  * Public Functions
  ****************************************************************************************/
 
-#endif /* __ARCH_ARM_SRC_SAM3U_CHIP_SAM_TWI_H */
+#endif /* __ARCH_ARM_SRC_SAM34_CHIP_SAM_TWI_H */
diff --git a/nuttx/arch/arm/src/sam3u/chip/sam_uart.h b/nuttx/arch/arm/src/sam34/chip/sam_uart.h
index 965a63a4a..4825435fd 100644
--- a/nuttx/arch/arm/src/sam3u/chip/sam_uart.h
+++ b/nuttx/arch/arm/src/sam34/chip/sam_uart.h
@@ -1,5 +1,5 @@
 /************************************************************************************************
- * arch/arm/src/sam3u/chip/sam_uart.h
+ * arch/arm/src/sam34/chip/sam_uart.h
  *
  *   Copyright (C) 2009, 2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -33,8 +33,8 @@
  *
  ************************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_SAM3U_CHIP_SAM_UART_H
-#define __ARCH_ARM_SRC_SAM3U_CHIP_SAM_UART_H
+#ifndef __ARCH_ARM_SRC_SAM34_CHIP_SAM_UART_H
+#define __ARCH_ARM_SRC_SAM34_CHIP_SAM_UART_H
 
 /************************************************************************************************
  * Included Files
@@ -388,4 +388,4 @@
  * Public Functions
  ************************************************************************************************/
 
-#endif /* __ARCH_ARM_SRC_SAM3U_CHIP_SAM_UART_H */
+#endif /* __ARCH_ARM_SRC_SAM34_CHIP_SAM_UART_H */
diff --git a/nuttx/arch/arm/src/sam3u/chip/sam_udphs.h b/nuttx/arch/arm/src/sam34/chip/sam_udphs.h
index 7bb33b428..9229cd837 100644
--- a/nuttx/arch/arm/src/sam3u/chip/sam_udphs.h
+++ b/nuttx/arch/arm/src/sam34/chip/sam_udphs.h
@@ -1,5 +1,5 @@
 /****************************************************************************************
- * arch/arm/src/sam3u/chip/sam_udphs.h
+ * arch/arm/src/sam34/chip/sam_udphs.h
  *
  *   Copyright (C) 2009, 2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -33,8 +33,8 @@
  *
  ****************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_SAM3U_CHIP_SAM_UDPHS_H
-#define __ARCH_ARM_SRC_SAM3U_CHIP_SAM_UDPHS_H
+#ifndef __ARCH_ARM_SRC_SAM34_CHIP_SAM_UDPHS_H
+#define __ARCH_ARM_SRC_SAM34_CHIP_SAM_UDPHS_H
 
 /****************************************************************************************
  * Included Files
@@ -367,5 +367,5 @@
  * Public Functions
  ****************************************************************************************/
 
-#endif /* __ARCH_ARM_SRC_SAM3U_CHIP_SAM_UDPHS_H */
+#endif /* __ARCH_ARM_SRC_SAM34_CHIP_SAM_UDPHS_H */
 
diff --git a/nuttx/arch/arm/src/sam3u/chip/sam_wdt.h b/nuttx/arch/arm/src/sam34/chip/sam_wdt.h
index 96aac3857..ffe0cb96d 100644
--- a/nuttx/arch/arm/src/sam3u/chip/sam_wdt.h
+++ b/nuttx/arch/arm/src/sam34/chip/sam_wdt.h
@@ -1,5 +1,5 @@
 /****************************************************************************************
- * arch/arm/src/sam3u/chip/sam_wdt.h
+ * arch/arm/src/sam34/chip/sam_wdt.h
  *
  *   Copyright (C) 2009, 2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -33,8 +33,8 @@
  *
  ****************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_SAM3U_CHIP_SAM_WDT_H
-#define __ARCH_ARM_SRC_SAM3U_CHIP_SAM_WDT_H
+#ifndef __ARCH_ARM_SRC_SAM34_CHIP_SAM_WDT_H
+#define __ARCH_ARM_SRC_SAM34_CHIP_SAM_WDT_H
 
 /****************************************************************************************
  * Included Files
@@ -93,4 +93,4 @@
  * Public Functions
  ****************************************************************************************/
 
-#endif /* __ARCH_ARM_SRC_SAM3U_CHIP_SAM_WDT_H */
+#endif /* __ARCH_ARM_SRC_SAM34_CHIP_SAM_WDT_H */
diff --git a/nuttx/arch/arm/src/sam3u/sam_allocateheap.c b/nuttx/arch/arm/src/sam34/sam_allocateheap.c
index bf765462e..bf765462e 100644
--- a/nuttx/arch/arm/src/sam3u/sam_allocateheap.c
+++ b/nuttx/arch/arm/src/sam34/sam_allocateheap.c
diff --git a/nuttx/arch/arm/src/sam3u/sam_clockconfig.c b/nuttx/arch/arm/src/sam34/sam_clockconfig.c
index df5cf59ba..8a3988a40 100644
--- a/nuttx/arch/arm/src/sam3u/sam_clockconfig.c
+++ b/nuttx/arch/arm/src/sam34/sam_clockconfig.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/arm/src/sam3u/sam_clockconfig.c
+ * arch/arm/src/sam34/sam_clockconfig.c
  * arch/arm/src/chip/sam_clockconfig.c
  *
  *   Copyright (C) 2010 Gregory Nutt. All rights reserved.
diff --git a/nuttx/arch/arm/src/sam3u/sam_clockconfig.h b/nuttx/arch/arm/src/sam34/sam_clockconfig.h
index da57cb71a..4ed9e6b87 100644
--- a/nuttx/arch/arm/src/sam3u/sam_clockconfig.h
+++ b/nuttx/arch/arm/src/sam34/sam_clockconfig.h
@@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/sam3u/sam_clockconfig.h
+ * arch/arm/src/sam34/sam_clockconfig.h
  *
  *   Copyright (C) 2009-2011, 2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -33,8 +33,8 @@
  *
  ************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_SAM3U_SAM_CLOCKCONFIG_H
-#define __ARCH_ARM_SRC_SAM3U_SAM_CLOCKCONFIG_H
+#ifndef __ARCH_ARM_SRC_SAM34_SAM_CLOCKCONFIG_H
+#define __ARCH_ARM_SRC_SAM34_SAM_CLOCKCONFIG_H
 
 /************************************************************************************
  * Included Files
@@ -79,7 +79,7 @@ extern "C"
  * Description:
  *   Called to initialize the SAM3/4.  This does whatever setup is needed to put the
  *   SoC in a usable state.  This includes the initialization of clocking using the
- *   settings in board.h.  (After power-on reset, the sam3u is initiallyrunning on
+ *   settings in board.h.  (After power-on reset, the sam3u is initially running on
  *   a 4MHz internal RC clock).  This function also performs other low-level chip
  *   initialization of the chip including EFC, master clock, IRQ and watchdog
  *   configuration.
@@ -94,4 +94,4 @@ void sam_clockconfig(void);
 #endif
 
 #endif /* __ASSEMBLY__ */
-#endif /* __ARCH_ARM_SRC_SAM3U_SAM_CLOCKCONFIG_H */
+#endif /* __ARCH_ARM_SRC_SAM34_SAM_CLOCKCONFIG_H */
diff --git a/nuttx/arch/arm/src/sam3u/sam_dmac.c b/nuttx/arch/arm/src/sam34/sam_dmac.c
index d2871a99d..75d692754 100644
--- a/nuttx/arch/arm/src/sam3u/sam_dmac.c
+++ b/nuttx/arch/arm/src/sam34/sam_dmac.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/arm/src/sam3u-ek/sam_dmac.c
+ * arch/arm/src/sam34-ek/sam_dmac.c
  *
  *   Copyright (C) 2010, 2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/nuttx/arch/arm/src/sam3u/sam_dmac.h b/nuttx/arch/arm/src/sam34/sam_dmac.h
index f07303011..4e34d4694 100644
--- a/nuttx/arch/arm/src/sam3u/sam_dmac.h
+++ b/nuttx/arch/arm/src/sam34/sam_dmac.h
@@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/sam3u/sam_dmac.h
+ * arch/arm/src/sam34/sam_dmac.h
  *
  *   Copyright (C) 2009-2011, 2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -33,8 +33,8 @@
  *
  ************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_SAM3U_SAM_DMAC_H
-#define __ARCH_ARM_SRC_SAM3U_SAM_DMAC_H
+#ifndef __ARCH_ARM_SRC_SAM34_SAM_DMAC_H
+#define __ARCH_ARM_SRC_SAM34_SAM_DMAC_H
 
 /************************************************************************************
  * Included Files
@@ -294,4 +294,4 @@ void sam_dmadump(DMA_HANDLE handle, const struct sam_dmaregs_s *regs,
 #endif
 
 #endif /* __ASSEMBLY__ */
-#endif /* __ARCH_ARM_SRC_SAM3U_SAM_DMAC_H */
+#endif /* __ARCH_ARM_SRC_SAM34_SAM_DMAC_H */
diff --git a/nuttx/arch/arm/src/sam3u/sam_gpio.c b/nuttx/arch/arm/src/sam34/sam_gpio.c
index ea389ec5a..123c3d4b9 100644
--- a/nuttx/arch/arm/src/sam3u/sam_gpio.c
+++ b/nuttx/arch/arm/src/sam34/sam_gpio.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/arm/src/sam3u/sam_gpio.c
+ * arch/arm/src/sam34/sam_gpio.c
  *
  *   Copyright (C) 2010, 2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/nuttx/arch/arm/src/sam3u/sam_gpio.h b/nuttx/arch/arm/src/sam34/sam_gpio.h
index 2832871e8..3324cd3b3 100644
--- a/nuttx/arch/arm/src/sam3u/sam_gpio.h
+++ b/nuttx/arch/arm/src/sam34/sam_gpio.h
@@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/sam3u/sam_gpio.h
+ * arch/arm/src/sam34/sam_gpio.h
  *
  *   Copyright (C) 2009-2011, 2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -33,8 +33,8 @@
  *
  ************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_SAM3U_SAM_GPIO_H
-#define __ARCH_ARM_SRC_SAM3U_SAM_GPIO_H
+#ifndef __ARCH_ARM_SRC_SAM34_SAM_GPIO_H
+#define __ARCH_ARM_SRC_SAM34_SAM_GPIO_H
 
 /************************************************************************************
  * Included Files
@@ -294,4 +294,4 @@ int sam_dumpgpio(uint32_t pinset, const char *msg);
 #endif
 
 #endif /* __ASSEMBLY__ */
-#endif /* __ARCH_ARM_SRC_SAM3U_SAM_GPIO_H */
+#endif /* __ARCH_ARM_SRC_SAM34_SAM_GPIO_H */
diff --git a/nuttx/arch/arm/src/sam3u/sam_gpioirq.c b/nuttx/arch/arm/src/sam34/sam_gpioirq.c
index 58a5252a4..e5f0364cd 100644
--- a/nuttx/arch/arm/src/sam3u/sam_gpioirq.c
+++ b/nuttx/arch/arm/src/sam34/sam_gpioirq.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/arm/src/sam3u/sam_gpioirq.c
+ * arch/arm/src/sam34/sam_gpioirq.c
  *
  *   Copyright (C) 2010, 2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/nuttx/arch/arm/src/sam3u/sam_hsmci.c b/nuttx/arch/arm/src/sam34/sam_hsmci.c
index 1737faa41..f9ee665a8 100644
--- a/nuttx/arch/arm/src/sam3u/sam_hsmci.c
+++ b/nuttx/arch/arm/src/sam34/sam_hsmci.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/arm/src/sam3u/sam_hsmci.c
+ * arch/arm/src/sam34/sam_hsmci.c
  *
  *   Copyright (C) 2010, 2012-2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/nuttx/arch/arm/src/sam3u/sam_hsmci.h b/nuttx/arch/arm/src/sam34/sam_hsmci.h
index 299f94c72..841ef3742 100644
--- a/nuttx/arch/arm/src/sam3u/sam_hsmci.h
+++ b/nuttx/arch/arm/src/sam34/sam_hsmci.h
@@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/sam3u/sam_hsmci.h
+ * arch/arm/src/sam34/sam_hsmci.h
  *
  *   Copyright (C) 2009-2011, 2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -33,8 +33,8 @@
  *
  ************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_SAM3U_SAM_HSMCI_H
-#define __ARCH_ARM_SRC_SAM3U_SAM_HSMCI_H
+#ifndef __ARCH_ARM_SRC_SAM34_SAM_HSMCI_H
+#define __ARCH_ARM_SRC_SAM34_SAM_HSMCI_H
 
 /************************************************************************************
  * Included Files
@@ -140,4 +140,4 @@ void sdio_wrprotect(FAR struct sdio_dev_s *dev, bool wrprotect);
 #endif
 
 #endif /* __ASSEMBLY__ */
-#endif /* __ARCH_ARM_SRC_SAM3U_SAM_HSMCI_H */
+#endif /* __ARCH_ARM_SRC_SAM34_SAM_HSMCI_H */
diff --git a/nuttx/arch/arm/src/sam3u/sam_irq.c b/nuttx/arch/arm/src/sam34/sam_irq.c
index 083ad5ae1..f21274211 100644
--- a/nuttx/arch/arm/src/sam3u/sam_irq.c
+++ b/nuttx/arch/arm/src/sam34/sam_irq.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/arm/src/sam3u/sam_irq.c
+ * arch/arm/src/sam34/sam_irq.c
  *
  *   Copyright (C) 2009, 2011, 2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/nuttx/arch/arm/src/sam3u/sam_lowputc.c b/nuttx/arch/arm/src/sam34/sam_lowputc.c
index 65e31fa47..00a3d3a89 100644
--- a/nuttx/arch/arm/src/sam3u/sam_lowputc.c
+++ b/nuttx/arch/arm/src/sam34/sam_lowputc.c
@@ -1,5 +1,5 @@
 /**************************************************************************
- * arch/arm/src/sam3u/sam_lowputc.c
+ * arch/arm/src/sam34/sam_lowputc.c
  *
  *   Copyright (C) 2010, 2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/nuttx/arch/arm/src/sam3u/sam_lowputc.h b/nuttx/arch/arm/src/sam34/sam_lowputc.h
index ffb033862..ecfb14cb7 100644
--- a/nuttx/arch/arm/src/sam3u/sam_lowputc.h
+++ b/nuttx/arch/arm/src/sam34/sam_lowputc.h
@@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/sam3u/sam_lowputc.h
+ * arch/arm/src/sam34/sam_lowputc.h
  *
  *   Copyright (C) 2009-2011, 2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -33,8 +33,8 @@
  *
  ************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_SAM3U_SAM_LOWPUTC_H
-#define __ARCH_ARM_SRC_SAM3U_SAM_LOWPUTC_H
+#ifndef __ARCH_ARM_SRC_SAM34_SAM_LOWPUTC_H
+#define __ARCH_ARM_SRC_SAM34_SAM_LOWPUTC_H
 
 /************************************************************************************
  * Included Files
@@ -99,4 +99,4 @@ void sam_lowsetup(void);
 #endif
 
 #endif /* __ASSEMBLY__ */
-#endif /* __ARCH_ARM_SRC_SAM3U_SAM_LOWPUTC_H */
+#endif /* __ARCH_ARM_SRC_SAM34_SAM_LOWPUTC_H */
diff --git a/nuttx/arch/arm/src/sam3u/sam_mpuinit.c b/nuttx/arch/arm/src/sam34/sam_mpuinit.c
index 3b49f9d97..3b49f9d97 100644
--- a/nuttx/arch/arm/src/sam3u/sam_mpuinit.c
+++ b/nuttx/arch/arm/src/sam34/sam_mpuinit.c
diff --git a/nuttx/arch/arm/src/sam3u/sam_mpuinit.h b/nuttx/arch/arm/src/sam34/sam_mpuinit.h
index f2111bd26..d047447ac 100644
--- a/nuttx/arch/arm/src/sam3u/sam_mpuinit.h
+++ b/nuttx/arch/arm/src/sam34/sam_mpuinit.h
@@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/sam3u/sam_mpuinit.h
+ * arch/arm/src/sam34/sam_mpuinit.h
  *
  *   Copyright (C) 2009-2011, 2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -33,8 +33,8 @@
  *
  ************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_SAM3U_SAM_MPUINIT_H
-#define __ARCH_ARM_SRC_SAM3U_SAM_MPUINIT_H
+#ifndef __ARCH_ARM_SRC_SAM34_SAM_MPUINIT_H
+#define __ARCH_ARM_SRC_SAM34_SAM_MPUINIT_H
 
 /************************************************************************************
  * Included Files
@@ -111,4 +111,4 @@ void sam_mpu_uheap(uintptr_t start, size_t size);
 #endif
 
 #endif /* __ASSEMBLY__ */
-#endif /* __ARCH_ARM_SRC_SAM3U_SAM_MPUINIT_H */
+#endif /* __ARCH_ARM_SRC_SAM34_SAM_MPUINIT_H */
diff --git a/nuttx/arch/arm/src/sam3u/sam_serial.c b/nuttx/arch/arm/src/sam34/sam_serial.c
index deef640ea..fb7d69cba 100644
--- a/nuttx/arch/arm/src/sam3u/sam_serial.c
+++ b/nuttx/arch/arm/src/sam34/sam_serial.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/arm/src/sam3u/sam_serial.c
+ * arch/arm/src/sam34/sam_serial.c
  *
  *   Copyright (C) 2010, 2012-2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/nuttx/arch/arm/src/sam3u/sam_spi.c b/nuttx/arch/arm/src/sam34/sam_spi.c
index c8ca05721..10395ec90 100644
--- a/nuttx/arch/arm/src/sam3u/sam_spi.c
+++ b/nuttx/arch/arm/src/sam34/sam_spi.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/arm/src/sam3u/sam_spi.c
+ * arch/arm/src/sam34/sam_spi.c
  *
  *   Copyright (C) 2011, 2013 Gregory Nutt. All rights reserved.
  *   Authors: Gregory Nutt <gnutt@nuttx.org>
diff --git a/nuttx/arch/arm/src/sam3u/sam_spi.h b/nuttx/arch/arm/src/sam34/sam_spi.h
index 32fb39387..77e6e26f3 100644
--- a/nuttx/arch/arm/src/sam3u/sam_spi.h
+++ b/nuttx/arch/arm/src/sam34/sam_spi.h
@@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/sam3u/sam_spi.h
+ * arch/arm/src/sam34/sam_spi.h
  *
  *   Copyright (C) 2009-2011, 2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -33,8 +33,8 @@
  *
  ************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_SAM3U_SAM_SPI_H
-#define __ARCH_ARM_SRC_SAM3U_SAM_SPI_H
+#ifndef __ARCH_ARM_SRC_SAM34_SAM_SPI_H
+#define __ARCH_ARM_SRC_SAM34_SAM_SPI_H
 
 /************************************************************************************
  * Included Files
@@ -223,4 +223,4 @@ int sam_spicmddata(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool cmd);
 #endif
 
 #endif /* __ASSEMBLY__ */
-#endif /* __ARCH_ARM_SRC_SAM3U_SAM_SPI_H */
+#endif /* __ARCH_ARM_SRC_SAM34_SAM_SPI_H */
diff --git a/nuttx/arch/arm/src/sam3u/sam_start.c b/nuttx/arch/arm/src/sam34/sam_start.c
index c5a7d1783..a3fc49fa2 100644
--- a/nuttx/arch/arm/src/sam3u/sam_start.c
+++ b/nuttx/arch/arm/src/sam34/sam_start.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/arm/src/sam3u/sam_start.c
+ * arch/arm/src/sam34/sam_start.c
  *
  *   Copyright (C) 2009-2010, 2012-2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/nuttx/arch/arm/src/sam3u/sam_timerisr.c b/nuttx/arch/arm/src/sam34/sam_timerisr.c
index 828ec1e73..e1879d5cc 100644
--- a/nuttx/arch/arm/src/sam3u/sam_timerisr.c
+++ b/nuttx/arch/arm/src/sam34/sam_timerisr.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/arm/src/sam3u/sam_timerisr.c
+ * arch/arm/src/sam34/sam_timerisr.c
  *
  *   Copyright (C) 2010, 2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/nuttx/arch/arm/src/sam3u/sam_userspace.c b/nuttx/arch/arm/src/sam34/sam_userspace.c
index 4e90435ae..72f1a814b 100644
--- a/nuttx/arch/arm/src/sam3u/sam_userspace.c
+++ b/nuttx/arch/arm/src/sam34/sam_userspace.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/arm/src/sam3u/sam_userspace.c
+ * arch/arm/src/sam34/sam_userspace.c
  *
  *   Copyright (C) 2011, 2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/nuttx/arch/arm/src/sam3u/sam_userspace.h b/nuttx/arch/arm/src/sam34/sam_userspace.h
index 93ca9d278..b24577589 100644
--- a/nuttx/arch/arm/src/sam3u/sam_userspace.h
+++ b/nuttx/arch/arm/src/sam34/sam_userspace.h
@@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/sam3u/sam_userspace.h
+ * arch/arm/src/sam34/sam_userspace.h
  *
  *   Copyright (C) 2009-2011, 2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -33,8 +33,8 @@
  *
  ************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_SAM3U_SAM_USERSPACE_H
-#define __ARCH_ARM_SRC_SAM3U_SAM_USERSPACE_H
+#ifndef __ARCH_ARM_SRC_SAM34_SAM_USERSPACE_H
+#define __ARCH_ARM_SRC_SAM34_SAM_USERSPACE_H
 
 /************************************************************************************
  * Included Files
@@ -102,4 +102,4 @@ void sam_userspace(void);
 #endif
 
 #endif /* __ASSEMBLY__ */
-#endif /* __ARCH_ARM_SRC_SAM3U_SAM_USERSPACE_H */
+#endif /* __ARCH_ARM_SRC_SAM34_SAM_USERSPACE_H */
diff --git a/nuttx/arch/arm/src/sam3u/sam_vectors.S b/nuttx/arch/arm/src/sam34/sam_vectors.S
index 7ff50553e..a80df3263 100644
--- a/nuttx/arch/arm/src/sam3u/sam_vectors.S
+++ b/nuttx/arch/arm/src/sam34/sam_vectors.S
@@ -1,5 +1,5 @@
 /************************************************************************************************
- * arch/arm/src/sam3u/sam_vectors.S
+ * arch/arm/src/sam34/sam_vectors.S
  *
  *   Copyright (C) 2009-2010, 2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
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