phone-side
/
nuttx-bb
9
0
Fork 0
Code Releases Activity

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

This commit is contained in:
Gregory Nutt 2013-06-02 13:57:22 -06:00
parent 0baf7136f9
commit 3d0cc6467f
65 changed files with 180 additions and 177 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
nuttx/ChangeLog
View File

@ -4863,3 +4863,6 @@
conditional compilation (CONFIG_ missing from setting name). This
affects some STM32 FLASH pre-fetch settings. From Lorenz Meier
(2013-6-2).
* arch/arm/include/sam34 and arch/arm/src/sam34: The old sam3u/
directories were renamed sam34/ to make room in the namespace for
the SAM4L (2013-6-2).

4
nuttx/arch/arm/Kconfig
View File

@ -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

8
nuttx/arch/arm/include/sam3u/chip.h → nuttx/arch/arm/include/sam34/chip.h
View File

@ -1,5 +1,5 @@
/************************************************************************************
* arch/arm/include/sam3u/chip.h
* arch/arm/include/sam34/chip.h
*
* Copyright (C) 2009-2010, 2013 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
@ -33,8 +33,8 @@
*
************************************************************************************/
#ifndef __ARCH_ARM_INCLUDE_SAM3U_CHIP_H
#define __ARCH_ARM_INCLUDE_SAM3U_CHIP_H
#ifndef __ARCH_ARM_INCLUDE_SAM34_CHIP_H
#define __ARCH_ARM_INCLUDE_SAM34_CHIP_H
/************************************************************************************
* Included Files
@ -92,4 +92,4 @@
* Public Functions
************************************************************************************/
#endif /* __ARCH_ARM_INCLUDE_SAM3U_CHIP_H */
#endif /* __ARCH_ARM_INCLUDE_SAM34_CHIP_H */

8
nuttx/arch/arm/include/sam3u/irq.h → nuttx/arch/arm/include/sam34/irq.h
View File

@ -1,5 +1,5 @@
/****************************************************************************************
* arch/arm/include/sam3u/irq.h
* arch/arm/include/sam34/irq.h
*
* Copyright (C) 2009-2011, 2013 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
@ -37,8 +37,8 @@
* only indirectly through nuttx/irq.h
*/
#ifndef __ARCH_ARM_INCLUDE_SAM3U_IRQ_H
#define __ARCH_ARM_INCLUDE_SAM3U_IRQ_H
#ifndef __ARCH_ARM_INCLUDE_SAM34_IRQ_H
#define __ARCH_ARM_INCLUDE_SAM34_IRQ_H
/****************************************************************************************
* Included Files
@ -293,5 +293,5 @@ extern "C" {
#endif
#endif
#endif /* __ARCH_ARM_INCLUDE_SAM3U_IRQ_H */
#endif /* __ARCH_ARM_INCLUDE_SAM34_IRQ_H */

0
nuttx/arch/arm/src/sam3u/Kconfig → nuttx/arch/arm/src/sam34/Kconfig
View File

2
nuttx/arch/arm/src/sam3u/Make.defs → nuttx/arch/arm/src/sam34/Make.defs
View File

@ -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>

10
nuttx/arch/arm/src/sam3u/chip.h → nuttx/arch/arm/src/sam34/chip.h
View File

@ -1,5 +1,5 @@
/************************************************************************************
* arch/arm/src/sam3u/chip.h
* arch/arm/src/sam34/chip.h
*
* Copyright (C) 2009-2010, 2013 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
@ -33,8 +33,8 @@
*
************************************************************************************/
#ifndef __ARCH_ARM_SRC_SAM3U_CHIP_H
#define __ARCH_ARM_SRC_SAM3U_CHIP_H
#ifndef __ARCH_ARM_SRC_SAM34_CHIP_H
#define __ARCH_ARM_SRC_SAM34_CHIP_H
/************************************************************************************
* Included Files
@ -46,7 +46,7 @@
* should then include this file for the proper setup.
*/
#include <arch/sam3u/chip.h>
#include <arch/sam34/chip.h>
#include "chip/sam_memorymap.h"
/************************************************************************************
@ -65,4 +65,4 @@
* Public Functions
************************************************************************************/
#endif /* __ARCH_ARM_SRC_SAM3U_CHIP_H */
#endif /* __ARCH_ARM_SRC_SAM34_CHIP_H */

8
nuttx/arch/arm/src/sam3u/chip/sam3u_memorymap.h → nuttx/arch/arm/src/sam34/chip/sam3u_memorymap.h
View File

@ -1,5 +1,5 @@
/************************************************************************************************
* arch/arm/src/sam3u/chip/sam3u_memorymap.h
* arch/arm/src/sam34/chip/sam3u_memorymap.h
*
* Copyright (C) 2009-2010, 2013 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
@ -33,8 +33,8 @@
*
************************************************************************************************/
#ifndef __ARCH_ARM_SRC_SAM3U_SAM3U_MEMORYMAP_H
#define __ARCH_ARM_SRC_SAM3U_SAM3U_MEMORYMAP_H
#ifndef __ARCH_ARM_SRC_SAM34_SAM3U_MEMORYMAP_H
#define __ARCH_ARM_SRC_SAM34_SAM3U_MEMORYMAP_H
/************************************************************************************************
* Included Files
@ -142,4 +142,4 @@
* Public Functions
************************************************************************************************/
#endif /* __ARCH_ARM_SRC_SAM3U_SAM3U_MEMORYMAP_H */
#endif /* __ARCH_ARM_SRC_SAM34_SAM3U_MEMORYMAP_H */

8
nuttx/arch/arm/src/sam3u/chip/sam3u_pinmap.h → nuttx/arch/arm/src/sam34/chip/sam3u_pinmap.h
View File

@ -1,5 +1,5 @@
/************************************************************************************
* arch/arm/src/sam3u/chip/sam3u_pinmap.h
* arch/arm/src/sam34/chip/sam3u_pinmap.h
*
* Copyright (C) 2009-2011, 2013 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
@ -33,8 +33,8 @@
*
************************************************************************************/
#ifndef __ARCH_ARM_SRC_SAM3U_CHIP_SAM3U_PINMAP_H
#define __ARCH_ARM_SRC_SAM3U_CHIP_SAM3U_PINMAP_H
#ifndef __ARCH_ARM_SRC_SAM34_CHIP_SAM3U_PINMAP_H
#define __ARCH_ARM_SRC_SAM34_CHIP_SAM3U_PINMAP_H
/************************************************************************************
* Included Files
@ -220,4 +220,4 @@ extern "C"
#endif
#endif /* __ASSEMBLY__ */
#endif /* __ARCH_ARM_SRC_SAM3U_CHIP_SAM3U_PINMAP_H */
#endif /* __ARCH_ARM_SRC_SAM34_CHIP_SAM3U_PINMAP_H */

