From e9859095dca542619ef7d496a283bb86db1e0e74 Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Sun, 2 Jun 2013 13:57:22 -0600 Subject: [PATCH] Rename sam3u/ architecture directories to sam34/ to include the SAM4L --- arch/arm/Kconfig | 4 ++-- arch/arm/include/{sam3u => sam34}/chip.h | 8 ++++---- arch/arm/include/{sam3u => sam34}/irq.h | 8 ++++---- arch/arm/src/{sam3u => sam34}/Kconfig | 0 arch/arm/src/{sam3u => sam34}/Make.defs | 2 +- arch/arm/src/{sam3u => sam34}/chip.h | 10 +++++----- arch/arm/src/{sam3u => sam34}/chip/sam3u_memorymap.h | 8 ++++---- arch/arm/src/{sam3u => sam34}/chip/sam3u_pinmap.h | 8 ++++---- arch/arm/src/{sam3u => sam34}/chip/sam3u_vectors.h | 2 +- arch/arm/src/{sam3u => sam34}/chip/sam_adc.h | 2 +- arch/arm/src/{sam3u => sam34}/chip/sam_chipid.h | 8 ++++---- arch/arm/src/{sam3u => sam34}/chip/sam_dmac.h | 8 ++++---- arch/arm/src/{sam3u => sam34}/chip/sam_eefc.h | 8 ++++---- arch/arm/src/{sam3u => sam34}/chip/sam_gpbr.h | 8 ++++---- arch/arm/src/{sam3u => sam34}/chip/sam_hsmci.h | 8 ++++---- arch/arm/src/{sam3u => sam34}/chip/sam_matrix.h | 8 ++++---- arch/arm/src/{sam3u => sam34}/chip/sam_memorymap.h | 8 ++++---- arch/arm/src/{sam3u => sam34}/chip/sam_pdc.h | 8 ++++---- arch/arm/src/{sam3u => sam34}/chip/sam_pinmap.h | 8 ++++---- arch/arm/src/{sam3u => sam34}/chip/sam_pio.h | 8 ++++---- arch/arm/src/{sam3u => sam34}/chip/sam_pmc.h | 8 ++++---- arch/arm/src/{sam3u => sam34}/chip/sam_pwm.h | 8 ++++---- arch/arm/src/{sam3u => sam34}/chip/sam_rstc.h | 8 ++++---- arch/arm/src/{sam3u => sam34}/chip/sam_rtc.h | 8 ++++---- arch/arm/src/{sam3u => sam34}/chip/sam_rtt.h | 8 ++++---- arch/arm/src/{sam3u => sam34}/chip/sam_smc.h | 8 ++++---- arch/arm/src/{sam3u => sam34}/chip/sam_spi.h | 8 ++++---- arch/arm/src/{sam3u => sam34}/chip/sam_ssc.h | 8 ++++---- arch/arm/src/{sam3u => sam34}/chip/sam_supc.h | 8 ++++---- arch/arm/src/{sam3u => sam34}/chip/sam_tc.h | 8 ++++---- arch/arm/src/{sam3u => sam34}/chip/sam_twi.h | 8 ++++---- arch/arm/src/{sam3u => sam34}/chip/sam_uart.h | 8 ++++---- arch/arm/src/{sam3u => sam34}/chip/sam_udphs.h | 8 ++++---- arch/arm/src/{sam3u => sam34}/chip/sam_wdt.h | 8 ++++---- arch/arm/src/{sam3u => sam34}/sam_allocateheap.c | 0 arch/arm/src/{sam3u => sam34}/sam_clockconfig.c | 2 +- arch/arm/src/{sam3u => sam34}/sam_clockconfig.h | 10 +++++----- arch/arm/src/{sam3u => sam34}/sam_dmac.c | 2 +- arch/arm/src/{sam3u => sam34}/sam_dmac.h | 8 ++++---- arch/arm/src/{sam3u => sam34}/sam_gpio.c | 2 +- arch/arm/src/{sam3u => sam34}/sam_gpio.h | 8 ++++---- arch/arm/src/{sam3u => sam34}/sam_gpioirq.c | 2 +- arch/arm/src/{sam3u => sam34}/sam_hsmci.c | 2 +- arch/arm/src/{sam3u => sam34}/sam_hsmci.h | 8 ++++---- arch/arm/src/{sam3u => sam34}/sam_irq.c | 2 +- arch/arm/src/{sam3u => sam34}/sam_lowputc.c | 2 +- arch/arm/src/{sam3u => sam34}/sam_lowputc.h | 8 ++++---- arch/arm/src/{sam3u => sam34}/sam_mpuinit.c | 0 arch/arm/src/{sam3u => sam34}/sam_mpuinit.h | 8 ++++---- arch/arm/src/{sam3u => sam34}/sam_serial.c | 2 +- arch/arm/src/{sam3u => sam34}/sam_spi.c | 2 +- arch/arm/src/{sam3u => sam34}/sam_spi.h | 8 ++++---- arch/arm/src/{sam3u => sam34}/sam_start.c | 2 +- arch/arm/src/{sam3u => sam34}/sam_timerisr.c | 2 +- arch/arm/src/{sam3u => sam34}/sam_userspace.c | 2 +- arch/arm/src/{sam3u => sam34}/sam_userspace.h | 8 ++++---- arch/arm/src/{sam3u => sam34}/sam_vectors.S | 2 +- 57 files changed, 168 insertions(+), 168 deletions(-) rename arch/arm/include/{sam3u => sam34}/chip.h (96%) rename arch/arm/include/{sam3u => sam34}/irq.h (99%) rename arch/arm/src/{sam3u => sam34}/Kconfig (100%) rename arch/arm/src/{sam3u => sam34}/Make.defs (99%) rename arch/arm/src/{sam3u => sam34}/chip.h (94%) rename arch/arm/src/{sam3u => sam34}/chip/sam3u_memorymap.h (98%) rename arch/arm/src/{sam3u => sam34}/chip/sam3u_pinmap.h (98%) rename arch/arm/src/{sam3u => sam34}/chip/sam3u_vectors.h (99%) rename arch/arm/src/{sam3u => sam34}/chip/sam_adc.h (99%) rename arch/arm/src/{sam3u => sam34}/chip/sam_chipid.h (98%) rename arch/arm/src/{sam3u => sam34}/chip/sam_dmac.h (99%) rename arch/arm/src/{sam3u => sam34}/chip/sam_eefc.h (97%) rename arch/arm/src/{sam3u => sam34}/chip/sam_gpbr.h (95%) rename arch/arm/src/{sam3u => sam34}/chip/sam_hsmci.h (99%) rename arch/arm/src/{sam3u => sam34}/chip/sam_matrix.h (98%) rename arch/arm/src/{sam3u => sam34}/chip/sam_memorymap.h (91%) rename arch/arm/src/{sam3u => sam34}/chip/sam_pdc.h (96%) rename arch/arm/src/{sam3u => sam34}/chip/sam_pinmap.h (92%) rename arch/arm/src/{sam3u => sam34}/chip/sam_pio.h (99%) rename arch/arm/src/{sam3u => sam34}/chip/sam_pmc.h (99%) rename arch/arm/src/{sam3u => sam34}/chip/sam_pwm.h (99%) rename arch/arm/src/{sam3u => sam34}/chip/sam_rstc.h (96%) rename arch/arm/src/{sam3u => sam34}/chip/sam_rtc.h (98%) rename arch/arm/src/{sam3u => sam34}/chip/sam_rtt.h (96%) rename arch/arm/src/{sam3u => sam34}/chip/sam_smc.h (99%) rename arch/arm/src/{sam3u => sam34}/chip/sam_spi.h (98%) rename arch/arm/src/{sam3u => sam34}/chip/sam_ssc.h (99%) rename arch/arm/src/{sam3u => sam34}/chip/sam_supc.h (98%) rename arch/arm/src/{sam3u => sam34}/chip/sam_tc.h (99%) rename arch/arm/src/{sam3u => sam34}/chip/sam_twi.h (98%) rename arch/arm/src/{sam3u => sam34}/chip/sam_uart.h (99%) rename arch/arm/src/{sam3u => sam34}/chip/sam_udphs.h (99%) rename arch/arm/src/{sam3u => sam34}/chip/sam_wdt.h (96%) rename arch/arm/src/{sam3u => sam34}/sam_allocateheap.c (100%) rename arch/arm/src/{sam3u => sam34}/sam_clockconfig.c (99%) rename arch/arm/src/{sam3u => sam34}/sam_clockconfig.h (94%) rename arch/arm/src/{sam3u => sam34}/sam_dmac.c (99%) rename arch/arm/src/{sam3u => sam34}/sam_dmac.h (98%) rename arch/arm/src/{sam3u => sam34}/sam_gpio.c (99%) rename arch/arm/src/{sam3u => sam34}/sam_gpio.h (98%) rename arch/arm/src/{sam3u => sam34}/sam_gpioirq.c (99%) rename arch/arm/src/{sam3u => sam34}/sam_hsmci.c (99%) rename arch/arm/src/{sam3u => sam34}/sam_hsmci.h (96%) rename arch/arm/src/{sam3u => sam34}/sam_irq.c (99%) rename arch/arm/src/{sam3u => sam34}/sam_lowputc.c (99%) rename arch/arm/src/{sam3u => sam34}/sam_lowputc.h (95%) rename arch/arm/src/{sam3u => sam34}/sam_mpuinit.c (100%) rename arch/arm/src/{sam3u => sam34}/sam_mpuinit.h (95%) rename arch/arm/src/{sam3u => sam34}/sam_serial.c (99%) rename arch/arm/src/{sam3u => sam34}/sam_spi.c (99%) rename arch/arm/src/{sam3u => sam34}/sam_spi.h (98%) rename arch/arm/src/{sam3u => sam34}/sam_start.c (99%) rename arch/arm/src/{sam3u => sam34}/sam_timerisr.c (99%) rename arch/arm/src/{sam3u => sam34}/sam_userspace.c (99%) rename arch/arm/src/{sam3u => sam34}/sam_userspace.h (95%) rename arch/arm/src/{sam3u => sam34}/sam_vectors.S (99%) diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 600a7e0112..fdd120779b 100644 --- a/arch/arm/Kconfig +++ b/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/arch/arm/include/sam3u/chip.h b/arch/arm/include/sam34/chip.h similarity index 96% rename from arch/arm/include/sam3u/chip.h rename to arch/arm/include/sam34/chip.h index afd475faf5..9cc7d1b7c5 100644 --- a/arch/arm/include/sam3u/chip.h +++ b/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 @@ -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/arch/arm/include/sam3u/irq.h b/arch/arm/include/sam34/irq.h similarity index 99% rename from arch/arm/include/sam3u/irq.h rename to arch/arm/include/sam34/irq.h index 72f4608168..2c59f487a5 100644 --- a/arch/arm/include/sam3u/irq.h +++ b/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 @@ -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/arch/arm/src/sam3u/Kconfig b/arch/arm/src/sam34/Kconfig similarity index 100% rename from arch/arm/src/sam3u/Kconfig rename to arch/arm/src/sam34/Kconfig diff --git a/arch/arm/src/sam3u/Make.defs b/arch/arm/src/sam34/Make.defs similarity index 99% rename from arch/arm/src/sam3u/Make.defs rename to arch/arm/src/sam34/Make.defs index 025ad0be4a..813bcbe4c0 100644 --- a/arch/arm/src/sam3u/Make.defs +++ b/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 diff --git a/arch/arm/src/sam3u/chip.h b/arch/arm/src/sam34/chip.h similarity index 94% rename from arch/arm/src/sam3u/chip.h rename to arch/arm/src/sam34/chip.h index 570c67d29a..cd5f76d89b 100644 --- a/arch/arm/src/sam3u/chip.h +++ b/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 @@ -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 +#include #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/arch/arm/src/sam3u/chip/sam3u_memorymap.h b/arch/arm/src/sam34/chip/sam3u_memorymap.h similarity index 98% rename from arch/arm/src/sam3u/chip/sam3u_memorymap.h rename to arch/arm/src/sam34/chip/sam3u_memorymap.h index 1017a82ddb..ea61f57d80 100644 --- a/arch/arm/src/sam3u/chip/sam3u_memorymap.h +++ b/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 @@ -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/arch/arm/src/sam3u/chip/sam3u_pinmap.h b/arch/arm/src/sam34/chip/sam3u_pinmap.h similarity index 98% rename from arch/arm/src/sam3u/chip/sam3u_pinmap.h rename to arch/arm/src/sam34/chip/sam3u_pinmap.h index 17287b05f8..fbcffbfd0f 100644 --- a/arch/arm/src/sam3u/chip/sam3u_pinmap.h +++ b/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 @@ -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/arch/arm/src/sam3u/chip/sam3u_vectors.h b/arch/arm/src/sam34/chip/sam3u_vectors.h similarity index 99% rename from arch/arm/src/sam3u/chip/sam3u_vectors.h rename to arch/arm/src/sam34/chip/sam3u_vectors.h index cdc5948c29..d1828ddd81 100644 --- a/arch/arm/src/sam3u/chip/sam3u_vectors.h +++ b/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 diff --git a/arch/arm/src/sam3u/chip/sam_adc.h b/arch/arm/src/sam34/chip/sam_adc.h similarity index 99% rename from arch/arm/src/sam3u/chip/sam_adc.h rename to arch/arm/src/sam34/chip/sam_adc.h index 0f38784026..802fdcd2ce 100644 --- a/arch/arm/src/sam3u/chip/sam_adc.h +++ b/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 diff --git a/arch/arm/src/sam3u/chip/sam_chipid.h b/arch/arm/src/sam34/chip/sam_chipid.h similarity index 98% rename from arch/arm/src/sam3u/chip/sam_chipid.h rename to arch/arm/src/sam34/chip/sam_chipid.h index 4a5138bde9..1c1e972b71 100644 --- a/arch/arm/src/sam3u/chip/sam_chipid.h +++ b/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 @@ -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/arch/arm/src/sam3u/chip/sam_dmac.h b/arch/arm/src/sam34/chip/sam_dmac.h similarity index 99% rename from arch/arm/src/sam3u/chip/sam_dmac.h rename to arch/arm/src/sam34/chip/sam_dmac.h index 6d0ed1488e..388383b1e0 100644 --- a/arch/arm/src/sam3u/chip/sam_dmac.h +++ b/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 @@ -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/arch/arm/src/sam3u/chip/sam_eefc.h b/arch/arm/src/sam34/chip/sam_eefc.h similarity index 97% rename from arch/arm/src/sam3u/chip/sam_eefc.h rename to arch/arm/src/sam34/chip/sam_eefc.h index 5a4272167c..546b6334ca 100644 --- a/arch/arm/src/sam3u/chip/sam_eefc.h +++ b/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 @@ -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/arch/arm/src/sam3u/chip/sam_gpbr.h b/arch/arm/src/sam34/chip/sam_gpbr.h similarity index 95% rename from arch/arm/src/sam3u/chip/sam_gpbr.h rename to arch/arm/src/sam34/chip/sam_gpbr.h index 6a0a28133d..f439be79a6 100644 --- a/arch/arm/src/sam3u/chip/sam_gpbr.h +++ b/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 @@ -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/arch/arm/src/sam3u/chip/sam_hsmci.h b/arch/arm/src/sam34/chip/sam_hsmci.h similarity index 99% rename from arch/arm/src/sam3u/chip/sam_hsmci.h rename to arch/arm/src/sam34/chip/sam_hsmci.h index ce9ccd7da9..dfee208c31 100644 --- a/arch/arm/src/sam3u/chip/sam_hsmci.h +++ b/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 @@ -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/arch/arm/src/sam3u/chip/sam_matrix.h b/arch/arm/src/sam34/chip/sam_matrix.h similarity index 98% rename from arch/arm/src/sam3u/chip/sam_matrix.h rename to arch/arm/src/sam34/chip/sam_matrix.h index fe30705e7d..6fed14092e 100644 --- a/arch/arm/src/sam3u/chip/sam_matrix.h +++ b/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 @@ -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/arch/arm/src/sam3u/chip/sam_memorymap.h b/arch/arm/src/sam34/chip/sam_memorymap.h similarity index 91% rename from arch/arm/src/sam3u/chip/sam_memorymap.h rename to arch/arm/src/sam34/chip/sam_memorymap.h index c403aa5412..ad4a6018c6 100644 --- a/arch/arm/src/sam3u/chip/sam_memorymap.h +++ b/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 @@ -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/arch/arm/src/sam3u/chip/sam_pdc.h b/arch/arm/src/sam34/chip/sam_pdc.h similarity index 96% rename from arch/arm/src/sam3u/chip/sam_pdc.h rename to arch/arm/src/sam34/chip/sam_pdc.h index 63f0d97195..40ae4e91ad 100644 --- a/arch/arm/src/sam3u/chip/sam_pdc.h +++ b/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 @@ -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/arch/arm/src/sam3u/chip/sam_pinmap.h b/arch/arm/src/sam34/chip/sam_pinmap.h similarity index 92% rename from arch/arm/src/sam3u/chip/sam_pinmap.h rename to arch/arm/src/sam34/chip/sam_pinmap.h index 1de42f4a10..2adfac974f 100644 --- a/arch/arm/src/sam3u/chip/sam_pinmap.h +++ b/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 @@ -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/arch/arm/src/sam3u/chip/sam_pio.h b/arch/arm/src/sam34/chip/sam_pio.h similarity index 99% rename from arch/arm/src/sam3u/chip/sam_pio.h rename to arch/arm/src/sam34/chip/sam_pio.h index e708c03925..f6cef564bc 100644 --- a/arch/arm/src/sam3u/chip/sam_pio.h +++ b/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 @@ -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/arch/arm/src/sam3u/chip/sam_pmc.h b/arch/arm/src/sam34/chip/sam_pmc.h similarity index 99% rename from arch/arm/src/sam3u/chip/sam_pmc.h rename to arch/arm/src/sam34/chip/sam_pmc.h index 538df4f789..f6a98e3eec 100644 --- a/arch/arm/src/sam3u/chip/sam_pmc.h +++ b/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 @@ -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/arch/arm/src/sam3u/chip/sam_pwm.h b/arch/arm/src/sam34/chip/sam_pwm.h similarity index 99% rename from arch/arm/src/sam3u/chip/sam_pwm.h rename to arch/arm/src/sam34/chip/sam_pwm.h index d13677d565..fe3bf04a14 100644 --- a/arch/arm/src/sam3u/chip/sam_pwm.h +++ b/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 @@ -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/arch/arm/src/sam3u/chip/sam_rstc.h b/arch/arm/src/sam34/chip/sam_rstc.h similarity index 96% rename from arch/arm/src/sam3u/chip/sam_rstc.h rename to arch/arm/src/sam34/chip/sam_rstc.h index d8e1bd10fb..3a620d7ef9 100644 --- a/arch/arm/src/sam3u/chip/sam_rstc.h +++ b/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 @@ -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/arch/arm/src/sam3u/chip/sam_rtc.h b/arch/arm/src/sam34/chip/sam_rtc.h similarity index 98% rename from arch/arm/src/sam3u/chip/sam_rtc.h rename to arch/arm/src/sam34/chip/sam_rtc.h index 2ec71e4771..5c0a2e15e3 100644 --- a/arch/arm/src/sam3u/chip/sam_rtc.h +++ b/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 @@ -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/arch/arm/src/sam3u/chip/sam_rtt.h b/arch/arm/src/sam34/chip/sam_rtt.h similarity index 96% rename from arch/arm/src/sam3u/chip/sam_rtt.h rename to arch/arm/src/sam34/chip/sam_rtt.h index 733d84f2bb..75b0d361e6 100644 --- a/arch/arm/src/sam3u/chip/sam_rtt.h +++ b/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 @@ -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/arch/arm/src/sam3u/chip/sam_smc.h b/arch/arm/src/sam34/chip/sam_smc.h similarity index 99% rename from arch/arm/src/sam3u/chip/sam_smc.h rename to arch/arm/src/sam34/chip/sam_smc.h index da79ad12fe..ba67d66088 100644 --- a/arch/arm/src/sam3u/chip/sam_smc.h +++ b/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 @@ -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/arch/arm/src/sam3u/chip/sam_spi.h b/arch/arm/src/sam34/chip/sam_spi.h similarity index 98% rename from arch/arm/src/sam3u/chip/sam_spi.h rename to arch/arm/src/sam34/chip/sam_spi.h index 40c843fab5..91720647fd 100644 --- a/arch/arm/src/sam3u/chip/sam_spi.h +++ b/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 @@ -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/arch/arm/src/sam3u/chip/sam_ssc.h b/arch/arm/src/sam34/chip/sam_ssc.h similarity index 99% rename from arch/arm/src/sam3u/chip/sam_ssc.h rename to arch/arm/src/sam34/chip/sam_ssc.h index 8de331ce73..5526592602 100644 --- a/arch/arm/src/sam3u/chip/sam_ssc.h +++ b/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 @@ -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/arch/arm/src/sam3u/chip/sam_supc.h b/arch/arm/src/sam34/chip/sam_supc.h similarity index 98% rename from arch/arm/src/sam3u/chip/sam_supc.h rename to arch/arm/src/sam34/chip/sam_supc.h index 41916fc0a1..1be920d0d9 100644 --- a/arch/arm/src/sam3u/chip/sam_supc.h +++ b/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 @@ -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/arch/arm/src/sam3u/chip/sam_tc.h b/arch/arm/src/sam34/chip/sam_tc.h similarity index 99% rename from arch/arm/src/sam3u/chip/sam_tc.h rename to arch/arm/src/sam34/chip/sam_tc.h index 50bee8ff1a..de20468520 100644 --- a/arch/arm/src/sam3u/chip/sam_tc.h +++ b/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 @@ -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/arch/arm/src/sam3u/chip/sam_twi.h b/arch/arm/src/sam34/chip/sam_twi.h similarity index 98% rename from arch/arm/src/sam3u/chip/sam_twi.h rename to arch/arm/src/sam34/chip/sam_twi.h index a3135f6def..056f1062eb 100644 --- a/arch/arm/src/sam3u/chip/sam_twi.h +++ b/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 @@ -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/arch/arm/src/sam3u/chip/sam_uart.h b/arch/arm/src/sam34/chip/sam_uart.h similarity index 99% rename from arch/arm/src/sam3u/chip/sam_uart.h rename to arch/arm/src/sam34/chip/sam_uart.h index 965a63a4ab..4825435fdb 100644 --- a/arch/arm/src/sam3u/chip/sam_uart.h +++ b/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 @@ -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/arch/arm/src/sam3u/chip/sam_udphs.h b/arch/arm/src/sam34/chip/sam_udphs.h similarity index 99% rename from arch/arm/src/sam3u/chip/sam_udphs.h rename to arch/arm/src/sam34/chip/sam_udphs.h index 7bb33b4285..9229cd8373 100644 --- a/arch/arm/src/sam3u/chip/sam_udphs.h +++ b/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 @@ -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/arch/arm/src/sam3u/chip/sam_wdt.h b/arch/arm/src/sam34/chip/sam_wdt.h similarity index 96% rename from arch/arm/src/sam3u/chip/sam_wdt.h rename to arch/arm/src/sam34/chip/sam_wdt.h index 96aac38579..ffe0cb96db 100644 --- a/arch/arm/src/sam3u/chip/sam_wdt.h +++ b/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 @@ -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/arch/arm/src/sam3u/sam_allocateheap.c b/arch/arm/src/sam34/sam_allocateheap.c similarity index 100% rename from arch/arm/src/sam3u/sam_allocateheap.c rename to arch/arm/src/sam34/sam_allocateheap.c diff --git a/arch/arm/src/sam3u/sam_clockconfig.c b/arch/arm/src/sam34/sam_clockconfig.c similarity index 99% rename from arch/arm/src/sam3u/sam_clockconfig.c rename to arch/arm/src/sam34/sam_clockconfig.c index df5cf59ba6..8a3988a405 100644 --- a/arch/arm/src/sam3u/sam_clockconfig.c +++ b/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/arch/arm/src/sam3u/sam_clockconfig.h b/arch/arm/src/sam34/sam_clockconfig.h similarity index 94% rename from arch/arm/src/sam3u/sam_clockconfig.h rename to arch/arm/src/sam34/sam_clockconfig.h index da57cb71a2..4ed9e6b878 100644 --- a/arch/arm/src/sam3u/sam_clockconfig.h +++ b/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 @@ -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/arch/arm/src/sam3u/sam_dmac.c b/arch/arm/src/sam34/sam_dmac.c similarity index 99% rename from arch/arm/src/sam3u/sam_dmac.c rename to arch/arm/src/sam34/sam_dmac.c index d2871a99db..75d6927542 100644 --- a/arch/arm/src/sam3u/sam_dmac.c +++ b/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 diff --git a/arch/arm/src/sam3u/sam_dmac.h b/arch/arm/src/sam34/sam_dmac.h similarity index 98% rename from arch/arm/src/sam3u/sam_dmac.h rename to arch/arm/src/sam34/sam_dmac.h index f073030110..4e34d46944 100644 --- a/arch/arm/src/sam3u/sam_dmac.h +++ b/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 @@ -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/arch/arm/src/sam3u/sam_gpio.c b/arch/arm/src/sam34/sam_gpio.c similarity index 99% rename from arch/arm/src/sam3u/sam_gpio.c rename to arch/arm/src/sam34/sam_gpio.c index ea389ec5ae..123c3d4b90 100644 --- a/arch/arm/src/sam3u/sam_gpio.c +++ b/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 diff --git a/arch/arm/src/sam3u/sam_gpio.h b/arch/arm/src/sam34/sam_gpio.h similarity index 98% rename from arch/arm/src/sam3u/sam_gpio.h rename to arch/arm/src/sam34/sam_gpio.h index 2832871e80..3324cd3b35 100644 --- a/arch/arm/src/sam3u/sam_gpio.h +++ b/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 @@ -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/arch/arm/src/sam3u/sam_gpioirq.c b/arch/arm/src/sam34/sam_gpioirq.c similarity index 99% rename from arch/arm/src/sam3u/sam_gpioirq.c rename to arch/arm/src/sam34/sam_gpioirq.c index 58a5252a49..e5f0364cd9 100644 --- a/arch/arm/src/sam3u/sam_gpioirq.c +++ b/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 diff --git a/arch/arm/src/sam3u/sam_hsmci.c b/arch/arm/src/sam34/sam_hsmci.c similarity index 99% rename from arch/arm/src/sam3u/sam_hsmci.c rename to arch/arm/src/sam34/sam_hsmci.c index 1737faa413..f9ee665a80 100644 --- a/arch/arm/src/sam3u/sam_hsmci.c +++ b/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 diff --git a/arch/arm/src/sam3u/sam_hsmci.h b/arch/arm/src/sam34/sam_hsmci.h similarity index 96% rename from arch/arm/src/sam3u/sam_hsmci.h rename to arch/arm/src/sam34/sam_hsmci.h index 299f94c72a..841ef37429 100644 --- a/arch/arm/src/sam3u/sam_hsmci.h +++ b/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 @@ -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/arch/arm/src/sam3u/sam_irq.c b/arch/arm/src/sam34/sam_irq.c similarity index 99% rename from arch/arm/src/sam3u/sam_irq.c rename to arch/arm/src/sam34/sam_irq.c index 083ad5ae15..f212742114 100644 --- a/arch/arm/src/sam3u/sam_irq.c +++ b/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 diff --git a/arch/arm/src/sam3u/sam_lowputc.c b/arch/arm/src/sam34/sam_lowputc.c similarity index 99% rename from arch/arm/src/sam3u/sam_lowputc.c rename to arch/arm/src/sam34/sam_lowputc.c index 65e31fa474..00a3d3a895 100644 --- a/arch/arm/src/sam3u/sam_lowputc.c +++ b/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 diff --git a/arch/arm/src/sam3u/sam_lowputc.h b/arch/arm/src/sam34/sam_lowputc.h similarity index 95% rename from arch/arm/src/sam3u/sam_lowputc.h rename to arch/arm/src/sam34/sam_lowputc.h index ffb0338622..ecfb14cb73 100644 --- a/arch/arm/src/sam3u/sam_lowputc.h +++ b/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 @@ -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/arch/arm/src/sam3u/sam_mpuinit.c b/arch/arm/src/sam34/sam_mpuinit.c similarity index 100% rename from arch/arm/src/sam3u/sam_mpuinit.c rename to arch/arm/src/sam34/sam_mpuinit.c diff --git a/arch/arm/src/sam3u/sam_mpuinit.h b/arch/arm/src/sam34/sam_mpuinit.h similarity index 95% rename from arch/arm/src/sam3u/sam_mpuinit.h rename to arch/arm/src/sam34/sam_mpuinit.h index f2111bd26d..d047447acb 100644 --- a/arch/arm/src/sam3u/sam_mpuinit.h +++ b/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 @@ -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/arch/arm/src/sam3u/sam_serial.c b/arch/arm/src/sam34/sam_serial.c similarity index 99% rename from arch/arm/src/sam3u/sam_serial.c rename to arch/arm/src/sam34/sam_serial.c index deef640ea5..fb7d69cba0 100644 --- a/arch/arm/src/sam3u/sam_serial.c +++ b/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 diff --git a/arch/arm/src/sam3u/sam_spi.c b/arch/arm/src/sam34/sam_spi.c similarity index 99% rename from arch/arm/src/sam3u/sam_spi.c rename to arch/arm/src/sam34/sam_spi.c index c8ca057216..10395ec90f 100644 --- a/arch/arm/src/sam3u/sam_spi.c +++ b/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 diff --git a/arch/arm/src/sam3u/sam_spi.h b/arch/arm/src/sam34/sam_spi.h similarity index 98% rename from arch/arm/src/sam3u/sam_spi.h rename to arch/arm/src/sam34/sam_spi.h index 32fb393873..77e6e26f37 100644 --- a/arch/arm/src/sam3u/sam_spi.h +++ b/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 @@ -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/arch/arm/src/sam3u/sam_start.c b/arch/arm/src/sam34/sam_start.c similarity index 99% rename from arch/arm/src/sam3u/sam_start.c rename to arch/arm/src/sam34/sam_start.c index c5a7d17830..a3fc49fa29 100644 --- a/arch/arm/src/sam3u/sam_start.c +++ b/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 diff --git a/arch/arm/src/sam3u/sam_timerisr.c b/arch/arm/src/sam34/sam_timerisr.c similarity index 99% rename from arch/arm/src/sam3u/sam_timerisr.c rename to arch/arm/src/sam34/sam_timerisr.c index 828ec1e734..e1879d5cc1 100644 --- a/arch/arm/src/sam3u/sam_timerisr.c +++ b/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 diff --git a/arch/arm/src/sam3u/sam_userspace.c b/arch/arm/src/sam34/sam_userspace.c similarity index 99% rename from arch/arm/src/sam3u/sam_userspace.c rename to arch/arm/src/sam34/sam_userspace.c index 4e90435aee..72f1a814b2 100644 --- a/arch/arm/src/sam3u/sam_userspace.c +++ b/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 diff --git a/arch/arm/src/sam3u/sam_userspace.h b/arch/arm/src/sam34/sam_userspace.h similarity index 95% rename from arch/arm/src/sam3u/sam_userspace.h rename to arch/arm/src/sam34/sam_userspace.h index 93ca9d2780..b245775893 100644 --- a/arch/arm/src/sam3u/sam_userspace.h +++ b/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 @@ -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/arch/arm/src/sam3u/sam_vectors.S b/arch/arm/src/sam34/sam_vectors.S similarity index 99% rename from arch/arm/src/sam3u/sam_vectors.S rename to arch/arm/src/sam34/sam_vectors.S index 7ff50553e0..a80df32632 100644 --- a/arch/arm/src/sam3u/sam_vectors.S +++ b/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