diff --git a/configs/cc3200-launchpad/nsh/defconfig b/configs/cc3200-launchpad/nsh/defconfig
index ed4be8e9dd3..c18d976d724 100644
--- a/configs/cc3200-launchpad/nsh/defconfig
+++ b/configs/cc3200-launchpad/nsh/defconfig
@@ -127,8 +127,8 @@ CONFIG_TIVA_BOARD_EARLYINIT=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 is not set
 # CONFIG_TIVA_FLASH is not set
 
diff --git a/configs/dk-tm4c129x/README.txt b/configs/dk-tm4c129x/README.txt
index c09889df0e7..381f914bab2 100644
--- a/configs/dk-tm4c129x/README.txt
+++ b/configs/dk-tm4c129x/README.txt
@@ -480,8 +480,8 @@ DK-TM4129X 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/configs/dk-tm4c129x/nsh/defconfig b/configs/dk-tm4c129x/nsh/defconfig
index 0ad2d3b5f4c..c8cf1786718 100644
--- a/configs/dk-tm4c129x/nsh/defconfig
+++ b/configs/dk-tm4c129x/nsh/defconfig
@@ -138,13 +138,21 @@ CONFIG_ARCH_CHIP_TM4C=y
 #
 # Tiva/Stellaris Peripheral Support
 #
+# CONFIG_TIVA_I2C is not set
 CONFIG_TIVA_HAVE_I2C2=y
 CONFIG_TIVA_HAVE_I2C3=y
+# CONFIG_TIVA_HAVE_I2C4 is not set
+# CONFIG_TIVA_HAVE_I2C5 is not set
 CONFIG_TIVA_HAVE_UART3=y
 CONFIG_TIVA_HAVE_UART4=y
 CONFIG_TIVA_HAVE_UART5=y
 CONFIG_TIVA_HAVE_UART6=y
 CONFIG_TIVA_HAVE_UART7=y
+CONFIG_TIVA_HAVE_SSI0=y
+CONFIG_TIVA_HAVE_SSI1=y
+CONFIG_TIVA_HAVE_SSI2=y
+CONFIG_TIVA_HAVE_SSI3=y
+# CONFIG_TIVA_SSI is not set
 # CONFIG_TIVA_I2C0 is not set
 # CONFIG_TIVA_I2C1 is not set
 # CONFIG_TIVA_I2C2 is not set
@@ -157,8 +165,10 @@ CONFIG_TIVA_UART0=y
 # CONFIG_TIVA_UART5 is not set
 # CONFIG_TIVA_UART6 is not set
 # CONFIG_TIVA_UART7 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_SSI2 is not set
+# CONFIG_TIVA_SSI3 is not set
 # CONFIG_TIVA_ETHERNET is not set
 # CONFIG_TIVA_FLASH is not set
 
diff --git a/configs/dk-tm4c129x/src/dk-tm4c129x.h b/configs/dk-tm4c129x/src/dk-tm4c129x.h
index f034b828494..ca6adf7383b 100644
--- a/configs/dk-tm4c129x/src/dk-tm4c129x.h
+++ b/configs/dk-tm4c129x/src/dk-tm4c129x.h
@@ -54,13 +54,10 @@
 /* How many SSI modules does this chip support? */
 
 #if TIVA_NSSI < 1
-#  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_SSI0
 #elif TIVA_NSSI < 2
-#  undef CONFIG_SSI1_DISABLE
-#  define CONFIG_SSI1_DISABLE 1
+#  undef CONFIG_TIVA_SSI0
 #endif
 
 /* LED definitions ******************************************************************/
diff --git a/configs/dk-tm4c129x/src/tm4c_boot.c b/configs/dk-tm4c129x/src/tm4c_boot.c
index 0fb510338b2..b35cc325b82 100644
--- a/configs/dk-tm4c129x/src/tm4c_boot.c
+++ b/configs/dk-tm4c129x/src/tm4c_boot.c
@@ -77,7 +77,7 @@ void tiva_boardinitialize(void)
 
   /* The DK-TM4C129x microSD CS and OLED are on SSI0 */
 
