Add peripheral configuration logic for the SAM3X/3A; Change all references to SAM3/4 SPI to SPI0 for compatibity with the SAM3X/3A which has SPI0 and SPI1; Add directory which will eventually holdl an Arduino Due port

10 files changed, 68 insertions, 40 deletions

diff --git a/nuttx/configs/sam4l-xplained/README.txt b/nuttx/configs/sam4l-xplained/README.txt
index 644c4b401..911aecb6d 100644
--- a/nuttx/configs/sam4l-xplained/README.txt
+++ b/nuttx/configs/sam4l-xplained/README.txt
@@ -528,7 +528,7 @@ SAM4L Xplained Pro-specific Configuration Options
     PBA
     ---
     CONFIG_SAM34_IISC
-    CONFIG_SAM34_SPI
+    CONFIG_SAM34_SPI0
     CONFIG_SAM34_TC0
     CONFIG_SAM34_TC1
     CONFIG_SAM34_TWIM0
@@ -739,7 +739,7 @@ Configuration sub-directories
          details.
 
        System Type -> Peripherals:
-         CONFIG_SAM34_SPI=y                : Enable the SAM4L SPI peripheral
+         CONFIG_SAM34_SPI0=y                : Enable the SAM4L SPI peripheral
 
        Device Drivers
          CONFIG_SPI=y                      : Enable SPI support
@@ -793,7 +793,7 @@ Configuration sub-directories
        changes to the configuration:
 
        System Type -> Peripherals:
-         CONFIG_SAM34_SPI=y                 : Enable the SAM4L SPI peripheral
+         CONFIG_SAM34_SPI0=y                 : Enable the SAM4L SPI peripheral
 
        Device Drivers -> SPI
          CONFIG_SPI=y                       : Enable SPI support
diff --git a/nuttx/configs/sam4l-xplained/nsh/defconfig b/nuttx/configs/sam4l-xplained/nsh/defconfig
index f8d26d297..f87213c0c 100644
--- a/nuttx/configs/sam4l-xplained/nsh/defconfig
+++ b/nuttx/configs/sam4l-xplained/nsh/defconfig
@@ -92,12 +92,19 @@ CONFIG_ARMV7M_TOOLCHAIN_BUILDROOT=y
 # CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYL is not set
 # CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL is not set
 CONFIG_ARMV7M_OABI_TOOLCHAIN=y
+# CONFIG_GPIO_IRQ is not set
 
 #
 # AT91SAM3/4 Configuration Options
 #
 # CONFIG_ARCH_CHIP_AT91SAM3U4E is not set
-# CONFIG_ARCH_CHIP_SAM34_NDMACHANC2C is not set
+# 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_ATSAM4LC2C is not set
 # CONFIG_ARCH_CHIP_ATSAM4LC2B is not set
 # CONFIG_ARCH_CHIP_ATSAM4LC2A is not set
 CONFIG_ARCH_CHIP_ATSAM4LC4C=y
@@ -109,17 +116,19 @@ CONFIG_ARCH_CHIP_ATSAM4LC4C=y
 # CONFIG_ARCH_CHIP_ATSAM4LS4C is not set
 # CONFIG_ARCH_CHIP_ATSAM4LS4B is not set
 # CONFIG_ARCH_CHIP_ATSAM4LS4A is not set
-# CONFIG_CONFIG_ARCH_CHIP_ATSAM4SD32C is not set
-# CONFIG_CONFIG_ARCH_CHIP_ATSAM4SD32B is not set
-# CONFIG_CONFIG_ARCH_CHIP_ATSAM4SD16C is not set
-# CONFIG_CONFIG_ARCH_CHIP_ATSAM4SD16B is not set
-# CONFIG_CONFIG_ARCH_CHIP_ATSAM4SA16C is not set
-# CONFIG_CONFIG_ARCH_CHIP_ATSAM4SA16B is not set
-# CONFIG_CONFIG_ARCH_CHIP_ATSAM4S16C is not set
-# CONFIG_CONFIG_ARCH_CHIP_ATSAM4S16B is not set
-# CONFIG_CONFIG_ARCH_CHIP_ATSAM4S8C is not set
-# CONFIG_CONFIG_ARCH_CHIP_ATSAM4S8B is not set
+# CONFIG_ARCH_CHIP_ATSAM4SD32C is not set
+# CONFIG_ARCH_CHIP_ATSAM4SD32B is not set
+# CONFIG_ARCH_CHIP_ATSAM4SD16C is not set
+# CONFIG_ARCH_CHIP_ATSAM4SD16B is not set
+# CONFIG_ARCH_CHIP_ATSAM4SA16C is not set
+# CONFIG_ARCH_CHIP_ATSAM4SA16B is not set
+# CONFIG_ARCH_CHIP_ATSAM4S16C is not set
+# CONFIG_ARCH_CHIP_ATSAM4S16B is not set
+# CONFIG_ARCH_CHIP_ATSAM4S8C is not set
+# CONFIG_ARCH_CHIP_ATSAM4S8B is not set
 # CONFIG_ARCH_CHIP_SAM3U is not set
