Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-06-05 15:58:59 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Gregory Nutt
2014-12-21 15:23:37 -06:00
parent b6839f5407
commit 7e5a0f227d
49 changed files with 108 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files
configs/cc3200-launchpad/nsh/defconfig
+2 -2
View File
@@ -127,8 +127,8 @@ CONFIG_TIVA_BOARD_EARLYINIT=y
CONFIG_TIVA_UART0=y CONFIG_TIVA_UART0=y
# CONFIG_TIVA_UART1 is not set # CONFIG_TIVA_UART1 is not set
# CONFIG_TIVA_UART2 is not set # CONFIG_TIVA_UART2 is not set
CONFIG_SSI0_DISABLE=y # CONFIG_TIVA_SSI0 is not set
CONFIG_SSI1_DISABLE=y # CONFIG_TIVA_SSI1 is not set
# CONFIG_TIVA_ETHERNET is not set # CONFIG_TIVA_ETHERNET is not set
# CONFIG_TIVA_FLASH is not set # CONFIG_TIVA_FLASH is not set
configs/dk-tm4c129x/README.txt
+2 -2
View File
@@ -480,8 +480,8 @@ DK-TM4129X Configuration Options
CONFIG_UARTn_PARTIY - 0=no parity, 1=odd parity, 2=even parity CONFIG_UARTn_PARTIY - 0=no parity, 1=odd parity, 2=even parity
CONFIG_UARTn_2STOP - Two stop bits CONFIG_UARTn_2STOP - Two stop bits
CONFIG_SSI0_DISABLE - Select to disable support for SSI0 CONFIG_TIVA_SSI0 - Select to enable support for SSI0
CONFIG_SSI1_DISABLE - Select to disable support for SSI1 CONFIG_TIVA_SSI1 - Select to enable support for SSI1
CONFIG_SSI_POLLWAIT - Select to disable interrupt driven SSI support. CONFIG_SSI_POLLWAIT - Select to disable interrupt driven SSI support.
Poll-waiting is recommended if the interrupt rate would be to Poll-waiting is recommended if the interrupt rate would be to
high in the interrupt driven case. high in the interrupt driven case.
configs/dk-tm4c129x/nsh/defconfig
+12 -2
View File
@@ -138,13 +138,21 @@ CONFIG_ARCH_CHIP_TM4C=y
# #
# Tiva/Stellaris Peripheral Support # Tiva/Stellaris Peripheral Support
# #
# CONFIG_TIVA_I2C is not set
CONFIG_TIVA_HAVE_I2C2=y CONFIG_TIVA_HAVE_I2C2=y
CONFIG_TIVA_HAVE_I2C3=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_UART3=y
CONFIG_TIVA_HAVE_UART4=y CONFIG_TIVA_HAVE_UART4=y
CONFIG_TIVA_HAVE_UART5=y CONFIG_TIVA_HAVE_UART5=y
CONFIG_TIVA_HAVE_UART6=y CONFIG_TIVA_HAVE_UART6=y
CONFIG_TIVA_HAVE_UART7=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_I2C0 is not set
# CONFIG_TIVA_I2C1 is not set # CONFIG_TIVA_I2C1 is not set
# CONFIG_TIVA_I2C2 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_UART5 is not set
# CONFIG_TIVA_UART6 is not set # CONFIG_TIVA_UART6 is not set
# CONFIG_TIVA_UART7 is not set # CONFIG_TIVA_UART7 is not set
CONFIG_SSI0_DISABLE=y # CONFIG_TIVA_SSI0 is not set
CONFIG_SSI1_DISABLE=y # 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_ETHERNET is not set
# CONFIG_TIVA_FLASH is not set # CONFIG_TIVA_FLASH is not set
configs/dk-tm4c129x/src/dk-tm4c129x.h
+3 -6
View File
@@ -54,13 +54,10 @@
/* How many SSI modules does this chip support? */ /* How many SSI modules does this chip support? */
#if TIVA_NSSI < 1 #if TIVA_NSSI < 1
# undef CONFIG_SSI0_DISABLE # undef CONFIG_TIVA_SSI0
# define CONFIG_SSI0_DISABLE 1 # undef CONFIG_TIVA_SSI0
# undef CONFIG_SSI1_DISABLE
# define CONFIG_SSI1_DISABLE 1
#elif TIVA_NSSI < 2 #elif TIVA_NSSI < 2
# undef CONFIG_SSI1_DISABLE # undef CONFIG_TIVA_SSI0
# define CONFIG_SSI1_DISABLE 1
#endif #endif
/* LED definitions ******************************************************************/ /* LED definitions ******************************************************************/
configs/dk-tm4c129x/src/tm4c_boot.c
+1 -1
View File
@@ -77,7 +77,7 @@ void tiva_boardinitialize(void)
/* The DK-TM4C129x microSD CS and OLED are on SSI0 */ /* 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) if (tm4c_ssiinitialize)
{ {
tm4c_ssiinitialize(); tm4c_ssiinitialize();
configs/dk-tm4c129x/src/tm4c_ssi.c
+2 -2
View File
@@ -53,7 +53,7 @@
/* The DK-TM4C129x microSD CS is on SSI0 */ /* 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 * Definitions
@@ -129,4 +129,4 @@ uint8_t tiva_spistatus(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
return SPI_STATUS_PRESENT; return SPI_STATUS_PRESENT;
} }
#endif /* !CONFIG_SSI0_DISABLE || !CONFIG_SSI1_DISABLE */ #endif /* CONFIG_TIVA_SSI0 || CONFIG_TIVA_SSI1 */
configs/eagle100/README.txt
+2 -2
View File
@@ -316,8 +316,8 @@ Eagle100-specific Configuration Options
CONFIG_UARTn_PARTIY - 0=no parity, 1=odd parity, 2=even parity CONFIG_UARTn_PARTIY - 0=no parity, 1=odd parity, 2=even parity
CONFIG_UARTn_2STOP - Two stop bits CONFIG_UARTn_2STOP - Two stop bits
CONFIG_SSI0_DISABLE - Select to disable support for SSI0 CONFIG_TIVA_SSI0 - Select to ensable support for SSI0
CONFIG_SSI1_DISABLE - Select to disable support for SSI1 CONFIG_TIVA_SSI1 - Select to ensable support for SSI1
CONFIG_SSI_POLLWAIT - Select to disable interrupt driven SSI support. CONFIG_SSI_POLLWAIT - Select to disable interrupt driven SSI support.
Poll-waiting is recommended if the interrupt rate would be to Poll-waiting is recommended if the interrupt rate would be to
high in the interrupt driven case. high in the interrupt driven case.
configs/eagle100/httpd/defconfig
+2 -2
View File
@@ -135,8 +135,8 @@ CONFIG_TIVA_HAVE_SSI1=y
CONFIG_TIVA_UART0=y CONFIG_TIVA_UART0=y
# CONFIG_TIVA_UART1 is not set # CONFIG_TIVA_UART1 is not set
# CONFIG_TIVA_UART2 is not set # CONFIG_TIVA_UART2 is not set
# CONFIG_SSI0_DISABLE is not set CONFIG_TIVA_SSI0=y
CONFIG_SSI1_DISABLE=y # CONFIG_TIVA_SSI1 is not set
CONFIG_TIVA_ETHERNET=y CONFIG_TIVA_ETHERNET=y
# CONFIG_TIVA_FLASH is not set # CONFIG_TIVA_FLASH is not set
configs/eagle100/nettest/defconfig
+2 -2
View File
@@ -161,8 +161,8 @@ CONFIG_TIVA_HAVE_SSI1=y
CONFIG_TIVA_UART0=y CONFIG_TIVA_UART0=y
# CONFIG_TIVA_UART1 is not set # CONFIG_TIVA_UART1 is not set
# CONFIG_TIVA_UART2 is not set # CONFIG_TIVA_UART2 is not set
# CONFIG_SSI0_DISABLE is not set CONFIG_TIVA_SSI0=y
CONFIG_SSI1_DISABLE=y # CONFIG_TIVA_SSI1 is not set
CONFIG_TIVA_ETHERNET=y CONFIG_TIVA_ETHERNET=y
# CONFIG_TIVA_FLASH is not set # CONFIG_TIVA_FLASH is not set
configs/eagle100/nsh/defconfig
+2 -2
View File
@@ -138,8 +138,8 @@ CONFIG_TIVA_HAVE_SSI1=y
CONFIG_TIVA_UART0=y CONFIG_TIVA_UART0=y
# CONFIG_TIVA_UART1 is not set # CONFIG_TIVA_UART1 is not set
# CONFIG_TIVA_UART2 is not set # CONFIG_TIVA_UART2 is not set
# CONFIG_SSI0_DISABLE is not set CONFIG_TIVA_SSI0=y
CONFIG_SSI1_DISABLE=y # CONFIG_TIVA_SSI1 is not set
CONFIG_TIVA_ETHERNET=y CONFIG_TIVA_ETHERNET=y
# CONFIG_TIVA_FLASH is not set # CONFIG_TIVA_FLASH is not set
configs/eagle100/nxflat/defconfig
+2 -2
View File
@@ -138,8 +138,8 @@ CONFIG_TIVA_HAVE_SSI1=y
CONFIG_TIVA_UART0=y CONFIG_TIVA_UART0=y
# CONFIG_TIVA_UART1 is not set # CONFIG_TIVA_UART1 is not set
# CONFIG_TIVA_UART2 is not set # CONFIG_TIVA_UART2 is not set
# CONFIG_SSI0_DISABLE is not set CONFIG_TIVA_SSI0=y
CONFIG_SSI1_DISABLE=y # CONFIG_TIVA_SSI1 is not set
# CONFIG_TIVA_ETHERNET is not set # CONFIG_TIVA_ETHERNET is not set
# CONFIG_TIVA_FLASH is not set # CONFIG_TIVA_FLASH is not set
configs/eagle100/src/eagle100_internal.h
+3 -6
View File
@@ -57,13 +57,10 @@
*/ */
#if TIVA_NSSI == 0 #if TIVA_NSSI == 0
# undef CONFIG_SSI0_DISABLE # undef CONFIG_TIVA_SSI0
# define CONFIG_SSI0_DISABLE 1 # undef CONFIG_TIVA_SSI1
# undef CONFIG_SSI1_DISABLE
# define CONFIG_SSI1_DISABLE 1
#elif TIVA_NSSI == 1 #elif TIVA_NSSI == 1
# undef CONFIG_SSI1_DISABLE # undef CONFIG_TIVA_SSI1
# define CONFIG_SSI1_DISABLE 1
#endif #endif
/* Eagle-100 GPIOs ******************************************************************/ /* Eagle-100 GPIOs ******************************************************************/
configs/eagle100/src/up_boot.c
+1 -1
View File
@@ -77,7 +77,7 @@ void tiva_boardinitialize(void)
/* The Eagle100 microSD CS is on SSI0 */ /* 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) if (lm_ssiinitialize)
{ {
lm_ssiinitialize(); lm_ssiinitialize();
configs/eagle100/src/up_ssi.c
+2 -2
View File
@@ -54,7 +54,7 @@
/* The Eagle100 microSD CS is on SSI0 */ /* 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 * Definitions
@@ -149,4 +149,4 @@ uint8_t tiva_spistatus(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
return SPI_STATUS_PRESENT; return SPI_STATUS_PRESENT;
} }
#endif /* !CONFIG_SSI0_DISABLE || !CONFIG_SSI1_DISABLE */ #endif /* CONFIG_TIVA_SSI0 || CONFIG_TIVA_SSI1 */
configs/eagle100/thttpd/defconfig
+2 -2
View File
@@ -128,8 +128,8 @@ CONFIG_TIVA_HAVE_SSI1=y
CONFIG_TIVA_UART0=y CONFIG_TIVA_UART0=y
# CONFIG_TIVA_UART1 is not set # CONFIG_TIVA_UART1 is not set
# CONFIG_TIVA_UART2 is not set # CONFIG_TIVA_UART2 is not set
# CONFIG_SSI0_DISABLE is not set CONFIG_TIVA_SSI0=y
CONFIG_SSI1_DISABLE=y # CONFIG_TIVA_SSI1 is not set
CONFIG_TIVA_ETHERNET=y CONFIG_TIVA_ETHERNET=y
# CONFIG_TIVA_FLASH is not set # CONFIG_TIVA_FLASH is not set
configs/ekk-lm3s9b96/README.txt
+2 -2
View File
@@ -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_PARTIY - 0=no parity, 1=odd parity, 2=even parity
CONFIG_UARTn_2STOP - Two stop bits CONFIG_UARTn_2STOP - Two stop bits
CONFIG_SSI0_DISABLE - Select to disable support for SSI0 CONFIG_TIVA_SSI0 - Select to enable support for SSI0
CONFIG_SSI1_DISABLE - Select to disable support for SSI1 CONFIG_TIVA_SSI1 - Select to enable support for SSI1
CONFIG_SSI_POLLWAIT - Select to disable interrupt driven SSI support. CONFIG_SSI_POLLWAIT - Select to disable interrupt driven SSI support.
Poll-waiting is recommended if the interrupt rate would be to Poll-waiting is recommended if the interrupt rate would be to
high in the interrupt driven case. high in the interrupt driven case.
configs/ekk-lm3s9b96/nsh/defconfig
+2 -2
View File
@@ -130,8 +130,8 @@ CONFIG_ARCH_CHIP_LM3S=y
CONFIG_TIVA_UART0=y CONFIG_TIVA_UART0=y
# CONFIG_TIVA_UART1 is not set # CONFIG_TIVA_UART1 is not set
# CONFIG_TIVA_UART2 is not set # CONFIG_TIVA_UART2 is not set
CONFIG_SSI0_DISABLE=y # CONFIG_TIVA_SSI0 is not set
CONFIG_SSI1_DISABLE=y # CONFIG_TIVA_SSI1 is not set
CONFIG_TIVA_ETHERNET=y CONFIG_TIVA_ETHERNET=y
# CONFIG_TIVA_FLASH is not set # CONFIG_TIVA_FLASH is not set
configs/ekk-lm3s9b96/src/ekklm3s9b96_internal.h
+3 -6
View File
@@ -58,13 +58,10 @@
*/ */
#if TIVA_NSSI == 0 #if TIVA_NSSI == 0
# undef CONFIG_SSI0_DISABLE # undef CONFIG_TIVA_SSI0
# define CONFIG_SSI0_DISABLE 1 # undef CONFIG_TIVA_SSI1
# undef CONFIG_SSI1_DISABLE
# define CONFIG_SSI1_DISABLE 1
#elif TIVA_NSSI == 1 #elif TIVA_NSSI == 1
# undef CONFIG_SSI1_DISABLE # undef CONFIG_TIVA_SSI1
# define CONFIG_SSI1_DISABLE 1
#endif #endif
/* EKK-LM3S9B96 Eval Kit ************************************************************/ /* EKK-LM3S9B96 Eval Kit ************************************************************/
configs/ekk-lm3s9b96/src/up_boot.c
+1 -1
View File
@@ -77,7 +77,7 @@ void tiva_boardinitialize(void)
* lm_ssiinitialize() has been brought into the link. * 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) if (lm_ssiinitialize)
{ {
lm_ssiinitialize(); lm_ssiinitialize();
configs/ekk-lm3s9b96/src/up_ssi.c
+2 -2
View File
@@ -53,7 +53,7 @@
#include "tiva_gpio.h" #include "tiva_gpio.h"
#include "ekklm3s9b96_internal.h" #include "ekklm3s9b96_internal.h"
#if !defined(CONFIG_SSI0_DISABLE) || !defined(CONFIG_SSI1_DISABLE) #if defined(CONFIG_TIVA_SSI0) || defined(CONFIG_TIVA_SSI1)
/************************************************************************************ /************************************************************************************
* Definitions * Definitions
@@ -159,4 +159,4 @@ uint8_t tiva_spistatus(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
return SPI_STATUS_PRESENT; return SPI_STATUS_PRESENT;
} }
#endif #endif
#endif /* !CONFIG_SSI0_DISABLE || !CONFIG_SSI1_DISABLE */ #endif /* CONFIG_TIVA_SSI0 || CONFIG_TIVA_SSI1 */
configs/lm3s6432-s2e/README.txt
+2 -2
View File
@@ -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_PARTIY - 0=no parity, 1=odd parity, 2=even parity
CONFIG_UARTn_2STOP - Two stop bits 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 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 for UART1. To avoid conflicts, only one of SSI0 and UART1 should
be enabled in a configuration. 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 Note that the LM3S6432 only has one SSI, so SSI1 should always be
disabled. disabled.
CONFIG_SSI_POLLWAIT - Select to disable interrupt driven SSI support. CONFIG_SSI_POLLWAIT - Select to disable interrupt driven SSI support.
configs/lm3s6432-s2e/nsh/defconfig
+2 -2
View File
@@ -129,8 +129,8 @@ CONFIG_ARCH_CHIP_LM3S=y
CONFIG_TIVA_UART0=y CONFIG_TIVA_UART0=y
CONFIG_TIVA_UART1=y CONFIG_TIVA_UART1=y
# CONFIG_TIVA_UART2 is not set # CONFIG_TIVA_UART2 is not set
CONFIG_SSI0_DISABLE=y # CONFIG_TIVA_SSI0 is not set
CONFIG_SSI1_DISABLE=y # CONFIG_TIVA_SSI1 is not set
CONFIG_TIVA_ETHERNET=y CONFIG_TIVA_ETHERNET=y
# CONFIG_TIVA_FLASH is not set # CONFIG_TIVA_FLASH is not set
configs/lm3s6432-s2e/src/lm3s6432s2e_internal.h
+2 -4
View File
@@ -56,11 +56,9 @@
*/ */
#if TIVA_NSSI == 0 #if TIVA_NSSI == 0
# undef CONFIG_SSI0_DISABLE # undef CONFIG_TIVA_SSI0
# define CONFIG_SSI0_DISABLE 1
#endif #endif
#undef CONFIG_SSI1_DISABLE #undef CONFIG_TIVA_SSI1
#define CONFIG_SSI1_DISABLE 1
/* LM3S6432 MDL-S2E *****************************************************************/ /* LM3S6432 MDL-S2E *****************************************************************/
configs/lm3s6432-s2e/src/up_boot.c
+2 -2
View File
@@ -54,7 +54,7 @@
* Definitions * 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. # error Only one of UART1 and SSI0 can be enabled on this board.
#endif #endif
@@ -82,7 +82,7 @@ void tiva_boardinitialize(void)
* lm_ssiinitialize() has been brought into the link. * lm_ssiinitialize() has been brought into the link.
*/ */
#if !defined(CONFIG_SSI0_DISABLE) #if defined(CONFIG_TIVA_SSI0)
if (lm_ssiinitialize) if (lm_ssiinitialize)
{ {
lm_ssiinitialize(); lm_ssiinitialize();
configs/lm3s6432-s2e/src/up_ssi.c
+2 -2
View File
@@ -52,7 +52,7 @@
#include "tiva_gpio.h" #include "tiva_gpio.h"
#include "lm3s6432s2e_internal.h" #include "lm3s6432s2e_internal.h"
#if !defined(CONFIG_SSI0_DISABLE) #if defined(CONFIG_TIVA_SSI0)
/************************************************************************************ /************************************************************************************
* Definitions * Definitions
@@ -149,4 +149,4 @@ uint8_t tiva_spistatus(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
return SPI_STATUS_PRESENT; return SPI_STATUS_PRESENT;
} }
#endif /* !CONFIG_SSI0_DISABLE || !CONFIG_SSI1_DISABLE */ #endif /* CONFIG_TIVA_SSI0 */
configs/lm3s6965-ek/README.txt
+2 -2
View File
@@ -514,8 +514,8 @@ Stellaris LM3S6965 Evaluation Kit Configuration Options
CONFIG_UARTn_PARTIY - 0=no parity, 1=odd parity, 2=even parity CONFIG_UARTn_PARTIY - 0=no parity, 1=odd parity, 2=even parity
CONFIG_UARTn_2STOP - Two stop bits CONFIG_UARTn_2STOP - Two stop bits
CONFIG_SSI0_DISABLE - Select to disable support for SSI0 CONFIG_TIVA_SSI0 - Select to enable support for SSI0
CONFIG_SSI1_DISABLE - Select to disable support for SSI1 CONFIG_TIVA_SSI1 - Select to enable support for SSI1
CONFIG_SSI_POLLWAIT - Select to disable interrupt driven SSI support. CONFIG_SSI_POLLWAIT - Select to disable interrupt driven SSI support.
Poll-waiting is recommended if the interrupt rate would be to Poll-waiting is recommended if the interrupt rate would be to
high in the interrupt driven case. high in the interrupt driven case.
configs/lm3s6965-ek/discover/defconfig
+2 -2
View File
@@ -130,8 +130,8 @@ CONFIG_ARCH_CHIP_LM3S=y
CONFIG_TIVA_UART0=y CONFIG_TIVA_UART0=y
# CONFIG_TIVA_UART1 is not set # CONFIG_TIVA_UART1 is not set
# CONFIG_TIVA_UART2 is not set # CONFIG_TIVA_UART2 is not set
# CONFIG_SSI0_DISABLE is not set CONFIG_TIVA_SSI0=y
CONFIG_SSI1_DISABLE=y # CONFIG_TIVA_SSI1 is not set
CONFIG_TIVA_ETHERNET=y CONFIG_TIVA_ETHERNET=y
# CONFIG_TIVA_FLASH is not set # CONFIG_TIVA_FLASH is not set
configs/lm3s6965-ek/nsh/defconfig
+2 -2
View File
@@ -130,8 +130,8 @@ CONFIG_ARCH_CHIP_LM3S=y
CONFIG_TIVA_UART0=y CONFIG_TIVA_UART0=y
# CONFIG_TIVA_UART1 is not set # CONFIG_TIVA_UART1 is not set
# CONFIG_TIVA_UART2 is not set # CONFIG_TIVA_UART2 is not set
# CONFIG_SSI0_DISABLE is not set CONFIG_TIVA_SSI0=y
CONFIG_SSI1_DISABLE=y # CONFIG_TIVA_SSI1 is not set
CONFIG_TIVA_ETHERNET=y CONFIG_TIVA_ETHERNET=y
# CONFIG_TIVA_FLASH is not set # CONFIG_TIVA_FLASH is not set
configs/lm3s6965-ek/nx/defconfig
+2 -2
View File
@@ -130,8 +130,8 @@ CONFIG_ARCH_CHIP_LM3S=y
CONFIG_TIVA_UART0=y CONFIG_TIVA_UART0=y
# CONFIG_TIVA_UART1 is not set # CONFIG_TIVA_UART1 is not set
# CONFIG_TIVA_UART2 is not set # CONFIG_TIVA_UART2 is not set
# CONFIG_SSI0_DISABLE is not set CONFIG_TIVA_SSI0=y
CONFIG_SSI1_DISABLE=y # CONFIG_TIVA_SSI1 is not set
# CONFIG_TIVA_ETHERNET is not set # CONFIG_TIVA_ETHERNET is not set
# CONFIG_TIVA_FLASH is not set # CONFIG_TIVA_FLASH is not set
configs/lm3s6965-ek/src/lm3s6965ek_internal.h
+3 -6
View File
@@ -57,13 +57,10 @@
*/ */
#if TIVA_NSSI == 0 #if TIVA_NSSI == 0
# undef CONFIG_SSI0_DISABLE # undef CONFIG_TIVA_SSI0
# define CONFIG_SSI0_DISABLE 1 # undef CONFIG_TIVA_SSI1
# undef CONFIG_SSI1_DISABLE
# define CONFIG_SSI1_DISABLE 1
#elif TIVA_NSSI == 1 #elif TIVA_NSSI == 1
# undef CONFIG_SSI1_DISABLE # undef CONFIG_TIVA_SSI1
# define CONFIG_SSI1_DISABLE 1
#endif #endif
/* LM3S6965 Eval Kit ***************************************************************/ /* LM3S6965 Eval Kit ***************************************************************/
configs/lm3s6965-ek/src/up_boot.c
+1 -1
View File
@@ -78,7 +78,7 @@ void tiva_boardinitialize(void)
/* The LM3S6965 Eval Kit microSD CS and OLED are on SSI0 (Duh! There is no SSI1) */ /* 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) if (lm_ssiinitialize)
{ {
lm_ssiinitialize(); lm_ssiinitialize();
configs/lm3s6965-ek/src/up_ssi.c
+2 -2
View File
@@ -54,7 +54,7 @@
/* The LM3S6965 Eval Kit microSD CS is on SSI0 */ /* 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 * Definitions
@@ -161,4 +161,4 @@ uint8_t tiva_spistatus(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
return SPI_STATUS_PRESENT; return SPI_STATUS_PRESENT;
} }
#endif /* !CONFIG_SSI0_DISABLE || !CONFIG_SSI1_DISABLE */ #endif /* CONFIG_TIVA_SSI0 || CONFIG_TIVA_SSI1 */
configs/lm3s6965-ek/tcpecho/defconfig
+2 -2
View File
@@ -152,8 +152,8 @@ CONFIG_ARCH_CHIP_LM3S=y
CONFIG_TIVA_UART0=y CONFIG_TIVA_UART0=y
# CONFIG_TIVA_UART1 is not set # CONFIG_TIVA_UART1 is not set
# CONFIG_TIVA_UART2 is not set # CONFIG_TIVA_UART2 is not set
# CONFIG_SSI0_DISABLE is not set CONFIG_TIVA_SSI0=y
CONFIG_SSI1_DISABLE=y # CONFIG_TIVA_SSI1 is not set
CONFIG_TIVA_ETHERNET=y CONFIG_TIVA_ETHERNET=y
# CONFIG_TIVA_FLASH is not set # CONFIG_TIVA_FLASH is not set
configs/lm3s8962-ek/README.txt
+2 -2
View File
@@ -418,8 +418,8 @@ Stellaris LM3S8962 Evaluation Kit Configuration Options
CONFIG_UARTn_PARTIY - 0=no parity, 1=odd parity, 2=even parity CONFIG_UARTn_PARTIY - 0=no parity, 1=odd parity, 2=even parity
CONFIG_UARTn_2STOP - Two stop bits CONFIG_UARTn_2STOP - Two stop bits
CONFIG_SSI0_DISABLE - Select to disable support for SSI0 CONFIG_TIVA_SSI0 - Select to enable support for SSI0
CONFIG_SSI1_DISABLE - Select to disable support for SSI1 CONFIG_TIVA_SSI1 - Select to enable support for SSI1
CONFIG_SSI_POLLWAIT - Select to disable interrupt driven SSI support. CONFIG_SSI_POLLWAIT - Select to disable interrupt driven SSI support.
Poll-waiting is recommended if the interrupt rate would be to Poll-waiting is recommended if the interrupt rate would be to
high in the interrupt driven case. high in the interrupt driven case.
configs/lm3s8962-ek/nsh/defconfig
+2 -2
View File
@@ -138,8 +138,8 @@ CONFIG_ARCH_CHIP_LM3S=y
CONFIG_TIVA_UART0=y CONFIG_TIVA_UART0=y
# CONFIG_TIVA_UART1 is not set # CONFIG_TIVA_UART1 is not set
# CONFIG_TIVA_UART2 is not set # CONFIG_TIVA_UART2 is not set
# CONFIG_SSI0_DISABLE is not set CONFIG_TIVA_SSI0=y
CONFIG_SSI1_DISABLE=y # CONFIG_TIVA_SSI1 is not set
CONFIG_TIVA_ETHERNET=y CONFIG_TIVA_ETHERNET=y
# CONFIG_TIVA_FLASH is not set # CONFIG_TIVA_FLASH is not set
configs/lm3s8962-ek/nx/defconfig
+2 -2
View File
@@ -138,8 +138,8 @@ CONFIG_ARCH_CHIP_LM3S=y
CONFIG_TIVA_UART0=y CONFIG_TIVA_UART0=y
# CONFIG_TIVA_UART1 is not set # CONFIG_TIVA_UART1 is not set
# CONFIG_TIVA_UART2 is not set # CONFIG_TIVA_UART2 is not set
# CONFIG_SSI0_DISABLE is not set CONFIG_TIVA_SSI0=y
CONFIG_SSI1_DISABLE=y # CONFIG_TIVA_SSI1 is not set
# CONFIG_TIVA_ETHERNET is not set # CONFIG_TIVA_ETHERNET is not set
# CONFIG_TIVA_FLASH is not set # CONFIG_TIVA_FLASH is not set
configs/lm3s8962-ek/src/lm3s8962ek_internal.h
+3 -6
View File
@@ -57,13 +57,10 @@
*/ */
#if TIVA_NSSI == 0 #if TIVA_NSSI == 0
# undef CONFIG_SSI0_DISABLE # undef CONFIG_TIVA_SSI0
# define CONFIG_SSI0_DISABLE 1 # undef CONFIG_TIVA_SSI1
# undef CONFIG_SSI1_DISABLE
# define CONFIG_SSI1_DISABLE 1
#elif TIVA_NSSI == 1 #elif TIVA_NSSI == 1
# undef CONFIG_SSI1_DISABLE # undef CONFIG_TIVA_SSI1
# define CONFIG_SSI1_DISABLE 1
#endif #endif
/* LM3S8962 Eval Kit ***************************************************************/ /* LM3S8962 Eval Kit ***************************************************************/
configs/lm3s8962-ek/src/up_boot.c
+1 -1
View File
@@ -78,7 +78,7 @@ void tiva_boardinitialize(void)
/* The LM3S8962 Eval Kit microSD CS and OLED are on SSI0 (Duh! There is no SSI1) */ /* 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) if (lm_ssiinitialize)
{ {
lm_ssiinitialize(); lm_ssiinitialize();
configs/lm3s8962-ek/src/up_ssi.c
+2 -2
View File
@@ -54,7 +54,7 @@
/* The LM3S8962 Eval Kit microSD CS is on SSI0 */ /* 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 * Definitions
@@ -161,4 +161,4 @@ uint8_t tiva_spistatus(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
return SPI_STATUS_PRESENT; return SPI_STATUS_PRESENT;
} }
#endif /* !CONFIG_SSI0_DISABLE || !CONFIG_SSI1_DISABLE */ #endif /* CONFIG_TIVA_SSI0 || CONFIG_TIVA_SSI1 */
configs/lm4f120-launchpad/README.txt
+2 -2
View File
@@ -645,8 +645,8 @@ LM4F120 LaunchPad Configuration Options
CONFIG_UARTn_PARTIY - 0=no parity, 1=odd parity, 2=even parity CONFIG_UARTn_PARTIY - 0=no parity, 1=odd parity, 2=even parity
CONFIG_UARTn_2STOP - Two stop bits CONFIG_UARTn_2STOP - Two stop bits
CONFIG_SSI0_DISABLE - Select to disable support for SSI0 CONFIG_TIVA_SSI0 - Select to enable support for SSI0
CONFIG_SSI1_DISABLE - Select to disable support for SSI1 CONFIG_TIVA_SSI1 - Select to enable support for SSI1
CONFIG_SSI_POLLWAIT - Select to disable interrupt driven SSI support. CONFIG_SSI_POLLWAIT - Select to disable interrupt driven SSI support.
Poll-waiting is recommended if the interrupt rate would be to Poll-waiting is recommended if the interrupt rate would be to
high in the interrupt driven case. high in the interrupt driven case.
configs/lm4f120-launchpad/nsh/defconfig
+2 -2
View File
@@ -136,8 +136,8 @@ CONFIG_TIVA_UART0=y
# CONFIG_TIVA_UART5 is not set # CONFIG_TIVA_UART5 is not set
# CONFIG_TIVA_UART6 is not set # CONFIG_TIVA_UART6 is not set
# CONFIG_TIVA_UART7 is not set # CONFIG_TIVA_UART7 is not set
# CONFIG_SSI0_DISABLE is not set CONFIG_TIVA_SSI0=y
CONFIG_SSI1_DISABLE=y # CONFIG_TIVA_SSI1 is not set
# CONFIG_TIVA_ETHERNET is not set # CONFIG_TIVA_ETHERNET is not set
# CONFIG_TIVA_FLASH is not set # CONFIG_TIVA_FLASH is not set
configs/lm4f120-launchpad/src/lm4f_boot.c
+1 -1
View File
@@ -78,7 +78,7 @@ void tiva_boardinitialize(void)
/* The LM4F LaunchPad microSD CS and OLED are on SSI0 (Duh! There is no SSI1) */ /* 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) if (lm4f_ssiinitialize)
{ {
lm4f_ssiinitialize(); lm4f_ssiinitialize();
configs/lm4f120-launchpad/src/lm4f_ssi.c
+2 -2
View File
@@ -54,7 +54,7 @@
/* The LM4F LaunchPad microSD CS is on SSI0 */ /* 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 * Definitions
@@ -130,4 +130,4 @@ uint8_t tiva_spistatus(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
return SPI_STATUS_PRESENT; return SPI_STATUS_PRESENT;
} }
#endif /* !CONFIG_SSI0_DISABLE || !CONFIG_SSI1_DISABLE */ #endif /* CONFIG_TIVA_SSI0 || CONFIG_TIVA_SSI1 */
configs/lm4f120-launchpad/src/lmf4120-launchpad.h
+3 -6
View File
@@ -57,13 +57,10 @@
*/ */
#if TIVA_NSSI < 1 #if TIVA_NSSI < 1
# undef CONFIG_SSI0_DISABLE # undef CONFIG_TIVA_SSI0
# define CONFIG_SSI0_DISABLE 1 # undef CONFIG_TIVA_SSI1
# undef CONFIG_SSI1_DISABLE
# define CONFIG_SSI1_DISABLE 1
#elif TIVA_NSSI < 2 #elif TIVA_NSSI < 2
# undef CONFIG_SSI1_DISABLE # undef CONFIG_TIVA_SSI1
# define CONFIG_SSI1_DISABLE 1
#endif #endif
/* LM4F LaunchPad *******************************************************************/ /* LM4F LaunchPad *******************************************************************/
configs/tm4c123g-launchpad/README.txt
+2 -2
View File
@@ -741,8 +741,8 @@ TM4C123G LaunchPad Configuration Options
CONFIG_UARTn_PARTIY - 0=no parity, 1=odd parity, 2=even parity CONFIG_UARTn_PARTIY - 0=no parity, 1=odd parity, 2=even parity
CONFIG_UARTn_2STOP - Two stop bits CONFIG_UARTn_2STOP - Two stop bits
CONFIG_SSI0_DISABLE - Select to disable support for SSI0 CONFIG_TIVA_SSI0 - Select to enable support for SSI0
CONFIG_SSI1_DISABLE - Select to disable support for SSI1 CONFIG_TIVA_SSI1 - Select to enable support for SSI1
CONFIG_SSI_POLLWAIT - Select to disable interrupt driven SSI support. CONFIG_SSI_POLLWAIT - Select to disable interrupt driven SSI support.
Poll-waiting is recommended if the interrupt rate would be to Poll-waiting is recommended if the interrupt rate would be to
high in the interrupt driven case. high in the interrupt driven case.
configs/tm4c123g-launchpad/nsh/defconfig
+2 -2
View File
@@ -148,8 +148,8 @@ CONFIG_TIVA_UART0=y
# CONFIG_TIVA_UART5 is not set # CONFIG_TIVA_UART5 is not set
# CONFIG_TIVA_UART6 is not set # CONFIG_TIVA_UART6 is not set
# CONFIG_TIVA_UART7 is not set # CONFIG_TIVA_UART7 is not set
# CONFIG_SSI0_DISABLE is not set CONFIG_TIVA_SSI0=y
CONFIG_SSI1_DISABLE=y # CONFIG_TIVA_SSI1 is not set
# CONFIG_TIVA_ETHERNET is not set # CONFIG_TIVA_ETHERNET is not set
# CONFIG_TIVA_FLASH is not set # CONFIG_TIVA_FLASH is not set
configs/tm4c123g-launchpad/src/tm4c123g-launchpad.h
+3 -6
View File
@@ -56,13 +56,10 @@
/* How many SSI modules does this chip support? */ /* How many SSI modules does this chip support? */
#if TIVA_NSSI < 1 #if TIVA_NSSI < 1
# undef CONFIG_SSI0_DISABLE # undef CONFIG_TIVA_SSI0
# define CONFIG_SSI0_DISABLE 1 # undef CONFIG_TIVA_SSI1
# undef CONFIG_SSI1_DISABLE
# define CONFIG_SSI1_DISABLE 1
#elif TIVA_NSSI < 2 #elif TIVA_NSSI < 2
# undef CONFIG_SSI1_DISABLE # undef CONFIG_TIVA_SSI1
# define CONFIG_SSI1_DISABLE 1
#endif #endif
/* AT24 Serial EEPROM /* AT24 Serial EEPROM
configs/tm4c123g-launchpad/src/tm4c_boot.c
+1 -1
View File
@@ -77,7 +77,7 @@ void tiva_boardinitialize(void)
/* The TM4C123G LaunchPad microSD CS and OLED are on SSI0 */ /* 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) if (tm4c_ssiinitialize)
{ {
tm4c_ssiinitialize(); tm4c_ssiinitialize();
configs/tm4c123g-launchpad/src/tm4c_ssi.c
+2 -2
View File
@@ -53,7 +53,7 @@
/* The TM4C123G LaunchPad microSD CS is on SSI0 */ /* 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 * Definitions
@@ -129,4 +129,4 @@ uint8_t tiva_spistatus(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
return SPI_STATUS_PRESENT; return SPI_STATUS_PRESENT;
} }
#endif /* !CONFIG_SSI0_DISABLE || !CONFIG_SSI1_DISABLE */ #endif /* CONFIG_TIVA_SSI0 || CONFIG_TIVA_SSI1 */