diff options
Diffstat (limited to 'nuttx/configs')
40 files changed, 724 insertions, 520 deletions
diff --git a/nuttx/configs/eagle100/README.txt b/nuttx/configs/eagle100/README.txt index 8d8daa33e..05ba18422 100644 --- a/nuttx/configs/eagle100/README.txt +++ b/nuttx/configs/eagle100/README.txt @@ -297,15 +297,15 @@ Eagle100-specific Configuration Options Additional interrupt support can be disabled if desired to reduce memory footprint. - CONFIG_LM_DISABLE_GPIOA_IRQS=n - CONFIG_LM_DISABLE_GPIOB_IRQS=n - CONFIG_LM_DISABLE_GPIOC_IRQS=n - CONFIG_LM_DISABLE_GPIOD_IRQS=n - CONFIG_LM_DISABLE_GPIOE_IRQS=n - CONFIG_LM_DISABLE_GPIOF_IRQS=n - CONFIG_LM_DISABLE_GPIOG_IRQS=n - CONFIG_LM_DISABLE_GPIOH_IRQS=y - CONFIG_LM_DISABLE_GPIOJ_IRQS=y + CONFIG_TIVA_DISABLE_GPIOA_IRQS=n + CONFIG_TIVA_DISABLE_GPIOB_IRQS=n + CONFIG_TIVA_DISABLE_GPIOC_IRQS=n + CONFIG_TIVA_DISABLE_GPIOD_IRQS=n + CONFIG_TIVA_DISABLE_GPIOE_IRQS=n + CONFIG_TIVA_DISABLE_GPIOF_IRQS=n + CONFIG_TIVA_DISABLE_GPIOG_IRQS=n + CONFIG_TIVA_DISABLE_GPIOH_IRQS=y + CONFIG_TIVA_DISABLE_GPIOJ_IRQS=y LM3S6918 specific device driver settings @@ -330,18 +330,18 @@ Eagle100-specific Configuration Options value is large, then larger values of this setting may cause Rx FIFO overrun errors. Default: half of the Tx FIFO size (4). - CONFIG_LM_ETHERNET - This must be set (along with CONFIG_NET) + CONFIG_TIVA_ETHERNET - This must be set (along with CONFIG_NET) to build the Stellaris Ethernet driver - CONFIG_LM_ETHLEDS - Enable to use Ethernet LEDs on the board. - CONFIG_LM_BOARDMAC - If the board-specific logic can provide + CONFIG_TIVA_ETHLEDS - Enable to use Ethernet LEDs on the board. + CONFIG_TIVA_BOARDMAC - If the board-specific logic can provide a MAC address (via tiva_ethernetmac()), then this should be selected. - CONFIG_LM_ETHHDUPLEX - Set to force half duplex operation - CONFIG_LM_ETHNOAUTOCRC - Set to suppress auto-CRC generation - CONFIG_LM_ETHNOPAD - Set to suppress Tx padding - CONFIG_LM_MULTICAST - Set to enable multicast frames - CONFIG_LM_PROMISCUOUS - Set to enable promiscuous mode - CONFIG_LM_BADCRC - Set to enable bad CRC rejection. - CONFIG_LM_DUMPPACKET - Dump each packet received/sent to the console. + CONFIG_TIVA_ETHHDUPLEX - Set to force half duplex operation + CONFIG_TIVA_ETHNOAUTOCRC - Set to suppress auto-CRC generation + CONFIG_TIVA_ETHNOPAD - Set to suppress Tx padding + CONFIG_TIVA_MULTICAST - Set to enable multicast frames + CONFIG_TIVA_PROMISCUOUS - Set to enable promiscuous mode + CONFIG_TIVA_BADCRC - Set to enable bad CRC rejection. + CONFIG_TIVA_DUMPPACKET - Dump each packet received/sent to the console. Configurations ^^^^^^^^^^^^^^ diff --git a/nuttx/configs/eagle100/httpd/defconfig b/nuttx/configs/eagle100/httpd/defconfig index 4c951c251..4fe62d567 100644 --- a/nuttx/configs/eagle100/httpd/defconfig +++ b/nuttx/configs/eagle100/httpd/defconfig @@ -127,45 +127,45 @@ CONFIG_ARCH_CHIP_LM3S6918=y # CONFIG_ARCH_CHIP_LM3S8962 is not set # CONFIG_ARCH_CHIP_LM4F120 is not set CONFIG_ARCH_CHIP_LM3S=y -CONFIG_LM_HAVE_SSI1=y +CONFIG_TIVA_HAVE_SSI1=y # CONFIG_LM_REVA2 is not set # # Stellaris Peripheral Support # -CONFIG_LM_UART0=y -# CONFIG_LM_UART1 is not set -# CONFIG_LM_UART2 is not set +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_LM_ETHERNET=y -# CONFIG_LM_FLASH is not set +CONFIG_TIVA_ETHERNET=y +# CONFIG_TIVA_FLASH is not set # # Disable GPIO Interrupts # -# CONFIG_LM_DISABLE_GPIOA_IRQS is not set -# CONFIG_LM_DISABLE_GPIOB_IRQS is not set -# CONFIG_LM_DISABLE_GPIOC_IRQS is not set -# CONFIG_LM_DISABLE_GPIOD_IRQS is not set -# CONFIG_LM_DISABLE_GPIOE_IRQS is not set -# CONFIG_LM_DISABLE_GPIOF_IRQS is not set -# CONFIG_LM_DISABLE_GPIOG_IRQS is not set -# CONFIG_LM_DISABLE_GPIOH_IRQS is not set -CONFIG_LM_DISABLE_GPIOJ_IRQS=y +# CONFIG_TIVA_DISABLE_GPIOA_IRQS is not set +# CONFIG_TIVA_DISABLE_GPIOB_IRQS is not set +# CONFIG_TIVA_DISABLE_GPIOC_IRQS is not set +# CONFIG_TIVA_DISABLE_GPIOD_IRQS is not set +# CONFIG_TIVA_DISABLE_GPIOE_IRQS is not set +# CONFIG_TIVA_DISABLE_GPIOF_IRQS is not set +# CONFIG_TIVA_DISABLE_GPIOG_IRQS is not set +# CONFIG_TIVA_DISABLE_GPIOH_IRQS is not set +CONFIG_TIVA_DISABLE_GPIOJ_IRQS=y # # Stellaris Ethernet Configuration # -# CONFIG_LM_ETHLEDS is not set -CONFIG_LM_BOARDMAC=y -# CONFIG_LM_ETHHDUPLEX is not set -# CONFIG_LM_ETHNOAUTOCRC is not set -# CONFIG_LM_ETHNOPAD is not set -# CONFIG_LM_MULTICAST is not set -# CONFIG_LM_PROMISCUOUS is not set -# CONFIG_LM_TIMESTAMP is not set -# CONFIG_LM_BADCRC is not set +# CONFIG_TIVA_ETHLEDS is not set +CONFIG_TIVA_BOARDMAC=y +# CONFIG_TIVA_ETHHDUPLEX is not set +# CONFIG_TIVA_ETHNOAUTOCRC is not set +# CONFIG_TIVA_ETHNOPAD is not set +# CONFIG_TIVA_MULTICAST is not set +# CONFIG_TIVA_PROMISCUOUS is not set +# CONFIG_TIVA_TIMESTAMP is not set +# CONFIG_TIVA_BADCRC is not set # CONFIG_M3S_DUMPPACKET is not set # diff --git a/nuttx/configs/eagle100/include/board.h b/nuttx/configs/eagle100/include/board.h index 3ec185537..9b9f52007 100644 --- a/nuttx/configs/eagle100/include/board.h +++ b/nuttx/configs/eagle100/include/board.h @@ -63,7 +63,7 @@ * of (400 / 2) / 4 = 50MHz */ -#define LM_SYSDIV 4 +#define TIVA_SYSDIV 4 #define SYSCLK_FREQUENCY 50000000 /* 50MHz */ /* Other RCC settings: @@ -74,7 +74,7 @@ * - No auto-clock gating reset */ -#define LM_RCC_VALUE (SYSCON_RCC_OSCSRC | SYSCON_RCC_XTAL | SYSCON_RCC_USESYSDIV | SYSCON_RCC_SYSDIV(LM_SYSDIV)) +#define TIVA_RCC_VALUE (SYSCON_RCC_OSCSRC | SYSCON_RCC_XTAL | SYSCON_RCC_USESYSDIV | SYSCON_RCC_SYSDIV(TIVA_SYSDIV)) /* RCC2 settings -- RCC2 not used. Other RCC2 settings * @@ -83,7 +83,7 @@ * - Not using RCC2 */ -#define LM_RCC2_VALUE (SYSCON_RCC2_OSCSRC | SYSCON_RCC2_SYSDIV(LM_SYSDIV)) +#define TIVA_RCC2_VALUE (SYSCON_RCC2_OSCSRC | SYSCON_RCC2_SYSDIV(TIVA_SYSDIV)) /* LED definitions ******************************************************************/ @@ -128,12 +128,12 @@ void tiva_boardinitialize(void); * * Description: * For the Ethernet Eval Kits, the MAC address will be stored in the non-volatile - * USER0 and USER1 registers. If CONFIG_LM_BOARDMAC is defined, this function + * USER0 and USER1 registers. If CONFIG_TIVA_BOARDMAC is defined, this function * will obtain the MAC address from these registers. * ************************************************************************************/ -#ifdef CONFIG_LM_BOARDMAC +#ifdef CONFIG_TIVA_BOARDMAC struct ether_addr; void tiva_ethernetmac(struct ether_addr *ethaddr); #endif diff --git a/nuttx/configs/eagle100/nettest/defconfig b/nuttx/configs/eagle100/nettest/defconfig index 1b872a449..9b8bfa71e 100644 --- a/nuttx/configs/eagle100/nettest/defconfig +++ b/nuttx/configs/eagle100/nettest/defconfig @@ -150,45 +150,45 @@ CONFIG_ARCH_CHIP_LM3S6918=y # CONFIG_ARCH_CHIP_LM3S8962 is not set # CONFIG_ARCH_CHIP_LM4F120 is not set CONFIG_ARCH_CHIP_LM3S=y -CONFIG_LM_HAVE_SSI1=y +CONFIG_TIVA_HAVE_SSI1=y # CONFIG_LM_REVA2 is not set # # Stellaris Peripheral Support # -CONFIG_LM_UART0=y -# CONFIG_LM_UART1 is not set -# CONFIG_LM_UART2 is not set +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_LM_ETHERNET=y -# CONFIG_LM_FLASH is not set +CONFIG_TIVA_ETHERNET=y +# CONFIG_TIVA_FLASH is not set # # Disable GPIO Interrupts # -# CONFIG_LM_DISABLE_GPIOA_IRQS is not set -# CONFIG_LM_DISABLE_GPIOB_IRQS is not set -# CONFIG_LM_DISABLE_GPIOC_IRQS is not set -# CONFIG_LM_DISABLE_GPIOD_IRQS is not set -# CONFIG_LM_DISABLE_GPIOE_IRQS is not set -# CONFIG_LM_DISABLE_GPIOF_IRQS is not set -# CONFIG_LM_DISABLE_GPIOG_IRQS is not set -# CONFIG_LM_DISABLE_GPIOH_IRQS is not set -CONFIG_LM_DISABLE_GPIOJ_IRQS=y +# CONFIG_TIVA_DISABLE_GPIOA_IRQS is not set +# CONFIG_TIVA_DISABLE_GPIOB_IRQS is not set +# CONFIG_TIVA_DISABLE_GPIOC_IRQS is not set +# CONFIG_TIVA_DISABLE_GPIOD_IRQS is not set +# CONFIG_TIVA_DISABLE_GPIOE_IRQS is not set +# CONFIG_TIVA_DISABLE_GPIOF_IRQS is not set +# CONFIG_TIVA_DISABLE_GPIOG_IRQS is not set +# CONFIG_TIVA_DISABLE_GPIOH_IRQS is not set +CONFIG_TIVA_DISABLE_GPIOJ_IRQS=y # # Stellaris Ethernet Configuration # -# CONFIG_LM_ETHLEDS is not set -CONFIG_LM_BOARDMAC=y -# CONFIG_LM_ETHHDUPLEX is not set -# CONFIG_LM_ETHNOAUTOCRC is not set -# CONFIG_LM_ETHNOPAD is not set -# CONFIG_LM_MULTICAST is not set -# CONFIG_LM_PROMISCUOUS is not set -# CONFIG_LM_TIMESTAMP is not set -# CONFIG_LM_BADCRC is not set +# CONFIG_TIVA_ETHLEDS is not set +CONFIG_TIVA_BOARDMAC=y +# CONFIG_TIVA_ETHHDUPLEX is not set +# CONFIG_TIVA_ETHNOAUTOCRC is not set +# CONFIG_TIVA_ETHNOPAD is not set +# CONFIG_TIVA_MULTICAST is not set +# CONFIG_TIVA_PROMISCUOUS is not set +# CONFIG_TIVA_TIMESTAMP is not set +# CONFIG_TIVA_BADCRC is not set # CONFIG_M3S_DUMPPACKET is not set # diff --git a/nuttx/configs/eagle100/nsh/defconfig b/nuttx/configs/eagle100/nsh/defconfig index 1eb615477..2c55647c8 100644 --- a/nuttx/configs/eagle100/nsh/defconfig +++ b/nuttx/configs/eagle100/nsh/defconfig @@ -127,45 +127,45 @@ CONFIG_ARCH_CHIP_LM3S6918=y # CONFIG_ARCH_CHIP_LM3S8962 is not set # CONFIG_ARCH_CHIP_LM4F120 is not set CONFIG_ARCH_CHIP_LM3S=y -CONFIG_LM_HAVE_SSI1=y +CONFIG_TIVA_HAVE_SSI1=y # CONFIG_LM_REVA2 is not set # # Stellaris Peripheral Support # -CONFIG_LM_UART0=y -# CONFIG_LM_UART1 is not set -# CONFIG_LM_UART2 is not set +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_LM_ETHERNET=y -# CONFIG_LM_FLASH is not set +CONFIG_TIVA_ETHERNET=y +# CONFIG_TIVA_FLASH is not set # # Disable GPIO Interrupts # -# CONFIG_LM_DISABLE_GPIOA_IRQS is not set -# CONFIG_LM_DISABLE_GPIOB_IRQS is not set -# CONFIG_LM_DISABLE_GPIOC_IRQS is not set -# CONFIG_LM_DISABLE_GPIOD_IRQS is not set -# CONFIG_LM_DISABLE_GPIOE_IRQS is not set -# CONFIG_LM_DISABLE_GPIOF_IRQS is not set -# CONFIG_LM_DISABLE_GPIOG_IRQS is not set -# CONFIG_LM_DISABLE_GPIOH_IRQS is not set -CONFIG_LM_DISABLE_GPIOJ_IRQS=y +# CONFIG_TIVA_DISABLE_GPIOA_IRQS is not set +# CONFIG_TIVA_DISABLE_GPIOB_IRQS is not set +# CONFIG_TIVA_DISABLE_GPIOC_IRQS is not set +# CONFIG_TIVA_DISABLE_GPIOD_IRQS is not set +# CONFIG_TIVA_DISABLE_GPIOE_IRQS is not set +# CONFIG_TIVA_DISABLE_GPIOF_IRQS is not set +# CONFIG_TIVA_DISABLE_GPIOG_IRQS is not set +# CONFIG_TIVA_DISABLE_GPIOH_IRQS is not set +CONFIG_TIVA_DISABLE_GPIOJ_IRQS=y # # Stellaris Ethernet Configuration # -# CONFIG_LM_ETHLEDS is not set -CONFIG_LM_BOARDMAC=y -# CONFIG_LM_ETHHDUPLEX is not set -# CONFIG_LM_ETHNOAUTOCRC is not set -# CONFIG_LM_ETHNOPAD is not set -# CONFIG_LM_MULTICAST is not set -# CONFIG_LM_PROMISCUOUS is not set -# CONFIG_LM_TIMESTAMP is not set -# CONFIG_LM_BADCRC is not set +# CONFIG_TIVA_ETHLEDS is not set +CONFIG_TIVA_BOARDMAC=y +# CONFIG_TIVA_ETHHDUPLEX is not set +# CONFIG_TIVA_ETHNOAUTOCRC is not set +# CONFIG_TIVA_ETHNOPAD is not set +# CONFIG_TIVA_MULTICAST is not set +# CONFIG_TIVA_PROMISCUOUS is not set +# CONFIG_TIVA_TIMESTAMP is not set +# CONFIG_TIVA_BADCRC is not set # CONFIG_M3S_DUMPPACKET is not set # diff --git a/nuttx/configs/eagle100/nxflat/defconfig b/nuttx/configs/eagle100/nxflat/defconfig index 20be1254c..00b2de30c 100644 --- a/nuttx/configs/eagle100/nxflat/defconfig +++ b/nuttx/configs/eagle100/nxflat/defconfig @@ -127,32 +127,32 @@ CONFIG_ARCH_CHIP_LM3S6918=y # CONFIG_ARCH_CHIP_LM3S8962 is not set # CONFIG_ARCH_CHIP_LM4F120 is not set CONFIG_ARCH_CHIP_LM3S=y -CONFIG_LM_HAVE_SSI1=y +CONFIG_TIVA_HAVE_SSI1=y # CONFIG_LM_REVA2 is not set # # Stellaris Peripheral Support # -CONFIG_LM_UART0=y -# CONFIG_LM_UART1 is not set -# CONFIG_LM_UART2 is not set +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_LM_ETHERNET is not set -# CONFIG_LM_FLASH is not set +# CONFIG_TIVA_ETHERNET is not set +# CONFIG_TIVA_FLASH is not set # # Disable GPIO Interrupts # -# CONFIG_LM_DISABLE_GPIOA_IRQS is not set -# CONFIG_LM_DISABLE_GPIOB_IRQS is not set -# CONFIG_LM_DISABLE_GPIOC_IRQS is not set -# CONFIG_LM_DISABLE_GPIOD_IRQS is not set -# CONFIG_LM_DISABLE_GPIOE_IRQS is not set -# CONFIG_LM_DISABLE_GPIOF_IRQS is not set -# CONFIG_LM_DISABLE_GPIOG_IRQS is not set -# CONFIG_LM_DISABLE_GPIOH_IRQS is not set -CONFIG_LM_DISABLE_GPIOJ_IRQS=y +# CONFIG_TIVA_DISABLE_GPIOA_IRQS is not set +# CONFIG_TIVA_DISABLE_GPIOB_IRQS is not set +# CONFIG_TIVA_DISABLE_GPIOC_IRQS is not set +# CONFIG_TIVA_DISABLE_GPIOD_IRQS is not set +# CONFIG_TIVA_DISABLE_GPIOE_IRQS is not set +# CONFIG_TIVA_DISABLE_GPIOF_IRQS is not set +# CONFIG_TIVA_DISABLE_GPIOG_IRQS is not set +# CONFIG_TIVA_DISABLE_GPIOH_IRQS is not set +CONFIG_TIVA_DISABLE_GPIOJ_IRQS=y # # Stellaris SSI Configuration diff --git a/nuttx/configs/eagle100/src/eagle100_internal.h b/nuttx/configs/eagle100/src/eagle100_internal.h index 948cb639a..71ebfc802 100644 --- a/nuttx/configs/eagle100/src/eagle100_internal.h +++ b/nuttx/configs/eagle100/src/eagle100_internal.h @@ -56,12 +56,12 @@ * expanded). */ -#if LM_NSSI == 0 +#if TIVA_NSSI == 0 # undef CONFIG_SSI0_DISABLE # define CONFIG_SSI0_DISABLE 1 # undef CONFIG_SSI1_DISABLE # define CONFIG_SSI1_DISABLE 1 -#elif LM_NSSI == 1 +#elif TIVA_NSSI == 1 # undef CONFIG_SSI1_DISABLE # define CONFIG_SSI1_DISABLE 1 #endif diff --git a/nuttx/configs/eagle100/src/up_ethernet.c b/nuttx/configs/eagle100/src/up_ethernet.c index 6ef448b8b..1b619ed97 100644 --- a/nuttx/configs/eagle100/src/up_ethernet.c +++ b/nuttx/configs/eagle100/src/up_ethernet.c @@ -67,12 +67,12 @@ * * Description: * For the Ethernet Eval Kits, the MAC address will be stored in the non-volatile - * USER0 and USER1 registers. If CONFIG_LM_BOARDMAC is defined, this function + * USER0 and USER1 registers. If CONFIG_TIVA_BOARDMAC is defined, this function * will obtain the MAC address from these registers. * ************************************************************************************/ -#ifdef CONFIG_LM_BOARDMAC +#ifdef CONFIG_TIVA_BOARDMAC void tiva_ethernetmac(struct ether_addr *ethaddr) { uint32_t user0; @@ -80,8 +80,8 @@ void tiva_ethernetmac(struct ether_addr *ethaddr) /* Get the current value of the user registers */ - user0 = getreg32(LM_FLASH_USERREG0); - user1 = getreg32(LM_FLASH_USERREG1); + user0 = getreg32(TIVA_FLASH_USERREG0); + user1 = getreg32(TIVA_FLASH_USERREG1); nlldbg("user: %06x:%06x\n", user1 & 0x00ffffff, user0 & 0x00ffffff); DEBUGASSERT(user0 != 0xffffffff && user1 != 0xffffffff); diff --git a/nuttx/configs/eagle100/thttpd/defconfig b/nuttx/configs/eagle100/thttpd/defconfig index 05334eb30..1390df73e 100644 --- a/nuttx/configs/eagle100/thttpd/defconfig +++ b/nuttx/configs/eagle100/thttpd/defconfig @@ -120,45 +120,45 @@ CONFIG_ARCH_CHIP_LM3S6918=y # CONFIG_ARCH_CHIP_LM3S8962 is not set # CONFIG_ARCH_CHIP_LM4F120 is not set CONFIG_ARCH_CHIP_LM3S=y -CONFIG_LM_HAVE_SSI1=y +CONFIG_TIVA_HAVE_SSI1=y # CONFIG_LM_REVA2 is not set # # Stellaris Peripheral Support # -CONFIG_LM_UART0=y -# CONFIG_LM_UART1 is not set -# CONFIG_LM_UART2 is not set +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_LM_ETHERNET=y -# CONFIG_LM_FLASH is not set +CONFIG_TIVA_ETHERNET=y +# CONFIG_TIVA_FLASH is not set # # Disable GPIO Interrupts # -# CONFIG_LM_DISABLE_GPIOA_IRQS is not set -# CONFIG_LM_DISABLE_GPIOB_IRQS is not set -# CONFIG_LM_DISABLE_GPIOC_IRQS is not set -# CONFIG_LM_DISABLE_GPIOD_IRQS is not set -# CONFIG_LM_DISABLE_GPIOE_IRQS is not set -# CONFIG_LM_DISABLE_GPIOF_IRQS is not set -# CONFIG_LM_DISABLE_GPIOG_IRQS is not set -# CONFIG_LM_DISABLE_GPIOH_IRQS is not set -CONFIG_LM_DISABLE_GPIOJ_IRQS=y +# CONFIG_TIVA_DISABLE_GPIOA_IRQS is not set +# CONFIG_TIVA_DISABLE_GPIOB_IRQS is not set +# CONFIG_TIVA_DISABLE_GPIOC_IRQS is not set +# CONFIG_TIVA_DISABLE_GPIOD_IRQS is not set +# CONFIG_TIVA_DISABLE_GPIOE_IRQS is not set +# CONFIG_TIVA_DISABLE_GPIOF_IRQS is not set +# CONFIG_TIVA_DISABLE_GPIOG_IRQS is not set +# CONFIG_TIVA_DISABLE_GPIOH_IRQS is not set +CONFIG_TIVA_DISABLE_GPIOJ_IRQS=y # # Stellaris Ethernet Configuration # -# CONFIG_LM_ETHLEDS is not set -CONFIG_LM_BOARDMAC=y -# CONFIG_LM_ETHHDUPLEX is not set -# CONFIG_LM_ETHNOAUTOCRC is not set -# CONFIG_LM_ETHNOPAD is not set -# CONFIG_LM_MULTICAST is not set -# CONFIG_LM_PROMISCUOUS is not set -# CONFIG_LM_TIMESTAMP is not set -# CONFIG_LM_BADCRC is not set +# CONFIG_TIVA_ETHLEDS is not set +CONFIG_TIVA_BOARDMAC=y +# CONFIG_TIVA_ETHHDUPLEX is not set +# CONFIG_TIVA_ETHNOAUTOCRC is not set +# CONFIG_TIVA_ETHNOPAD is not set +# CONFIG_TIVA_MULTICAST is not set +# CONFIG_TIVA_PROMISCUOUS is not set +# CONFIG_TIVA_TIMESTAMP is not set +# CONFIG_TIVA_BADCRC is not set # CONFIG_M3S_DUMPPACKET is not set # diff --git a/nuttx/configs/ekk-lm3s9b96/README.txt b/nuttx/configs/ekk-lm3s9b96/README.txt index c35a9a542..52f5421b4 100644 --- a/nuttx/configs/ekk-lm3s9b96/README.txt +++ b/nuttx/configs/ekk-lm3s9b96/README.txt @@ -352,15 +352,15 @@ Stellaris EKK-LM3S9B96 Evaluation Kit Configuration Options Additional interrupt support can be disabled if desired to reduce memory footprint. - CONFIG_LM_DISABLE_GPIOA_IRQS=n - CONFIG_LM_DISABLE_GPIOB_IRQS=n - CONFIG_LM_DISABLE_GPIOC_IRQS=n - CONFIG_LM_DISABLE_GPIOD_IRQS=n - CONFIG_LM_DISABLE_GPIOE_IRQS=n - CONFIG_LM_DISABLE_GPIOF_IRQS=n - CONFIG_LM_DISABLE_GPIOG_IRQS=n - CONFIG_LM_DISABLE_GPIOH_IRQS=n - CONFIG_LM_DISABLE_GPIOJ_IRQS=y + CONFIG_TIVA_DISABLE_GPIOA_IRQS=n + CONFIG_TIVA_DISABLE_GPIOB_IRQS=n + CONFIG_TIVA_DISABLE_GPIOC_IRQS=n + CONFIG_TIVA_DISABLE_GPIOD_IRQS=n + CONFIG_TIVA_DISABLE_GPIOE_IRQS=n + CONFIG_TIVA_DISABLE_GPIOF_IRQS=n + CONFIG_TIVA_DISABLE_GPIOG_IRQS=n + CONFIG_TIVA_DISABLE_GPIOH_IRQS=n + CONFIG_TIVA_DISABLE_GPIOJ_IRQS=y LM3S9B96 specific device driver settings @@ -385,18 +385,18 @@ Stellaris EKK-LM3S9B96 Evaluation Kit Configuration Options value is large, then larger values of this setting may cause Rx FIFO overrun errors. Default: half of the Tx FIFO size (4). - CONFIG_LM_ETHERNET - This must be set (along with CONFIG_NET) + CONFIG_TIVA_ETHERNET - This must be set (along with CONFIG_NET) to build the Stellaris Ethernet driver - CONFIG_LM_ETHLEDS - Enable to use Ethernet LEDs on the board. - CONFIG_LM_BOARDMAC - If the board-specific logic can provide + CONFIG_TIVA_ETHLEDS - Enable to use Ethernet LEDs on the board. + CONFIG_TIVA_BOARDMAC - If the board-specific logic can provide a MAC address (via tiva_ethernetmac()), then this should be selected. - CONFIG_LM_ETHHDUPLEX - Set to force half duplex operation - CONFIG_LM_ETHNOAUTOCRC - Set to suppress auto-CRC generation - CONFIG_LM_ETHNOPAD - Set to suppress Tx padding - CONFIG_LM_MULTICAST - Set to enable multicast frames - CONFIG_LM_PROMISCUOUS - Set to enable promiscuous mode - CONFIG_LM_BADCRC - Set to enable bad CRC rejection. - CONFIG_LM_DUMPPACKET - Dump each packet received/sent to the console. + CONFIG_TIVA_ETHHDUPLEX - Set to force half duplex operation + CONFIG_TIVA_ETHNOAUTOCRC - Set to suppress auto-CRC generation + CONFIG_TIVA_ETHNOPAD - Set to suppress Tx padding + CONFIG_TIVA_MULTICAST - Set to enable multicast frames + CONFIG_TIVA_PROMISCUOUS - Set to enable promiscuous mode + CONFIG_TIVA_BADCRC - Set to enable bad CRC rejection. + CONFIG_TIVA_DUMPPACKET - Dump each packet received/sent to the console. Configurations ^^^^^^^^^^^^^^ diff --git a/nuttx/configs/ekk-lm3s9b96/include/board.h b/nuttx/configs/ekk-lm3s9b96/include/board.h index 8637e1c4e..755e74b50 100644 --- a/nuttx/configs/ekk-lm3s9b96/include/board.h +++ b/nuttx/configs/ekk-lm3s9b96/include/board.h @@ -64,7 +64,7 @@ * of (400 / 2) / 4 = 50MHz */ -#define LM_SYSDIV 4 +#define TIVA_SYSDIV 4 #define SYSCLK_FREQUENCY 50000000 /* 50MHz */ /* Other RCC settings: @@ -75,7 +75,7 @@ * - No auto-clock gating reset */ -#define LM_RCC_VALUE (SYSCON_RCC_OSCSRC | SYSCON_RCC_XTAL | SYSCON_RCC_USESYSDIV | SYSCON_RCC_SYSDIV(LM_SYSDIV)) +#define TIVA_RCC_VALUE (SYSCON_RCC_OSCSRC | SYSCON_RCC_XTAL | SYSCON_RCC_USESYSDIV | SYSCON_RCC_SYSDIV(TIVA_SYSDIV)) /* RCC2 settings -- RCC2 not used. Other RCC2 settings * @@ -84,7 +84,7 @@ * - Not using RCC2 */ -#define LM_RCC2_VALUE (SYSCON_RCC2_OSCSRC | SYSCON_RCC2_SYSDIV(LM_SYSDIV)) +#define TIVA_RCC2_VALUE (SYSCON_RCC2_OSCSRC | SYSCON_RCC2_SYSDIV(TIVA_SYSDIV)) /* LED definitions ******************************************************************/ @@ -129,12 +129,12 @@ void tiva_boardinitialize(void); * * Description: * For the Ethernet Eval Kits, the MAC address will be stored in the non-volatile - * USER0 and USER1 registers. If CONFIG_LM_BOARDMAC is defined, this function + * USER0 and USER1 registers. If CONFIG_TIVA_BOARDMAC is defined, this function * will obtain the MAC address from these registers. * ************************************************************************************/ -#ifdef CONFIG_LM_BOARDMAC +#ifdef CONFIG_TIVA_BOARDMAC struct ether_addr; void tiva_ethernetmac(struct ether_addr *ethaddr); #endif diff --git a/nuttx/configs/ekk-lm3s9b96/nsh/defconfig b/nuttx/configs/ekk-lm3s9b96/nsh/defconfig index 28f8338ba..fb83b763f 100644 --- a/nuttx/configs/ekk-lm3s9b96/nsh/defconfig +++ b/nuttx/configs/ekk-lm3s9b96/nsh/defconfig @@ -7,6 +7,7 @@ # Build Setup # # CONFIG_EXPERIMENTAL is not set +# CONFIG_DEFAULT_SMALL is not set CONFIG_HOST_LINUX=y # CONFIG_HOST_OSX is not set # CONFIG_HOST_WINDOWS is not set @@ -29,6 +30,7 @@ CONFIG_RAW_BINARY=y # # Customize Header Files # +# CONFIG_ARCH_STDINT_H is not set # CONFIG_ARCH_STDBOOL_H is not set # CONFIG_ARCH_MATH_H is not set # CONFIG_ARCH_FLOAT_H is not set @@ -38,7 +40,13 @@ CONFIG_RAW_BINARY=y # Debug Options # # CONFIG_DEBUG is not set +CONFIG_ARCH_HAVE_STACKCHECK=y +# CONFIG_ARCH_HAVE_HEAPCHECK is not set # CONFIG_DEBUG_SYMBOLS is not set +CONFIG_ARCH_HAVE_CUSTOMOPT=y +# CONFIG_DEBUG_NOOPT is not set +# CONFIG_DEBUG_CUSTOMOPT is not set +CONFIG_DEBUG_FULLOPT=y # # System Type @@ -59,29 +67,42 @@ CONFIG_ARCH="arm" # # ARM Options # +# CONFIG_ARCH_CHIP_A1X is not set # CONFIG_ARCH_CHIP_C5471 is not set # CONFIG_ARCH_CHIP_CALYPSO is not set # CONFIG_ARCH_CHIP_DM320 is not set # CONFIG_ARCH_CHIP_IMX is not set # CONFIG_ARCH_CHIP_KINETIS is not set +# CONFIG_ARCH_CHIP_KL is not set CONFIG_ARCH_CHIP_LM=y +# CONFIG_ARCH_CHIP_TIVA is not set # CONFIG_ARCH_CHIP_LPC17XX is not set # CONFIG_ARCH_CHIP_LPC214X is not set # CONFIG_ARCH_CHIP_LPC2378 is not set # CONFIG_ARCH_CHIP_LPC31XX is not set # CONFIG_ARCH_CHIP_LPC43XX is not set # CONFIG_ARCH_CHIP_NUC1XX is not set -# CONFIG_ARCH_CHIP_SAM3U is not set +# CONFIG_ARCH_CHIP_SAMA5 is not set +# CONFIG_ARCH_CHIP_SAMD is not set +# CONFIG_ARCH_CHIP_SAM34 is not set # CONFIG_ARCH_CHIP_STM32 is not set # CONFIG_ARCH_CHIP_STR71X is not set +# CONFIG_ARCH_ARM7TDMI is not set +# CONFIG_ARCH_ARM926EJS is not set +# CONFIG_ARCH_ARM920T is not set +# CONFIG_ARCH_CORTEXM0 is not set CONFIG_ARCH_CORTEXM3=y +# CONFIG_ARCH_CORTEXM4 is not set +# CONFIG_ARCH_CORTEXA5 is not set +# CONFIG_ARCH_CORTEXA8 is not set CONFIG_ARCH_FAMILY="armv7-m" CONFIG_ARCH_CHIP="tiva" # CONFIG_ARMV7M_USEBASEPRI is not set -# CONFIG_ARCH_HAVE_MPU is not set +CONFIG_ARCH_HAVE_CMNVECTOR=y +# CONFIG_ARMV7M_CMNVECTOR is not set +# CONFIG_ARCH_HAVE_FPU is not set +CONFIG_ARCH_HAVE_MPU=y # CONFIG_ARMV7M_MPU is not set -CONFIG_BOARD_LOOPSPERMSEC=4531 -# CONFIG_ARCH_CALIBRATION is not set # # ARMV7M Configuration Options @@ -93,79 +114,89 @@ CONFIG_ARMV7M_TOOLCHAIN_BUILDROOT=y CONFIG_ARMV7M_OABI_TOOLCHAIN=y # -# Stellaris Configuration Options +# Tiva/Stellaris Configuration Options # # CONFIG_ARCH_CHIP_LM3S6918 is not set CONFIG_ARCH_CHIP_LM3S9B96=y # CONFIG_ARCH_CHIP_LM3S6432 is not set # CONFIG_ARCH_CHIP_LM3S6965 is not set # CONFIG_ARCH_CHIP_LM3S8962 is not set +# CONFIG_ARCH_CHIP_LM4F120 is not set CONFIG_ARCH_CHIP_LM3S=y # CONFIG_LM_REVA2 is not set # -# Stellaris Peripheral Support +# Tiva/Stellaris Peripheral Support # -CONFIG_LM_UART0=y -# CONFIG_LM_UART1 is not set +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_LM_UART2 is not set -CONFIG_LM_ETHERNET=y +CONFIG_TIVA_ETHERNET=y +# CONFIG_TIVA_FLASH is not set # # Disable GPIO Interrupts # -# CONFIG_LM_DISABLE_GPIOA_IRQS is not set -# CONFIG_LM_DISABLE_GPIOB_IRQS is not set -# CONFIG_LM_DISABLE_GPIOC_IRQS is not set -# CONFIG_LM_DISABLE_GPIOD_IRQS is not set -# CONFIG_LM_DISABLE_GPIOE_IRQS is not set -# CONFIG_LM_DISABLE_GPIOF_IRQS is not set -# CONFIG_LM_DISABLE_GPIOG_IRQS is not set -CONFIG_LM_DISABLE_GPIOH_IRQS=y -CONFIG_LM_DISABLE_GPIOJ_IRQS=y - -# -# Stellaris Ethernet Configuration -# -# CONFIG_LM_ETHLEDS is not set -# CONFIG_LM_BOARDMAC is not set -# CONFIG_LM_ETHHDUPLEX is not set -# CONFIG_LM_ETHNOAUTOCRC is not set -# CONFIG_LM_ETHNOPAD is not set -# CONFIG_LM_MULTICAST is not set -# CONFIG_LM_PROMISCUOUS is not set -# CONFIG_LM_TIMESTAMP is not set -# CONFIG_LM_BADCRC is not set +# CONFIG_TIVA_DISABLE_GPIOA_IRQS is not set +# CONFIG_TIVA_DISABLE_GPIOB_IRQS is not set +# CONFIG_TIVA_DISABLE_GPIOC_IRQS is not set +# CONFIG_TIVA_DISABLE_GPIOD_IRQS is not set +# CONFIG_TIVA_DISABLE_GPIOE_IRQS is not set +# CONFIG_TIVA_DISABLE_GPIOF_IRQS is not set +# CONFIG_TIVA_DISABLE_GPIOG_IRQS is not set +CONFIG_TIVA_DISABLE_GPIOH_IRQS=y +CONFIG_TIVA_DISABLE_GPIOJ_IRQS=y + +# +# Tiva/Stellaris Ethernet Configuration +# +# CONFIG_TIVA_ETHLEDS is not set +# CONFIG_TIVA_BOARDMAC is not set +# CONFIG_TIVA_ETHHDUPLEX is not set +# CONFIG_TIVA_ETHNOAUTOCRC is not set +# CONFIG_TIVA_ETHNOPAD is not set +# CONFIG_TIVA_MULTICAST is not set +# CONFIG_TIVA_PROMISCUOUS is not set +# CONFIG_TIVA_TIMESTAMP is not set +# CONFIG_TIVA_BADCRC is not set # CONFIG_M3S_DUMPPACKET is not set # CONFIG_NET_MULTICAST is not set # -# External Memory Configuration -# - -# # Architecture Options # # CONFIG_ARCH_NOINTC is not set # CONFIG_ARCH_VECNOTIRQ is not set # CONFIG_ARCH_DMA is not set -CONFIG_ARCH_IRQPRIO=y +CONFIG_ARCH_HAVE_IRQPRIO=y # CONFIG_CUSTOM_STACK is not set # CONFIG_ADDRENV is not set CONFIG_ARCH_HAVE_VFORK=y +# CONFIG_ARCH_HAVE_MMU is not set +# CONFIG_ARCH_NAND_HWECC is not set +CONFIG_ARCH_IRQPRIO=y CONFIG_ARCH_STACKDUMP=y # CONFIG_ENDIAN_BIG is not set +# CONFIG_ARCH_IDLE_CUSTOM is not set # CONFIG_ARCH_HAVE_RAMFUNCS is not set +CONFIG_ARCH_HAVE_RAMVECTORS=y +# CONFIG_ARCH_RAMVECTORS is not set # # Board Settings # -CONFIG_RAM_START=0x20000000 -CONFIG_RAM_SIZE=98304 +CONFIG_BOARD_LOOPSPERMSEC=4531 +# CONFIG_ARCH_CALIBRATION is not set + +# +# Interrupt options +# CONFIG_ARCH_HAVE_INTERRUPTSTACK=y CONFIG_ARCH_INTERRUPTSTACK=0 +CONFIG_ARCH_HAVE_HIPRI_INTERRUPT=y +# CONFIG_ARCH_HIPRI_INTERRUPT is not set # # Boot options @@ -177,6 +208,13 @@ CONFIG_BOOT_RUNFROMFLASH=y # CONFIG_BOOT_COPYTORAM is not set # +# Boot Memory Configuration +# +CONFIG_RAM_START=0x20000000 +CONFIG_RAM_SIZE=98304 +# CONFIG_ARCH_HAVE_SDRAM is not set + +# # Board Selection # CONFIG_ARCH_BOARD_EKKLM3S9B96=y @@ -201,7 +239,9 @@ CONFIG_NSH_MMCSDSPIPORTNO=0 # # CONFIG_BOARD_INITIALIZE is not set CONFIG_MSEC_PER_TICK=10 +# CONFIG_SYSTEM_TIME64 is not set CONFIG_RR_INTERVAL=200 +# CONFIG_SCHED_CPULOAD is not set # CONFIG_SCHED_INSTRUMENTATION is not set CONFIG_TASK_NAME_SIZE=0 # CONFIG_SCHED_HAVE_PARENT is not set @@ -215,7 +255,6 @@ CONFIG_DEV_CONSOLE=y # CONFIG_FDCLONE_DISABLE is not set # CONFIG_FDCLONE_STDIO is not set CONFIG_SDCLONE_DISABLE=y -# CONFIG_SCHED_WORKQUEUE is not set # CONFIG_SCHED_WAITPID is not set # CONFIG_SCHED_STARTHOOK is not set # CONFIG_SCHED_ATEXIT is not set @@ -269,15 +308,21 @@ CONFIG_DEV_NULL=y # CONFIG_LOOP is not set # CONFIG_RAMDISK is not set # CONFIG_CAN is not set +# CONFIG_ARCH_HAVE_PWM_PULSECOUNT is not set # CONFIG_PWM is not set +# CONFIG_ARCH_HAVE_I2CRESET is not set # CONFIG_I2C is not set CONFIG_SPI=y # CONFIG_SPI_OWNBUS is not set CONFIG_SPI_EXCHANGE=y # CONFIG_SPI_CMDDATA is not set +# CONFIG_SPI_BITBANG is not set +# CONFIG_I2S is not set # CONFIG_RTC is not set # CONFIG_WATCHDOG is not set # CONFIG_ANALOG is not set +# CONFIG_AUDIO_DEVICES is not set +# CONFIG_VIDEO_DEVICES is not set # CONFIG_BCH is not set # CONFIG_INPUT is not set # CONFIG_LCD is not set @@ -289,10 +334,25 @@ CONFIG_MMCSD_MMCSUPPORT=y CONFIG_MMCSD_HAVECARDDETECT=y CONFIG_MMCSD_SPI=y CONFIG_MMCSD_SPICLOCK=20000000 -# CONFIG_MMCSD_SDIO is not set +CONFIG_MMCSD_SPIMODE=0 +# CONFIG_ARCH_HAVE_SDIO is not set # CONFIG_MTD is not set -# CONFIG_NETDEVICES is not set +CONFIG_NETDEVICES=y + +# +# General Ethernet MAC Driver Options +# +# CONFIG_NETDEV_MULTINIC is not set + +# +# External Ethernet MAC Device Support +# +# CONFIG_NET_DM90x0 is not set +# CONFIG_ENC28J60 is not set +# CONFIG_ENCX24J600 is not set +# CONFIG_NET_E1000 is not set # CONFIG_NET_SLIP is not set +# CONFIG_NET_VNET is not set # CONFIG_PIPES is not set # CONFIG_PM is not set # CONFIG_POWER is not set @@ -301,7 +361,31 @@ CONFIG_MMCSD_SPICLOCK=20000000 CONFIG_SERIAL=y # CONFIG_DEV_LOWCONSOLE is not set # CONFIG_16550_UART is not set +# CONFIG_ARCH_HAVE_UART is not set CONFIG_ARCH_HAVE_UART0=y +# CONFIG_ARCH_HAVE_UART1 is not set +# CONFIG_ARCH_HAVE_UART2 is not set +# CONFIG_ARCH_HAVE_UART3 is not set +# CONFIG_ARCH_HAVE_UART4 is not set +# CONFIG_ARCH_HAVE_UART5 is not set +# CONFIG_ARCH_HAVE_UART6 is not set +# CONFIG_ARCH_HAVE_UART7 is not set +# CONFIG_ARCH_HAVE_UART8 is not set +# CONFIG_ARCH_HAVE_SCI0 is not set +# CONFIG_ARCH_HAVE_SCI1 is not set +# CONFIG_ARCH_HAVE_USART0 is not set +# CONFIG_ARCH_HAVE_USART1 is not set +# CONFIG_ARCH_HAVE_USART2 is not set +# CONFIG_ARCH_HAVE_USART3 is not set +# CONFIG_ARCH_HAVE_USART4 is not set +# CONFIG_ARCH_HAVE_USART5 is not set +# CONFIG_ARCH_HAVE_USART6 is not set +# CONFIG_ARCH_HAVE_USART7 is not set +# CONFIG_ARCH_HAVE_USART8 is not set + +# +# USART Configuration +# CONFIG_MCU_SERIAL=y CONFIG_STANDARD_SERIAL=y CONFIG_UART0_SERIAL_CONSOLE=y @@ -316,6 +400,10 @@ CONFIG_UART0_BAUD=115200 CONFIG_UART0_BITS=8 CONFIG_UART0_PARITY=0 CONFIG_UART0_2STOP=0 +# CONFIG_UART0_IFLOWCONTROL is not set +# CONFIG_UART0_OFLOWCONTROL is not set +# CONFIG_SERIAL_IFLOWCONTROL is not set +# CONFIG_SERIAL_OFLOWCONTROL is not set # CONFIG_USBDEV is not set # CONFIG_USBHOST is not set # CONFIG_WIRELESS is not set @@ -332,13 +420,16 @@ CONFIG_UART0_2STOP=0 # # Networking Support # +CONFIG_ARCH_HAVE_NET=y +# CONFIG_ARCH_HAVE_PHY is not set CONFIG_NET=y # CONFIG_NET_NOINTS is not set # CONFIG_NET_MULTIBUFFER is not set -# CONFIG_NET_IPv6 is not set +# CONFIG_NET_PROMISCUOUS is not set CONFIG_NSOCKET_DESCRIPTORS=40 CONFIG_NET_NACTIVESOCKETS=16 CONFIG_NET_SOCKOPTS=y +# CONFIG_NET_SOLINGER is not set CONFIG_NET_BUFSIZE=562 # CONFIG_NET_TCPURGDATA is not set @@ -351,9 +442,11 @@ CONFIG_NET_MAX_LISTENPORTS=8 CONFIG_NET_TCP_READAHEAD=y CONFIG_NET_TCP_READAHEAD_BUFSIZE=536 CONFIG_NET_NTCP_READAHEAD_BUFFERS=16 +# CONFIG_NET_TCP_WRITE_BUFFERS is not set CONFIG_NET_TCP_RECVDELAY=0 # CONFIG_NET_TCPBACKLOG is not set # CONFIG_NET_TCP_SPLIT is not set +# CONFIG_NET_SENDFILE is not set # # UDP Networking @@ -362,6 +455,7 @@ CONFIG_NET_UDP=y CONFIG_NET_UDP_CHECKSUMS=y CONFIG_NET_UDP_CONNS=8 # CONFIG_NET_BROADCAST is not set +# CONFIG_NET_RXAVAIL is not set CONFIG_NET_ICMP=y CONFIG_NET_ICMP_PING=y # CONFIG_NET_PINGADDRCONF is not set @@ -370,6 +464,7 @@ CONFIG_NET_STATISTICS=y CONFIG_NET_RECEIVE_WINDOW=536 CONFIG_NET_ARPTAB_SIZE=16 # CONFIG_NET_ARP_IPIN is not set +# CONFIG_NET_ROUTE is not set # # File Systems @@ -379,6 +474,9 @@ CONFIG_NET_ARPTAB_SIZE=16 # File system configuration # # CONFIG_DISABLE_MOUNTPOINT is not set +# CONFIG_DISABLE_PSEUDOFS_OPERATIONS is not set +CONFIG_FS_READABLE=y +CONFIG_FS_WRITABLE=y # CONFIG_FS_RAMMAP is not set CONFIG_FS_FAT=y # CONFIG_FAT_LCNAMES is not set @@ -389,6 +487,8 @@ CONFIG_NFS=y # CONFIG_NFS_STATISTICS is not set # CONFIG_FS_NXFFS is not set # CONFIG_FS_ROMFS is not set +# CONFIG_FS_SMARTFS is not set +# CONFIG_FS_PROCFS is not set # # System Logging @@ -404,11 +504,18 @@ CONFIG_NFS=y # # Memory Management # +# CONFIG_MM_MULTIHEAP is not set # CONFIG_MM_SMALL is not set CONFIG_MM_REGIONS=1 +# CONFIG_ARCH_HAVE_HEAP2 is not set # CONFIG_GRAN is not set # +# Audio Support +# +# CONFIG_AUDIO is not set + +# # Binary Formats # # CONFIG_BINFMT_DISABLE is not set @@ -433,6 +540,7 @@ CONFIG_LIB_HOMEDIR="/" # CONFIG_LIBM is not set # CONFIG_NOPRINTF_FIELDWIDTH is not set # CONFIG_LIBC_FLOATINGPOINT is not set +CONFIG_LIB_RAND_ORDER=1 # CONFIG_EOL_IS_CR is not set # CONFIG_EOL_IS_LF is not set # CONFIG_EOL_IS_BOTH_CRLF is not set @@ -448,9 +556,11 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512 # CONFIG_ARCH_OPTIMIZED_FUNCTIONS is not set # -# Non-standard Helper Functions +# Non-standard Library Support # +# CONFIG_SCHED_WORKQUEUE is not set # CONFIG_LIB_KBDCODEC is not set +# CONFIG_LIB_SLCDCODEC is not set # # Basic CXX Support @@ -471,7 +581,7 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512 # # CONFIG_EXAMPLES_BUTTONS is not set # CONFIG_EXAMPLES_CAN is not set -# CONFIG_SYSTEM_COMPOSITE is not set +# CONFIG_EXAMPLES_CONFIGDATA is not set # CONFIG_EXAMPLES_DHCPD is not set # CONFIG_EXAMPLES_ELF is not set # CONFIG_EXAMPLES_FTPC is not set @@ -484,9 +594,10 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512 # CONFIG_EXAMPLES_IGMP is not set # CONFIG_EXAMPLES_LCDRW is not set # CONFIG_EXAMPLES_MM is not set -# CONFIG_EXAMPLES_MOUNT is not set # CONFIG_EXAMPLES_MODBUS is not set +# CONFIG_EXAMPLES_MOUNT is not set # CONFIG_EXAMPLES_NETTEST is not set +# CONFIG_EXAMPLES_NRF24L01TERM is not set CONFIG_EXAMPLES_NSH=y # CONFIG_EXAMPLES_NULL is not set # CONFIG_EXAMPLES_NX is not set @@ -507,6 +618,9 @@ CONFIG_EXAMPLES_NSH=y # CONFIG_EXAMPLES_ROMFS is not set # CONFIG_EXAMPLES_SENDMAIL is not set # CONFIG_EXAMPLES_SERLOOP is not set +# CONFIG_EXAMPLES_SLCD is not set +# CONFIG_EXAMPLES_SMART is not set +# CONFIG_EXAMPLES_TCPECHO is not set # CONFIG_EXAMPLES_TELNETD is not set # CONFIG_EXAMPLES_THTTPD is not set # CONFIG_EXAMPLES_TIFF is not set @@ -515,14 +629,14 @@ CONFIG_EXAMPLES_NSH=y # CONFIG_EXAMPLES_DISCOVER is not set # CONFIG_EXAMPLES_UIP is not set # CONFIG_EXAMPLES_USBSERIAL is not set -# CONFIG_SYSTEM_USBMSC is not set # CONFIG_EXAMPLES_USBTERM is not set # CONFIG_EXAMPLES_WATCHDOG is not set # CONFIG_EXAMPLES_WGET is not set # -# Interpreters +# Graphics Support # +# CONFIG_TIFF is not set # # Interpreters @@ -538,14 +652,10 @@ CONFIG_EXAMPLES_NSH=y # Networking Utilities # # CONFIG_NETUTILS_CODECS is not set -CONFIG_NETUTILS_DHCPC=y # CONFIG_NETUTILS_DHCPD is not set # CONFIG_NETUTILS_FTPC is not set # CONFIG_NETUTILS_FTPD is not set # CONFIG_NETUTILS_JSON is not set -CONFIG_NETUTILS_RESOLV=y -CONFIG_NET_RESOLV_ENTRIES=4 -CONFIG_NET_RESOLV_MAXRESPONSE=96 # CONFIG_NETUTILS_SMTP is not set CONFIG_NETUTILS_TELNETD=y CONFIG_NETUTILS_TFTPC=y @@ -558,11 +668,7 @@ CONFIG_NSH_WGET_USERAGENT="NuttX/6.xx.x (; http://www.nuttx.org/)" # CONFIG_NETUTILS_XMLRPC is not set # -# ModBus -# - -# -# FreeModbus +# FreeModBus # # CONFIG_MODBUS is not set @@ -576,10 +682,14 @@ CONFIG_NSH_READLINE=y # # Disable Individual commands # +# CONFIG_NSH_DISABLE_ADDROUTE is not set # CONFIG_NSH_DISABLE_CAT is not set # CONFIG_NSH_DISABLE_CD is not set # CONFIG_NSH_DISABLE_CP is not set +# CONFIG_NSH_DISABLE_CMP is not set # CONFIG_NSH_DISABLE_DD is not set +# CONFIG_NSH_DISABLE_DF is not set +# CONFIG_NSH_DISABLE_DELROUTE is not set # CONFIG_NSH_DISABLE_ECHO is not set # CONFIG_NSH_DISABLE_EXEC is not set # CONFIG_NSH_DISABLE_EXIT is not set @@ -615,11 +725,24 @@ CONFIG_NSH_READLINE=y # CONFIG_NSH_DISABLE_USLEEP is not set # CONFIG_NSH_DISABLE_WGET is not set # CONFIG_NSH_DISABLE_XD is not set + +# +# Configure Command Options +# +CONFIG_NSH_CMDOPT_DF_H=y CONFIG_NSH_CODECS_BUFSIZE=128 +CONFIG_NSH_CMDOPT_HEXDUMP=y CONFIG_NSH_FILEIOSIZE=512 CONFIG_NSH_LINELEN=64 +# CONFIG_NSH_DISABLE_SEMICOLON is not set +CONFIG_NSH_CMDPARMS=y +CONFIG_NSH_TMPDIR="/tmp" +CONFIG_NSH_MAXARGUMENTS=6 +CONFIG_NSH_ARGCAT=y CONFIG_NSH_NESTDEPTH=3 # CONFIG_NSH_DISABLESCRIPT is not set +# CONFIG_NSH_DISABLE_ITEF is not set +# CONFIG_NSH_DISABLE_LOOPS is not set # CONFIG_NSH_DISABLEBG is not set CONFIG_NSH_CONSOLE=y @@ -647,7 +770,20 @@ CONFIG_NSH_MAX_ROUNDTRIP=20 # # -# System NSH Add-Ons +# Platform-specific Support +# +# CONFIG_PLATFORM_CONFIGDATA is not set + +# +# System Libraries and NSH Add-Ons +# + +# +# USB CDC/ACM Device Commands +# + +# +# USB Composite Device Commands # # @@ -660,11 +796,30 @@ CONFIG_NSH_MAX_ROUNDTRIP=20 # # +# INI File Parser +# +# CONFIG_SYSTEM_INIFILE is not set + +# # FLASH Program Installation # # CONFIG_SYSTEM_INSTALL is not set # +# FLASH Erase-all Command +# + +# +# NxPlayer media player library / command Line +# +# CONFIG_SYSTEM_NXPLAYER is not set + +# +# RAM test +# +# CONFIG_SYSTEM_RAMTEST is not set + +# # readline() # CONFIG_SYSTEM_READLINE=y @@ -693,3 +848,26 @@ CONFIG_READLINE_ECHO=y # # USB Monitor # + +# +# EMACS-like Command Line Editor +# +# CONFIG_SYSTEM_CLE is not set + +# +# VI Work-Alike Editor +# +# CONFIG_SYSTEM_VI is not set + +# +# Stack Monitor +# + +# +# USB Mass Storage Device Commands +# + +# +# Zmodem Commands +# +# CONFIG_SYSTEM_ZMODEM is not set diff --git a/nuttx/configs/ekk-lm3s9b96/nsh/setenv.sh b/nuttx/configs/ekk-lm3s9b96/nsh/setenv.sh index bba7595de..a9564a3e7 100755 --- a/nuttx/configs/ekk-lm3s9b96/nsh/setenv.sh +++ b/nuttx/configs/ekk-lm3s9b96/nsh/setenv.sh @@ -51,7 +51,8 @@ fi # This is the Cygwin path to the location where I installed the CodeSourcery # toolchain under windows. You will also have to edit this if you install # the CodeSourcery toolchain in any other location -# export TOOLCHAIN_BIN="/cygdrive/c/Program Files (x86)/CodeSourcery/Sourcery G++ Lite/bin" +#export TOOLCHAIN_BIN="/cygdrive/c/Program Files (x86)/CodeSourcery/Sourcery G++ Lite/bin" +#export TOOLCHAIN_BIN="/cygdrive/c/Program Files (x86)/CodeSourcery/Sourcery_CodeBench_Lite_for_ARM_EABI/bin" # This is the Cygwin path to the location where I build the buildroot # toolchain. diff --git a/nuttx/configs/ekk-lm3s9b96/src/ekklm3s9b96_internal.h b/nuttx/configs/ekk-lm3s9b96/src/ekklm3s9b96_internal.h index 59fde40c5..af179ddd9 100644 --- a/nuttx/configs/ekk-lm3s9b96/src/ekklm3s9b96_internal.h +++ b/nuttx/configs/ekk-lm3s9b96/src/ekklm3s9b96_internal.h @@ -57,12 +57,12 @@ * expanded). */ -#if LM_NSSI == 0 +#if TIVA_NSSI == 0 # undef CONFIG_SSI0_DISABLE # define CONFIG_SSI0_DISABLE 1 # undef CONFIG_SSI1_DISABLE # define CONFIG_SSI1_DISABLE 1 -#elif LM_NSSI == 1 +#elif TIVA_NSSI == 1 # undef CONFIG_SSI1_DISABLE # define CONFIG_SSI1_DISABLE 1 #endif diff --git a/nuttx/configs/ekk-lm3s9b96/src/up_ethernet.c b/nuttx/configs/ekk-lm3s9b96/src/up_ethernet.c index ecae5b75a..e62fc1520 100644 --- a/nuttx/configs/ekk-lm3s9b96/src/up_ethernet.c +++ b/nuttx/configs/ekk-lm3s9b96/src/up_ethernet.c @@ -68,12 +68,12 @@ * * Description: * For the Ethernet Eval Kits, the MAC address will be stored in the non-volatile - * USER0 and USER1 registers. If CONFIG_LM_BOARDMAC is defined, this function + * USER0 and USER1 registers. If CONFIG_TIVA_BOARDMAC is defined, this function * will obtain the MAC address from these registers. * ************************************************************************************/ -#ifdef CONFIG_LM_BOARDMAC +#ifdef CONFIG_TIVA_BOARDMAC void tiva_ethernetmac(struct ether_addr *ethaddr) { uint32_t user0; @@ -81,8 +81,8 @@ void tiva_ethernetmac(struct ether_addr *ethaddr) /* Get the current value of the user registers */ - user0 = getreg32(LM_FLASH_USERREG0); - user1 = getreg32(LM_FLASH_USERREG1); + user0 = getreg32(TIVA_FLASH_USERREG0); + user1 = getreg32(TIVA_FLASH_USERREG1); nlldbg("user: %06x:%06x\n", user1 & 0x00ffffff, user0 & 0x00ffffff); DEBUGASSERT(user0 != 0xffffffff && user1 != 0xffffffff); diff --git a/nuttx/configs/lm3s6432-s2e/README.txt b/nuttx/configs/lm3s6432-s2e/README.txt index 91e4f0f71..f81866a08 100644 --- a/nuttx/configs/lm3s6432-s2e/README.txt +++ b/nuttx/configs/lm3s6432-s2e/README.txt @@ -346,15 +346,15 @@ Stellaris MDL-S2E Reference Design Configuration Options Additional interrupt support can be disabled if desired to reduce memory footprint - GPIOs C-G are not pinned out on the MDL-S2E board. - CONFIG_LM_DISABLE_GPIOA_IRQS=n - CONFIG_LM_DISABLE_GPIOB_IRQS=n - CONFIG_LM_DISABLE_GPIOC_IRQS=y - CONFIG_LM_DISABLE_GPIOD_IRQS=y - CONFIG_LM_DISABLE_GPIOE_IRQS=y - CONFIG_LM_DISABLE_GPIOF_IRQS=y - CONFIG_LM_DISABLE_GPIOG_IRQS=y - CONFIG_LM_DISABLE_GPIOH_IRQS=y - CONFIG_LM_DISABLE_GPIOJ_IRQS=y + CONFIG_TIVA_DISABLE_GPIOA_IRQS=n + CONFIG_TIVA_DISABLE_GPIOB_IRQS=n + CONFIG_TIVA_DISABLE_GPIOC_IRQS=y + CONFIG_TIVA_DISABLE_GPIOD_IRQS=y + CONFIG_TIVA_DISABLE_GPIOE_IRQS=y + CONFIG_TIVA_DISABLE_GPIOF_IRQS=y + CONFIG_TIVA_DISABLE_GPIOG_IRQS=y + CONFIG_TIVA_DISABLE_GPIOH_IRQS=y + CONFIG_TIVA_DISABLE_GPIOJ_IRQS=y LM3S6432 specific device driver settings @@ -388,18 +388,18 @@ Stellaris MDL-S2E Reference Design Configuration Options value is large, then larger values of this setting may cause Rx FIFO overrun errors. Default: half of the Tx FIFO size (4). - CONFIG_LM_ETHERNET - This must be set (along with CONFIG_NET) + CONFIG_TIVA_ETHERNET - This must be set (along with CONFIG_NET) to build the Stellaris Ethernet driver - CONFIG_LM_ETHLEDS - Enable to use Ethernet LEDs on the board. - CONFIG_LM_BOARDMAC - This should be set in order to use the + CONFIG_TIVA_ETHLEDS - Enable to use Ethernet LEDs on the board. + CONFIG_TIVA_BOARDMAC - This should be set in order to use the MAC address configured in the flash USER registers. - CONFIG_LM_ETHHDUPLEX - Set to force half duplex operation - CONFIG_LM_ETHNOAUTOCRC - Set to suppress auto-CRC generation - CONFIG_LM_ETHNOPAD - Set to suppress Tx padding - CONFIG_LM_MULTICAST - Set to enable multicast frames - CONFIG_LM_PROMISCUOUS - Set to enable promiscuous mode - CONFIG_LM_BADCRC - Set to enable bad CRC rejection. - CONFIG_LM_DUMPPACKET - Dump each packet received/sent to the console. + CONFIG_TIVA_ETHHDUPLEX - Set to force half duplex operation + CONFIG_TIVA_ETHNOAUTOCRC - Set to suppress auto-CRC generation + CONFIG_TIVA_ETHNOPAD - Set to suppress Tx padding + CONFIG_TIVA_MULTICAST - Set to enable multicast frames + CONFIG_TIVA_PROMISCUOUS - Set to enable promiscuous mode + CONFIG_TIVA_BADCRC - Set to enable bad CRC rejection. + CONFIG_TIVA_DUMPPACKET - Dump each packet received/sent to the console. Configurations ^^^^^^^^^^^^^^ diff --git a/nuttx/configs/lm3s6432-s2e/include/board.h b/nuttx/configs/lm3s6432-s2e/include/board.h index ba6acf16b..6054786ba 100644 --- a/nuttx/configs/lm3s6432-s2e/include/board.h +++ b/nuttx/configs/lm3s6432-s2e/include/board.h @@ -63,7 +63,7 @@ * of (400 / 2) / 4 = 50MHz */ -#define LM_SYSDIV 4 +#define TIVA_SYSDIV 4 #define SYSCLK_FREQUENCY 50000000 /* 50MHz */ /* Other RCC settings: @@ -74,7 +74,7 @@ * - No auto-clock gating reset */ -#define LM_RCC_VALUE (SYSCON_RCC_OSCSRC | SYSCON_RCC_XTAL | SYSCON_RCC_USESYSDIV | SYSCON_RCC_SYSDIV(LM_SYSDIV)) +#define TIVA_RCC_VALUE (SYSCON_RCC_OSCSRC | SYSCON_RCC_XTAL | SYSCON_RCC_USESYSDIV | SYSCON_RCC_SYSDIV(TIVA_SYSDIV)) /* RCC2 settings -- RCC2 not used. Other RCC2 settings * @@ -83,7 +83,7 @@ * - Not using RCC2 */ -#define LM_RCC2_VALUE (SYSCON_RCC2_OSCSRC | SYSCON_RCC2_SYSDIV(LM_SYSDIV)) +#define TIVA_RCC2_VALUE (SYSCON_RCC2_OSCSRC | SYSCON_RCC2_SYSDIV(TIVA_SYSDIV)) /* LED definitions ******************************************************************/ @@ -123,21 +123,21 @@ * ************************************************************************************/ -extern void tiva_boardinitialize(void); +void tiva_boardinitialize(void); /************************************************************************************ * Name: tiva_ethernetmac * * Description: * For the MDL-S2E Reference Design, the MAC address will be stored in the - * non-volatile USER0 and USER1 registers. If CONFIG_LM_BOARDMAC is defined, + * non-volatile USER0 and USER1 registers. If CONFIG_TIVA_BOARDMAC is defined, * this function will obtain the MAC address from these registers. * ************************************************************************************/ -#ifdef CONFIG_LM_BOARDMAC +#ifdef CONFIG_TIVA_BOARDMAC struct ether_addr; -extern void tiva_ethernetmac(struct ether_addr *ethaddr); +void tiva_ethernetmac(struct ether_addr *ethaddr); #endif #endif /* __ASSEMBLY__ */ diff --git a/nuttx/configs/lm3s6432-s2e/nsh/defconfig b/nuttx/configs/lm3s6432-s2e/nsh/defconfig index f8b333677..73d1133e5 100644 --- a/nuttx/configs/lm3s6432-s2e/nsh/defconfig +++ b/nuttx/configs/lm3s6432-s2e/nsh/defconfig @@ -123,39 +123,39 @@ CONFIG_ARCH_CHIP_LM3S=y # # Stellaris Peripheral Support # -CONFIG_LM_UART0=y -CONFIG_LM_UART1=y -# CONFIG_LM_UART2 is not set +CONFIG_TIVA_UART0=y +CONFIG_TIVA_UART1=y +# CONFIG_TIVA_UART2 is not set CONFIG_SSI0_DISABLE=y CONFIG_SSI1_DISABLE=y -CONFIG_LM_ETHERNET=y -# CONFIG_LM_FLASH is not set +CONFIG_TIVA_ETHERNET=y +# CONFIG_TIVA_FLASH is not set # # Disable GPIO Interrupts # -# CONFIG_LM_DISABLE_GPIOA_IRQS is not set -# CONFIG_LM_DISABLE_GPIOB_IRQS is not set -CONFIG_LM_DISABLE_GPIOC_IRQS=y -CONFIG_LM_DISABLE_GPIOD_IRQS=y -CONFIG_LM_DISABLE_GPIOE_IRQS=y -CONFIG_LM_DISABLE_GPIOF_IRQS=y -CONFIG_LM_DISABLE_GPIOG_IRQS=y -CONFIG_LM_DISABLE_GPIOH_IRQS=y -CONFIG_LM_DISABLE_GPIOJ_IRQS=y +# CONFIG_TIVA_DISABLE_GPIOA_IRQS is not set +# CONFIG_TIVA_DISABLE_GPIOB_IRQS is not set +CONFIG_TIVA_DISABLE_GPIOC_IRQS=y +CONFIG_TIVA_DISABLE_GPIOD_IRQS=y +CONFIG_TIVA_DISABLE_GPIOE_IRQS=y +CONFIG_TIVA_DISABLE_GPIOF_IRQS=y +CONFIG_TIVA_DISABLE_GPIOG_IRQS=y +CONFIG_TIVA_DISABLE_GPIOH_IRQS=y +CONFIG_TIVA_DISABLE_GPIOJ_IRQS=y # # Stellaris Ethernet Configuration # -# CONFIG_LM_ETHLEDS is not set -CONFIG_LM_BOARDMAC=y -# CONFIG_LM_ETHHDUPLEX is not set -# CONFIG_LM_ETHNOAUTOCRC is not set -# CONFIG_LM_ETHNOPAD is not set -# CONFIG_LM_MULTICAST is not set -# CONFIG_LM_PROMISCUOUS is not set -# CONFIG_LM_TIMESTAMP is not set -# CONFIG_LM_BADCRC is not set +# CONFIG_TIVA_ETHLEDS is not set +CONFIG_TIVA_BOARDMAC=y +# CONFIG_TIVA_ETHHDUPLEX is not set +# CONFIG_TIVA_ETHNOAUTOCRC is not set +# CONFIG_TIVA_ETHNOPAD is not set +# CONFIG_TIVA_MULTICAST is not set +# CONFIG_TIVA_PROMISCUOUS is not set +# CONFIG_TIVA_TIMESTAMP is not set +# CONFIG_TIVA_BADCRC is not set # CONFIG_M3S_DUMPPACKET is not set # CONFIG_NET_MULTICAST is not set diff --git a/nuttx/configs/lm3s6432-s2e/src/lm3s6432s2e_internal.h b/nuttx/configs/lm3s6432-s2e/src/lm3s6432s2e_internal.h index 7c3be6360..bf4cf97db 100644 --- a/nuttx/configs/lm3s6432-s2e/src/lm3s6432s2e_internal.h +++ b/nuttx/configs/lm3s6432-s2e/src/lm3s6432s2e_internal.h @@ -55,7 +55,7 @@ * expanded). */ -#if LM_NSSI == 0 +#if TIVA_NSSI == 0 # undef CONFIG_SSI0_DISABLE # define CONFIG_SSI0_DISABLE 1 #endif diff --git a/nuttx/configs/lm3s6432-s2e/src/up_boot.c b/nuttx/configs/lm3s6432-s2e/src/up_boot.c index b8aaf5d78..8d1d276ac 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_LM_UART1) && !defined(CONFIG_SSI0_DISABLE) +#if defined(CONFIG_TIVA_UART1) && !defined(CONFIG_SSI0_DISABLE) # error Only one of UART1 and SSI0 can be enabled on this board. #endif diff --git a/nuttx/configs/lm3s6432-s2e/src/up_ethernet.c b/nuttx/configs/lm3s6432-s2e/src/up_ethernet.c index 5cfc23136..7bffdb3ca 100644 --- a/nuttx/configs/lm3s6432-s2e/src/up_ethernet.c +++ b/nuttx/configs/lm3s6432-s2e/src/up_ethernet.c @@ -67,12 +67,12 @@ * * Description: * For the Ethernet Eval Kits, the MAC address will be stored in the non-volatile - * USER0 and USER1 registers. If CONFIG_LM_BOARDMAC is defined, this function + * USER0 and USER1 registers. If CONFIG_TIVA_BOARDMAC is defined, this function * will obtain the MAC address from these registers. * ************************************************************************************/ -#ifdef CONFIG_LM_BOARDMAC +#ifdef CONFIG_TIVA_BOARDMAC void tiva_ethernetmac(struct ether_addr *ethaddr) { uint32_t user0; @@ -80,8 +80,8 @@ void tiva_ethernetmac(struct ether_addr *ethaddr) /* Get the current value of the user registers */ - user0 = getreg32(LM_FLASH_USERREG0); - user1 = getreg32(LM_FLASH_USERREG1); + user0 = getreg32(TIVA_FLASH_USERREG0); + user1 = getreg32(TIVA_FLASH_USERREG1); nlldbg("user: %06x:%06x\n", user1 & 0x00ffffff, user0 & 0x00ffffff); DEBUGASSERT(user0 != 0xffffffff && user1 != 0xffffffff); diff --git a/nuttx/configs/lm3s6965-ek/README.txt b/nuttx/configs/lm3s6965-ek/README.txt index 0dbeda7bd..e3824bb83 100644 --- a/nuttx/configs/lm3s6965-ek/README.txt +++ b/nuttx/configs/lm3s6965-ek/README.txt @@ -495,15 +495,15 @@ Stellaris LM3S6965 Evaluation Kit Configuration Options Additional interrupt support can be disabled if desired to reduce memory footprint. - CONFIG_LM_DISABLE_GPIOA_IRQS=n - CONFIG_LM_DISABLE_GPIOB_IRQS=n - CONFIG_LM_DISABLE_GPIOC_IRQS=n - CONFIG_LM_DISABLE_GPIOD_IRQS=n - CONFIG_LM_DISABLE_GPIOE_IRQS=n - CONFIG_LM_DISABLE_GPIOF_IRQS=n - CONFIG_LM_DISABLE_GPIOG_IRQS=n - CONFIG_LM_DISABLE_GPIOH_IRQS=n - CONFIG_LM_DISABLE_GPIOJ_IRQS=y + CONFIG_TIVA_DISABLE_GPIOA_IRQS=n + CONFIG_TIVA_DISABLE_GPIOB_IRQS=n + CONFIG_TIVA_DISABLE_GPIOC_IRQS=n + CONFIG_TIVA_DISABLE_GPIOD_IRQS=n + CONFIG_TIVA_DISABLE_GPIOE_IRQS=n + CONFIG_TIVA_DISABLE_GPIOF_IRQS=n + CONFIG_TIVA_DISABLE_GPIOG_IRQS=n + CONFIG_TIVA_DISABLE_GPIOH_IRQS=n + CONFIG_TIVA_DISABLE_GPIOJ_IRQS=y LM3S6965 specific device driver settings @@ -528,18 +528,18 @@ Stellaris LM3S6965 Evaluation Kit Configuration Options value is large, then larger values of this setting may cause Rx FIFO overrun errors. Default: half of the Tx FIFO size (4). - CONFIG_LM_ETHERNET - This must be set (along with CONFIG_NET) + CONFIG_TIVA_ETHERNET - This must be set (along with CONFIG_NET) to build the Stellaris Ethernet driver - CONFIG_LM_ETHLEDS - Enable to use Ethernet LEDs on the board. - CONFIG_LM_BOARDMAC - If the board-specific logic can provide + CONFIG_TIVA_ETHLEDS - Enable to use Ethernet LEDs on the board. + CONFIG_TIVA_BOARDMAC - If the board-specific logic can provide a MAC address (via tiva_ethernetmac()), then this should be selected. - CONFIG_LM_ETHHDUPLEX - Set to force half duplex operation - CONFIG_LM_ETHNOAUTOCRC - Set to suppress auto-CRC generation - CONFIG_LM_ETHNOPAD - Set to suppress Tx padding - CONFIG_LM_MULTICAST - Set to enable multicast frames - CONFIG_LM_PROMISCUOUS - Set to enable promiscuous mode - CONFIG_LM_BADCRC - Set to enable bad CRC rejection. - CONFIG_LM_DUMPPACKET - Dump each packet received/sent to the console. + CONFIG_TIVA_ETHHDUPLEX - Set to force half duplex operation + CONFIG_TIVA_ETHNOAUTOCRC - Set to suppress auto-CRC generation + CONFIG_TIVA_ETHNOPAD - Set to suppress Tx padding + CONFIG_TIVA_MULTICAST - Set to enable multicast frames + CONFIG_TIVA_PROMISCUOUS - Set to enable promiscuous mode + CONFIG_TIVA_BADCRC - Set to enable bad CRC rejection. + CONFIG_TIVA_DUMPPACKET - Dump each packet received/sent to the console. Configurations ^^^^^^^^^^^^^^ diff --git a/nuttx/configs/lm3s6965-ek/discover/defconfig b/nuttx/configs/lm3s6965-ek/discover/defconfig index acea959bf..5d859ccb1 100644 --- a/nuttx/configs/lm3s6965-ek/discover/defconfig +++ b/nuttx/configs/lm3s6965-ek/discover/defconfig @@ -104,38 +104,38 @@ CONFIG_ARCH_CHIP_LM3S6965=y # # Select Stellaris Peripheral Support # -CONFIG_LM_UART0=y -# CONFIG_LM_UART1 is not set +CONFIG_TIVA_UART0=y +# CONFIG_TIVA_UART1 is not set # CONFIG_SSI0_DISABLE is not set CONFIG_SSI1_DISABLE=y -# CONFIG_LM_UART2 is not set -CONFIG_LM_ETHERNET=y +# CONFIG_TIVA_UART2 is not set +CONFIG_TIVA_ETHERNET=y # # Disable GPIO Interrupts # -# CONFIG_LM_DISABLE_GPIOA_IRQS is not set -# CONFIG_LM_DISABLE_GPIOB_IRQS is not set -# CONFIG_LM_DISABLE_GPIOC_IRQS is not set -# CONFIG_LM_DISABLE_GPIOD_IRQS is not set -# CONFIG_LM_DISABLE_GPIOE_IRQS is not set -# CONFIG_LM_DISABLE_GPIOF_IRQS is not set -# CONFIG_LM_DISABLE_GPIOG_IRQS is not set -CONFIG_LM_DISABLE_GPIOH_IRQS=y -CONFIG_LM_DISABLE_GPIOJ_IRQS=y +# CONFIG_TIVA_DISABLE_GPIOA_IRQS is not set +# CONFIG_TIVA_DISABLE_GPIOB_IRQS is not set +# CONFIG_TIVA_DISABLE_GPIOC_IRQS is not set +# CONFIG_TIVA_DISABLE_GPIOD_IRQS is not set +# CONFIG_TIVA_DISABLE_GPIOE_IRQS is not set +# CONFIG_TIVA_DISABLE_GPIOF_IRQS is not set +# CONFIG_TIVA_DISABLE_GPIOG_IRQS is not set +CONFIG_TIVA_DISABLE_GPIOH_IRQS=y +CONFIG_TIVA_DISABLE_GPIOJ_IRQS=y # # Stellaris Ethernet Configuration # -# CONFIG_LM_ETHLEDS is not set -# CONFIG_LM_BOARDMAC is not set -# CONFIG_LM_ETHHDUPLEX is not set -# CONFIG_LM_ETHNOAUTOCRC is not set -# CONFIG_LM_ETHNOPAD is not set -# CONFIG_LM_MULTICAST is not set -# CONFIG_LM_PROMISCUOUS is not set -# CONFIG_LM_TIMESTAMP is not set -# CONFIG_LM_BADCRC is not set +# CONFIG_TIVA_ETHLEDS is not set +# CONFIG_TIVA_BOARDMAC is not set +# CONFIG_TIVA_ETHHDUPLEX is not set +# CONFIG_TIVA_ETHNOAUTOCRC is not set +# CONFIG_TIVA_ETHNOPAD is not set +# CONFIG_TIVA_MULTICAST is not set +# CONFIG_TIVA_PROMISCUOUS is not set +# CONFIG_TIVA_TIMESTAMP is not set +# CONFIG_TIVA_BADCRC is not set # CONFIG_M3S_DUMPPACKET is not set # diff --git a/nuttx/configs/lm3s6965-ek/include/board.h b/nuttx/configs/lm3s6965-ek/include/board.h index ce88604bc..fdbc0dd10 100644 --- a/nuttx/configs/lm3s6965-ek/include/board.h +++ b/nuttx/configs/lm3s6965-ek/include/board.h @@ -63,7 +63,7 @@ * of (400 / 2) / 4 = 50MHz */ -#define LM_SYSDIV 4 +#define TIVA_SYSDIV 4 #define SYSCLK_FREQUENCY 50000000 /* 50MHz */ /* Other RCC settings: @@ -74,7 +74,7 @@ * - No auto-clock gating reset */ -#define LM_RCC_VALUE (SYSCON_RCC_OSCSRC | SYSCON_RCC_XTAL | SYSCON_RCC_USESYSDIV | SYSCON_RCC_SYSDIV(LM_SYSDIV)) +#define TIVA_RCC_VALUE (SYSCON_RCC_OSCSRC | SYSCON_RCC_XTAL | SYSCON_RCC_USESYSDIV | SYSCON_RCC_SYSDIV(TIVA_SYSDIV)) /* RCC2 settings -- RCC2 not used. Other RCC2 settings * @@ -83,7 +83,7 @@ * - Not using RCC2 */ -#define LM_RCC2_VALUE (SYSCON_RCC2_OSCSRC | SYSCON_RCC2_SYSDIV(LM_SYSDIV)) +#define TIVA_RCC2_VALUE (SYSCON_RCC2_OSCSRC | SYSCON_RCC2_SYSDIV(TIVA_SYSDIV)) /* LED definitions ******************************************************************/ @@ -128,12 +128,12 @@ void tiva_boardinitialize(void); * * Description: * For the Ethernet Eval Kits, the MAC address will be stored in the non-volatile - * USER0 and USER1 registers. If CONFIG_LM_BOARDMAC is defined, this function + * USER0 and USER1 registers. If CONFIG_TIVA_BOARDMAC is defined, this function * will obtain the MAC address from these registers. * ************************************************************************************/ -#ifdef CONFIG_LM_BOARDMAC +#ifdef CONFIG_TIVA_BOARDMAC struct ether_addr; void tiva_ethernetmac(struct ether_addr *ethaddr); #endif diff --git a/nuttx/configs/lm3s6965-ek/nsh/defconfig b/nuttx/configs/lm3s6965-ek/nsh/defconfig index acea959bf..5d859ccb1 100644 --- a/nuttx/configs/lm3s6965-ek/nsh/defconfig +++ b/nuttx/configs/lm3s6965-ek/nsh/defconfig @@ -104,38 +104,38 @@ CONFIG_ARCH_CHIP_LM3S6965=y # # Select Stellaris Peripheral Support # -CONFIG_LM_UART0=y -# CONFIG_LM_UART1 is not set +CONFIG_TIVA_UART0=y +# CONFIG_TIVA_UART1 is not set # CONFIG_SSI0_DISABLE is not set CONFIG_SSI1_DISABLE=y -# CONFIG_LM_UART2 is not set -CONFIG_LM_ETHERNET=y +# CONFIG_TIVA_UART2 is not set +CONFIG_TIVA_ETHERNET=y # # Disable GPIO Interrupts # -# CONFIG_LM_DISABLE_GPIOA_IRQS is not set -# CONFIG_LM_DISABLE_GPIOB_IRQS is not set -# CONFIG_LM_DISABLE_GPIOC_IRQS is not set -# CONFIG_LM_DISABLE_GPIOD_IRQS is not set -# CONFIG_LM_DISABLE_GPIOE_IRQS is not set -# CONFIG_LM_DISABLE_GPIOF_IRQS is not set -# CONFIG_LM_DISABLE_GPIOG_IRQS is not set -CONFIG_LM_DISABLE_GPIOH_IRQS=y -CONFIG_LM_DISABLE_GPIOJ_IRQS=y +# CONFIG_TIVA_DISABLE_GPIOA_IRQS is not set +# CONFIG_TIVA_DISABLE_GPIOB_IRQS is not set +# CONFIG_TIVA_DISABLE_GPIOC_IRQS is not set +# CONFIG_TIVA_DISABLE_GPIOD_IRQS is not set +# CONFIG_TIVA_DISABLE_GPIOE_IRQS is not set +# CONFIG_TIVA_DISABLE_GPIOF_IRQS is not set +# CONFIG_TIVA_DISABLE_GPIOG_IRQS is not set +CONFIG_TIVA_DISABLE_GPIOH_IRQS=y +CONFIG_TIVA_DISABLE_GPIOJ_IRQS=y # # Stellaris Ethernet Configuration # -# CONFIG_LM_ETHLEDS is not set -# CONFIG_LM_BOARDMAC is not set -# CONFIG_LM_ETHHDUPLEX is not set -# CONFIG_LM_ETHNOAUTOCRC is not set -# CONFIG_LM_ETHNOPAD is not set -# CONFIG_LM_MULTICAST is not set -# CONFIG_LM_PROMISCUOUS is not set -# CONFIG_LM_TIMESTAMP is not set -# CONFIG_LM_BADCRC is not set +# CONFIG_TIVA_ETHLEDS is not set +# CONFIG_TIVA_BOARDMAC is not set +# CONFIG_TIVA_ETHHDUPLEX is not set +# CONFIG_TIVA_ETHNOAUTOCRC is not set +# CONFIG_TIVA_ETHNOPAD is not set +# CONFIG_TIVA_MULTICAST is not set +# CONFIG_TIVA_PROMISCUOUS is not set +# CONFIG_TIVA_TIMESTAMP is not set +# CONFIG_TIVA_BADCRC is not set # CONFIG_M3S_DUMPPACKET is not set # diff --git a/nuttx/configs/lm3s6965-ek/nx/defconfig b/nuttx/configs/lm3s6965-ek/nx/defconfig index 216683df0..31d2c7e6c 100644 --- a/nuttx/configs/lm3s6965-ek/nx/defconfig +++ b/nuttx/configs/lm3s6965-ek/nx/defconfig @@ -104,25 +104,25 @@ CONFIG_ARCH_CHIP_LM3S6965=y # # Select Stellaris Peripheral Support # -CONFIG_LM_UART0=y -# CONFIG_LM_UART1 is not set +CONFIG_TIVA_UART0=y +# CONFIG_TIVA_UART1 is not set # CONFIG_SSI0_DISABLE is not set CONFIG_SSI1_DISABLE=y -# CONFIG_LM_UART2 is not set -# CONFIG_LM_ETHERNET is not set +# CONFIG_TIVA_UART2 is not set +# CONFIG_TIVA_ETHERNET is not set # # Disable GPIO Interrupts # -# CONFIG_LM_DISABLE_GPIOA_IRQS is not set -# CONFIG_LM_DISABLE_GPIOB_IRQS is not set -# CONFIG_LM_DISABLE_GPIOC_IRQS is not set -# CONFIG_LM_DISABLE_GPIOD_IRQS is not set -# CONFIG_LM_DISABLE_GPIOE_IRQS is not set -# CONFIG_LM_DISABLE_GPIOF_IRQS is not set -# CONFIG_LM_DISABLE_GPIOG_IRQS is not set -CONFIG_LM_DISABLE_GPIOH_IRQS=y -CONFIG_LM_DISABLE_GPIOJ_IRQS=y +# CONFIG_TIVA_DISABLE_GPIOA_IRQS is not set +# CONFIG_TIVA_DISABLE_GPIOB_IRQS is not set +# CONFIG_TIVA_DISABLE_GPIOC_IRQS is not set +# CONFIG_TIVA_DISABLE_GPIOD_IRQS is not set +# CONFIG_TIVA_DISABLE_GPIOE_IRQS is not set +# CONFIG_TIVA_DISABLE_GPIOF_IRQS is not set +# CONFIG_TIVA_DISABLE_GPIOG_IRQS is not set +CONFIG_TIVA_DISABLE_GPIOH_IRQS=y +CONFIG_TIVA_DISABLE_GPIOJ_IRQS=y # # Stellaris SSI Configuration diff --git a/nuttx/configs/lm3s6965-ek/src/lm3s6965ek_internal.h b/nuttx/configs/lm3s6965-ek/src/lm3s6965ek_internal.h index 4b834238e..061645c8c 100644 --- a/nuttx/configs/lm3s6965-ek/src/lm3s6965ek_internal.h +++ b/nuttx/configs/lm3s6965-ek/src/lm3s6965ek_internal.h @@ -56,12 +56,12 @@ * expanded). */ -#if LM_NSSI == 0 +#if TIVA_NSSI == 0 # undef CONFIG_SSI0_DISABLE # define CONFIG_SSI0_DISABLE 1 # undef CONFIG_SSI1_DISABLE # define CONFIG_SSI1_DISABLE 1 -#elif LM_NSSI == 1 +#elif TIVA_NSSI == 1 # undef CONFIG_SSI1_DISABLE # define CONFIG_SSI1_DISABLE 1 #endif diff --git a/nuttx/configs/lm3s6965-ek/src/up_ethernet.c b/nuttx/configs/lm3s6965-ek/src/up_ethernet.c index 0d064e7d6..4ae9ef0e9 100644 --- a/nuttx/configs/lm3s6965-ek/src/up_ethernet.c +++ b/nuttx/configs/lm3s6965-ek/src/up_ethernet.c @@ -67,12 +67,12 @@ * * Description: * For the Ethernet Eval Kits, the MAC address will be stored in the non-volatile - * USER0 and USER1 registers. If CONFIG_LM_BOARDMAC is defined, this function + * USER0 and USER1 registers. If CONFIG_TIVA_BOARDMAC is defined, this function * will obtain the MAC address from these registers. * ************************************************************************************/ -#ifdef CONFIG_LM_BOARDMAC +#ifdef CONFIG_TIVA_BOARDMAC void tiva_ethernetmac(struct ether_addr *ethaddr) { uint32_t user0; @@ -80,8 +80,8 @@ void tiva_ethernetmac(struct ether_addr *ethaddr) /* Get the current value of the user registers */ - user0 = getreg32(LM_FLASH_USERREG0); - user1 = getreg32(LM_FLASH_USERREG1); + user0 = getreg32(TIVA_FLASH_USERREG0); + user1 = getreg32(TIVA_FLASH_USERREG1); nlldbg("user: %06x:%06x\n", user1 & 0x00ffffff, user0 & 0x00ffffff); DEBUGASSERT(user0 != 0xffffffff && user1 != 0xffffffff); diff --git a/nuttx/configs/lm3s6965-ek/tcpecho/defconfig b/nuttx/configs/lm3s6965-ek/tcpecho/defconfig index a59251a3e..3fec14651 100644 --- a/nuttx/configs/lm3s6965-ek/tcpecho/defconfig +++ b/nuttx/configs/lm3s6965-ek/tcpecho/defconfig @@ -126,39 +126,39 @@ CONFIG_ARCH_CHIP_LM3S=y # # Stellaris Peripheral Support # -CONFIG_LM_UART0=y -# CONFIG_LM_UART1 is not set -# CONFIG_LM_UART2 is not set +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_LM_ETHERNET=y -# CONFIG_LM_FLASH is not set +CONFIG_TIVA_ETHERNET=y +# CONFIG_TIVA_FLASH is not set # # Disable GPIO Interrupts # -# CONFIG_LM_DISABLE_GPIOA_IRQS is not set -# CONFIG_LM_DISABLE_GPIOB_IRQS is not set -# CONFIG_LM_DISABLE_GPIOC_IRQS is not set -# CONFIG_LM_DISABLE_GPIOD_IRQS is not set -# CONFIG_LM_DISABLE_GPIOE_IRQS is not set -# CONFIG_LM_DISABLE_GPIOF_IRQS is not set -# CONFIG_LM_DISABLE_GPIOG_IRQS is not set -CONFIG_LM_DISABLE_GPIOH_IRQS=y -CONFIG_LM_DISABLE_GPIOJ_IRQS=y +# CONFIG_TIVA_DISABLE_GPIOA_IRQS is not set +# CONFIG_TIVA_DISABLE_GPIOB_IRQS is not set +# CONFIG_TIVA_DISABLE_GPIOC_IRQS is not set +# CONFIG_TIVA_DISABLE_GPIOD_IRQS is not set +# CONFIG_TIVA_DISABLE_GPIOE_IRQS is not set +# CONFIG_TIVA_DISABLE_GPIOF_IRQS is not set +# CONFIG_TIVA_DISABLE_GPIOG_IRQS is not set +CONFIG_TIVA_DISABLE_GPIOH_IRQS=y +CONFIG_TIVA_DISABLE_GPIOJ_IRQS=y # # Stellaris Ethernet Configuration # -# CONFIG_LM_ETHLEDS is not set -# CONFIG_LM_BOARDMAC is not set -# CONFIG_LM_ETHHDUPLEX is not set -# CONFIG_LM_ETHNOAUTOCRC is not set -# CONFIG_LM_ETHNOPAD is not set -# CONFIG_LM_MULTICAST is not set -# CONFIG_LM_PROMISCUOUS is not set -# CONFIG_LM_TIMESTAMP is not set -# CONFIG_LM_BADCRC is not set +# CONFIG_TIVA_ETHLEDS is not set +# CONFIG_TIVA_BOARDMAC is not set +# CONFIG_TIVA_ETHHDUPLEX is not set +# CONFIG_TIVA_ETHNOAUTOCRC is not set +# CONFIG_TIVA_ETHNOPAD is not set +# CONFIG_TIVA_MULTICAST is not set +# CONFIG_TIVA_PROMISCUOUS is not set +# CONFIG_TIVA_TIMESTAMP is not set +# CONFIG_TIVA_BADCRC is not set # CONFIG_M3S_DUMPPACKET is not set # diff --git a/nuttx/configs/lm3s8962-ek/README.txt b/nuttx/configs/lm3s8962-ek/README.txt index 1081f604d..fd25170cc 100644 --- a/nuttx/configs/lm3s8962-ek/README.txt +++ b/nuttx/configs/lm3s8962-ek/README.txt @@ -399,15 +399,15 @@ Stellaris LM3S8962 Evaluation Kit Configuration Options Additional interrupt support can be disabled if desired to reduce memory footprint. - CONFIG_LM_DISABLE_GPIOA_IRQS=n - CONFIG_LM_DISABLE_GPIOB_IRQS=n - CONFIG_LM_DISABLE_GPIOC_IRQS=n - CONFIG_LM_DISABLE_GPIOD_IRQS=n - CONFIG_LM_DISABLE_GPIOE_IRQS=n - CONFIG_LM_DISABLE_GPIOF_IRQS=n - CONFIG_LM_DISABLE_GPIOG_IRQS=n - CONFIG_LM_DISABLE_GPIOH_IRQS=n - CONFIG_LM_DISABLE_GPIOJ_IRQS=y + CONFIG_TIVA_DISABLE_GPIOA_IRQS=n + CONFIG_TIVA_DISABLE_GPIOB_IRQS=n + CONFIG_TIVA_DISABLE_GPIOC_IRQS=n + CONFIG_TIVA_DISABLE_GPIOD_IRQS=n + CONFIG_TIVA_DISABLE_GPIOE_IRQS=n + CONFIG_TIVA_DISABLE_GPIOF_IRQS=n + CONFIG_TIVA_DISABLE_GPIOG_IRQS=n + CONFIG_TIVA_DISABLE_GPIOH_IRQS=n + CONFIG_TIVA_DISABLE_GPIOJ_IRQS=y LM3S8962 specific device driver settings @@ -432,18 +432,18 @@ Stellaris LM3S8962 Evaluation Kit Configuration Options value is large, then larger values of this setting may cause Rx FIFO overrun errors. Default: half of the Tx FIFO size (4). - CONFIG_LM_ETHERNET - This must be set (along with CONFIG_NET) + CONFIG_TIVA_ETHERNET - This must be set (along with CONFIG_NET) to build the Stellaris Ethernet driver - CONFIG_LM_ETHLEDS - Enable to use Ethernet LEDs on the board. - CONFIG_LM_BOARDMAC - If the board-specific logic can provide + CONFIG_TIVA_ETHLEDS - Enable to use Ethernet LEDs on the board. + CONFIG_TIVA_BOARDMAC - If the board-specific logic can provide a MAC address (via tiva_ethernetmac()), then this should be selected. - CONFIG_LM_ETHHDUPLEX - Set to force half duplex operation - CONFIG_LM_ETHNOAUTOCRC - Set to suppress auto-CRC generation - CONFIG_LM_ETHNOPAD - Set to suppress Tx padding - CONFIG_LM_MULTICAST - Set to enable multicast frames - CONFIG_LM_PROMISCUOUS - Set to enable promiscuous mode - CONFIG_LM_BADCRC - Set to enable bad CRC rejection. - CONFIG_LM_DUMPPACKET - Dump each packet received/sent to the console. + CONFIG_TIVA_ETHHDUPLEX - Set to force half duplex operation + CONFIG_TIVA_ETHNOAUTOCRC - Set to suppress auto-CRC generation + CONFIG_TIVA_ETHNOPAD - Set to suppress Tx padding + CONFIG_TIVA_MULTICAST - Set to enable multicast frames + CONFIG_TIVA_PROMISCUOUS - Set to enable promiscuous mode + CONFIG_TIVA_BADCRC - Set to enable bad CRC rejection. + CONFIG_TIVA_DUMPPACKET - Dump each packet received/sent to the console. Configurations ^^^^^^^^^^^^^^ diff --git a/nuttx/configs/lm3s8962-ek/include/board.h b/nuttx/configs/lm3s8962-ek/include/board.h index a3a0520d6..180e44dd3 100644 --- a/nuttx/configs/lm3s8962-ek/include/board.h +++ b/nuttx/configs/lm3s8962-ek/include/board.h @@ -63,7 +63,7 @@ * of (400 / 2) / 4 = 50MHz */ -#define LM_SYSDIV 4 +#define TIVA_SYSDIV 4 #define SYSCLK_FREQUENCY 50000000 /* 50MHz */ /* Other RCC settings: @@ -74,7 +74,7 @@ * - No auto-clock gating reset */ -#define LM_RCC_VALUE (SYSCON_RCC_OSCSRC | SYSCON_RCC_XTAL | SYSCON_RCC_USESYSDIV | SYSCON_RCC_SYSDIV(LM_SYSDIV)) +#define TIVA_RCC_VALUE (SYSCON_RCC_OSCSRC | SYSCON_RCC_XTAL | SYSCON_RCC_USESYSDIV | SYSCON_RCC_SYSDIV(TIVA_SYSDIV)) /* RCC2 settings -- RCC2 not used. Other RCC2 settings * @@ -83,7 +83,7 @@ * - Not using RCC2 */ -#define LM_RCC2_VALUE (SYSCON_RCC2_OSCSRC | SYSCON_RCC2_SYSDIV(LM_SYSDIV)) +#define TIVA_RCC2_VALUE (SYSCON_RCC2_OSCSRC | SYSCON_RCC2_SYSDIV(TIVA_SYSDIV)) /* LED definitions ******************************************************************/ @@ -128,12 +128,12 @@ void tiva_boardinitialize(void); * * Description: * For the Ethernet Eval Kits, the MAC address will be stored in the non-volatile - * USER0 and USER1 registers. If CONFIG_LM_BOARDMAC is defined, this function + * USER0 and USER1 registers. If CONFIG_TIVA_BOARDMAC is defined, this function * will obtain the MAC address from these registers. * ************************************************************************************/ -#ifdef CONFIG_LM_BOARDMAC +#ifdef CONFIG_TIVA_BOARDMAC struct ether_addr; void tiva_ethernetmac(struct ether_addr *ethaddr); #endif diff --git a/nuttx/configs/lm3s8962-ek/nsh/defconfig b/nuttx/configs/lm3s8962-ek/nsh/defconfig index 5e50cb404..72bbdec76 100644 --- a/nuttx/configs/lm3s8962-ek/nsh/defconfig +++ b/nuttx/configs/lm3s8962-ek/nsh/defconfig @@ -34,6 +34,7 @@ CONFIG_RAW_BINARY=y # # Customize Header Files # +# CONFIG_ARCH_STDINT_H is not set # CONFIG_ARCH_STDBOOL_H is not set # CONFIG_ARCH_MATH_H is not set # CONFIG_ARCH_FLOAT_H is not set @@ -78,6 +79,7 @@ CONFIG_ARCH="arm" # CONFIG_ARCH_CHIP_KINETIS is not set # CONFIG_ARCH_CHIP_KL is not set CONFIG_ARCH_CHIP_LM=y +# CONFIG_ARCH_CHIP_TIVA is not set # CONFIG_ARCH_CHIP_LPC17XX is not set # CONFIG_ARCH_CHIP_LPC214X is not set # CONFIG_ARCH_CHIP_LPC2378 is not set @@ -103,7 +105,8 @@ CONFIG_ARCH_CHIP="tiva" CONFIG_ARCH_HAVE_CMNVECTOR=y # CONFIG_ARMV7M_CMNVECTOR is not set # CONFIG_ARCH_HAVE_FPU is not set -# CONFIG_ARCH_HAVE_MPU is not set +CONFIG_ARCH_HAVE_MPU=y +# CONFIG_ARMV7M_MPU is not set # # ARMV7M Configuration Options @@ -119,7 +122,7 @@ CONFIG_ARMV7M_TOOLCHAIN_BUILDROOT=y # CONFIG_ARMV7M_OABI_TOOLCHAIN is not set # -# Stellaris Configuration Options +# Tiva/Stellaris Configuration Options # # CONFIG_ARCH_CHIP_LM3S6918 is not set # CONFIG_ARCH_CHIP_LM3S9B96 is not set @@ -131,45 +134,45 @@ CONFIG_ARCH_CHIP_LM3S=y # CONFIG_LM_REVA2 is not set # -# Stellaris Peripheral Support +# Tiva/Stellaris Peripheral Support # -CONFIG_LM_UART0=y -# CONFIG_LM_UART1 is not set -# CONFIG_LM_UART2 is not set +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_LM_ETHERNET=y -# CONFIG_LM_FLASH is not set +CONFIG_TIVA_ETHERNET=y +# CONFIG_TIVA_FLASH is not set # # Disable GPIO Interrupts # -# CONFIG_LM_DISABLE_GPIOA_IRQS is not set -# CONFIG_LM_DISABLE_GPIOB_IRQS is not set -# CONFIG_LM_DISABLE_GPIOC_IRQS is not set -# CONFIG_LM_DISABLE_GPIOD_IRQS is not set -# CONFIG_LM_DISABLE_GPIOE_IRQS is not set -# CONFIG_LM_DISABLE_GPIOF_IRQS is not set -# CONFIG_LM_DISABLE_GPIOG_IRQS is not set -CONFIG_LM_DISABLE_GPIOH_IRQS=y -CONFIG_LM_DISABLE_GPIOJ_IRQS=y - -# -# Stellaris Ethernet Configuration -# -# CONFIG_LM_ETHLEDS is not set -# CONFIG_LM_BOARDMAC is not set -# CONFIG_LM_ETHHDUPLEX is not set -# CONFIG_LM_ETHNOAUTOCRC is not set -# CONFIG_LM_ETHNOPAD is not set -# CONFIG_LM_MULTICAST is not set -# CONFIG_LM_PROMISCUOUS is not set -# CONFIG_LM_TIMESTAMP is not set -# CONFIG_LM_BADCRC is not set +# CONFIG_TIVA_DISABLE_GPIOA_IRQS is not set +# CONFIG_TIVA_DISABLE_GPIOB_IRQS is not set +# CONFIG_TIVA_DISABLE_GPIOC_IRQS is not set +# CONFIG_TIVA_DISABLE_GPIOD_IRQS is not set +# CONFIG_TIVA_DISABLE_GPIOE_IRQS is not set +# CONFIG_TIVA_DISABLE_GPIOF_IRQS is not set +# CONFIG_TIVA_DISABLE_GPIOG_IRQS is not set +CONFIG_TIVA_DISABLE_GPIOH_IRQS=y +CONFIG_TIVA_DISABLE_GPIOJ_IRQS=y + +# +# Tiva/Stellaris Ethernet Configuration +# +# CONFIG_TIVA_ETHLEDS is not set +# CONFIG_TIVA_BOARDMAC is not set +# CONFIG_TIVA_ETHHDUPLEX is not set +# CONFIG_TIVA_ETHNOAUTOCRC is not set +# CONFIG_TIVA_ETHNOPAD is not set +# CONFIG_TIVA_MULTICAST is not set +# CONFIG_TIVA_PROMISCUOUS is not set +# CONFIG_TIVA_TIMESTAMP is not set +# CONFIG_TIVA_BADCRC is not set # CONFIG_M3S_DUMPPACKET is not set # -# Stellaris SSI Configuration +# Tiva/Stellaris SSI Configuration # CONFIG_SSI_POLLWAIT=y CONFIG_SSI_TXLIMIT=4 @@ -190,6 +193,7 @@ CONFIG_ARCH_HAVE_VFORK=y CONFIG_ARCH_IRQPRIO=y CONFIG_ARCH_STACKDUMP=y # CONFIG_ENDIAN_BIG is not set +# CONFIG_ARCH_IDLE_CUSTOM is not set # CONFIG_ARCH_HAVE_RAMFUNCS is not set CONFIG_ARCH_HAVE_RAMVECTORS=y # CONFIG_ARCH_RAMVECTORS is not set @@ -371,7 +375,27 @@ CONFIG_NETDEVICES=y CONFIG_SERIAL=y # CONFIG_DEV_LOWCONSOLE is not set # CONFIG_16550_UART is not set +# CONFIG_ARCH_HAVE_UART is not set CONFIG_ARCH_HAVE_UART0=y +# CONFIG_ARCH_HAVE_UART1 is not set +# CONFIG_ARCH_HAVE_UART2 is not set +# CONFIG_ARCH_HAVE_UART3 is not set +# CONFIG_ARCH_HAVE_UART4 is not set +# CONFIG_ARCH_HAVE_UART5 is not set +# CONFIG_ARCH_HAVE_UART6 is not set +# CONFIG_ARCH_HAVE_UART7 is not set +# CONFIG_ARCH_HAVE_UART8 is not set +# CONFIG_ARCH_HAVE_SCI0 is not set +# CONFIG_ARCH_HAVE_SCI1 is not set +# CONFIG_ARCH_HAVE_USART0 is not set +# CONFIG_ARCH_HAVE_USART1 is not set +# CONFIG_ARCH_HAVE_USART2 is not set +# CONFIG_ARCH_HAVE_USART3 is not set +# CONFIG_ARCH_HAVE_USART4 is not set +# CONFIG_ARCH_HAVE_USART5 is not set +# CONFIG_ARCH_HAVE_USART6 is not set +# CONFIG_ARCH_HAVE_USART7 is not set +# CONFIG_ARCH_HAVE_USART8 is not set # # USART Configuration diff --git a/nuttx/configs/lm3s8962-ek/nsh/setenv.sh b/nuttx/configs/lm3s8962-ek/nsh/setenv.sh index 1db7f8ee2..e9aa7ca32 100755 --- a/nuttx/configs/lm3s8962-ek/nsh/setenv.sh +++ b/nuttx/configs/lm3s8962-ek/nsh/setenv.sh @@ -50,7 +50,8 @@ fi # This is the Cygwin path to the location where I installed the CodeSourcery # toolchain under windows. You will also have to edit this if you install # the CodeSourcery toolchain in any other location -# export TOOLCHAIN_BIN="/cygdrive/c/Program Files (x86)/CodeSourcery/Sourcery G++ Lite/bin" +#export TOOLCHAIN_BIN="/cygdrive/c/Program Files (x86)/CodeSourcery/Sourcery G++ Lite/bin" +#export TOOLCHAIN_BIN="/cygdrive/c/Program Files (x86)/CodeSourcery/Sourcery_CodeBench_Lite_for_ARM_EABI/bin" # This is the Cygwin path to the location where I build the buildroot # toolchain. diff --git a/nuttx/configs/lm3s8962-ek/nx/defconfig b/nuttx/configs/lm3s8962-ek/nx/defconfig index d37e4aa9d..0de126d3b 100644 --- a/nuttx/configs/lm3s8962-ek/nx/defconfig +++ b/nuttx/configs/lm3s8962-ek/nx/defconfig @@ -133,26 +133,26 @@ CONFIG_ARCH_CHIP_LM3S=y # # Stellaris Peripheral Support # -CONFIG_LM_UART0=y -# CONFIG_LM_UART1 is not set -# CONFIG_LM_UART2 is not set +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_LM_ETHERNET is not set -# CONFIG_LM_FLASH is not set +# CONFIG_TIVA_ETHERNET is not set +# CONFIG_TIVA_FLASH is not set # # Disable GPIO Interrupts # -# CONFIG_LM_DISABLE_GPIOA_IRQS is not set -# CONFIG_LM_DISABLE_GPIOB_IRQS is not set -# CONFIG_LM_DISABLE_GPIOC_IRQS is not set -# CONFIG_LM_DISABLE_GPIOD_IRQS is not set -# CONFIG_LM_DISABLE_GPIOE_IRQS is not set -# CONFIG_LM_DISABLE_GPIOF_IRQS is not set -# CONFIG_LM_DISABLE_GPIOG_IRQS is not set -CONFIG_LM_DISABLE_GPIOH_IRQS=y -CONFIG_LM_DISABLE_GPIOJ_IRQS=y +# CONFIG_TIVA_DISABLE_GPIOA_IRQS is not set +# CONFIG_TIVA_DISABLE_GPIOB_IRQS is not set +# CONFIG_TIVA_DISABLE_GPIOC_IRQS is not set +# CONFIG_TIVA_DISABLE_GPIOD_IRQS is not set +# CONFIG_TIVA_DISABLE_GPIOE_IRQS is not set +# CONFIG_TIVA_DISABLE_GPIOF_IRQS is not set +# CONFIG_TIVA_DISABLE_GPIOG_IRQS is not set +CONFIG_TIVA_DISABLE_GPIOH_IRQS=y +CONFIG_TIVA_DISABLE_GPIOJ_IRQS=y # # Stellaris SSI Configuration diff --git a/nuttx/configs/lm3s8962-ek/src/lm3s8962ek_internal.h b/nuttx/configs/lm3s8962-ek/src/lm3s8962ek_internal.h index ece21e18c..675179458 100644 --- a/nuttx/configs/lm3s8962-ek/src/lm3s8962ek_internal.h +++ b/nuttx/configs/lm3s8962-ek/src/lm3s8962ek_internal.h @@ -56,12 +56,12 @@ * expanded). */ -#if LM_NSSI == 0 +#if TIVA_NSSI == 0 # undef CONFIG_SSI0_DISABLE # define CONFIG_SSI0_DISABLE 1 # undef CONFIG_SSI1_DISABLE # define CONFIG_SSI1_DISABLE 1 -#elif LM_NSSI == 1 +#elif TIVA_NSSI == 1 # undef CONFIG_SSI1_DISABLE # define CONFIG_SSI1_DISABLE 1 #endif diff --git a/nuttx/configs/lm3s8962-ek/src/up_ethernet.c b/nuttx/configs/lm3s8962-ek/src/up_ethernet.c index 487e4004a..bc20ea0f1 100644 --- a/nuttx/configs/lm3s8962-ek/src/up_ethernet.c +++ b/nuttx/configs/lm3s8962-ek/src/up_ethernet.c @@ -67,12 +67,12 @@ * * Description: * For the Ethernet Eval Kits, the MAC address will be stored in the non-volatile - * USER0 and USER1 registers. If CONFIG_LM_BOARDMAC is defined, this function + * USER0 and USER1 registers. If CONFIG_TIVA_BOARDMAC is defined, this function * will obtain the MAC address from these registers. * ************************************************************************************/ -#ifdef CONFIG_LM_BOARDMAC +#ifdef CONFIG_TIVA_BOARDMAC void tiva_ethernetmac(struct ether_addr *ethaddr) { uint32_t user0; @@ -80,8 +80,8 @@ void tiva_ethernetmac(struct ether_addr *ethaddr) /* Get the current value of the user registers */ - user0 = getreg32(LM_FLASH_USERREG0); - user1 = getreg32(LM_FLASH_USERREG1); + user0 = getreg32(TIVA_FLASH_USERREG0); + user1 = getreg32(TIVA_FLASH_USERREG1); nlldbg("user: %06x:%06x\n", user1 & 0x00ffffff, user0 & 0x00ffffff); DEBUGASSERT(user0 != 0xffffffff && user1 != 0xffffffff); diff --git a/nuttx/configs/lm4f120-launchpad/README.txt b/nuttx/configs/lm4f120-launchpad/README.txt index 274c9758b..17dd30851 100644 --- a/nuttx/configs/lm4f120-launchpad/README.txt +++ b/nuttx/configs/lm4f120-launchpad/README.txt @@ -626,15 +626,15 @@ LM4F120 LaunchPad Configuration Options Additional interrupt support can be disabled if desired to reduce memory footprint. - CONFIG_LM_DISABLE_GPIOA_IRQS=n - CONFIG_LM_DISABLE_GPIOB_IRQS=n - CONFIG_LM_DISABLE_GPIOC_IRQS=n - CONFIG_LM_DISABLE_GPIOD_IRQS=n - CONFIG_LM_DISABLE_GPIOE_IRQS=n - CONFIG_LM_DISABLE_GPIOF_IRQS=n - CONFIG_LM_DISABLE_GPIOG_IRQS=n - CONFIG_LM_DISABLE_GPIOH_IRQS=n - CONFIG_LM_DISABLE_GPIOJ_IRQS=y + CONFIG_TIVA_DISABLE_GPIOA_IRQS=n + CONFIG_TIVA_DISABLE_GPIOB_IRQS=n + CONFIG_TIVA_DISABLE_GPIOC_IRQS=n + CONFIG_TIVA_DISABLE_GPIOD_IRQS=n + CONFIG_TIVA_DISABLE_GPIOE_IRQS=n + CONFIG_TIVA_DISABLE_GPIOF_IRQS=n + CONFIG_TIVA_DISABLE_GPIOG_IRQS=n + CONFIG_TIVA_DISABLE_GPIOH_IRQS=n + CONFIG_TIVA_DISABLE_GPIOJ_IRQS=y LM4F120 specific device driver settings @@ -659,18 +659,18 @@ LM4F120 LaunchPad Configuration Options value is large, then larger values of this setting may cause Rx FIFO overrun errors. Default: half of the Tx FIFO size (4). - CONFIG_LM_ETHERNET - This must be set (along with CONFIG_NET) + CONFIG_TIVA_ETHERNET - This must be set (along with CONFIG_NET) to build the Stellaris Ethernet driver - CONFIG_LM_ETHLEDS - Enable to use Ethernet LEDs on the board. - CONFIG_LM_BOARDMAC - If the board-specific logic can provide + CONFIG_TIVA_ETHLEDS - Enable to use Ethernet LEDs on the board. + CONFIG_TIVA_BOARDMAC - If the board-specific logic can provide a MAC address (via tiva_ethernetmac()), then this should be selected. - CONFIG_LM_ETHHDUPLEX - Set to force half duplex operation - CONFIG_LM_ETHNOAUTOCRC - Set to suppress auto-CRC generation - CONFIG_LM_ETHNOPAD - Set to suppress Tx padding - CONFIG_LM_MULTICAST - Set to enable multicast frames - CONFIG_LM_PROMISCUOUS - Set to enable promiscuous mode - CONFIG_LM_BADCRC - Set to enable bad CRC rejection. - CONFIG_LM_DUMPPACKET - Dump each packet received/sent to the console. + CONFIG_TIVA_ETHHDUPLEX - Set to force half duplex operation + CONFIG_TIVA_ETHNOAUTOCRC - Set to suppress auto-CRC generation + CONFIG_TIVA_ETHNOPAD - Set to suppress Tx padding + CONFIG_TIVA_MULTICAST - Set to enable multicast frames + CONFIG_TIVA_PROMISCUOUS - Set to enable promiscuous mode + CONFIG_TIVA_BADCRC - Set to enable bad CRC rejection. + CONFIG_TIVA_DUMPPACKET - Dump each packet received/sent to the console. Configurations ^^^^^^^^^^^^^^ diff --git a/nuttx/configs/lm4f120-launchpad/include/board.h b/nuttx/configs/lm4f120-launchpad/include/board.h index 5d86c6ea9..d9008bb08 100644 --- a/nuttx/configs/lm4f120-launchpad/include/board.h +++ b/nuttx/configs/lm4f120-launchpad/include/board.h @@ -65,7 +65,7 @@ * of (400 / 1) / 5 = 80MHz (Using RCC2 and DIV400). */ -#define LM_SYSDIV 5 +#define TIVA_SYSDIV 5 #define SYSCLK_FREQUENCY 80000000 /* 80MHz */ /* Other RCC settings: @@ -76,8 +76,8 @@ * - No auto-clock gating reset */ -#define LM_RCC_VALUE (SYSCON_RCC_OSCSRC | SYSCON_RCC_XTAL | \ - SYSCON_RCC_USESYSDIV | SYSCON_RCC_SYSDIV(LM_SYSDIV)) +#define TIVA_RCC_VALUE (SYSCON_RCC_OSCSRC | SYSCON_RCC_XTAL | \ + SYSCON_RCC_USESYSDIV | SYSCON_RCC_SYSDIV(TIVA_SYSDIV)) /* RCC2 settings * @@ -98,13 +98,13 @@ * etc. */ -#if (LM_SYSDIV & 1) == 0 -# define LM_RCC2_VALUE (SYSCON_RCC2_OSCSRC | SYSCON_RCC2_SYSDIV2LSB | \ - SYSCON_RCC2_SYSDIV_DIV400(LM_SYSDIV) | \ - SYSCON_RCC2_DIV400 | SYSCON_RCC2_USERCC2) +#if (TIVA_SYSDIV & 1) == 0 +# define TIVA_RCC2_VALUE (SYSCON_RCC2_OSCSRC | SYSCON_RCC2_SYSDIV2LSB | \ + SYSCON_RCC2_SYSDIV_DIV400(TIVA_SYSDIV) | \ + SYSCON_RCC2_DIV400 | SYSCON_RCC2_USERCC2) #else -# define LM_RCC2_VALUE (SYSCON_RCC2_OSCSRC | SYSCON_RCC2_SYSDIV_DIV400(LM_SYSDIV) | \ - SYSCON_RCC2_DIV400 | SYSCON_RCC2_USERCC2) +# define TIVA_RCC2_VALUE (SYSCON_RCC2_OSCSRC | SYSCON_RCC2_SYSDIV_DIV400(TIVA_SYSDIV) | \ + SYSCON_RCC2_DIV400 | SYSCON_RCC2_USERCC2) #endif /* LED definitions ******************************************************************/ diff --git a/nuttx/configs/lm4f120-launchpad/nsh/defconfig b/nuttx/configs/lm4f120-launchpad/nsh/defconfig index 309ce5cb3..99f77fc10 100644 --- a/nuttx/configs/lm4f120-launchpad/nsh/defconfig +++ b/nuttx/configs/lm4f120-launchpad/nsh/defconfig @@ -129,31 +129,31 @@ CONFIG_ARCH_CHIP_LM4F=y # # Tiva/Stellaris Peripheral Support # -CONFIG_LM_UART0=y -# CONFIG_LM_UART1 is not set -# CONFIG_LM_UART2 is not set -# CONFIG_LM_UART3 is not set -# CONFIG_LM_UART4 is not set -# CONFIG_LM_UART5 is not set -# CONFIG_LM_UART6 is not set -# CONFIG_LM_UART7 is not set +CONFIG_TIVA_UART0=y +# CONFIG_TIVA_UART1 is not set +# CONFIG_TIVA_UART2 is not set +# CONFIG_TIVA_UART3 is not set +# CONFIG_TIVA_UART4 is not set +# 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_LM_ETHERNET is not set -# CONFIG_LM_FLASH is not set +# CONFIG_TIVA_ETHERNET is not set +# CONFIG_TIVA_FLASH is not set # # Disable GPIO Interrupts # -# CONFIG_LM_DISABLE_GPIOA_IRQS is not set -# CONFIG_LM_DISABLE_GPIOB_IRQS is not set -# CONFIG_LM_DISABLE_GPIOC_IRQS is not set -# CONFIG_LM_DISABLE_GPIOD_IRQS is not set -# CONFIG_LM_DISABLE_GPIOE_IRQS is not set -# CONFIG_LM_DISABLE_GPIOF_IRQS is not set -# CONFIG_LM_DISABLE_GPIOG_IRQS is not set -CONFIG_LM_DISABLE_GPIOH_IRQS=y -CONFIG_LM_DISABLE_GPIOJ_IRQS=y +# CONFIG_TIVA_DISABLE_GPIOA_IRQS is not set +# CONFIG_TIVA_DISABLE_GPIOB_IRQS is not set +# CONFIG_TIVA_DISABLE_GPIOC_IRQS is not set +# CONFIG_TIVA_DISABLE_GPIOD_IRQS is not set +# CONFIG_TIVA_DISABLE_GPIOE_IRQS is not set +# CONFIG_TIVA_DISABLE_GPIOF_IRQS is not set +# CONFIG_TIVA_DISABLE_GPIOG_IRQS is not set +CONFIG_TIVA_DISABLE_GPIOH_IRQS=y +CONFIG_TIVA_DISABLE_GPIOJ_IRQS=y # # Tiva/Stellaris SSI Configuration diff --git a/nuttx/configs/lm4f120-launchpad/src/lmf4120-launchpad.h b/nuttx/configs/lm4f120-launchpad/src/lmf4120-launchpad.h index 450fd8ea8..2024351c1 100644 --- a/nuttx/configs/lm4f120-launchpad/src/lmf4120-launchpad.h +++ b/nuttx/configs/lm4f120-launchpad/src/lmf4120-launchpad.h @@ -56,12 +56,12 @@ * expanded). */ -#if LM_NSSI < 1 +#if TIVA_NSSI < 1 # undef CONFIG_SSI0_DISABLE # define CONFIG_SSI0_DISABLE 1 # undef CONFIG_SSI1_DISABLE # define CONFIG_SSI1_DISABLE 1 -#elif LM_NSSI < 2 +#elif TIVA_NSSI < 2 # undef CONFIG_SSI1_DISABLE # define CONFIG_SSI1_DISABLE 1 #endif |