diff options
| author | Gregory Nutt <gnutt@nuttx.org> | 2013-06-27 14:24:27 -0600 |
|---|---|---|
| committer | Gregory Nutt <gnutt@nuttx.org> | 2013-06-27 14:24:27 -0600 |
| commit | 3739d5f33e73675fc0bdd0dc600bb39ed30b23b8 (patch) | |
| tree | 51642eac4b6c9adb85861210226d96ba5883452c /nuttx/arch | |
| parent | d5e65458491f91198ae56185f4e692061b2c49ce (diff) | |
| download | px4-nuttx-3739d5f33e73675fc0bdd0dc600bb39ed30b23b8.tar.gz px4-nuttx-3739d5f33e73675fc0bdd0dc600bb39ed30b23b8.tar.bz2 px4-nuttx-3739d5f33e73675fc0bdd0dc600bb39ed30b23b8.zip | |
Flesh out the Arduino Due board configuratino and integrate it with the build and configuration system
Diffstat (limited to 'nuttx/arch')
| -rw-r--r-- | nuttx/arch/arm/include/sam34/chip.h | 14 | ||||
| -rw-r--r-- | nuttx/arch/arm/src/sam34/Kconfig | 30 | ||||
| -rw-r--r-- | nuttx/arch/arm/src/sam34/sam3u_dmac.c | 2 |
3 files changed, 23 insertions, 23 deletions
diff --git a/nuttx/arch/arm/include/sam34/chip.h b/nuttx/arch/arm/include/sam34/chip.h index f1881d1f0..cd107d0e9 100644 --- a/nuttx/arch/arm/include/sam34/chip.h +++ b/nuttx/arch/arm/include/sam34/chip.h @@ -50,7 +50,7 @@ /* AT91SAM3U Family *****************************************************************/ -#if defined(CONFIG_ARCH_CHIP_AT91SAM3U4E) +#if defined(CONFIG_ARCH_CHIP_ATSAM3U4E) /* Internal memory */ @@ -95,7 +95,7 @@ * HSMCI 8 bit 4 bit 8 bit 4 bit 4 bit 4 bit */ -#elif defined(CONFIG_ARCH_CHIP_AT91SAM3X8E) +#elif defined(CONFIG_ARCH_CHIP_ATSAM3X8E) /* Internal memory */ @@ -115,7 +115,7 @@ # define SAM32_NUDPFS 0 /* No USB full speed device */ # define SAM32_NUHPFS 0 /* No USB full speed embedded host */ -#elif defined(CONFIG_ARCH_CHIP_AT91SAM3X8C) +#elif defined(CONFIG_ARCH_CHIP_ATSAM3X8C) /* Internal memory */ @@ -135,7 +135,7 @@ # define SAM32_NUDPFS 0 /* No USB full speed device */ # define SAM32_NUHPFS 0 /* No USB full speed embedded host */ -#elif defined(CONFIG_ARCH_CHIP_AT91SAM3X4E) +#elif defined(CONFIG_ARCH_CHIP_ATSAM3X4E) /* Internal memory */ @@ -155,7 +155,7 @@ # define SAM32_NUDPFS 0 /* No USB full speed device */ # define SAM32_NUHPFS 0 /* No USB full speed embedded host */ -#elif defined(CONFIG_ARCH_CHIP_AT91SAM3X4C) +#elif defined(CONFIG_ARCH_CHIP_ATSAM3X4C) /* Internal memory */ @@ -175,7 +175,7 @@ # define SAM32_NUDPFS 0 /* No USB full speed device */ # define SAM32_NUHPFS 0 /* No USB full speed embedded host */ -#elif defined(CONFIG_ARCH_CHIP_AT91SAM3A8C) +#elif defined(CONFIG_ARCH_CHIP_ATSAM3A8C) /* Internal memory */ @@ -195,7 +195,7 @@ # define SAM32_NUDPFS 0 /* No USB full speed device */ # define SAM32_NUHPFS 0 /* No USB full speed embedded host */ -#elif defined(CONFIG_ARCH_CHIP_AT91SAM3A4C) +#elif defined(CONFIG_ARCH_CHIP_ATSAM3A4C) /* Internal memory */ diff --git a/nuttx/arch/arm/src/sam34/Kconfig b/nuttx/arch/arm/src/sam34/Kconfig index 28e49ab96..8ce877628 100644 --- a/nuttx/arch/arm/src/sam34/Kconfig +++ b/nuttx/arch/arm/src/sam34/Kconfig @@ -7,16 +7,16 @@ comment "AT91SAM3/4 Configuration Options" choice prompt "AT91SAM3/4 Chip Selection" - default ARCH_CHIP_AT91SAM3U4E + default ARCH_CHIP_ATSAM3U4E depends on ARCH_CHIP_SAM34 -config ARCH_CHIP_AT91SAM3U4E - bool "AT91SAM3U4E" +config ARCH_CHIP_ATSAM3U4E + bool "ATSAM3U4E" select ARCH_CORTEXM3 select ARCH_CHIP_SAM3U -config ARCH_CHIP_AT91SAM3X8E - bool "AT91SAMSAM3X8E" +config ARCH_CHIP_ATSAM3X8E + bool "ATSAMSAM3X8E" select ARCH_CORTEXM3 select ARCH_CHIP_SAM3X select ARCH_HAVE_EXTNOR @@ -24,13 +24,13 @@ config ARCH_CHIP_AT91SAM3X8E select ARCH_HAVE_EXTSRAM0 select ARCH_HAVE_EXTSRAM1 -config ARCH_CHIP_AT91SAM3X8C - bool "AT91SAM3X8C" +config ARCH_CHIP_ATSAM3X8C + bool "ATSAM3X8C" select ARCH_CORTEXM3 select ARCH_CHIP_SAM3X -config ARCH_CHIP_AT91SAM3X4E - bool "AT91SAM3X4E" +config ARCH_CHIP_ATSAM3X4E + bool "ATSAM3X4E" select ARCH_CORTEXM3 select ARCH_CHIP_SAM3X select ARCH_HAVE_EXTNOR @@ -38,18 +38,18 @@ config ARCH_CHIP_AT91SAM3X4E select ARCH_HAVE_EXTSRAM0 select ARCH_HAVE_EXTSRAM1 -config ARCH_CHIP_AT91SAM3X4C - bool "AT91SAM3X4C" +config ARCH_CHIP_ATSAM3X4C + bool "ATSAM3X4C" select ARCH_CORTEXM3 select ARCH_CHIP_SAM3X -config ARCH_CHIP_AT91SAM3A8C - bool "AT91SAM3A8C" +config ARCH_CHIP_ATSAM3A8C + bool "ATSAM3A8C" select ARCH_CORTEXM3 select ARCH_CHIP_SAM3A -config ARCH_CHIP_AT91SAM3A4C - bool "AT91SAM3A4C" +config ARCH_CHIP_ATSAM3A4C + bool "ATSAM3A4C" select ARCH_CORTEXM3 select ARCH_CHIP_SAM3A diff --git a/nuttx/arch/arm/src/sam34/sam3u_dmac.c b/nuttx/arch/arm/src/sam34/sam3u_dmac.c index 90a9bbebe..eff7a2a0b 100644 --- a/nuttx/arch/arm/src/sam34/sam3u_dmac.c +++ b/nuttx/arch/arm/src/sam34/sam3u_dmac.c @@ -152,7 +152,7 @@ static struct dma_linklist_s g_linklist[CONFIG_SAM34_NLLDESC]; static struct sam_dma_s g_dma[SAM34_NDMACHAN] = { -#ifdef CONFIG_ARCH_CHIP_AT91SAM3U4E +#ifdef CONFIG_ARCH_CHIP_ATSAM3U4E /* the AT91SAM3U4E has four DMA channels. The FIFOs for channels 0-2 are * 8 bytes in size; channel 3 is 32 bytes. */ |