2
nuttx/arch/arm/src/sam3u/chip/sam3u_vectors.h → nuttx/arch/arm/src/sam34/chip/sam3u_vectors.h
View File

@ -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>

2
nuttx/arch/arm/src/sam3u/chip/sam_adc.h → nuttx/arch/arm/src/sam34/chip/sam_adc.h
View File

@ -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>

8
nuttx/arch/arm/src/sam3u/chip/sam_chipid.h → nuttx/arch/arm/src/sam34/chip/sam_chipid.h
View File

@ -1,5 +1,5 @@
/****************************************************************************************
* arch/arm/src/sam3u/chip/sam_chipid.h
* arch/arm/src/sam34/chip/sam_chipid.h
*
* Copyright (C) 2009, 2013 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
@ -33,8 +33,8 @@
*
****************************************************************************************/
#ifndef __ARCH_ARM_SRC_SAM3U_CHIP_SAM_CHIPID_H
#define __ARCH_ARM_SRC_SAM3U_CHIP_SAM_CHIPID_H
#ifndef __ARCH_ARM_SRC_SAM34_CHIP_SAM_CHIPID_H
#define __ARCH_ARM_SRC_SAM34_CHIP_SAM_CHIPID_H
/****************************************************************************************
* Included Files
@ -164,4 +164,4 @@
* Public Functions
****************************************************************************************/
#endif /* __ARCH_ARM_SRC_SAM3U_CHIP_SAM_CHIPID_H */
#endif /* __ARCH_ARM_SRC_SAM34_CHIP_SAM_CHIPID_H */

8
nuttx/arch/arm/src/sam3u/chip/sam_dmac.h → nuttx/arch/arm/src/sam34/chip/sam_dmac.h
View File

@ -1,5 +1,5 @@
/****************************************************************************************
* arch/arm/src/sam3u/chip/sam_dmac.h
* arch/arm/src/sam34/chip/sam_dmac.h
*
* Copyright (C) 2009-2010, 2013 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
@ -33,8 +33,8 @@
*
****************************************************************************************/
#ifndef __ARCH_ARM_SRC_SAM3U_CHIP_SAM_DMAC_H
#define __ARCH_ARM_SRC_SAM3U_CHIP_SAM_DMAC_H
#ifndef __ARCH_ARM_SRC_SAM34_CHIP_SAM_DMAC_H
#define __ARCH_ARM_SRC_SAM34_CHIP_SAM_DMAC_H
/****************************************************************************************
* Included Files
@ -437,4 +437,4 @@ struct dma_linklist_s
* Public Functions
****************************************************************************************/
#endif /* __ARCH_ARM_SRC_SAM3U_CHIP_SAM_DMAC_H */
#endif /* __ARCH_ARM_SRC_SAM34_CHIP_SAM_DMAC_H */

8
nuttx/arch/arm/src/sam3u/chip/sam_eefc.h → nuttx/arch/arm/src/sam34/chip/sam_eefc.h
View File

@ -1,5 +1,5 @@
/****************************************************************************************
* arch/arm/src/sam3u/chip/sam_eefc.h
* arch/arm/src/sam34/chip/sam_eefc.h
*
* Copyright (C) 2009, 2013 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
@ -33,8 +33,8 @@
*
****************************************************************************************/
#ifndef __ARCH_ARM_SRC_SAM3U_CHIP_SAM_EEFC_H
#define __ARCH_ARM_SRC_SAM3U_CHIP_SAM_EEFC_H
#ifndef __ARCH_ARM_SRC_SAM34_CHIP_SAM_EEFC_H
#define __ARCH_ARM_SRC_SAM34_CHIP_SAM_EEFC_H
/****************************************************************************************
* Included Files
@ -117,4 +117,4 @@
* Public Functions
****************************************************************************************/
#endif /* __ARCH_ARM_SRC_SAM3U_CHIP_SAM_EEFC_H */
#endif /* __ARCH_ARM_SRC_SAM34_CHIP_SAM_EEFC_H */

8
nuttx/arch/arm/src/sam3u/chip/sam_gpbr.h → nuttx/arch/arm/src/sam34/chip/sam_gpbr.h
View File

@ -1,5 +1,5 @@
/****************************************************************************************
* arch/arm/src/sam3u/chip/sam_gpbr.h
* arch/arm/src/sam34/chip/sam_gpbr.h
*
* Copyright (C) 2009, 2013 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
@ -33,8 +33,8 @@
*
****************************************************************************************/
#ifndef __ARCH_ARM_SRC_SAM3U_CHIP_SAM_GPBR_H
#define __ARCH_ARM_SRC_SAM3U_CHIP_SAM_GPBR_H
#ifndef __ARCH_ARM_SRC_SAM34_CHIP_SAM_GPBR_H
#define __ARCH_ARM_SRC_SAM34_CHIP_SAM_GPBR_H
/****************************************************************************************
* Included Files
@ -87,4 +87,4 @@
* Public Functions
****************************************************************************************/
#endif /* __ARCH_ARM_SRC_SAM3U_CHIP_SAM_GPBR_H */
#endif /* __ARCH_ARM_SRC_SAM34_CHIP_SAM_GPBR_H */

8
nuttx/arch/arm/src/sam3u/chip/sam_hsmci.h → nuttx/arch/arm/src/sam34/chip/sam_hsmci.h
View File

@ -1,5 +1,5 @@
/****************************************************************************************
* arch/arm/src/sam3u/chip/sam_hsmci.h
* arch/arm/src/sam34/chip/sam_hsmci.h
*
* Copyright (C) 2009, 2013 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
@ -33,8 +33,8 @@
*
****************************************************************************************/
#ifndef __ARCH_ARM_SRC_SAM3U_CHIP_SAM_HSMCI_H
#define __ARCH_ARM_SRC_SAM3U_CHIP_SAM_HSMCI_H
#ifndef __ARCH_ARM_SRC_SAM34_CHIP_SAM_HSMCI_H
#define __ARCH_ARM_SRC_SAM34_CHIP_SAM_HSMCI_H
/****************************************************************************************
* Included Files
@ -294,4 +294,4 @@
* Public Functions
****************************************************************************************/
#endif /* __ARCH_ARM_SRC_SAM3U_CHIP_SAM_HSMCI_H */
#endif /* __ARCH_ARM_SRC_SAM34_CHIP_SAM_HSMCI_H */

