SAMA5D3x-EK: Change name of all board-specific configuration variables so that there are no collisions with names of similar variables for other boards

11 files changed, 58 insertions, 58 deletions

diff --git a/nuttx/configs/sama5d3x-ek/src/Makefile b/nuttx/configs/sama5d3x-ek/src/Makefile
index e2a0e9f74..ab20d97a5 100644
--- a/nuttx/configs/sama5d3x-ek/src/Makefile
+++ b/nuttx/configs/sama5d3x-ek/src/Makefile
@@ -66,7 +66,7 @@ ifeq ($(CONFIG_SAMA5_EBICS3_NAND),y)
 CSRCS += sam_nandflash.c
 endif
 
-ifeq ($(CONFIG_SAMA5_NOR_MAIN),y)
+ifeq ($(CONFIG_SAMA5D3xEK_NOR_MAIN),y)
 CSRCS += nor_main.c
 endif
 
diff --git a/nuttx/configs/sama5d3x-ek/src/nor_main.c b/nuttx/configs/sama5d3x-ek/src/nor_main.c
index e4a3438a5..0a284b12f 100644
--- a/nuttx/configs/sama5d3x-ek/src/nor_main.c
+++ b/nuttx/configs/sama5d3x-ek/src/nor_main.c
@@ -88,7 +88,7 @@ int nor_main(int argc, char *argv)
 {
   uint32_t regval;
 
-#ifdef CONFIG_SAMA5_NOR_START
+#ifdef CONFIG_SAMA5D3xEK_NOR_START
   printf("Configuring and booting from NOR FLASH on CS0\n");
 #else
   printf("Configuring NOR FLASH on CS0 and halting\n");
@@ -180,7 +180,7 @@ int nor_main(int argc, char *argv)
   cp15_invalidate_dcache_all();
   cp15_invalidate_tlbs();
 
-#ifdef CONFIG_SAMA5_NOR_START
+#ifdef CONFIG_SAMA5D3xEK_NOR_START
   /* Then jump into NOR flash */
 
   NOR_ENTRY();
diff --git a/nuttx/configs/sama5d3x-ek/src/sam_at24.c b/nuttx/configs/sama5d3x-ek/src/sam_at24.c
index fe1722f07..a87a61908 100644
--- a/nuttx/configs/sama5d3x-ek/src/sam_at24.c
+++ b/nuttx/configs/sama5d3x-ek/src/sam_at24.c
@@ -120,7 +120,7 @@ int sam_at24_automount(int minor)
           return -ENODEV;
         }
 
-#if defined(CONFIG_SAMA5_AT24_FTL)
+#if defined(CONFIG_SAMA5D3xEK_AT24_FTL)
       /* And finally, use the FTL layer to wrap the MTD driver as a block driver */
 
       fvdbg("Initialize the FTL layer to create /dev/mtdblock%d\n", AT24_MINOR);
@@ -131,7 +131,7 @@ int sam_at24_automount(int minor)
           return ret;
         }
 
-#elif defined(CONFIG_SAMA5_AT24_NXFFS)
+#elif defined(CONFIG_SAMA5D3xEK_AT24_NXFFS)
       /* Initialize to provide NXFFS on the MTD interface */
 
       fvdbg("Initialize the NXFFS file system\n");
diff --git a/nuttx/configs/sama5d3x-ek/src/sam_at25.c b/nuttx/configs/sama5d3x-ek/src/sam_at25.c
index 52ee4e14b..128cb4f91 100644
--- a/nuttx/configs/sama5d3x-ek/src/sam_at25.c
+++ b/nuttx/configs/sama5d3x-ek/src/sam_at25.c
@@ -100,7 +100,7 @@ int sam_at25_automount(int minor)
           return -ENODEV;
         }
 
-#if defined(CONFIG_SAMA5_AT25_FTL)
+#if defined(CONFIG_SAMA5D3xEK_AT25_FTL)
       /* And finally, use the FTL layer to wrap the MTD driver as a block driver */
 
       ret = ftl_initialize(AT25_MINOR, mtd);
@@ -110,7 +110,7 @@ int sam_at25_automount(int minor)
           return ret;
         }
 
-#elif defined(CONFIG_SAMA5_AT25_NXFFS)
+#elif defined(CONFIG_SAMA5D3xEK_AT25_NXFFS)
       /* Initialize to provide NXFFS on the MTD interface */
 
       ret = nxffs_initialize(mtd);