-#if !defined(CONFIG_SSI0_DISABLE) || !defined(CONFIG_SSI1_DISABLE)
+#if defined(CONFIG_TIVA_SSI0) || defined(CONFIG_TIVA_SSI1)
   if (tm4c_ssiinitialize)
     {
       tm4c_ssiinitialize();
diff --git a/configs/dk-tm4c129x/src/tm4c_ssi.c b/configs/dk-tm4c129x/src/tm4c_ssi.c
index 7885cb40b32..2d021d902be 100644
--- a/configs/dk-tm4c129x/src/tm4c_ssi.c
+++ b/configs/dk-tm4c129x/src/tm4c_ssi.c
@@ -53,7 +53,7 @@
 
 /* The DK-TM4C129x microSD CS is on SSI0 */
 
-#if !defined(CONFIG_SSI0_DISABLE) || !defined(CONFIG_SSI1_DISABLE)
+#if defined(CONFIG_TIVA_SSI0) || defined(CONFIG_TIVA_SSI1)
 
 /************************************************************************************
  * Definitions
@@ -129,4 +129,4 @@ uint8_t tiva_spistatus(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
   return SPI_STATUS_PRESENT;
 }
 
-#endif /* !CONFIG_SSI0_DISABLE || !CONFIG_SSI1_DISABLE */
+#endif /* CONFIG_TIVA_SSI0 || CONFIG_TIVA_SSI1 */
diff --git a/configs/eagle100/README.txt b/configs/eagle100/README.txt
index e6d3de3cc88..5f7e4c6e135 100644
--- a/configs/eagle100/README.txt
+++ b/configs/eagle100/README.txt
@@ -316,8 +316,8 @@ Eagle100-specific 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 ensable support for SSI0
+    CONFIG_TIVA_SSI1 - Select to ensable 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/configs/eagle100/httpd/defconfig b/configs/eagle100/httpd/defconfig
index 96901251c10..aafaf621698 100644
--- a/configs/eagle100/httpd/defconfig
+++ b/configs/eagle100/httpd/defconfig
@@ -135,8 +135,8 @@ CONFIG_TIVA_HAVE_SSI1=y
 CONFIG_TIVA_UART0=y
 # CONFIG_TIVA_UART1 is not set
 # CONFIG_TIVA_UART2 is not set
-# CONFIG_SSI0_DISABLE is not set
-CONFIG_SSI1_DISABLE=y
+CONFIG_TIVA_SSI0=y
+# CONFIG_TIVA_SSI1 is not set
 CONFIG_TIVA_ETHERNET=y
 # CONFIG_TIVA_FLASH is not set
 
diff --git a/configs/eagle100/nettest/defconfig b/configs/eagle100/nettest/defconfig
index 35d47d82376..d81a60e1ae1 100644
--- a/configs/eagle100/nettest/defconfig
+++ b/configs/eagle100/nettest/defconfig
@@ -161,8 +161,8 @@ CONFIG_TIVA_HAVE_SSI1=y
 CONFIG_TIVA_UART0=y
 # CONFIG_TIVA_UART1 is not set
 # CONFIG_TIVA_UART2 is not set
-# CONFIG_SSI0_DISABLE is not set
-CONFIG_SSI1_DISABLE=y
+CONFIG_TIVA_SSI0=y
+# CONFIG_TIVA_SSI1 is not set
 CONFIG_TIVA_ETHERNET=y
 # CONFIG_TIVA_FLASH is not set
 
diff --git a/configs/eagle100/nsh/defconfig b/configs/eagle100/nsh/defconfig
index a4f287be4a2..758571ac728 100644
--- a/configs/eagle100/nsh/defconfig
+++ b/configs/eagle100/nsh/defconfig
@@ -138,8 +138,8 @@ CONFIG_TIVA_HAVE_SSI1=y
 CONFIG_TIVA_UART0=y
 # CONFIG_TIVA_UART1 is not set
 # CONFIG_TIVA_UART2 is not set
-# CONFIG_SSI0_DISABLE is not set
-CONFIG_SSI1_DISABLE=y
+CONFIG_TIVA_SSI0=y
+# CONFIG_TIVA_SSI1 is not set
 CONFIG_TIVA_ETHERNET=y
 # CONFIG_TIVA_FLASH is not set
 
diff --git a/configs/eagle100/nxflat/defconfig b/configs/eagle100/nxflat/defconfig
index 51eb3986663..561e5a235d3 100644
--- a/configs/eagle100/nxflat/defconfig
+++ b/configs/eagle100/nxflat/defconfig
@@ -138,8 +138,8 @@ CONFIG_TIVA_HAVE_SSI1=y
 CONFIG_TIVA_UART0=y
 # CONFIG_TIVA_UART1 is not set
 # CONFIG_TIVA_UART2 is not set
-# CONFIG_SSI0_DISABLE is not set
-CONFIG_SSI1_DISABLE=y
+CONFIG_TIVA_SSI0=y
+# CONFIG_TIVA_SSI1 is not set
 # CONFIG_TIVA_ETHERNET is not set
 # CONFIG_TIVA_FLASH is not set
 
diff --git a/configs/eagle100/src/eagle100_internal.h b/configs/eagle100/src/eagle100_internal.h
index 71ebfc80226..b1a1b29a5b6 100644
--- a/configs/eagle100/src/eagle100_internal.h
+++ b/configs/eagle100/src/eagle100_internal.h
@@ -57,13 +57,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
 
 /* Eagle-100 GPIOs ******************************************************************/
diff --git a/configs/eagle100/src/up_boot.c b/configs/eagle100/src/up_boot.c
index 1cd4e9472d7..7688144040b 100644
--- a/configs/eagle100/src/up_boot.c
+++ b/configs/eagle100/src/up_boot.c
@@ -77,7 +77,7 @@ void tiva_boardinitialize(void)
 
 /* The Eagle100 microSD CS is on SSI0 */
 
-#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/configs/eagle100/src/up_ssi.c b/configs/eagle100/src/up_ssi.c
index 4523b3cdfd3..a31ef79fca3 100644
--- a/configs/eagle100/src/up_ssi.c
+++ b/configs/eagle100/src/up_ssi.c
@@ -54,7 +54,7 @@
 
 /* The Eagle100 microSD CS is on SSI0 */
 
-#if !defined(CONFIG_SSI0_DISABLE) /* || !defined(CONFIG_SSI1_DISABLE) */
+#if defined(CONFIG_TIVA_SSI0) /* || defined(CONFIG_TIVA_SSI1) */
 
 /************************************************************************************
  * Definitions
@@ -149,4 +149,4 @@ uint8_t tiva_spistatus(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
   return SPI_STATUS_PRESENT;
 }
 
-#endif /* !CONFIG_SSI0_DISABLE || !CONFIG_SSI1_DISABLE */
+#endif /* CONFIG_TIVA_SSI0 || CONFIG_TIVA_SSI1 */
diff --git a/configs/eagle100/thttpd/defconfig b/configs/eagle100/thttpd/defconfig
index e75fbec0aca..067431b0d44 100644
--- a/configs/eagle100/thttpd/defconfig
+++ b/configs/eagle100/thttpd/defconfig
@@ -128,8 +128,8 @@ CONFIG_TIVA_HAVE_SSI1=y
 CONFIG_TIVA_UART0=y
 # CONFIG_TIVA_UART1 is not set
 # CONFIG_TIVA_UART2 is not set
-# CONFIG_SSI0_DISABLE is not set
-CONFIG_SSI1_DISABLE=y
+CONFIG_TIVA_SSI0=y
+# CONFIG_TIVA_SSI1 is not set
 CONFIG_TIVA_ETHERNET=y
 # CONFIG_TIVA_FLASH is not set
 
diff --git a/configs/ekk-lm3s9b96/README.txt b/configs/ekk-lm3s9b96/README.txt
index 2592c9a8125..fab80710f96 100644
--- a/configs/ekk-lm3s9b96/README.txt
+++ b/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/configs/ekk-lm3s9b96/nsh/defconfig b/configs/ekk-lm3s9b96/nsh/defconfig
index 4ec9ad8106f..9fcbb98ec8a 100644
--- a/configs/ekk-lm3s9b96/nsh/defconfig
+++ b/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/configs/ekk-lm3s9b96/src/ekklm3s9b96_internal.h b/configs/ekk-lm3s9b96/src/ekklm3s9b96_internal.h
index af179ddd90d..2c5047f8703 100644
--- a/configs/ekk-lm3s9b96/src/ekklm3s9b96_internal.h
+++ b/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/configs/ekk-lm3s9b96/src/up_boot.c b/configs/ekk-lm3s9b96/src/up_boot.c
index bd4df316e4b..43c7de0006d 100644
--- a/configs/ekk-lm3s9b96/src/up_boot.c
+++ b/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/configs/ekk-lm3s9b96/src/up_ssi.c b/configs/ekk-lm3s9b96/src/up_ssi.c
index 9c26c7d8558..fa603df2e5b 100644
--- a/configs/ekk-lm3s9b96/src/up_ssi.c
+++ b/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 */
diff --git a/configs/lm3s6432-s2e/README.txt b/configs/lm3s6432-s2e/README.txt
index 5e7d29cd647..87f0ed0b879 100644
--- a/configs/lm3s6432-s2e/README.txt
+++ b/configs/lm3s6432-s2e/README.txt
@@ -369,11 +369,11 @@ Stellaris MDL-S2E Reference Design 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_TIVA_SSI0 - Select to enable support for SSI0
       The TX and RX pins for SSI0 share I/O pins with the TX and RX pins
       for UART1.  To avoid conflicts, only one of SSI0 and UART1 should
       be enabled in a configuration.
-    CONFIG_SSI1_DISABLE - Select to disable support for SSI1
+    CONFIG_TIVA_SSI1 - Select to enable support for SSI1
       Note that the LM3S6432 only has one SSI, so SSI1 should always be
       disabled.
     CONFIG_SSI_POLLWAIT - Select to disable interrupt driven SSI support.
diff --git a/configs/lm3s6432-s2e/nsh/defconfig b/configs/lm3s6432-s2e/nsh/defconfig
index 1a619963305..1b4780e7576 100644
--- a/configs/lm3s6432-s2e/nsh/defconfig
+++ b/configs/lm3s6432-s2e/nsh/defconfig
@@ -129,8 +129,8 @@ CONFIG_ARCH_CHIP_LM3S=y
 CONFIG_TIVA_UART0=y
 CONFIG_TIVA_UART1=y
 # 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/configs/lm3s6432-s2e/src/lm3s6432s2e_internal.h b/configs/lm3s6432-s2e/src/lm3s6432s2e_internal.h
index bf4cf97dbd8..2db0df1912f 100644
--- a/configs/lm3s6432-s2e/src/lm3s6432s2e_internal.h
+++ b/configs/lm3s6432-s2e/src/lm3s6432s2e_internal.h
@@ -56,11 +56,9 @@
  */
 
 #if TIVA_NSSI == 0
-#  undef CONFIG_SSI0_DISABLE
-#  define CONFIG_SSI0_DISABLE 1
+#  undef CONFIG_TIVA_SSI0
 #endif
-#undef CONFIG_SSI1_DISABLE
-#define CONFIG_SSI1_DISABLE 1
+#undef CONFIG_TIVA_SSI1
 
 /* LM3S6432 MDL-S2E *****************************************************************/
 
diff --git a/configs/lm3s6432-s2e/src/up_boot.c b/configs/lm3s6432-s2e/src/up_boot.c
index 492924a47f8..a0e28f32a8d 100644
--- a/configs/lm3s6432-s2e/src/up_boot.c
+++ b/configs/lm3s6432-s2e/src/up_boot.c
@@ -54,7 +54,7 @@
  * Definitions
  ************************************************************************************/
 
-#if defined(CONFIG_TIVA_UART1) && !defined(CONFIG_SSI0_DISABLE)
+#if defined(CONFIG_TIVA_UART1) && defined(CONFIG_TIVA_SSI0)
 #  error Only one of UART1 and SSI0 can be enabled on this board.
 #endif
 
@@ -82,7 +82,7 @@ void tiva_boardinitialize(void)
    * lm_ssiinitialize() has been brought into the link.
    */
 
-#if !defined(CONFIG_SSI0_DISABLE)
+#if defined(CONFIG_TIVA_SSI0)
   if (lm_ssiinitialize)
     {
       lm_ssiinitialize();
diff --git a/configs/lm3s6432-s2e/src/up_ssi.c b/configs/lm3s6432-s2e/src/up_ssi.c
index 33dea280e76..270ec4f47a2 100644
--- a/configs/lm3s6432-s2e/src/up_ssi.c
+++ b/configs/lm3s6432-s2e/src/up_ssi.c
@@ -52,7 +52,7 @@
 #include "tiva_gpio.h"
 #include "lm3s6432s2e_internal.h"
 
-#if !defined(CONFIG_SSI0_DISABLE)
+#if defined(CONFIG_TIVA_SSI0)
 
 /************************************************************************************
  * Definitions
@@ -149,4 +149,4 @@ uint8_t tiva_spistatus(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
   return SPI_STATUS_PRESENT;
 }
 
-#endif /* !CONFIG_SSI0_DISABLE || !CONFIG_SSI1_DISABLE */
+#endif /* CONFIG_TIVA_SSI0 */
diff --git a/configs/lm3s6965-ek/README.txt b/configs/lm3s6965-ek/README.txt
index 4998d6ee81b..3522a63030f 100644
--- a/configs/lm3s6965-ek/README.txt
+++ b/configs/lm3s6965-ek/README.txt
@@ -514,8 +514,8 @@ Stellaris LM3S6965 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/configs/lm3s6965-ek/discover/defconfig b/configs/lm3s6965-ek/discover/defconfig
index aaae23e9d4d..763c44e5e0b 100644
--- a/configs/lm3s6965-ek/discover/defconfig
+++ b/configs/lm3s6965-ek/discover/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 is not set
-CONFIG_SSI1_DISABLE=y
+CONFIG_TIVA_SSI0=y
+# CONFIG_TIVA_SSI1 is not set
 CONFIG_TIVA_ETHERNET=y
 # CONFIG_TIVA_FLASH is not set
 
diff --git a/configs/lm3s6965-ek/nsh/defconfig b/configs/lm3s6965-ek/nsh/defconfig
index aaae23e9d4d..763c44e5e0b 100644
--- a/configs/lm3s6965-ek/nsh/defconfig
+++ b/configs/lm3s6965-ek/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 is not set
-CONFIG_SSI1_DISABLE=y
+CONFIG_TIVA_SSI0=y
+# CONFIG_TIVA_SSI1 is not set
 CONFIG_TIVA_ETHERNET=y
 # CONFIG_TIVA_FLASH is not set
 
diff --git a/configs/lm3s6965-ek/nx/defconfig b/configs/lm3s6965-ek/nx/defconfig
index db6b6519ebc..3772cb87e04 100644
--- a/configs/lm3s6965-ek/nx/defconfig
+++ b/configs/lm3s6965-ek/nx/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 is not set
-CONFIG_SSI1_DISABLE=y
+CONFIG_TIVA_SSI0=y
+# CONFIG_TIVA_SSI1 is not set
 # CONFIG_TIVA_ETHERNET is not set
 # CONFIG_TIVA_FLASH is not set
 
diff --git a/configs/lm3s6965-ek/src/lm3s6965ek_internal.h b/configs/lm3s6965-ek/src/lm3s6965ek_internal.h
index 061645c8c35..6c38276f103 100644
--- a/configs/lm3s6965-ek/src/lm3s6965ek_internal.h
+++ b/configs/lm3s6965-ek/src/lm3s6965ek_internal.h
@@ -57,13 +57,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
 
 /* LM3S6965 Eval Kit ***************************************************************/
diff --git a/configs/lm3s6965-ek/src/up_boot.c b/configs/lm3s6965-ek/src/up_boot.c
index fd9333e2b43..175379f1618 100644
--- a/configs/lm3s6965-ek/src/up_boot.c
+++ b/configs/lm3s6965-ek/src/up_boot.c
@@ -78,7 +78,7 @@ void tiva_boardinitialize(void)
 
   /* The LM3S6965 Eval Kit microSD CS and OLED are on SSI0 (Duh! There is no SSI1) */
 
-#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/configs/lm3s6965-ek/src/up_ssi.c b/configs/lm3s6965-ek/src/up_ssi.c
index 0af04448e61..aea93c995ef 100644
--- a/configs/lm3s6965-ek/src/up_ssi.c
+++ b/configs/lm3s6965-ek/src/up_ssi.c
@@ -54,7 +54,7 @@
 
 /* The LM3S6965 Eval Kit microSD CS is on SSI0 */
 
-#if !defined(CONFIG_SSI0_DISABLE) /* || !defined(CONFIG_SSI1_DISABLE) */
+#if defined(CONFIG_TIVA_SSI0) /* || defined(CONFIG_TIVA_SSI1) */
 
 /************************************************************************************
  * Definitions
@@ -161,4 +161,4 @@ uint8_t tiva_spistatus(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
   return SPI_STATUS_PRESENT;
 }
 
-#endif /* !CONFIG_SSI0_DISABLE || !CONFIG_SSI1_DISABLE */
+#endif /* CONFIG_TIVA_SSI0 || CONFIG_TIVA_SSI1 */
diff --git a/configs/lm3s6965-ek/tcpecho/defconfig b/configs/lm3s6965-ek/tcpecho/defconfig
index f24783fe6a2..5e62686fb40 100644
--- a/configs/lm3s6965-ek/tcpecho/defconfig
+++ b/configs/lm3s6965-ek/tcpecho/defconfig
@@ -152,8 +152,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 is not set
-CONFIG_SSI1_DISABLE=y
+CONFIG_TIVA_SSI0=y
+# CONFIG_TIVA_SSI1 is not set
 CONFIG_TIVA_ETHERNET=y
 # CONFIG_TIVA_FLASH is not set
 
diff --git a/configs/lm3s8962-ek/README.txt b/configs/lm3s8962-ek/README.txt
index 868d79497b8..6ae53a11d20 100644
--- a/configs/lm3s8962-ek/README.txt
+++ b/configs/lm3s8962-ek/README.txt
@@ -418,8 +418,8 @@ Stellaris LM3S8962 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/configs/lm3s8962-ek/nsh/defconfig b/configs/lm3s8962-ek/nsh/defconfig
index bf4f9e8aae2..da73434d193 100644
--- a/configs/lm3s8962-ek/nsh/defconfig
+++ b/configs/lm3s8962-ek/nsh/defconfig
@@ -138,8 +138,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 is not set
-CONFIG_SSI1_DISABLE=y
+CONFIG_TIVA_SSI0=y
+# CONFIG_TIVA_SSI1 is not set
 CONFIG_TIVA_ETHERNET=y
 # CONFIG_TIVA_FLASH is not set
 
diff --git a/configs/lm3s8962-ek/nx/defconfig b/configs/lm3s8962-ek/nx/defconfig
index 6a541ba2cd5..b046d37e772 100644
--- a/configs/lm3s8962-ek/nx/defconfig
+++ b/configs/lm3s8962-ek/nx/defconfig
@@ -138,8 +138,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 is not set
-CONFIG_SSI1_DISABLE=y
+CONFIG_TIVA_SSI0=y
+# CONFIG_TIVA_SSI1 is not set
 # CONFIG_TIVA_ETHERNET is not set
 # CONFIG_TIVA_FLASH is not set
 
diff --git a/configs/lm3s8962-ek/src/lm3s8962ek_internal.h b/configs/lm3s8962-ek/src/lm3s8962ek_internal.h
index 675179458ef..f6148f0712b 100644
--- a/configs/lm3s8962-ek/src/lm3s8962ek_internal.h
+++ b/configs/lm3s8962-ek/src/lm3s8962ek_internal.h
@@ -57,13 +57,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
 
 /* LM3S8962 Eval Kit ***************************************************************/
diff --git a/configs/lm3s8962-ek/src/up_boot.c b/configs/lm3s8962-ek/src/up_boot.c
index 19c2442e59b..e3e180d158d 100644
--- a/configs/lm3s8962-ek/src/up_boot.c
+++ b/configs/lm3s8962-ek/src/up_boot.c
@@ -78,7 +78,7 @@ void tiva_boardinitialize(void)
 
   /* The LM3S8962 Eval Kit microSD CS and OLED are on SSI0 (Duh! There is no SSI1) */
 
-#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/configs/lm3s8962-ek/src/up_ssi.c b/configs/lm3s8962-ek/src/up_ssi.c
index 9657dafa1d0..762de87ea82 100644
--- a/configs/lm3s8962-ek/src/up_ssi.c
+++ b/configs/lm3s8962-ek/src/up_ssi.c
@@ -54,7 +54,7 @@
 
 /* The LM3S8962 Eval Kit microSD CS is on SSI0 */
 
-#if !defined(CONFIG_SSI0_DISABLE) /* || !defined(CONFIG_SSI1_DISABLE) */
+#if defined(CONFIG_TIVA_SSI0) /* || defined(CONFIG_TIVA_SSI1) */
 
 /************************************************************************************
  * Definitions
@@ -161,4 +161,4 @@ uint8_t tiva_spistatus(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
   return SPI_STATUS_PRESENT;
 }
 
-#endif /* !CONFIG_SSI0_DISABLE || !CONFIG_SSI1_DISABLE */
+#endif /* CONFIG_TIVA_SSI0 || CONFIG_TIVA_SSI1 */
diff --git a/configs/lm4f120-launchpad/README.txt b/configs/lm4f120-launchpad/README.txt
index 521b11e1d47..0fe8049f147 100644
--- a/configs/lm4f120-launchpad/README.txt
+++ b/configs/lm4f120-launchpad/README.txt
@@ -645,8 +645,8 @@ LM4F120 LaunchPad 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/configs/lm4f120-launchpad/nsh/defconfig b/configs/lm4f120-launchpad/nsh/defconfig
index 3b07eaf6fa8..3482feb8345 100644
--- a/configs/lm4f120-launchpad/nsh/defconfig
+++ b/configs/lm4f120-launchpad/nsh/defconfig
@@ -136,8 +136,8 @@ CONFIG_TIVA_UART0=y
 # CONFIG_TIVA_UART5 is not set
 # CONFIG_TIVA_UART6 is not set
 # CONFIG_TIVA_UART7 is not set
-# CONFIG_SSI0_DISABLE is not set
-CONFIG_SSI1_DISABLE=y
+CONFIG_TIVA_SSI0=y
+# CONFIG_TIVA_SSI1 is not set
 # CONFIG_TIVA_ETHERNET is not set
 # CONFIG_TIVA_FLASH is not set
 
diff --git a/configs/lm4f120-launchpad/src/lm4f_boot.c b/configs/lm4f120-launchpad/src/lm4f_boot.c
index 78fda4823ed..73d0acdcbb9 100644
--- a/configs/lm4f120-launchpad/src/lm4f_boot.c
+++ b/configs/lm4f120-launchpad/src/lm4f_boot.c
@@ -78,7 +78,7 @@ void tiva_boardinitialize(void)
 
   /* The LM4F LaunchPad microSD CS and OLED are on SSI0 (Duh! There is no SSI1) */
 
-#if !defined(CONFIG_SSI0_DISABLE) /* || !defined(CONFIG_SSI1_DISABLE) */
+#if defined(CONFIG_TIVA_SSI0) /* || defined(CONFIG_TIVA_SSI1) */
   if (lm4f_ssiinitialize)
     {
       lm4f_ssiinitialize();
diff --git a/configs/lm4f120-launchpad/src/lm4f_ssi.c b/configs/lm4f120-launchpad/src/lm4f_ssi.c
index e7b5faf55e7..0428acb22d1 100644
--- a/configs/lm4f120-launchpad/src/lm4f_ssi.c
+++ b/configs/lm4f120-launchpad/src/lm4f_ssi.c
@@ -54,7 +54,7 @@
 
 /* The LM4F LaunchPad microSD CS is on SSI0 */
 
-#if !defined(CONFIG_SSI0_DISABLE) || !defined(CONFIG_SSI1_DISABLE)
+#if defined(CONFIG_TIVA_SSI0) || defined(CONFIG_TIVA_SSI1)
 
 /************************************************************************************
  * Definitions
@@ -130,4 +130,4 @@ uint8_t tiva_spistatus(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
   return SPI_STATUS_PRESENT;
 }
 
-#endif /* !CONFIG_SSI0_DISABLE || !CONFIG_SSI1_DISABLE */
+#endif /* CONFIG_TIVA_SSI0 || CONFIG_TIVA_SSI1 */
diff --git a/configs/lm4f120-launchpad/src/lmf4120-launchpad.h b/configs/lm4f120-launchpad/src/lmf4120-launchpad.h
index 2024351c132..b8b480ff591 100644
--- a/configs/lm4f120-launchpad/src/lmf4120-launchpad.h
+++ b/configs/lm4f120-launchpad/src/lmf4120-launchpad.h
@@ -57,13 +57,10 @@
  */
 
 #if TIVA_NSSI < 1
-#  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 < 2
-#  undef CONFIG_SSI1_DISABLE
-#  define CONFIG_SSI1_DISABLE 1
+#  undef CONFIG_TIVA_SSI1
 #endif
 
 /* LM4F LaunchPad *******************************************************************/
diff --git a/configs/tm4c123g-launchpad/README.txt b/configs/tm4c123g-launchpad/README.txt
index 3b72987098e..f80fc92583e 100644
--- a/configs/tm4c123g-launchpad/README.txt
+++ b/configs/tm4c123g-launchpad/README.txt
@@ -741,8 +741,8 @@ TM4C123G LaunchPad 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/configs/tm4c123g-launchpad/nsh/defconfig b/configs/tm4c123g-launchpad/nsh/defconfig
index f53fe868543..66e601c2f84 100644
--- a/configs/tm4c123g-launchpad/nsh/defconfig
+++ b/configs/tm4c123g-launchpad/nsh/defconfig
@@ -148,8 +148,8 @@ CONFIG_TIVA_UART0=y
 # CONFIG_TIVA_UART5 is not set
 # CONFIG_TIVA_UART6 is not set
 # CONFIG_TIVA_UART7 is not set
-# CONFIG_SSI0_DISABLE is not set
-CONFIG_SSI1_DISABLE=y
+CONFIG_TIVA_SSI0=y
+# CONFIG_TIVA_SSI1 is not set
 # CONFIG_TIVA_ETHERNET is not set
 # CONFIG_TIVA_FLASH is not set
 
diff --git a/configs/tm4c123g-launchpad/src/tm4c123g-launchpad.h b/configs/tm4c123g-launchpad/src/tm4c123g-launchpad.h
index 7d8a9d379b5..90048154f29 100644
--- a/configs/tm4c123g-launchpad/src/tm4c123g-launchpad.h
+++ b/configs/tm4c123g-launchpad/src/tm4c123g-launchpad.h
@@ -56,13 +56,10 @@
 /* How many SSI modules does this chip support? */
 
 #if TIVA_NSSI < 1
-#  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 < 2
-#  undef CONFIG_SSI1_DISABLE
-#  define CONFIG_SSI1_DISABLE 1
+#  undef CONFIG_TIVA_SSI1
 #endif
 
 /* AT24 Serial EEPROM
diff --git a/configs/tm4c123g-launchpad/src/tm4c_boot.c b/configs/tm4c123g-launchpad/src/tm4c_boot.c
index e30d6244926..7ad94d973d8 100644
--- a/configs/tm4c123g-launchpad/src/tm4c_boot.c
+++ b/configs/tm4c123g-launchpad/src/tm4c_boot.c
@@ -77,7 +77,7 @@ void tiva_boardinitialize(void)
 
   /* The TM4C123G LaunchPad microSD CS and OLED are on SSI0 */
 
-#if !defined(CONFIG_SSI0_DISABLE) || !defined(CONFIG_SSI1_DISABLE)
+#if defined(CONFIG_TIVA_SSI0) || defined(CONFIG_TIVA_SSI1)
   if (tm4c_ssiinitialize)
     {
       tm4c_ssiinitialize();
diff --git a/configs/tm4c123g-launchpad/src/tm4c_ssi.c b/configs/tm4c123g-launchpad/src/tm4c_ssi.c
index 55c32786a8f..dd94d97bb09 100644
--- a/configs/tm4c123g-launchpad/src/tm4c_ssi.c
+++ b/configs/tm4c123g-launchpad/src/tm4c_ssi.c
@@ -53,7 +53,7 @@
 
 /* The TM4C123G LaunchPad microSD CS is on SSI0 */
 
-#if !defined(CONFIG_SSI0_DISABLE) || !defined(CONFIG_SSI1_DISABLE)
+#if defined(CONFIG_TIVA_SSI0) || defined(CONFIG_TIVA_SSI1)
 
 /************************************************************************************
  * Definitions
@@ -129,4 +129,4 @@ uint8_t tiva_spistatus(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
   return SPI_STATUS_PRESENT;
 }
 
-#endif /* !CONFIG_SSI0_DISABLE || !CONFIG_SSI1_DISABLE */
+#endif /* CONFIG_TIVA_SSI0 || CONFIG_TIVA_SSI1 */