8
nuttx/arch/arm/src/sam3u/chip/sam_matrix.h → nuttx/arch/arm/src/sam34/chip/sam_matrix.h
View File

@ -1,5 +1,5 @@
/****************************************************************************************
* arch/arm/src/sam3u/chip/sam_matric.h
* arch/arm/src/sam34/chip/sam_matric.h
*
* Copyright (C) 2009-2010, 2013 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
@ -33,8 +33,8 @@
*
****************************************************************************************/
#ifndef __ARCH_ARM_SRC_SAM3U_CHIP_SAM_MATRIX_H
#define __ARCH_ARM_SRC_SAM3U_CHIP_SAM_MATRIX_H
#ifndef __ARCH_ARM_SRC_SAM34_CHIP_SAM_MATRIX_H
#define __ARCH_ARM_SRC_SAM34_CHIP_SAM_MATRIX_H
/****************************************************************************************
* Included Files
@ -211,4 +211,4 @@
* Public Functions
****************************************************************************************/
#endif /* __ARCH_ARM_SRC_SAM3U_CHIP_SAM_MATRIX_H */
#endif /* __ARCH_ARM_SRC_SAM34_CHIP_SAM_MATRIX_H */

8
nuttx/arch/arm/src/sam3u/chip/sam_memorymap.h → nuttx/arch/arm/src/sam34/chip/sam_memorymap.h
View File

@ -1,5 +1,5 @@
/************************************************************************************
* arch/arm/src/sam3u/chip/sam_memorymap.h
* arch/arm/src/sam34/chip/sam_memorymap.h
*
* Copyright (C) 2012 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
@ -33,8 +33,8 @@
*
************************************************************************************/
#ifndef __ARCH_ARM_SRC_SAM3U_CHIP_SAM_MEMORYMAP_H
#define __ARCH_ARM_SRC_SAM3U_CHIP_SAM_MEMORYMAP_H
#ifndef __ARCH_ARM_SRC_SAM34_CHIP_SAM_MEMORYMAP_H
#define __ARCH_ARM_SRC_SAM34_CHIP_SAM_MEMORYMAP_H
/************************************************************************************
* Included Files
@ -49,5 +49,5 @@
# Unrecognized SAM architecture
#endif
#endif /* __ARCH_ARM_SRC_SAM3U_CHIP_SAM_MEMORYMAP_H */
#endif /* __ARCH_ARM_SRC_SAM34_CHIP_SAM_MEMORYMAP_H */

8
nuttx/arch/arm/src/sam3u/chip/sam_pdc.h → nuttx/arch/arm/src/sam34/chip/sam_pdc.h
View File

@ -1,5 +1,5 @@
/****************************************************************************************
* arch/arm/src/sam3u/chip/sam_pdc.h
* arch/arm/src/sam34/chip/sam_pdc.h
*
* Copyright (C) 2009, 2013 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
@ -33,8 +33,8 @@
*
****************************************************************************************/
#ifndef __ARCH_ARM_SRC_SAM3U_CHIP_SAM_PDC_H
#define __ARCH_ARM_SRC_SAM3U_CHIP_SAM_PDC_H
#ifndef __ARCH_ARM_SRC_SAM34_CHIP_SAM_PDC_H
#define __ARCH_ARM_SRC_SAM34_CHIP_SAM_PDC_H
/****************************************************************************************
* Included Files
@ -100,4 +100,4 @@
* Public Functions
****************************************************************************************/
#endif /* __ARCH_ARM_SRC_SAM3U_CHIP_SAM_PDC_H */
#endif /* __ARCH_ARM_SRC_SAM34_CHIP_SAM_PDC_H */

8
nuttx/arch/arm/src/sam3u/chip/sam_pinmap.h → nuttx/arch/arm/src/sam34/chip/sam_pinmap.h
View File

@ -1,5 +1,5 @@
/************************************************************************************
* arch/arm/src/sam3u/chip/sam_pinmap.h
* arch/arm/src/sam34/chip/sam_pinmap.h
*
* Copyright (C) 2012 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
@ -33,8 +33,8 @@
*
************************************************************************************/
#ifndef __ARCH_ARM_SRC_SAM3U_CHIP_SAM_PINMAP_H
#define __ARCH_ARM_SRC_SAM3U_CHIP_SAM_PINMAP_H
#ifndef __ARCH_ARM_SRC_SAM34_CHIP_SAM_PINMAP_H
#define __ARCH_ARM_SRC_SAM34_CHIP_SAM_PINMAP_H
/************************************************************************************
* Included Files
@ -49,5 +49,5 @@
# Unrecognized SAM architecture
#endif
#endif /* __ARCH_ARM_SRC_SAM3U_CHIP_SAM_PINMAP_H */
#endif /* __ARCH_ARM_SRC_SAM34_CHIP_SAM_PINMAP_H */

8
nuttx/arch/arm/src/sam3u/chip/sam_pio.h → nuttx/arch/arm/src/sam34/chip/sam_pio.h
View File

@ -1,5 +1,5 @@
/****************************************************************************************
* arch/arm/src/sam3u/chip/sam_pio.h
* arch/arm/src/sam34/chip/sam_pio.h
*
* Copyright (C) 2009, 2013 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
@ -33,8 +33,8 @@
*
****************************************************************************************/
#ifndef __ARCH_ARM_SRC_SAM3U_CHIP_SAM_PIO_H
#define __ARCH_ARM_SRC_SAM3U_CHIP_SAM_PIO_H
#ifndef __ARCH_ARM_SRC_SAM34_CHIP_SAM_PIO_H
#define __ARCH_ARM_SRC_SAM34_CHIP_SAM_PIO_H
/****************************************************************************************
* Included Files
@ -321,4 +321,4 @@
* Public Functions
****************************************************************************************/
#endif /* __ARCH_ARM_SRC_SAM3U_CHIP_SAM_PIO_H */
#endif /* __ARCH_ARM_SRC_SAM34_CHIP_SAM_PIO_H */

8
nuttx/arch/arm/src/sam3u/chip/sam_pmc.h → nuttx/arch/arm/src/sam34/chip/sam_pmc.h
View File

