summaryrefslogtreecommitdiff
path: root/nuttx/configs
diff options
context:
space:
mode:
authorGregory Nutt <gnutt@nuttx.org>2014-12-21 15:23:37 -0600
committerGregory Nutt <gnutt@nuttx.org>2014-12-21 15:23:37 -0600
commitcd29be472f91ff0b069bfcd836d52f8f89c1a9dc (patch)
treeb435e4f08cfe91d08d68a94adf55dbb3274be4ef /nuttx/configs
parent55ff857fdd75da4f086fbff603758d905211eb90 (diff)
downloadpx4-nuttx-cd29be472f91ff0b069bfcd836d52f8f89c1a9dc.tar.gz
px4-nuttx-cd29be472f91ff0b069bfcd836d52f8f89c1a9dc.tar.bz2
px4-nuttx-cd29be472f91ff0b069bfcd836d52f8f89c1a9dc.zip
Tiva SSI and board configurations: hange negative Tiva logic CONFIG_SSIx_DISABLE to positive logic CONFIG_TIVA_SSIx. Add support for SSI2 and SSI3
Diffstat (limited to 'nuttx/configs')
-rw-r--r--nuttx/configs/cc3200-launchpad/nsh/defconfig4
-rw-r--r--nuttx/configs/dk-tm4c129x/README.txt4
-rw-r--r--nuttx/configs/dk-tm4c129x/nsh/defconfig14
-rw-r--r--nuttx/configs/dk-tm4c129x/src/dk-tm4c129x.h9
-rw-r--r--nuttx/configs/dk-tm4c129x/src/tm4c_boot.c2
-rw-r--r--nuttx/configs/dk-tm4c129x/src/tm4c_ssi.c4
-rw-r--r--nuttx/configs/eagle100/README.txt4
-rw-r--r--nuttx/configs/eagle100/httpd/defconfig4
-rw-r--r--nuttx/configs/eagle100/nettest/defconfig4
-rw-r--r--nuttx/configs/eagle100/nsh/defconfig4
-rw-r--r--nuttx/configs/eagle100/nxflat/defconfig4
-rw-r--r--nuttx/configs/eagle100/src/eagle100_internal.h9
-rw-r--r--nuttx/configs/eagle100/src/up_boot.c2
-rw-r--r--nuttx/configs/eagle100/src/up_ssi.c4
-rw-r--r--nuttx/configs/eagle100/thttpd/defconfig4
-rw-r--r--nuttx/configs/ekk-lm3s9b96/README.txt4
-rw-r--r--nuttx/configs/ekk-lm3s9b96/nsh/defconfig4
-rw-r--r--nuttx/configs/ekk-lm3s9b96/src/ekklm3s9b96_internal.h9
-rw-r--r--nuttx/configs/ekk-lm3s9b96/src/up_boot.c2
-rw-r--r--nuttx/configs/ekk-lm3s9b96/src/up_ssi.c4
-rw-r--r--nuttx/configs/lm3s6432-s2e/README.txt4
-rw-r--r--nuttx/configs/lm3s6432-s2e/nsh/defconfig4
-rw-r--r--nuttx/configs/lm3s6432-s2e/src/lm3s6432s2e_internal.h6
-rw-r--r--nuttx/configs/lm3s6432-s2e/src/up_boot.c4
-rw-r--r--nuttx/configs/lm3s6432-s2e/src/up_ssi.c4
-rw-r--r--nuttx/configs/lm3s6965-ek/README.txt4
-rw-r--r--nuttx/configs/lm3s6965-ek/discover/defconfig4
-rw-r--r--nuttx/configs/lm3s6965-ek/nsh/defconfig4
-rw-r--r--nuttx/configs/lm3s6965-ek/nx/defconfig4
-rw-r--r--nuttx/configs/lm3s6965-ek/src/lm3s6965ek_internal.h9
-rw-r--r--nuttx/configs/lm3s6965-ek/src/up_boot.c2
-rw-r--r--nuttx/configs/lm3s6965-ek/src/up_ssi.c4
-rw-r--r--nuttx/configs/lm3s6965-ek/tcpecho/defconfig4
-rw-r--r--nuttx/configs/lm3s8962-ek/README.txt4
-rw-r--r--nuttx/configs/lm3s8962-ek/nsh/defconfig4
-rw-r--r--nuttx/configs/lm3s8962-ek/nx/defconfig4
-rw-r--r--nuttx/configs/lm3s8962-ek/src/lm3s8962ek_internal.h9
-rw-r--r--nuttx/configs/lm3s8962-ek/src/up_boot.c2
-rw-r--r--nuttx/configs/lm3s8962-ek/src/up_ssi.c4
-rw-r--r--nuttx/configs/lm4f120-launchpad/README.txt4
-rw-r--r--nuttx/configs/lm4f120-launchpad/nsh/defconfig4
-rw-r--r--nuttx/configs/lm4f120-launchpad/src/lm4f_boot.c2
-rw-r--r--nuttx/configs/lm4f120-launchpad/src/lm4f_ssi.c4
-rw-r--r--nuttx/configs/lm4f120-launchpad/src/lmf4120-launchpad.h9
-rw-r--r--nuttx/configs/tm4c123g-launchpad/README.txt4
-rw-r--r--nuttx/configs/tm4c123g-launchpad/nsh/defconfig4
-rw-r--r--nuttx/configs/tm4c123g-launchpad/src/tm4c123g-launchpad.h9
-rw-r--r--nuttx/configs/tm4c123g-launchpad/src/tm4c_boot.c2
-rw-r--r--nuttx/configs/tm4c123g-launchpad/src/tm4c_ssi.c4
49 files changed, 108 insertions, 121 deletions
diff --git a/nuttx/configs/cc3200-launchpad/nsh/defconfig b/nuttx/configs/cc3200-launchpad/nsh/defconfig
index ed4be8e9d..c18d976d7 100644
--- a/nuttx/configs/cc3200-launchpad/nsh/defconfig
+++ b/nuttx/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/nuttx/configs/dk-tm4c129x/README.txt b/nuttx/configs/dk-tm4c129x/README.txt
index c09889df0..381f914ba 100644
--- a/nuttx/configs/dk-tm4c129x/README.txt
+++ b/nuttx/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/nuttx/configs/dk-tm4c129x/nsh/defconfig b/nuttx/configs/dk-tm4c129x/nsh/defconfig
index 0ad2d3b5f..c8cf17867 100644
--- a/nuttx/configs/dk-tm4c129x/nsh/defconfig
+++ b/nuttx/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/nuttx/configs/dk-tm4c129x/src/dk-tm4c129x.h b/nuttx/configs/dk-tm4c129x/src/dk-tm4c129x.h
index f034b8284..ca6adf738 100644
--- a/nuttx/configs/dk-tm4c129x/src/dk-tm4c129x.h
+++ b/nuttx/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/nuttx/configs/dk-tm4c129x/src/tm4c_boot.c b/nuttx/configs/dk-tm4c129x/src/tm4c_boot.c
index 0fb510338..b35cc325b 100644
--- a/nuttx/configs/dk-tm4c129x/src/tm4c_boot.c
+++ b/nuttx/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/nuttx/configs/dk-tm4c129x/src/tm4c_ssi.c b/nuttx/configs/dk-tm4c129x/src/tm4c_ssi.c
index 7885cb40b..2d021d902 100644
--- a/nuttx/configs/dk-tm4c129x/src/tm4c_ssi.c
+++ b/nuttx/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/nuttx/configs/eagle100/README.txt b/nuttx/configs/eagle100/README.txt
index e6d3de3cc..5f7e4c6e1 100644
--- a/nuttx/configs/eagle100/README.txt
+++ b/nuttx/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/nuttx/configs/eagle100/httpd/defconfig b/nuttx/configs/eagle100/httpd/defconfig
index 96901251c..aafaf6216 100644
--- a/nuttx/configs/eagle100/httpd/defconfig
+++ b/nuttx/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/nuttx/configs/eagle100/nettest/defconfig b/nuttx/configs/eagle100/nettest/defconfig
index 35d47d823..d81a60e1a 100644
--- a/nuttx/configs/eagle100/nettest/defconfig
+++ b/nuttx/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/nuttx/configs/eagle100/nsh/defconfig b/nuttx/configs/eagle100/nsh/defconfig
index a4f287be4..758571ac7 100644
--- a/nuttx/configs/eagle100/nsh/defconfig
+++ b/nuttx/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/nuttx/configs/eagle100/nxflat/defconfig b/nuttx/configs/eagle100/nxflat/defconfig
index 51eb39866..561e5a235 100644
--- a/nuttx/configs/eagle100/nxflat/defconfig
+++ b/nuttx/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/nuttx/configs/eagle100/src/eagle100_internal.h b/nuttx/configs/eagle100/src/eagle100_internal.h
index 71ebfc802..b1a1b29a5 100644
--- a/nuttx/configs/eagle100/src/eagle100_internal.h
+++ b/nuttx/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/nuttx/configs/eagle100/src/up_boot.c b/nuttx/configs/eagle100/src/up_boot.c
index 1cd4e9472..768814404 100644
--- a/nuttx/configs/eagle100/src/up_boot.c
+++ b/nuttx/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/nuttx/configs/eagle100/src/up_ssi.c b/nuttx/configs/eagle100/src/up_ssi.c
index 4523b3cdf..a31ef79fc 100644
--- a/nuttx/configs/eagle100/src/up_ssi.c
+++ b/nuttx/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/nuttx/configs/eagle100/thttpd/defconfig b/nuttx/configs/eagle100/thttpd/defconfig
index e75fbec0a..067431b0d 100644
--- a/nuttx/configs/eagle100/thttpd/defconfig
+++ b/nuttx/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/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 */
diff --git a/nuttx/configs/lm3s6432-s2e/README.txt b/nuttx/configs/lm3s6432-s2e/README.txt
index 5e7d29cd6..87f0ed0b8 100644
--- a/nuttx/configs/lm3s6432-s2e/README.txt
+++ b/nuttx/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/nuttx/configs/lm3s6432-s2e/nsh/defconfig b/nuttx/configs/lm3s6432-s2e/nsh/defconfig
index 1a6199633..1b4780e75 100644
--- a/nuttx/configs/lm3s6432-s2e/nsh/defconfig
+++ b/nuttx/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/nuttx/configs/lm3s6432-s2e/src/lm3s6432s2e_internal.h b/nuttx/configs/lm3s6432-s2e/src/lm3s6432s2e_internal.h
index bf4cf97db..2db0df191 100644
--- a/nuttx/configs/lm3s6432-s2e/src/lm3s6432s2e_internal.h
+++ b/nuttx/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/nuttx/configs/lm3s6432-s2e/src/up_boot.c b/nuttx/configs/lm3s6432-s2e/src/up_boot.c
index 492924a47..a0e28f32a 100644
--- a/nuttx/configs/lm3s6432-s2e/src/up_boot.c
+++ b/nuttx/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/nuttx/configs/lm3s6432-s2e/src/up_ssi.c b/nuttx/configs/lm3s6432-s2e/src/up_ssi.c
index 33dea280e..270ec4f47 100644
--- a/nuttx/configs/lm3s6432-s2e/src/up_ssi.c
+++ b/nuttx/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/nuttx/configs/lm3s6965-ek/README.txt b/nuttx/configs/lm3s6965-ek/README.txt
index 4998d6ee8..3522a6303 100644
--- a/nuttx/configs/lm3s6965-ek/README.txt
+++ b/nuttx/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/nuttx/configs/lm3s6965-ek/discover/defconfig b/nuttx/configs/lm3s6965-ek/discover/defconfig
index aaae23e9d..763c44e5e 100644
--- a/nuttx/configs/lm3s6965-ek/discover/defconfig
+++ b/nuttx/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/nuttx/configs/lm3s6965-ek/nsh/defconfig b/nuttx/configs/lm3s6965-ek/nsh/defconfig
index aaae23e9d..763c44e5e 100644
--- a/nuttx/configs/lm3s6965-ek/nsh/defconfig
+++ b/nuttx/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/nuttx/configs/lm3s6965-ek/nx/defconfig b/nuttx/configs/lm3s6965-ek/nx/defconfig
index db6b6519e..3772cb87e 100644
--- a/nuttx/configs/lm3s6965-ek/nx/defconfig
+++ b/nuttx/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/nuttx/configs/lm3s6965-ek/src/lm3s6965ek_internal.h b/nuttx/configs/lm3s6965-ek/src/lm3s6965ek_internal.h
index 061645c8c..6c38276f1 100644
--- a/nuttx/configs/lm3s6965-ek/src/lm3s6965ek_internal.h
+++ b/nuttx/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/nuttx/configs/lm3s6965-ek/src/up_boot.c b/nuttx/configs/lm3s6965-ek/src/up_boot.c
index fd9333e2b..175379f16 100644
--- a/nuttx/configs/lm3s6965-ek/src/up_boot.c
+++ b/nuttx/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/nuttx/configs/lm3s6965-ek/src/up_ssi.c b/nuttx/configs/lm3s6965-ek/src/up_ssi.c
index 0af04448e..aea93c995 100644
--- a/nuttx/configs/lm3s6965-ek/src/up_ssi.c
+++ b/nuttx/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/nuttx/configs/lm3s6965-ek/tcpecho/defconfig b/nuttx/configs/lm3s6965-ek/tcpecho/defconfig
index f24783fe6..5e62686fb 100644
--- a/nuttx/configs/lm3s6965-ek/tcpecho/defconfig
+++ b/nuttx/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/nuttx/configs/lm3s8962-ek/README.txt b/nuttx/configs/lm3s8962-ek/README.txt
index 868d79497..6ae53a11d 100644
--- a/nuttx/configs/lm3s8962-ek/README.txt
+++ b/nuttx/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/nuttx/configs/lm3s8962-ek/nsh/defconfig b/nuttx/configs/lm3s8962-ek/nsh/defconfig
index bf4f9e8aa..da73434d1 100644
--- a/nuttx/configs/lm3s8962-ek/nsh/defconfig
+++ b/nuttx/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/nuttx/configs/lm3s8962-ek/nx/defconfig b/nuttx/configs/lm3s8962-ek/nx/defconfig
index 6a541ba2c..b046d37e7 100644
--- a/nuttx/configs/lm3s8962-ek/nx/defconfig
+++ b/nuttx/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/nuttx/configs/lm3s8962-ek/src/lm3s8962ek_internal.h b/nuttx/configs/lm3s8962-ek/src/lm3s8962ek_internal.h
index 675179458..f6148f071 100644
--- a/nuttx/configs/lm3s8962-ek/src/lm3s8962ek_internal.h
+++ b/nuttx/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/nuttx/configs/lm3s8962-ek/src/up_boot.c b/nuttx/configs/lm3s8962-ek/src/up_boot.c
index 19c2442e5..e3e180d15 100644
--- a/nuttx/configs/lm3s8962-ek/src/up_boot.c
+++ b/nuttx/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/nuttx/configs/lm3s8962-ek/src/up_ssi.c b/nuttx/configs/lm3s8962-ek/src/up_ssi.c
index 9657dafa1..762de87ea 100644
--- a/nuttx/configs/lm3s8962-ek/src/up_ssi.c
+++ b/nuttx/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/nuttx/configs/lm4f120-launchpad/README.txt b/nuttx/configs/lm4f120-launchpad/README.txt
index 521b11e1d..0fe8049f1 100644
--- a/nuttx/configs/lm4f120-launchpad/README.txt
+++ b/nuttx/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/nuttx/configs/lm4f120-launchpad/nsh/defconfig b/nuttx/configs/lm4f120-launchpad/nsh/defconfig
index 3b07eaf6f..3482feb83 100644
--- a/nuttx/configs/lm4f120-launchpad/nsh/defconfig
+++ b/nuttx/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/nuttx/configs/lm4f120-launchpad/src/lm4f_boot.c b/nuttx/configs/lm4f120-launchpad/src/lm4f_boot.c
index 78fda4823..73d0acdcb 100644
--- a/nuttx/configs/lm4f120-launchpad/src/lm4f_boot.c
+++ b/nuttx/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/nuttx/configs/lm4f120-launchpad/src/lm4f_ssi.c b/nuttx/configs/lm4f120-launchpad/src/lm4f_ssi.c
index e7b5faf55..0428acb22 100644
--- a/nuttx/configs/lm4f120-launchpad/src/lm4f_ssi.c
+++ b/nuttx/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/nuttx/configs/lm4f120-launchpad/src/lmf4120-launchpad.h b/nuttx/configs/lm4f120-launchpad/src/lmf4120-launchpad.h
index 2024351c1..b8b480ff5 100644
--- a/nuttx/configs/lm4f120-launchpad/src/lmf4120-launchpad.h
+++ b/nuttx/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/nuttx/configs/tm4c123g-launchpad/README.txt b/nuttx/configs/tm4c123g-launchpad/README.txt
index 3b7298709..f80fc9258 100644
--- a/nuttx/configs/tm4c123g-launchpad/README.txt
+++ b/nuttx/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/nuttx/configs/tm4c123g-launchpad/nsh/defconfig b/nuttx/configs/tm4c123g-launchpad/nsh/defconfig
index f53fe8685..66e601c2f 100644
--- a/nuttx/configs/tm4c123g-launchpad/nsh/defconfig
+++ b/nuttx/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/nuttx/configs/tm4c123g-launchpad/src/tm4c123g-launchpad.h b/nuttx/configs/tm4c123g-launchpad/src/tm4c123g-launchpad.h
index 7d8a9d379..90048154f 100644
--- a/nuttx/configs/tm4c123g-launchpad/src/tm4c123g-launchpad.h
+++ b/nuttx/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/nuttx/configs/tm4c123g-launchpad/src/tm4c_boot.c b/nuttx/configs/tm4c123g-launchpad/src/tm4c_boot.c
index e30d62449..7ad94d973 100644
--- a/nuttx/configs/tm4c123g-launchpad/src/tm4c_boot.c
+++ b/nuttx/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/nuttx/configs/tm4c123g-launchpad/src/tm4c_ssi.c b/nuttx/configs/tm4c123g-launchpad/src/tm4c_ssi.c
index 55c32786a..dd94d97bb 100644
--- a/nuttx/configs/tm4c123g-launchpad/src/tm4c_ssi.c
+++ b/nuttx/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 */