Tiva SSI and board configurations: hange negative Tiva logic CONFIG_SSIx_DISABLE to positive logic CONFIG_TIVA_SSIx. Add support for SSI2 and SSI3

5 files changed, 10 insertions, 13 deletions

diff --git a/nuttx/configs/ekk-lm3s9b96/README.txt b/nuttx/configs/ekk-lm3s9b96/README.txt
index 2592c9a81..fab80710f 100644
--- a/nuttx/configs/ekk-lm3s9b96/README.txt
+++ b/nuttx/configs/ekk-lm3s9b96/README.txt
@@ -371,8 +371,8 @@ Stellaris EKK-LM3S9B96 Evaluation Kit Configuration Options
     CONFIG_UARTn_PARTIY - 0=no parity, 1=odd parity, 2=even parity
     CONFIG_UARTn_2STOP - Two stop bits
 
-    CONFIG_SSI0_DISABLE - Select to disable support for SSI0
-    CONFIG_SSI1_DISABLE - Select to disable support for SSI1
+    CONFIG_TIVA_SSI0 - Select to enable support for SSI0
+    CONFIG_TIVA_SSI1 - Select to enable support for SSI1
     CONFIG_SSI_POLLWAIT - Select to disable interrupt driven SSI support.
       Poll-waiting is recommended if the interrupt rate would be to
       high in the interrupt driven case.
diff --git a/nuttx/configs/ekk-lm3s9b96/nsh/defconfig b/nuttx/configs/ekk-lm3s9b96/nsh/defconfig
index 4ec9ad810..9fcbb98ec 100644
--- a/nuttx/configs/ekk-lm3s9b96/nsh/defconfig
+++ b/nuttx/configs/ekk-lm3s9b96/nsh/defconfig
@@ -130,8 +130,8 @@ CONFIG_ARCH_CHIP_LM3S=y
 CONFIG_TIVA_UART0=y
 # CONFIG_TIVA_UART1 is not set
 # CONFIG_TIVA_UART2 is not set
-CONFIG_SSI0_DISABLE=y
-CONFIG_SSI1_DISABLE=y
+# CONFIG_TIVA_SSI0 is not set
+# CONFIG_TIVA_SSI1 is not set
 CONFIG_TIVA_ETHERNET=y
 # CONFIG_TIVA_FLASH is not set
 
diff --git a/nuttx/configs/ekk-lm3s9b96/src/ekklm3s9b96_internal.h b/nuttx/configs/ekk-lm3s9b96/src/ekklm3s9b96_internal.h
index af179ddd9..2c5047f87 100644
--- a/nuttx/configs/ekk-lm3s9b96/src/ekklm3s9b96_internal.h
+++ b/nuttx/configs/ekk-lm3s9b96/src/ekklm3s9b96_internal.h
@@ -58,13 +58,10 @@
  */
 
 #if TIVA_NSSI == 0
-#  undef CONFIG_SSI0_DISABLE
-#  define CONFIG_SSI0_DISABLE 1
-#  undef CONFIG_SSI1_DISABLE
-#  define CONFIG_SSI1_DISABLE 1
+#  undef CONFIG_TIVA_SSI0
+#  undef CONFIG_TIVA_SSI1
 #elif TIVA_NSSI == 1
-#  undef CONFIG_SSI1_DISABLE
-#  define CONFIG_SSI1_DISABLE 1
+#  undef CONFIG_TIVA_SSI1
 #endif
 
 /* EKK-LM3S9B96 Eval Kit ************************************************************/
diff --git a/nuttx/configs/ekk-lm3s9b96/src/up_boot.c b/nuttx/configs/ekk-lm3s9b96/src/up_boot.c
index bd4df316e..43c7de000 100644
--- a/nuttx/configs/ekk-lm3s9b96/src/up_boot.c
+++ b/nuttx/configs/ekk-lm3s9b96/src/up_boot.c
@@ -77,7 +77,7 @@ void tiva_boardinitialize(void)
    * lm_ssiinitialize() has been brought into the link.
    */
 
-#if !defined(CONFIG_SSI0_DISABLE)  || !defined(CONFIG_SSI1_DISABLE)
+#if defined(CONFIG_TIVA_SSI0)  || defined(CONFIG_TIVA_SSI1)
   if (lm_ssiinitialize)
     {
       lm_ssiinitialize();
diff --git a/nuttx/configs/ekk-lm3s9b96/src/up_ssi.c b/nuttx/configs/ekk-lm3s9b96/src/up_ssi.c
index 9c26c7d85..fa603df2e 100644
--- a/nuttx/configs/ekk-lm3s9b96/src/up_ssi.c
+++ b/nuttx/configs/ekk-lm3s9b96/src/up_ssi.c
@@ -53,7 +53,7 @@
 #include "tiva_gpio.h"
 #include "ekklm3s9b96_internal.h"
 
-#if !defined(CONFIG_SSI0_DISABLE)  || !defined(CONFIG_SSI1_DISABLE)
+#if defined(CONFIG_TIVA_SSI0)  || defined(CONFIG_TIVA_SSI1)
 
 /************************************************************************************
  * Definitions
@@ -159,4 +159,4 @@ uint8_t tiva_spistatus(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
   return SPI_STATUS_PRESENT;
 }
 #endif
-#endif /* !CONFIG_SSI0_DISABLE || !CONFIG_SSI1_DISABLE */
+#endif /* CONFIG_TIVA_SSI0 || CONFIG_TIVA_SSI1 */