Flesh out the Arduino Due board configuratino and integrate it with the build and configuration system

10 files changed, 18 insertions, 18 deletions

diff --git a/nuttx/configs/sam3u-ek/README.txt b/nuttx/configs/sam3u-ek/README.txt
index cefc3dd98..cf01f744d 100644
--- a/nuttx/configs/sam3u-ek/README.txt
+++ b/nuttx/configs/sam3u-ek/README.txt
@@ -3,7 +3,7 @@ README
 
 This README discusses issues unique to NuttX configurations for the Atmel
 SAM3U-EK development board featuring the ATAM3U.  This board features the
-AT91SAM3U4E MCU running at 96MHz.
+ATSAM3U4E MCU running at 96MHz.
 
 Contents
 ^^^^^^^^
@@ -292,7 +292,7 @@ SAM3U-EK-specific Configuration Options
 
        CONFIG_ARCH_CHIP_SAM34
        CONFIG_ARCH_CHIP_SAM3U
-       CONFIG_ARCH_CHIP_AT91SAM3U4
+       CONFIG_ARCH_CHIP_ATSAM3U4
 
     CONFIG_ARCH_BOARD - Identifies the configs subdirectory and
        hence, the board that supports the particular chip or SoC.
@@ -377,7 +377,7 @@ SAM3U-EK-specific Configuration Options
     CONFIG_USART3_ISUART
     CONFIG_SAM34_NAND          - NAND memory
 
-  AT91SAM3U specific device driver settings
+  SAM3U specific device driver settings
 
     CONFIG_U[S]ARTn_SERIAL_CONSOLE - selects the USARTn (n=0,1,2,3) or UART
            m (m=4,5) for the console and ttys0 (default is the USART1).
diff --git a/nuttx/configs/sam3u-ek/include/board.h b/nuttx/configs/sam3u-ek/include/board.h
index 1c0d7230a..d5a10c4b1 100644
--- a/nuttx/configs/sam3u-ek/include/board.h
+++ b/nuttx/configs/sam3u-ek/include/board.h
@@ -123,7 +123,7 @@
 
 /* MCK = 96MHz, CLKDIV = 1, MCI_SPEED = 96MHz / 2 * (1+1) = 24 MHz */
 
-#define HSMCI_SDXFR_CLKDIV         (3 << HSMCI_MR_CLKDIV_SHIFT)
+#define HSMCI_SDXFR_CLKDIV         (1 << HSMCI_MR_CLKDIV_SHIFT)
 #define HSMCI_SDWIDEXFR_CLKDIV     HSMCI_SDXFR_CLKDIV
 
 /* FLASH wait states
diff --git a/nuttx/configs/sam3u-ek/knsh/defconfig b/nuttx/configs/sam3u-ek/knsh/defconfig
index 892f3203e..f5fb5d86d 100644
--- a/nuttx/configs/sam3u-ek/knsh/defconfig
+++ b/nuttx/configs/sam3u-ek/knsh/defconfig
@@ -105,7 +105,7 @@ CONFIG_ARMV7M_OABI_TOOLCHAIN=y
 #
 # AT91SAM3/4 Configuration Options
 #
-CONFIG_ARCH_CHIP_AT91SAM3U4E=y
+CONFIG_ARCH_CHIP_ATSAM3U4E=y
 # CONFIG_ARCH_CHIP_SAM34_NDMACHANC2C is not set
 # CONFIG_ARCH_CHIP_ATSAM4LC2B is not set
 # CONFIG_ARCH_CHIP_ATSAM4LC2A is not set
diff --git a/nuttx/configs/sam3u-ek/nsh/defconfig b/nuttx/configs/sam3u-ek/nsh/defconfig
index 34e8db316..07edb61d3 100644
--- a/nuttx/configs/sam3u-ek/nsh/defconfig
+++ b/nuttx/configs/sam3u-ek/nsh/defconfig
@@ -97,13 +97,13 @@ CONFIG_ARMV7M_OABI_TOOLCHAIN=y
 #
 # AT91SAM3/4 Configuration Options
 #
-CONFIG_ARCH_CHIP_AT91SAM3U4E=y
-# CONFIG_ARCH_CHIP_AT91SAM3X8E is not set
-# CONFIG_ARCH_CHIP_AT91SAM3X8C is not set
-# CONFIG_ARCH_CHIP_AT91SAM3X4E is not set
-# CONFIG_ARCH_CHIP_AT91SAM3X4C is not set
-# CONFIG_ARCH_CHIP_AT91SAM3A8C is not set
-# CONFIG_ARCH_CHIP_AT91SAM3A4C is not set
+CONFIG_ARCH_CHIP_ATSAM3U4E=y
+# CONFIG_ARCH_CHIP_ATSAM3X8E is not set
+# CONFIG_ARCH_CHIP_ATSAM3X8C is not set
+# CONFIG_ARCH_CHIP_ATSAM3X4E is not set
+# CONFIG_ARCH_CHIP_ATSAM3X4C is not set
+# CONFIG_ARCH_CHIP_ATSAM3A8C is not set
+# CONFIG_ARCH_CHIP_ATSAM3A4C is not set
 # CONFIG_ARCH_CHIP_ATSAM4LC2C is not set
 # CONFIG_ARCH_CHIP_ATSAM4LC2B is not set
 # CONFIG_ARCH_CHIP_ATSAM4LC2A is not set
diff --git a/nuttx/configs/sam3u-ek/nx/defconfig b/nuttx/configs/sam3u-ek/nx/defconfig
index 344057eee..327053a8c 100644
--- a/nuttx/configs/sam3u-ek/nx/defconfig
+++ b/nuttx/configs/sam3u-ek/nx/defconfig
@@ -97,7 +97,7 @@ CONFIG_ARMV7M_OABI_TOOLCHAIN=y
 #
 # AT91SAM3/4 Configuration Options
 #
-CONFIG_ARCH_CHIP_AT91SAM3U4E=y
+CONFIG_ARCH_CHIP_ATSAM3U4E=y
 # CONFIG_ARCH_CHIP_SAM34_NDMACHANC2C is not set
 # CONFIG_ARCH_CHIP_ATSAM4LC2B is not set
 # CONFIG_ARCH_CHIP_ATSAM4LC2A is not set
diff --git a/nuttx/configs/sam3u-ek/ostest/defconfig b/nuttx/configs/sam3u-ek/ostest/defconfig
index e4bc12f87..ec0780d51 100644
--- a/nuttx/configs/sam3u-ek/ostest/defconfig
+++ b/nuttx/configs/sam3u-ek/ostest/defconfig
@@ -97,7 +97,7 @@ CONFIG_ARMV7M_OABI_TOOLCHAIN=y
 #
 # AT91SAM3/4 Configuration Options
 #
-CONFIG_ARCH_CHIP_AT91SAM3U4E=y
+CONFIG_ARCH_CHIP_ATSAM3U4E=y
 # CONFIG_ARCH_CHIP_SAM34_NDMACHANC2C is not set
 # CONFIG_ARCH_CHIP_ATSAM4LC2B is not set
 # CONFIG_ARCH_CHIP_ATSAM4LC2A is not set
diff --git a/nuttx/configs/sam3u-ek/scripts/ld.script b/nuttx/configs/sam3u-ek/scripts/ld.script
index e38216583..0deb1b15e 100755
--- a/nuttx/configs/sam3u-ek/scripts/ld.script
+++ b/nuttx/configs/sam3u-ek/scripts/ld.script
@@ -33,7 +33,7 @@
  *
  ****************************************************************************/
 