diff --git a/nuttx/configs/sama5d3x-ek/src/sam_i2schar.c b/nuttx/configs/sama5d3x-ek/src/sam_i2schar.c
index d443e6315..5fa7c324d 100644
--- a/nuttx/configs/sama5d3x-ek/src/sam_i2schar.c
+++ b/nuttx/configs/sama5d3x-ek/src/sam_i2schar.c
@@ -55,16 +55,16 @@
  * Pre-processor Definitions
  ************************************************************************************/
 
-#ifndef CONFIG_SAMA5D3X_EK_SSC_PORT
+#ifndef CONFIG_SAMA5D3xEK_SSC_PORT
 #  if defined(CONFIG_SAMA5_SSC0)
-#    define CONFIG_SAMA5D3X_EK_SSC_PORT 0
+#    define CONFIG_SAMA5D3xEK_SSC_PORT 0
 #  elif defined(CONFIG_SAMA5_SSC1)
-#    define CONFIG_SAMA5D3X_EK_SSC_PORT 1
+#    define CONFIG_SAMA5D3xEK_SSC_PORT 1
 #  endif
 #endif
 
-#ifndef CONFIG_SAMA5D3X_EK_I2SCHAR_MINOR
-#  define CONFIG_SAMA5D3X_EK_I2SCHAR_MINOR 0
+#ifndef CONFIG_SAMA5D3xEK_I2SCHAR_MINOR
+#  define CONFIG_SAMA5D3xEK_I2SCHAR_MINOR 0
 #endif
 
 /************************************************************************************
@@ -96,17 +96,17 @@ int i2schar_devinit(void)
     {
       /* Call sam_ssc_initialize() to get an instance of the SSC/I2S interface */
 
-      i2s = sam_ssc_initialize(CONFIG_SAMA5D3X_EK_SSC_PORT);
+      i2s = sam_ssc_initialize(CONFIG_SAMA5D3xEK_SSC_PORT);
       if (!i2s)
         {
           dbg("ERROR: Failed to get the SAMA5 SSC/I2S driver for SSC%d\n",
-              CONFIG_SAMA5D3X_EK_SSC_PORT);
+              CONFIG_SAMA5D3xEK_SSC_PORT);
           return -ENODEV;
         }
 
       /* Register the I2S character driver at "/dev/i2schar0" */
 
-      ret = i2schar_register(i2s, CONFIG_SAMA5D3X_EK_I2SCHAR_MINOR);
+      ret = i2schar_register(i2s, CONFIG_SAMA5D3xEK_I2SCHAR_MINOR);
       if (ret < 0)
         {
           adbg("ERROR: i2schar_register failed: %d\n", ret);
diff --git a/nuttx/configs/sama5d3x-ek/src/sam_nandflash.c b/nuttx/configs/sama5d3x-ek/src/sam_nandflash.c
index 8a620dcd1..709d3c240 100644
--- a/nuttx/configs/sama5d3x-ek/src/sam_nandflash.c
+++ b/nuttx/configs/sama5d3x-ek/src/sam_nandflash.c
@@ -190,7 +190,7 @@ int sam_nand_automount(int minor)
           return -ENODEV;
         }
 
-#if defined(CONFIG_SAMA5_NAND_FTL)
+#if defined(CONFIG_SAMA5D3xEK_NAND_FTL)
       /* Use the FTL layer to wrap the MTD driver as a block driver */
 
       ret = ftl_initialize(NAND_MINOR, mtd);
@@ -200,7 +200,7 @@ int sam_nand_automount(int minor)
           return ret;
         }
 
-#elif defined(CONFIG_SAMA5_NAND_NXFFS)
+#elif defined(CONFIG_SAMA5D3xEK_NAND_NXFFS)
       /* Initialize to provide NXFFS on the MTD interface */
 
       ret = nxffs_initialize(mtd);
diff --git a/nuttx/configs/sama5d3x-ek/src/sam_pwm.c b/nuttx/configs/sama5d3x-ek/src/sam_pwm.c
index 90216f4f2..97729cd02 100644
--- a/nuttx/configs/sama5d3x-ek/src/sam_pwm.c
+++ b/nuttx/configs/sama5d3x-ek/src/sam_pwm.c
@@ -87,19 +87,19 @@
  *    -----+---+---+----+--------------------
  */
 
