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

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

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
+#ifndef __ARCH_ARM_INCLUDE_SAM34_CHIP_H
-#define __ARCH_ARM_INCLUDE_SAM3U_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 */

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
+#ifndef __ARCH_ARM_INCLUDE_SAM34_IRQ_H
-#define __ARCH_ARM_INCLUDE_SAM3U_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 */
 

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>

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
+#ifndef __ARCH_ARM_SRC_SAM34_CHIP_H
-#define __ARCH_ARM_SRC_SAM3U_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 */

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
+#ifndef __ARCH_ARM_SRC_SAM34_SAM3U_MEMORYMAP_H
-#define __ARCH_ARM_SRC_SAM3U_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 */

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
+#ifndef __ARCH_ARM_SRC_SAM34_CHIP_SAM3U_PINMAP_H
-#define __ARCH_ARM_SRC_SAM3U_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 */

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>

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>

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
+#ifndef __ARCH_ARM_SRC_SAM34_CHIP_SAM_CHIPID_H
-#define __ARCH_ARM_SRC_SAM3U_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 */

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
+#ifndef __ARCH_ARM_SRC_SAM34_CHIP_SAM_DMAC_H
-#define __ARCH_ARM_SRC_SAM3U_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 */

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
+#ifndef __ARCH_ARM_SRC_SAM34_CHIP_SAM_EEFC_H
-#define __ARCH_ARM_SRC_SAM3U_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 */

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
+#ifndef __ARCH_ARM_SRC_SAM34_CHIP_SAM_GPBR_H
-#define __ARCH_ARM_SRC_SAM3U_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 */

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
+#ifndef __ARCH_ARM_SRC_SAM34_CHIP_SAM_HSMCI_H
-#define __ARCH_ARM_SRC_SAM3U_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 */

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
+#ifndef __ARCH_ARM_SRC_SAM34_CHIP_SAM_MATRIX_H
-#define __ARCH_ARM_SRC_SAM3U_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 */

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
+#ifndef __ARCH_ARM_SRC_SAM34_CHIP_SAM_MEMORYMAP_H
-#define __ARCH_ARM_SRC_SAM3U_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 */
 

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
+#ifndef __ARCH_ARM_SRC_SAM34_CHIP_SAM_PDC_H
-#define __ARCH_ARM_SRC_SAM3U_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 */

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
+#ifndef __ARCH_ARM_SRC_SAM34_CHIP_SAM_PINMAP_H
-#define __ARCH_ARM_SRC_SAM3U_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 */
 

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
+#ifndef __ARCH_ARM_SRC_SAM34_CHIP_SAM_PIO_H
-#define __ARCH_ARM_SRC_SAM3U_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 */

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
+#ifndef __ARCH_ARM_SRC_SAM34_CHIP_SAM_PMC_H
-#define __ARCH_ARM_SRC_SAM3U_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 */

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
+#ifndef __ARCH_ARM_SRC_SAM34_CHIP_SAM_PWM_H
-#define __ARCH_ARM_SRC_SAM3U_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 */

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
+#ifndef __ARCH_ARM_SRC_SAM34_CHIP_SAM_RSTC_H
-#define __ARCH_ARM_SRC_SAM3U_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 */

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
+#ifndef __ARCH_ARM_SRC_SAM34_CHIP_SAM_RTC_H
-#define __ARCH_ARM_SRC_SAM3U_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 */

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
+#ifndef __ARCH_ARM_SRC_SAM34_CHIP_SAM_RTT_H
-#define __ARCH_ARM_SRC_SAM3U_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 */

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
+#ifndef __ARCH_ARM_SRC_SAM34_CHIP_SAM_SMC_H
-#define __ARCH_ARM_SRC_SAM3U_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 */

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
+#ifndef __ARCH_ARM_SRC_SAM34_CHIP_SAM_SPI_H
-#define __ARCH_ARM_SRC_SAM3U_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 */

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
+#ifndef __ARCH_ARM_SRC_SAM34_CHIP_SAM_SSC_H
-#define __ARCH_ARM_SRC_SAM3U_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 */

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
+#ifndef __ARCH_ARM_SRC_SAM34_CHIP_SAM_SUPC_H
-#define __ARCH_ARM_SRC_SAM3U_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 */

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
+#ifndef __ARCH_ARM_SRC_SAM34_CHIP_SAM_TC_H
-#define __ARCH_ARM_SRC_SAM3U_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 */

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
+#ifndef __ARCH_ARM_SRC_SAM34_CHIP_SAM_TWI_H
-#define __ARCH_ARM_SRC_SAM3U_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 */

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
+#ifndef __ARCH_ARM_SRC_SAM34_CHIP_SAM_UART_H
-#define __ARCH_ARM_SRC_SAM3U_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 */

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
+#ifndef __ARCH_ARM_SRC_SAM34_CHIP_SAM_UDPHS_H
-#define __ARCH_ARM_SRC_SAM3U_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 */
 

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
+#ifndef __ARCH_ARM_SRC_SAM34_CHIP_SAM_WDT_H
-#define __ARCH_ARM_SRC_SAM3U_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 */

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.

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
+#ifndef __ARCH_ARM_SRC_SAM34_SAM_CLOCKCONFIG_H
-#define __ARCH_ARM_SRC_SAM3U_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 */

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>

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
+#ifndef __ARCH_ARM_SRC_SAM34_SAM_DMAC_H
-#define __ARCH_ARM_SRC_SAM3U_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 */

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>

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
+#ifndef __ARCH_ARM_SRC_SAM34_SAM_GPIO_H
-#define __ARCH_ARM_SRC_SAM3U_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 */

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>

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>

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
+#ifndef __ARCH_ARM_SRC_SAM34_SAM_HSMCI_H
-#define __ARCH_ARM_SRC_SAM3U_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 */

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>

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>

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
+#ifndef __ARCH_ARM_SRC_SAM34_SAM_LOWPUTC_H
-#define __ARCH_ARM_SRC_SAM3U_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 */

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
+#ifndef __ARCH_ARM_SRC_SAM34_SAM_MPUINIT_H
-#define __ARCH_ARM_SRC_SAM3U_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 */

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>

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>

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
+#ifndef __ARCH_ARM_SRC_SAM34_SAM_SPI_H
-#define __ARCH_ARM_SRC_SAM3U_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 */

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>

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>

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>

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
+#ifndef __ARCH_ARM_SRC_SAM34_SAM_USERSPACE_H
-#define __ARCH_ARM_SRC_SAM3U_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 */

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>