@ -1,5 +1,5 @@
/****************************************************************************************
* arch/arm/src/sam3u/chip/sam_pmc.h
* arch/arm/src/sam34/chip/sam_pmc.h
*
* Copyright (C) 2009, 2013 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
@ -33,8 +33,8 @@
*
****************************************************************************************/
#ifndef __ARCH_ARM_SRC_SAM3U_CHIP_SAM_PMC_H
#define __ARCH_ARM_SRC_SAM3U_CHIP_SAM_PMC_H
#ifndef __ARCH_ARM_SRC_SAM34_CHIP_SAM_PMC_H
#define __ARCH_ARM_SRC_SAM34_CHIP_SAM_PMC_H
/****************************************************************************************
* Included Files
@ -312,4 +312,4 @@
* Public Functions
****************************************************************************************/
#endif /* __ARCH_ARM_SRC_SAM3U_CHIP_SAM_PMC_H */
#endif /* __ARCH_ARM_SRC_SAM34_CHIP_SAM_PMC_H */

8
nuttx/arch/arm/src/sam3u/chip/sam_pwm.h → nuttx/arch/arm/src/sam34/chip/sam_pwm.h
View File

@ -1,5 +1,5 @@
/****************************************************************************************
* arch/arm/src/sam3u/chip/sam_pwm.h
* arch/arm/src/sam34/chip/sam_pwm.h
*
* Copyright (C) 2009, 2013 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
@ -33,8 +33,8 @@
*
****************************************************************************************/
#ifndef __ARCH_ARM_SRC_SAM3U_CHIP_SAM_PWM_H
#define __ARCH_ARM_SRC_SAM3U_CHIP_SAM_PWM_H
#ifndef __ARCH_ARM_SRC_SAM34_CHIP_SAM_PWM_H
#define __ARCH_ARM_SRC_SAM34_CHIP_SAM_PWM_H
/****************************************************************************************
* Included Files
@ -630,4 +630,4 @@
* Public Functions
****************************************************************************************/
#endif /* __ARCH_ARM_SRC_SAM3U_CHIP_SAM_PWM_H */
#endif /* __ARCH_ARM_SRC_SAM34_CHIP_SAM_PWM_H */

8
nuttx/arch/arm/src/sam3u/chip/sam_rstc.h → nuttx/arch/arm/src/sam34/chip/sam_rstc.h
View File

@ -1,5 +1,5 @@
/****************************************************************************************
* arch/arm/src/sam3u/chip/sam_rstc.h
* arch/arm/src/sam34/chip/sam_rstc.h
*
* Copyright (C) 2009, 2013 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
@ -33,8 +33,8 @@
*
****************************************************************************************/
#ifndef __ARCH_ARM_SRC_SAM3U_CHIP_SAM_RSTC_H
#define __ARCH_ARM_SRC_SAM3U_CHIP_SAM_RSTC_H
#ifndef __ARCH_ARM_SRC_SAM34_CHIP_SAM_RSTC_H
#define __ARCH_ARM_SRC_SAM34_CHIP_SAM_RSTC_H
/****************************************************************************************
* Included Files
@ -99,4 +99,4 @@
* Public Functions
****************************************************************************************/
#endif /* __ARCH_ARM_SRC_SAM3U_CHIP_SAM_RSTC_H */
#endif /* __ARCH_ARM_SRC_SAM34_CHIP_SAM_RSTC_H */

8
nuttx/arch/arm/src/sam3u/chip/sam_rtc.h → nuttx/arch/arm/src/sam34/chip/sam_rtc.h
View File

@ -1,5 +1,5 @@
/****************************************************************************************
* arch/arm/src/sam3u/chip/sam_rtc.h
* arch/arm/src/sam34/chip/sam_rtc.h
*
* Copyright (C) 2009, 2013 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
@ -33,8 +33,8 @@
*
****************************************************************************************/
#ifndef __ARCH_ARM_SRC_SAM3U_CHIP_SAM_RTC_H
#define __ARCH_ARM_SRC_SAM3U_CHIP_SAM_RTC_H
#ifndef __ARCH_ARM_SRC_SAM34_CHIP_SAM_RTC_H
#define __ARCH_ARM_SRC_SAM34_CHIP_SAM_RTC_H
/****************************************************************************************
* Included Files
@ -181,4 +181,4 @@
* Public Functions
****************************************************************************************/
#endif /* __ARCH_ARM_SRC_SAM3U_CHIP_SAM_RTC_H */
#endif /* __ARCH_ARM_SRC_SAM34_CHIP_SAM_RTC_H */

8
nuttx/arch/arm/src/sam3u/chip/sam_rtt.h → nuttx/arch/arm/src/sam34/chip/sam_rtt.h
View File

@ -1,5 +1,5 @@
/****************************************************************************************
* arch/arm/src/sam3u/chip/sam_rtt.h
* arch/arm/src/sam34/chip/sam_rtt.h
*
* Copyright (C) 2009, 2013 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
@ -33,8 +33,8 @@
*
****************************************************************************************/
#ifndef __ARCH_ARM_SRC_SAM3U_CHIP_SAM_RTT_H
#define __ARCH_ARM_SRC_SAM3U_CHIP_SAM_RTT_H
#ifndef __ARCH_ARM_SRC_SAM34_CHIP_SAM_RTT_H
#define __ARCH_ARM_SRC_SAM34_CHIP_SAM_RTT_H
/****************************************************************************************
* Included Files
@ -86,4 +86,4 @@
* Public Functions
****************************************************************************************/
#endif /* __ARCH_ARM_SRC_SAM3U_CHIP_SAM_RTT_H */
#endif /* __ARCH_ARM_SRC_SAM34_CHIP_SAM_RTT_H */

8
nuttx/arch/arm/src/sam3u/chip/sam_smc.h → nuttx/arch/arm/src/sam34/chip/sam_smc.h
View File

@ -1,5 +1,5 @@
/****************************************************************************************
* arch/arm/src/sam3u/chip/sam_smc.h
* arch/arm/src/sam34/chip/sam_smc.h
*
* Copyright (C) 2009, 2013 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
@ -33,8 +33,8 @@
*
****************************************************************************************/
#ifndef __ARCH_ARM_SRC_SAM3U_CHIP_SAM_SMC_H
#define __ARCH_ARM_SRC_SAM3U_CHIP_SAM_SMC_H
#ifndef __ARCH_ARM_SRC_SAM34_CHIP_SAM_SMC_H
#define __ARCH_ARM_SRC_SAM34_CHIP_SAM_SMC_H
/****************************************************************************************
* Included Files
@ -429,4 +429,4 @@
* Public Functions
****************************************************************************************/
#endif /* __ARCH_ARM_SRC_SAM3U_CHIP_SAM_SMC_H */
#endif /* __ARCH_ARM_SRC_SAM34_CHIP_SAM_SMC_H */

8
nuttx/arch/arm/src/sam3u/chip/sam_spi.h → nuttx/arch/arm/src/sam34/chip/sam_spi.h
View File