-#ifndef CONFIG_SAMA5D3X_EK_CHANNEL
+#ifndef CONFIG_SAMA5D3xEK_CHANNEL
 #  if defined(CONFIG_SAMA5_PWM_CHAN0)
 #    warning Assuming PWM channel 0
-#    define CONFIG_SAMA5D3X_EK_CHANNEL 0
+#    define CONFIG_SAMA5D3xEK_CHANNEL 0
 #  elif defined(CONFIG_SAMA5_PWM_CHAN1)
 #    warning Assuming PWM channel 1
-#    define CONFIG_SAMA5D3X_EK_CHANNEL 1
+#    define CONFIG_SAMA5D3xEK_CHANNEL 1
 #  elif defined(CONFIG_SAMA5_PWM_CHAN2)
 #    warning Assuming PWM channel 2
-#    define CONFIG_SAMA5D3X_EK_CHANNEL 2
+#    define CONFIG_SAMA5D3xEK_CHANNEL 2
 #  elif defined(CONFIG_SAMA5_PWM_CHAN3)
 #    warning Assuming PWM channel 3
-#    define CONFIG_SAMA5D3X_EK_CHANNEL 3
+#    define CONFIG_SAMA5D3xEK_CHANNEL 3
 #  endif
 #endif
 
@@ -134,7 +134,7 @@ int pwm_devinit(void)
     {
       /* Call sam_pwminitialize() to get an instance of the PWM interface */
 
-      pwm = sam_pwminitialize(CONFIG_SAMA5D3X_EK_CHANNEL);
+      pwm = sam_pwminitialize(CONFIG_SAMA5D3xEK_CHANNEL);
       if (!pwm)
         {
           dbg("Failed to get the SAMA5 PWM lower half\n");
diff --git a/nuttx/configs/sama5d3x-ek/src/sam_sdram.c b/nuttx/configs/sama5d3x-ek/src/sam_sdram.c
index f1fe8c328..6ba478a7e 100644
--- a/nuttx/configs/sama5d3x-ek/src/sam_sdram.c
+++ b/nuttx/configs/sama5d3x-ek/src/sam_sdram.c
@@ -71,14 +71,14 @@
  ****************************************************************************/
 /* SDRAM differences */
 
-#if defined(CONFIG_SAMA5_MT47H128M16RT)
+#if defined(CONFIG_SAMA5D3xEK_MT47H128M16RT)
 
   /* Used for SDRAM command handshaking */
 
 #  define DDR2_BA0    (1 << 26)
 #  define DDR2_BA1    (1 << 27)
 
-#elif defined(CONFIG_SAMA5_MT47H64M16HR)
+#elif defined(CONFIG_SAMA5D3xEK_MT47H64M16HR)
 
   /* Used for SDRAM command handshaking */
 
@@ -222,7 +222,7 @@ void sam_sdram_config(void)
    * Register
    */
 
-#if defined(CONFIG_SAMA5_MT47H128M16RT)
+#if defined(CONFIG_SAMA5D3xEK_MT47H128M16RT)
 
   /* For MT47H128M16RT
    *
@@ -250,7 +250,7 @@ void sam_sdram_config(void)
            MPDDRC_CR_NDQS |     /* Not DQS */
            MPDDRC_CR_UNAL;      /* upport Unaligned Access */
 
-#elif defined(CONFIG_SAMA5_MT47H64M16HR)
+#elif defined(CONFIG_SAMA5D3xEK_MT47H64M16HR)
   /* For MT47H64M16HR
    *
    *   NC      = 10 DDR column bits
diff --git a/nuttx/configs/sama5d3x-ek/src/sam_touchscreen.c b/nuttx/configs/sama5d3x-ek/src/sam_touchscreen.c
index 4593576eb..51345ab66 100644
--- a/nuttx/configs/sama5d3x-ek/src/sam_touchscreen.c
+++ b/nuttx/configs/sama5d3x-ek/src/sam_touchscreen.c
@@ -58,8 +58,8 @@
 #  error "Touchscreen support requires CONFIG_INPUT"
 #endif
 
-#ifndef CONFIG_SAMA5_TSD_DEVMINOR
-#  define CONFIG_SAMA5_TSD_DEVMINOR 0
+#ifndef CONFIG_SAMA5D3xEK_TSD_DEVMINOR
+#  define CONFIG_SAMA5D3xEK_TSD_DEVMINOR 0
 #endif
 
 /****************************************************************************
@@ -126,11 +126,11 @@ int arch_tcinitialize(int minor)
 
       /* Initialize and register the SPI touchscreen device */
 
-      ret = sam_tsd_register(adc, CONFIG_SAMA5_TSD_DEVMINOR);
+      ret = sam_tsd_register(adc, CONFIG_SAMA5D3xEK_TSD_DEVMINOR);
       if (ret < 0)
         {
           idbg("ERROR: Failed to register touchscreen device /dev/input%d: %d\n",
-               CONFIG_SAMA5_TSD_DEVMINOR, ret);
+               CONFIG_SAMA5D3xEK_TSD_DEVMINOR, ret);
           return -ENODEV;
         }
 
diff --git a/nuttx/configs/sama5d3x-ek/src/sam_usbmsc.c b/nuttx/configs/sama5d3x-ek/src/sam_usbmsc.c
index a386bda49..65f9d4f2b 100644
--- a/nuttx/configs/sama5d3x-ek/src/sam_usbmsc.c
+++ b/nuttx/configs/sama5d3x-ek/src/sam_usbmsc.c
@@ -59,8 +59,8 @@
 #  error AT25 Serial FLASH not supported
 #endif
 
-#ifndef CONFIG_SAMA5_AT25_FTL
-#  error AT25 FTL support required (CONFIG_SAMA5_AT25_FTL)
+#ifndef CONFIG_SAMA5D3xEK_AT25_FTL
+#  error AT25 FTL support required (CONFIG_SAMA5D3xEK_AT25_FTL)
 #  undef HAVE_AT25
 #endif
 
diff --git a/nuttx/configs/sama5d3x-ek/src/sama5d3x-ek.h b/nuttx/configs/sama5d3x-ek/src/sama5d3x-ek.h
index 9bb8849a8..a5611f7ed 100644
--- a/nuttx/configs/sama5d3x-ek/src/sama5d3x-ek.h
+++ b/nuttx/configs/sama5d3x-ek/src/sama5d3x-ek.h
@@ -108,27 +108,27 @@
 #endif
 
 /* If we are going to mount the NAND, then they user must also have told
- * us what to do with it by setting one of CONFIG_SAMA5_NAND_FTL or
- * CONFIG_SAMA5_NAND_NXFFS.
+ * us what to do with it by setting one of CONFIG_SAMA5D3xEK_NAND_FTL or
+ * CONFIG_SAMA5D3xEK_NAND_NXFFS.
  */
 
 #ifndef CONFIG_MTD
-#  undef CONFIG_SAMA5_NAND_NXFFS
-#  undef CONFIG_SAMA5_NAND_FTL
+#  undef CONFIG_SAMA5D3xEK_NAND_NXFFS
+#  undef CONFIG_SAMA5D3xEK_NAND_FTL
 #endif
 
 #if !defined(CONFIG_FS_NXFFS) || !defined(CONFIG_NXFFS_NAND)
-#  undef CONFIG_SAMA5_NAND_NXFFS
+#  undef CONFIG_SAMA5D3xEK_NAND_NXFFS
 #endif
 
-#if !defined(CONFIG_SAMA5_NAND_FTL) && !defined(CONFIG_SAMA5_NAND_NXFFS)
+#if !defined(CONFIG_SAMA5D3xEK_NAND_FTL) && !defined(CONFIG_SAMA5D3xEK_NAND_NXFFS)
 #  undef HAVE_NAND
 #endif
 
-#if defined(CONFIG_SAMA5_NAND_FTL) && defined(CONFIG_SAMA5_NAND_NXFFS)
-#  warning Both CONFIG_SAMA5_NAND_FTL and CONFIG_SAMA5_NAND_NXFFS are set
-#  warning Ignoring CONFIG_SAMA5_NAND_NXFFS
-#  undef CONFIG_SAMA5_NAND_NXFFS
+#if defined(CONFIG_SAMA5D3xEK_NAND_FTL) && defined(CONFIG_SAMA5D3xEK_NAND_NXFFS)
+#  warning Both CONFIG_SAMA5D3xEK_NAND_FTL and CONFIG_SAMA5D3xEK_NAND_NXFFS are set
+#  warning Ignoring CONFIG_SAMA5D3xEK_NAND_NXFFS
+#  undef CONFIG_SAMA5D3xEK_NAND_NXFFS
 #endif
 
 /* AT25 Serial FLASH */
@@ -142,7 +142,7 @@
  * asked to mount the AT25 part
  */
 
-#if defined(CONFIG_DISABLE_MOUNTPOINT) || !defined(CONFIG_SAMA5_AT25_AUTOMOUNT)
+#if defined(CONFIG_DISABLE_MOUNTPOINT) || !defined(CONFIG_SAMA5D3xEK_AT25_AUTOMOUNT)
 #  undef HAVE_AT25
 #endif
 
@@ -151,17 +151,17 @@
  */
 
 #ifndef CONFIG_FS_NXFFS
-#  undef CONFIG_SAMA5_AT25_NXFFS
+#  undef CONFIG_SAMA5D3xEK_AT25_NXFFS
 #endif
 
-#if !defined(CONFIG_SAMA5_AT25_FTL) && !defined(CONFIG_SAMA5_AT25_NXFFS)
+#if !defined(CONFIG_SAMA5D3xEK_AT25_FTL) && !defined(CONFIG_SAMA5D3xEK_AT25_NXFFS)
 #  undef HAVE_AT25
 #endif
 
-#if defined(CONFIG_SAMA5_AT25_FTL) && defined(CONFIG_SAMA5_AT25_NXFFS)
-#  warning Both CONFIG_SAMA5_AT25_FTL and CONFIG_SAMA5_AT25_NXFFS are set
-#  warning Ignoring CONFIG_SAMA5_AT25_NXFFS
-#  undef CONFIG_SAMA5_AT25_NXFFS
+#if defined(CONFIG_SAMA5D3xEK_AT25_FTL) && defined(CONFIG_SAMA5D3xEK_AT25_NXFFS)
+#  warning Both CONFIG_SAMA5D3xEK_AT25_FTL and CONFIG_SAMA5D3xEK_AT25_NXFFS are set
+#  warning Ignoring CONFIG_SAMA5D3xEK_AT25_NXFFS
+#  undef CONFIG_SAMA5D3xEK_AT25_NXFFS
 #endif
 
 /* AT24 Serial EEPROM
@@ -192,7 +192,7 @@
  * asked to mount the AT25 part
  */
 
-#if defined(CONFIG_DISABLE_MOUNTPOINT) || !defined(CONFIG_SAMA5_AT24_AUTOMOUNT)
+#if defined(CONFIG_DISABLE_MOUNTPOINT) || !defined(CONFIG_SAMA5D3xEK_AT24_AUTOMOUNT)
 #  undef HAVE_AT24
 #endif
 
@@ -201,17 +201,17 @@
  */
 
 #ifndef CONFIG_FS_NXFFS
-#  undef CONFIG_SAMA5_AT24_NXFFS
+#  undef CONFIG_SAMA5D3xEK_AT24_NXFFS
 #endif
 
-#if !defined(CONFIG_SAMA5_AT24_FTL) && !defined(CONFIG_SAMA5_AT24_NXFFS)
+#if !defined(CONFIG_SAMA5D3xEK_AT24_FTL) && !defined(CONFIG_SAMA5D3xEK_AT24_NXFFS)
 #  undef HAVE_AT24
 #endif
 
-#if defined(CONFIG_SAMA5_AT24_FTL) && defined(CONFIG_SAMA5_AT24_NXFFS)
-#  warning Both CONFIG_SAMA5_AT24_FTL and CONFIG_SAMA5_AT24_NXFFS are set
-#  warning Ignoring CONFIG_SAMA5_AT24_NXFFS
-#  undef CONFIG_SAMA5_AT24_NXFFS
+#if defined(CONFIG_SAMA5D3xEK_AT24_FTL) && defined(CONFIG_SAMA5D3xEK_AT24_NXFFS)
+#  warning Both CONFIG_SAMA5D3xEK_AT24_FTL and CONFIG_SAMA5D3xEK_AT24_NXFFS are set
+#  warning Ignoring CONFIG_SAMA5D3xEK_AT24_NXFFS
+#  undef CONFIG_SAMA5D3xEK_AT24_NXFFS
 #endif
 
 /* Assign minor device numbers.  For example, if we also use MINOR number 0
@@ -322,7 +322,7 @@
 
 #define OV2640_BUS 1
 
-#ifndef CONFIG_SAMA5_OV2640_DEMO
+#ifndef CONFIG_SAMA5D3xEK_OV2640_DEMO
 #  undef HAVE_CAMERA
 #endif