+# CONFIG_ARCH_CHIP_SAM3X is not set
+# CONFIG_ARCH_CHIP_SAM3A is not set
 CONFIG_ARCH_CHIP_SAM4L=y
 # CONFIG_ARCH_CHIP_SAM4S is not set
 
@@ -131,7 +140,7 @@ CONFIG_SAM_PICOCACHE=y
 # CONFIG_SAM34_APBA is not set
 # CONFIG_SAM34_AESA is not set
 # CONFIG_SAM34_IISC is not set
-# CONFIG_SAM34_SPI is not set
+# CONFIG_SAM34_SPI0 is not set
 # CONFIG_SAM34_TC0 is not set
 # CONFIG_SAM34_TC1 is not set
 # CONFIG_SAM34_TWIM0 is not set
@@ -145,9 +154,9 @@ CONFIG_SAM34_USART0=y
 # CONFIG_SAM34_USART1 is not set
 # CONFIG_SAM34_USART2 is not set
 # CONFIG_SAM34_USART3 is not set
-# CONFIG_SAM34_ADCIFE is not set
+# CONFIG_SAM34_ADC12B is not set
 # CONFIG_SAM34_DACC is not set
-# CONFIG_SAM34_ACIFC is not set
+# CONFIG_SAM34_ACC is not set
 # CONFIG_SAM34_GLOC is not set
 # CONFIG_SAM34_ABDACB is not set
 # CONFIG_SAM34_TRNG is not set
@@ -165,7 +174,17 @@ CONFIG_SAM34_USART0=y
 # CONFIG_SAM34_AST is not set
 # CONFIG_SAM34_WDT is not set
 # CONFIG_SAM34_EIC is not set
+
+#
+# AT91SAM3/4 Clock Configuration
+#
 # CONFIG_SAM32_RESET_PERIPHCLKS is not set
+# CONFIG_SAM34_OSC0 is not set
+# CONFIG_SAM34_OSC32K is not set
+# CONFIG_SAM34_RC80M is not set
+# CONFIG_SAM34_RCFAST is not set
+# CONFIG_SAM34_RC1M is not set
+# CONFIG_SAM34_RC32K is not set
 
 #
 # AT91SAM3/4 USART Configuration
@@ -175,9 +194,6 @@ CONFIG_USART0_ISUART=y
 #
 # AT91SAM3/4 GPIO Interrupt Configuration
 #
-# CONFIG_GPIOA_IRQ is not set
-# CONFIG_GPIOB_IRQ is not set
-# CONFIG_GPIOC_IRQ is not set
 
 #
 # External Memory Configuration
@@ -242,6 +258,13 @@ CONFIG_NSH_MMCSDMINOR=0
 #
 
 #
+# SAM4L Xplained Pro Modules
+#
+# CONFIG_SAM4L_XPLAINED_SLCD1MODULE is not set
+# CONFIG_SAM4L_XPLAINED_IOMODULE is not set
+# CONFIG_SAM4L_XPLAINED_OLED1MODULE is not set
+
+#
 # RTOS Features
 #
 # CONFIG_BOARD_INITIALIZE is not set
@@ -260,7 +283,7 @@ CONFIG_DEV_CONSOLE=y
 # CONFIG_FDCLONE_DISABLE is not set
 # CONFIG_FDCLONE_STDIO is not set
 CONFIG_SDCLONE_DISABLE=y
-# CONFIG_SCHED_WAITPID is not set
+CONFIG_SCHED_WAITPID=y
 # CONFIG_SCHED_STARTHOOK is not set
 # CONFIG_SCHED_ATEXIT is not set
 # CONFIG_SCHED_ONEXIT is not set
@@ -664,6 +687,11 @@ CONFIG_NSH_CONSOLE=y
 #
 
 #
+# RAM test
+#
+# CONFIG_SYSTEM_RAMTEST is not set
+
+#
 # readline()
 #
 CONFIG_SYSTEM_READLINE=y