@ -1,5 +1,5 @@
/****************************************************************************************
* arch/arm/src/sam3u/chip/sam_spi.h
* arch/arm/src/sam34/chip/sam_spi.h
*
* Copyright (C) 2009, 2011, 2013 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
@ -33,8 +33,8 @@
*
****************************************************************************************/
#ifndef __ARCH_ARM_SRC_SAM3U_CHIP_SAM_SPI_H
#define __ARCH_ARM_SRC_SAM3U_CHIP_SAM_SPI_H
#ifndef __ARCH_ARM_SRC_SAM34_CHIP_SAM_SPI_H
#define __ARCH_ARM_SRC_SAM34_CHIP_SAM_SPI_H
/****************************************************************************************
* Included Files
@ -186,4 +186,4 @@
* Public Functions
****************************************************************************************/
#endif /* __ARCH_ARM_SRC_SAM3U_CHIP_SAM_SPI_H */
#endif /* __ARCH_ARM_SRC_SAM34_CHIP_SAM_SPI_H */

8
nuttx/arch/arm/src/sam3u/chip/sam_ssc.h → nuttx/arch/arm/src/sam34/chip/sam_ssc.h
View File

@ -1,5 +1,5 @@
/****************************************************************************************
* arch/arm/src/sam3u/chip/sam_ssc.h
* arch/arm/src/sam34/chip/sam_ssc.h
*
* Copyright (C) 2009, 2013 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
@ -33,8 +33,8 @@
*
****************************************************************************************/
#ifndef __ARCH_ARM_SRC_SAM3U_CHIP_SAM_SSC_H
#define __ARCH_ARM_SRC_SAM3U_CHIP_SAM_SSC_H
#ifndef __ARCH_ARM_SRC_SAM34_CHIP_SAM_SSC_H
#define __ARCH_ARM_SRC_SAM34_CHIP_SAM_SSC_H
/****************************************************************************************
* Included Files
@ -289,4 +289,4 @@
* Public Functions
****************************************************************************************/
#endif /* __ARCH_ARM_SRC_SAM3U_CHIP_SAM_SSC_H */
#endif /* __ARCH_ARM_SRC_SAM34_CHIP_SAM_SSC_H */

8
nuttx/arch/arm/src/sam3u/chip/sam_supc.h → nuttx/arch/arm/src/sam34/chip/sam_supc.h
View File

@ -1,5 +1,5 @@
/****************************************************************************************
* arch/arm/src/sam3u/chip/sam_supc.h
* arch/arm/src/sam34/chip/sam_supc.h
*
* Copyright (C) 2009, 2013 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
@ -33,8 +33,8 @@
*
****************************************************************************************/
#ifndef __ARCH_ARM_SRC_SAM3U_CHIP_SAM_SUPC_H
#define __ARCH_ARM_SRC_SAM3U_CHIP_SAM_SUPC_H
#ifndef __ARCH_ARM_SRC_SAM34_CHIP_SAM_SUPC_H
#define __ARCH_ARM_SRC_SAM34_CHIP_SAM_SUPC_H
/****************************************************************************************
* Included Files
@ -161,4 +161,4 @@
* Public Functions
****************************************************************************************/
#endif /* __ARCH_ARM_SRC_SAM3U_CHIP_SAM_SUPC_H */
#endif /* __ARCH_ARM_SRC_SAM34_CHIP_SAM_SUPC_H */

8
nuttx/arch/arm/src/sam3u/chip/sam_tc.h → nuttx/arch/arm/src/sam34/chip/sam_tc.h
View File

@ -1,5 +1,5 @@
/************************************************************************************************
* arch/arm/src/sam3u/chip/sam_tc.h
* arch/arm/src/sam34/chip/sam_tc.h
*
* Copyright (C) 2009, 2013 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
@ -33,8 +33,8 @@
*
************************************************************************************************/
#ifndef __ARCH_ARM_SRC_SAM3U_CHIP_SAM_TC_H
#define __ARCH_ARM_SRC_SAM3U_CHIP_SAM_TC_H
#ifndef __ARCH_ARM_SRC_SAM34_CHIP_SAM_TC_H
#define __ARCH_ARM_SRC_SAM34_CHIP_SAM_TC_H
/************************************************************************************************
* Included Files
@ -344,4 +344,4 @@
* Public Functions
************************************************************************************************/
#endif /* __ARCH_ARM_SRC_SAM3U_CHIP_SAM_TC_H */
#endif /* __ARCH_ARM_SRC_SAM34_CHIP_SAM_TC_H */

8
nuttx/arch/arm/src/sam3u/chip/sam_twi.h → nuttx/arch/arm/src/sam34/chip/sam_twi.h
View File

@ -1,5 +1,5 @@
/****************************************************************************************
* arch/arm/src/sam3u/chip/sam_twi.h
* arch/arm/src/sam34/chip/sam_twi.h
*
* Copyright (C) 2009, 2013 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
@ -33,8 +33,8 @@
*
****************************************************************************************/
#ifndef __ARCH_ARM_SRC_SAM3U_CHIP_SAM_TWI_H
#define __ARCH_ARM_SRC_SAM3U_CHIP_SAM_TWI_H
#ifndef __ARCH_ARM_SRC_SAM34_CHIP_SAM_TWI_H
#define __ARCH_ARM_SRC_SAM34_CHIP_SAM_TWI_H
/****************************************************************************************
* Included Files
@ -189,4 +189,4 @@
* Public Functions
****************************************************************************************/
#endif /* __ARCH_ARM_SRC_SAM3U_CHIP_SAM_TWI_H */
#endif /* __ARCH_ARM_SRC_SAM34_CHIP_SAM_TWI_H */

8
nuttx/arch/arm/src/sam3u/chip/sam_uart.h → nuttx/arch/arm/src/sam34/chip/sam_uart.h
View File

@ -1,5 +1,5 @@
/************************************************************************************************
* arch/arm/src/sam3u/chip/sam_uart.h
* arch/arm/src/sam34/chip/sam_uart.h
*
* Copyright (C) 2009, 2013 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
@ -33,8 +33,8 @@
*
************************************************************************************************/
#ifndef __ARCH_ARM_SRC_SAM3U_CHIP_SAM_UART_H
#define __ARCH_ARM_SRC_SAM3U_CHIP_SAM_UART_H
#ifndef __ARCH_ARM_SRC_SAM34_CHIP_SAM_UART_H
#define __ARCH_ARM_SRC_SAM34_CHIP_SAM_UART_H
/************************************************************************************************
* Included Files
@ -388,4 +388,4 @@
* Public Functions
************************************************************************************************/
#endif /* __ARCH_ARM_SRC_SAM3U_CHIP_SAM_UART_H */
#endif /* __ARCH_ARM_SRC_SAM34_CHIP_SAM_UART_H */