-/* The AT91SAM3U-4 has 256Kb of FLASH beginning at address 0x0008:0000,
+/* The ATSAM3U4E has 256Kb of FLASH beginning at address 0x0008:0000,
  * 32Kb of SRAM beginning at address 0x2000:0000, and 16Kb of SRAM beginning
  * at address 0x2008:000 (used only for heap).  When booting from FLASH,
  * FLASH memory is aliased to address 0x0000:0000 where the code expects to
diff --git a/nuttx/configs/sam3u-ek/scripts/memory.ld b/nuttx/configs/sam3u-ek/scripts/memory.ld
index c99a31146..57b97d915 100644
--- a/nuttx/configs/sam3u-ek/scripts/memory.ld
+++ b/nuttx/configs/sam3u-ek/scripts/memory.ld
@@ -33,7 +33,7 @@
  *
  ****************************************************************************/
 
-/* The AT91SAM3U-4 has 256KB of FLASH beginning at address 0x0008:0000,
+/* The ATSAM3U4E has 256KB of FLASH beginning at address 0x0008:0000,
  * 32KB of SRAM beginning at address 0x2000:0000, and 16Kb of SRAM beginning
  * at address 0x2008:000 (used only for heap).  When booting from FLASH,
  * FLASH memory is aliased to address 0x0000:0000 where the code expects to
diff --git a/nuttx/configs/sam3u-ek/src/sam3u-ek.h b/nuttx/configs/sam3u-ek/src/sam3u-ek.h
index a9841dcc6..e6e091363 100644
--- a/nuttx/configs/sam3u-ek/src/sam3u-ek.h
+++ b/nuttx/configs/sam3u-ek/src/sam3u-ek.h
@@ -67,7 +67,7 @@
 /* SAM3U-EK GPIO Pin Definitions ****************************************************/
 
 /* LCD:
- *   LCD Module Pin Out:                         AT91SAM3U PIO:
+ *   LCD Module Pin Out:                         SAM3U PIO:
  *  -------------------------------------------- --------------------------------------
  *   Pin Symbol Function                         LCD            PeriphA  PeriphB Extra
  *  ---- ------ -------------------------------- -------------- -------- ------- ------
diff --git a/nuttx/configs/sam3u-ek/src/up_lcd.c b/nuttx/configs/sam3u-ek/src/up_lcd.c
index 56d1018d6..6cfb08720 100644
--- a/nuttx/configs/sam3u-ek/src/up_lcd.c
+++ b/nuttx/configs/sam3u-ek/src/up_lcd.c
@@ -38,7 +38,7 @@
  * touch-screen, FTM280C12D, with integratd driver IC HX8346. The LCD display size
  * is 2.8 inches, with a native resolution of 240 x 320 pixels.
  *
- *   LCD Module Pin Out:                         AT91SAM3U PIO:
+ *   LCD Module Pin Out:                         SAM3U PIO:
  *  -------------------------------------------- --------------------------------------
  *   Pin Symbol Function                         LCD            PeriphA  PeriphB Extra
  *  ---- ------ -------------------------------- -------------- -------- ------- ------