diff --git a/nuttx/configs/sam4l-xplained/ostest/defconfig b/nuttx/configs/sam4l-xplained/ostest/defconfig
index 8183572f0..447334e25 100644
--- a/nuttx/configs/sam4l-xplained/ostest/defconfig
+++ b/nuttx/configs/sam4l-xplained/ostest/defconfig
@@ -131,7 +131,7 @@ CONFIG_SAM_PICOCACHE=y
 # CONFIG_SAM34_APBA is not set
 # CONFIG_SAM34_AESA is not set
 # CONFIG_SAM34_IISC is not set
-# CONFIG_SAM34_SPI is not set
+# CONFIG_SAM34_SPI0 is not set
 # CONFIG_SAM34_TC0 is not set
 # CONFIG_SAM34_TC1 is not set
 # CONFIG_SAM34_TWIM0 is not set
diff --git a/nuttx/configs/sam4l-xplained/src/Makefile b/nuttx/configs/sam4l-xplained/src/Makefile
index d4c215099..ff7c9e38d 100644
--- a/nuttx/configs/sam4l-xplained/src/Makefile
+++ b/nuttx/configs/sam4l-xplained/src/Makefile
@@ -46,7 +46,7 @@ ifeq ($(CONFIG_HAVE_CXX),y)
 CSRCS += sam_cxxinitialize.c
 endif
 
-ifeq ($(CONFIG_SAM34_SPI),y)
+ifeq ($(CONFIG_SAM34_SPI0),y)
 CSRCS += sam_spi.c
 endif
 
@@ -70,13 +70,13 @@ CSRCS += sam_slcd.c
 endif
 endif
 
-ifeq ($(CONFIG_SAM34_SPI),y)
+ifeq ($(CONFIG_SAM34_SPI0),y)
 ifeq ($(CONFIG_SAM4L_XPLAINED_IOMODULE),y)
 CSRCS += sam_mmcsd.c
 endif
 endif
 
-ifeq ($(CONFIG_SAM34_SPI),y)
+ifeq ($(CONFIG_SAM34_SPI0),y)
 ifeq ($(CONFIG_SAM4L_XPLAINED_OLED1MODULE),y)
 ifeq ($(CONFIG_LCD_UG2832HSWEG04),y)
 CSRCS += sam_ug2832hsweg04.c
diff --git a/nuttx/configs/sam4l-xplained/src/sam4l-xplained.h b/nuttx/configs/sam4l-xplained/src/sam4l-xplained.h
index b4d00002c..bbb88b811 100644
--- a/nuttx/configs/sam4l-xplained/src/sam4l-xplained.h
+++ b/nuttx/configs/sam4l-xplained/src/sam4l-xplained.h
@@ -189,8 +189,8 @@
 
 #ifdef CONFIG_SAM4L_XPLAINED_IOMODULE
 
-#  ifndef CONFIG_SAM34_SPI
-#    error CONFIG_SAM34_SPI is required to use the I/O1 module
+#  ifndef CONFIG_SAM34_SPI0
+#    error CONFIG_SAM34_SPI0 is required to use the I/O1 module
 #  endif
 
 #  if defined(CONFIG_SAM4L_XPLAINED_IOMODULE_EXT1)
@@ -248,8 +248,8 @@
 
 #ifdef CONFIG_SAM4L_XPLAINED_OLED1MODULE
 
-#  ifndef CONFIG_SAM34_SPI
-#    error CONFIG_SAM34_SPI is required to use the OLED1 module
+#  ifndef CONFIG_SAM34_SPI0
+#    error CONFIG_SAM34_SPI0 is required to use the OLED1 module
 #  endif
 
 #  ifndef CONFIG_SPI_CMDDATA
@@ -337,11 +337,11 @@ void weak_function sam_spiinitialize(void);
  *
  * Description:
  *   Initialize the SPI-based SD card.  Requires CONFIG_SAM4L_XPLAINED_IOMODULE=y,
- *   CONFIG_DISABLE_MOUNTPOINT=n, CONFIG_MMCSD=y, and CONFIG_SAM34_SPI=y
+ *   CONFIG_DISABLE_MOUNTPOINT=n, CONFIG_MMCSD=y, and CONFIG_SAM34_SPI0=y
  *
  ************************************************************************************/
 
-#if defined(CONFIG_SAM34_SPI) && defined(CONFIG_SAM4L_XPLAINED_IOMODULE)
+#if defined(CONFIG_SAM34_SPI0) && defined(CONFIG_SAM4L_XPLAINED_IOMODULE)
 int sam_sdinitialize(int minor);
 #endif
 