8
nuttx/arch/arm/src/sam3u/chip/sam_udphs.h → nuttx/arch/arm/src/sam34/chip/sam_udphs.h
View File

@ -1,5 +1,5 @@
/****************************************************************************************
* arch/arm/src/sam3u/chip/sam_udphs.h
* arch/arm/src/sam34/chip/sam_udphs.h
*
* Copyright (C) 2009, 2013 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
@ -33,8 +33,8 @@
*
****************************************************************************************/
#ifndef __ARCH_ARM_SRC_SAM3U_CHIP_SAM_UDPHS_H
#define __ARCH_ARM_SRC_SAM3U_CHIP_SAM_UDPHS_H
#ifndef __ARCH_ARM_SRC_SAM34_CHIP_SAM_UDPHS_H
#define __ARCH_ARM_SRC_SAM34_CHIP_SAM_UDPHS_H
/****************************************************************************************
* Included Files
@ -367,5 +367,5 @@
* Public Functions
****************************************************************************************/
#endif /* __ARCH_ARM_SRC_SAM3U_CHIP_SAM_UDPHS_H */
#endif /* __ARCH_ARM_SRC_SAM34_CHIP_SAM_UDPHS_H */

8
nuttx/arch/arm/src/sam3u/chip/sam_wdt.h → nuttx/arch/arm/src/sam34/chip/sam_wdt.h
View File

@ -1,5 +1,5 @@
/****************************************************************************************
* arch/arm/src/sam3u/chip/sam_wdt.h
* arch/arm/src/sam34/chip/sam_wdt.h
*
* Copyright (C) 2009, 2013 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
@ -33,8 +33,8 @@
*
****************************************************************************************/
#ifndef __ARCH_ARM_SRC_SAM3U_CHIP_SAM_WDT_H
#define __ARCH_ARM_SRC_SAM3U_CHIP_SAM_WDT_H
#ifndef __ARCH_ARM_SRC_SAM34_CHIP_SAM_WDT_H
#define __ARCH_ARM_SRC_SAM34_CHIP_SAM_WDT_H
/****************************************************************************************
* Included Files
@ -93,4 +93,4 @@
* Public Functions
****************************************************************************************/
#endif /* __ARCH_ARM_SRC_SAM3U_CHIP_SAM_WDT_H */
#endif /* __ARCH_ARM_SRC_SAM34_CHIP_SAM_WDT_H */

0
nuttx/arch/arm/src/sam3u/sam_allocateheap.c → nuttx/arch/arm/src/sam34/sam_allocateheap.c
View File

2
nuttx/arch/arm/src/sam3u/sam_clockconfig.c → nuttx/arch/arm/src/sam34/sam_clockconfig.c
View File

@ -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.

10
nuttx/arch/arm/src/sam3u/sam_clockconfig.h → nuttx/arch/arm/src/sam34/sam_clockconfig.h
View File

@ -1,5 +1,5 @@
/************************************************************************************
* arch/arm/src/sam3u/sam_clockconfig.h
* arch/arm/src/sam34/sam_clockconfig.h
*
* Copyright (C) 2009-2011, 2013 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
@ -33,8 +33,8 @@
*
************************************************************************************/
#ifndef __ARCH_ARM_SRC_SAM3U_SAM_CLOCKCONFIG_H
#define __ARCH_ARM_SRC_SAM3U_SAM_CLOCKCONFIG_H
#ifndef __ARCH_ARM_SRC_SAM34_SAM_CLOCKCONFIG_H
#define __ARCH_ARM_SRC_SAM34_SAM_CLOCKCONFIG_H
/************************************************************************************
* Included Files
@ -79,7 +79,7 @@ extern "C"
* Description:
* Called to initialize the SAM3/4. This does whatever setup is needed to put the
* SoC in a usable state. This includes the initialization of clocking using the
* settings in board.h. (After power-on reset, the sam3u is initiallyrunning on
* settings in board.h. (After power-on reset, the sam3u is initially running on
* a 4MHz internal RC clock). This function also performs other low-level chip
* initialization of the chip including EFC, master clock, IRQ and watchdog
* configuration.
@ -94,4 +94,4 @@ void sam_clockconfig(void);
#endif
#endif /* __ASSEMBLY__ */
#endif /* __ARCH_ARM_SRC_SAM3U_SAM_CLOCKCONFIG_H */
#endif /* __ARCH_ARM_SRC_SAM34_SAM_CLOCKCONFIG_H */

2
nuttx/arch/arm/src/sam3u/sam_dmac.c → nuttx/arch/arm/src/sam34/sam_dmac.c
View File

@ -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>

8
nuttx/arch/arm/src/sam3u/sam_dmac.h → nuttx/arch/arm/src/sam34/sam_dmac.h
View File

@ -1,5 +1,5 @@
/************************************************************************************
* arch/arm/src/sam3u/sam_dmac.h
* arch/arm/src/sam34/sam_dmac.h
*
* Copyright (C) 2009-2011, 2013 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
@ -33,8 +33,8 @@
*
************************************************************************************/
#ifndef __ARCH_ARM_SRC_SAM3U_SAM_DMAC_H
#define __ARCH_ARM_SRC_SAM3U_SAM_DMAC_H
#ifndef __ARCH_ARM_SRC_SAM34_SAM_DMAC_H
#define __ARCH_ARM_SRC_SAM34_SAM_DMAC_H
/************************************************************************************
* Included Files
@ -294,4 +294,4 @@ void sam_dmadump(DMA_HANDLE handle, const struct sam_dmaregs_s *regs,
#endif
#endif /* __ASSEMBLY__ */
#endif /* __ARCH_ARM_SRC_SAM3U_SAM_DMAC_H */
#endif /* __ARCH_ARM_SRC_SAM34_SAM_DMAC_H */

2
nuttx/arch/arm/src/sam3u/sam_gpio.c → nuttx/arch/arm/src/sam34/sam_gpio.c
View File

@ -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>

8
nuttx/arch/arm/src/sam3u/sam_gpio.h → nuttx/arch/arm/src/sam34/sam_gpio.h
View File

@ -1,5 +1,5 @@
/************************************************************************************
* arch/arm/src/sam3u/sam_gpio.h
* arch/arm/src/sam34/sam_gpio.h
*
* Copyright (C) 2009-2011, 2013 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
@ -33,8 +33,8 @@
*
************************************************************************************/
#ifndef __ARCH_ARM_SRC_SAM3U_SAM_GPIO_H
#define __ARCH_ARM_SRC_SAM3U_SAM_GPIO_H
#ifndef __ARCH_ARM_SRC_SAM34_SAM_GPIO_H
#define __ARCH_ARM_SRC_SAM34_SAM_GPIO_H
/************************************************************************************
* Included Files
@ -294,4 +294,4 @@ int sam_dumpgpio(uint32_t pinset, const char *msg);
#endif
#endif /* __ASSEMBLY__ */
#endif /* __ARCH_ARM_SRC_SAM3U_SAM_GPIO_H */
#endif /* __ARCH_ARM_SRC_SAM34_SAM_GPIO_H */

2
nuttx/arch/arm/src/sam3u/sam_gpioirq.c → nuttx/arch/arm/src/sam34/sam_gpioirq.c
View File

@ -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>

2
nuttx/arch/arm/src/sam3u/sam_hsmci.c → nuttx/arch/arm/src/sam34/sam_hsmci.c
View File

@ -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>

8
nuttx/arch/arm/src/sam3u/sam_hsmci.h → nuttx/arch/arm/src/sam34/sam_hsmci.h
View File

@ -1,5 +1,5 @@
/************************************************************************************
* arch/arm/src/sam3u/sam_hsmci.h
* arch/arm/src/sam34/sam_hsmci.h
*
* Copyright (C) 2009-2011, 2013 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
@ -33,8 +33,8 @@
*
************************************************************************************/
#ifndef __ARCH_ARM_SRC_SAM3U_SAM_HSMCI_H
#define __ARCH_ARM_SRC_SAM3U_SAM_HSMCI_H
#ifndef __ARCH_ARM_SRC_SAM34_SAM_HSMCI_H
#define __ARCH_ARM_SRC_SAM34_SAM_HSMCI_H
/************************************************************************************
* Included Files
@ -140,4 +140,4 @@ void sdio_wrprotect(FAR struct sdio_dev_s *dev, bool wrprotect);
#endif
#endif /* __ASSEMBLY__ */
#endif /* __ARCH_ARM_SRC_SAM3U_SAM_HSMCI_H */
#endif /* __ARCH_ARM_SRC_SAM34_SAM_HSMCI_H */

2
nuttx/arch/arm/src/sam3u/sam_irq.c → nuttx/arch/arm/src/sam34/sam_irq.c
View File

@ -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>

2
nuttx/arch/arm/src/sam3u/sam_lowputc.c → nuttx/arch/arm/src/sam34/sam_lowputc.c
View File

@ -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>

8
nuttx/arch/arm/src/sam3u/sam_lowputc.h → nuttx/arch/arm/src/sam34/sam_lowputc.h
View File

@ -1,5 +1,5 @@
/************************************************************************************
* arch/arm/src/sam3u/sam_lowputc.h
* arch/arm/src/sam34/sam_lowputc.h
*
* Copyright (C) 2009-2011, 2013 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
@ -33,8 +33,8 @@
*
************************************************************************************/
#ifndef __ARCH_ARM_SRC_SAM3U_SAM_LOWPUTC_H
#define __ARCH_ARM_SRC_SAM3U_SAM_LOWPUTC_H
#ifndef __ARCH_ARM_SRC_SAM34_SAM_LOWPUTC_H
#define __ARCH_ARM_SRC_SAM34_SAM_LOWPUTC_H
/************************************************************************************
* Included Files
@ -99,4 +99,4 @@ void sam_lowsetup(void);
#endif
#endif /* __ASSEMBLY__ */
#endif /* __ARCH_ARM_SRC_SAM3U_SAM_LOWPUTC_H */
#endif /* __ARCH_ARM_SRC_SAM34_SAM_LOWPUTC_H */

0
nuttx/arch/arm/src/sam3u/sam_mpuinit.c → nuttx/arch/arm/src/sam34/sam_mpuinit.c
View File

8
nuttx/arch/arm/src/sam3u/sam_mpuinit.h → nuttx/arch/arm/src/sam34/sam_mpuinit.h
View File

@ -1,5 +1,5 @@
/************************************************************************************
* arch/arm/src/sam3u/sam_mpuinit.h
* arch/arm/src/sam34/sam_mpuinit.h
*
* Copyright (C) 2009-2011, 2013 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
@ -33,8 +33,8 @@
*
************************************************************************************/
#ifndef __ARCH_ARM_SRC_SAM3U_SAM_MPUINIT_H
#define __ARCH_ARM_SRC_SAM3U_SAM_MPUINIT_H
#ifndef __ARCH_ARM_SRC_SAM34_SAM_MPUINIT_H
#define __ARCH_ARM_SRC_SAM34_SAM_MPUINIT_H
/************************************************************************************
* Included Files
@ -111,4 +111,4 @@ void sam_mpu_uheap(uintptr_t start, size_t size);
#endif
#endif /* __ASSEMBLY__ */
#endif /* __ARCH_ARM_SRC_SAM3U_SAM_MPUINIT_H */
#endif /* __ARCH_ARM_SRC_SAM34_SAM_MPUINIT_H */

2
nuttx/arch/arm/src/sam3u/sam_serial.c → nuttx/arch/arm/src/sam34/sam_serial.c
View File

@ -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>

2
nuttx/arch/arm/src/sam3u/sam_spi.c → nuttx/arch/arm/src/sam34/sam_spi.c
View File

@ -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>

8
nuttx/arch/arm/src/sam3u/sam_spi.h → nuttx/arch/arm/src/sam34/sam_spi.h
View File

@ -1,5 +1,5 @@
/************************************************************************************
* arch/arm/src/sam3u/sam_spi.h
* arch/arm/src/sam34/sam_spi.h
*
* Copyright (C) 2009-2011, 2013 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
@ -33,8 +33,8 @@
*
************************************************************************************/
#ifndef __ARCH_ARM_SRC_SAM3U_SAM_SPI_H
#define __ARCH_ARM_SRC_SAM3U_SAM_SPI_H
#ifndef __ARCH_ARM_SRC_SAM34_SAM_SPI_H
#define __ARCH_ARM_SRC_SAM34_SAM_SPI_H
/************************************************************************************
* Included Files
@ -223,4 +223,4 @@ int sam_spicmddata(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool cmd);
#endif
#endif /* __ASSEMBLY__ */
#endif /* __ARCH_ARM_SRC_SAM3U_SAM_SPI_H */
#endif /* __ARCH_ARM_SRC_SAM34_SAM_SPI_H */