diff --git a/nuttx/configs/sam4l-xplained/src/sam_boot.c b/nuttx/configs/sam4l-xplained/src/sam_boot.c
index 09123c506..ac831ab7b 100644
--- a/nuttx/configs/sam4l-xplained/src/sam_boot.c
+++ b/nuttx/configs/sam4l-xplained/src/sam_boot.c
@@ -71,7 +71,7 @@ void sam_boardinitialize(void)
    * sam_spiinitialize() has been brought into the link.
    */
 
-#ifdef CONFIG_SAM34_SPI
+#ifdef CONFIG_SAM34_SPI0
   if (sam_spiinitialize)
     {
       sam_spiinitialize();
diff --git a/nuttx/configs/sam4l-xplained/src/sam_mmcsd.c b/nuttx/configs/sam4l-xplained/src/sam_mmcsd.c
index c23adf324..d432c56a9 100644
--- a/nuttx/configs/sam4l-xplained/src/sam_mmcsd.c
+++ b/nuttx/configs/sam4l-xplained/src/sam_mmcsd.c
@@ -59,8 +59,8 @@
 #  error Mountpoints are disabled (CONFIG_DISABLE_MOUNTPOINT=y)
 #endif
 
-#ifndef CONFIG_SAM34_SPI
-#  error SPI support is required (CONFIG_SAM34_SPI)
+#ifndef CONFIG_SAM34_SPI0
+#  error SPI support is required (CONFIG_SAM34_SPI0)
 #endif
 
 #ifndef CONFIG_MMCSD
@@ -81,7 +81,7 @@
  *   - CONFIG_SAM4L_XPLAINED_IOMODULE=y,
  *   - CONFIG_DISABLE_MOUNTPOINT=n,
  *   - CONFIG_MMCSD=y, and
- *   - CONFIG_SAM34_SPI=y
+ *   - CONFIG_SAM34_SPI0=y
  *
  *****************************************************************************/
 
diff --git a/nuttx/configs/sam4l-xplained/src/sam_nsh.c b/nuttx/configs/sam4l-xplained/src/sam_nsh.c
index cceef3cce..15e6203d3 100644
--- a/nuttx/configs/sam4l-xplained/src/sam_nsh.c
+++ b/nuttx/configs/sam4l-xplained/src/sam_nsh.c
@@ -112,7 +112,7 @@ int nsh_archinitialize(void)
       }
   }
 #endif
-#if defined(CONFIG_SAM34_SPI) && defined(CONFIG_SAM4L_XPLAINED_IOMODULE)
+#if defined(CONFIG_SAM34_SPI0) && defined(CONFIG_SAM4L_XPLAINED_IOMODULE)
   /* Initialize the SPI-based MMC/SD slot */
 
   {
diff --git a/nuttx/configs/sam4l-xplained/src/sam_spi.c b/nuttx/configs/sam4l-xplained/src/sam_spi.c
index e1bc73b9c..49ae7b57c 100644
--- a/nuttx/configs/sam4l-xplained/src/sam_spi.c
+++ b/nuttx/configs/sam4l-xplained/src/sam_spi.c
@@ -49,7 +49,7 @@
 #include "sam_spi.h"
 #include "sam4l-xplained.h"
 
-#ifdef CONFIG_SAM34_SPI
+#ifdef CONFIG_SAM34_SPI0
 
 /************************************************************************************
  * Definitions
@@ -236,7 +236,7 @@ uint8_t sam_spistatus(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
   return ret;
 }
 
-#endif /* CONFIG_SAM34_SPI */
+#endif /* CONFIG_SAM34_SPI0 */
 
 /****************************************************************************
  * Name: sam_spicmddata
diff --git a/nuttx/configs/sam4l-xplained/src/sam_ug2832hsweg04.c b/nuttx/configs/sam4l-xplained/src/sam_ug2832hsweg04.c
index 5ea61774a..b845b5084 100644
--- a/nuttx/configs/sam4l-xplained/src/sam_ug2832hsweg04.c
+++ b/nuttx/configs/sam4l-xplained/src/sam_ug2832hsweg04.c
@@ -103,8 +103,8 @@
 #  error "The OLED driver requires CONFIG_LCD_UG2832HSWEG04 in the configuration"
 #endif
 
-#ifndef CONFIG_SAM34_SPI
-#  error "The OLED driver requires CONFIG_SAM34_SPI in the configuration"
+#ifndef CONFIG_SAM34_SPI0
+#  error "The OLED driver requires CONFIG_SAM34_SPI0 in the configuration"
 #endif
 
 #ifndef CONFIG_SPI_CMDDATA