2
nuttx/arch/arm/src/sam3u/sam_start.c → nuttx/arch/arm/src/sam34/sam_start.c
View File

@ -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>

2
nuttx/arch/arm/src/sam3u/sam_timerisr.c → nuttx/arch/arm/src/sam34/sam_timerisr.c
View File

@ -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>

2
nuttx/arch/arm/src/sam3u/sam_userspace.c → nuttx/arch/arm/src/sam34/sam_userspace.c
View File

@ -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>

8
nuttx/arch/arm/src/sam3u/sam_userspace.h → nuttx/arch/arm/src/sam34/sam_userspace.h
View File

@ -1,5 +1,5 @@
/************************************************************************************
* arch/arm/src/sam3u/sam_userspace.h
* arch/arm/src/sam34/sam_userspace.h
*
* Copyright (C) 2009-2011, 2013 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
@ -33,8 +33,8 @@
*
************************************************************************************/
#ifndef __ARCH_ARM_SRC_SAM3U_SAM_USERSPACE_H
#define __ARCH_ARM_SRC_SAM3U_SAM_USERSPACE_H
#ifndef __ARCH_ARM_SRC_SAM34_SAM_USERSPACE_H
#define __ARCH_ARM_SRC_SAM34_SAM_USERSPACE_H
/************************************************************************************
* Included Files
@ -102,4 +102,4 @@ void sam_userspace(void);
#endif
#endif /* __ASSEMBLY__ */
#endif /* __ARCH_ARM_SRC_SAM3U_SAM_USERSPACE_H */
#endif /* __ARCH_ARM_SRC_SAM34_SAM_USERSPACE_H */

2
nuttx/arch/arm/src/sam3u/sam_vectors.S → nuttx/arch/arm/src/sam34/sam_vectors.S
View File

@ -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>

6
nuttx/configs/sam3u-ek/README.txt
View File

@ -108,13 +108,13 @@ IDEs
2) Start the NuttX build at least one time from the Cygwin command line
before trying to create your project. This is necessary to create
certain auto-generated files and directories that will be needed.
3) Set up include pathes: You will need include/, arch/arm/src/sam3u,
3) Set up include pathes: You will need include/, arch/arm/src/sam34,
arch/arm/src/common, arch/arm/src/armv7-m, and sched/.
4) All assembly files need to have the definition option -D __ASSEMBLY__
on the command line.
Startup files will probably cause you some headaches. The NuttX startup file
is arch/arm/src/sam3u/sam_vectors.S. You may need to build NuttX
is arch/arm/src/sam34/sam_vectors.S. You may need to build NuttX
one time from the Cygwin command line in order to obtain the pre-built
startup object needed by RIDE.
@ -256,7 +256,7 @@ SAM3U-EK-specific Configuration Options
CONFIG_ARCH_CHIP - Identifies the arch/*/chip subdirectory
CONFIG_ARCH_CHIP=sam3u
CONFIG_ARCH_CHIP="sam34"
CONFIG_ARCH_CHIP_name - For use in C code to identify the exact
chip:

2
nuttx/configs/sam3u-ek/knsh/defconfig
View File

@ -83,7 +83,7 @@ CONFIG_ARCH_CHIP_SAM34=y
# CONFIG_ARCH_CHIP_STR71X is not set
CONFIG_ARCH_CORTEXM3=y
CONFIG_ARCH_FAMILY="armv7-m"
CONFIG_ARCH_CHIP="sam3u"
CONFIG_ARCH_CHIP="sam34"
# CONFIG_ARMV7M_USEBASEPRI is not set
CONFIG_ARCH_HAVE_MPU=y
CONFIG_ARMV7M_MPU=y

2
nuttx/configs/sam3u-ek/nsh/defconfig
View File

@ -78,7 +78,7 @@ CONFIG_ARCH_CHIP_SAM34=y
# CONFIG_ARCH_CHIP_STR71X is not set
CONFIG_ARCH_CORTEXM3=y
CONFIG_ARCH_FAMILY="armv7-m"
CONFIG_ARCH_CHIP="sam3u"
CONFIG_ARCH_CHIP="sam34"
# CONFIG_ARMV7M_USEBASEPRI is not set
CONFIG_ARCH_HAVE_MPU=y
# CONFIG_ARMV7M_MPU is not set

2
nuttx/configs/sam3u-ek/nx/defconfig
View File

@ -78,7 +78,7 @@ CONFIG_ARCH_CHIP_SAM34=y
# CONFIG_ARCH_CHIP_STR71X is not set
CONFIG_ARCH_CORTEXM3=y
CONFIG_ARCH_FAMILY="armv7-m"
CONFIG_ARCH_CHIP="sam3u"
CONFIG_ARCH_CHIP="sam34"
# CONFIG_ARMV7M_USEBASEPRI is not set
CONFIG_ARCH_HAVE_MPU=y
# CONFIG_ARMV7M_MPU is not set

2
nuttx/configs/sam3u-ek/ostest/defconfig
View File

@ -78,7 +78,7 @@ CONFIG_ARCH_CHIP_SAM34=y
# CONFIG_ARCH_CHIP_STR71X is not set
CONFIG_ARCH_CORTEXM3=y
CONFIG_ARCH_FAMILY="armv7-m"
CONFIG_ARCH_CHIP="sam3u"
CONFIG_ARCH_CHIP="sam34"
# CONFIG_ARMV7M_USEBASEPRI is not set
CONFIG_ARCH_HAVE_MPU=y
# CONFIG_ARMV7M_MPU is not set

2
nuttx/configs/sam3u-ek/src/up_mmcsd.c
View File

@ -54,7 +54,7 @@
/* This needs to be extended. The card detect GPIO must be configured as an interrupt.
* when the interrupt indicating that a card has been inserted or removed is received,
* this function must call sio_mediachange() to handle that event. See
* arch/arm/src/sam3u/sam_hsmci.h for more information.
* arch/arm/src/sam34/sam_hsmci.h for more information.
*/
#ifdef GPIO_MCI_CD

2
nuttx/configs/sam3u-ek/touchscreen/defconfig
View File

@ -78,7 +78,7 @@ CONFIG_ARCH_CHIP_SAM34=y
# CONFIG_ARCH_CHIP_STR71X is not set
CONFIG_ARCH_CORTEXM3=y
CONFIG_ARCH_FAMILY="armv7-m"
CONFIG_ARCH_CHIP="sam3u"
CONFIG_ARCH_CHIP="sam34"
# CONFIG_ARMV7M_USEBASEPRI is not set
CONFIG_ARCH_HAVE_MPU=y
# CONFIG_ARMV7M_MPU is not set