From fc300bda7bf9d68ac5d75fa7b732692eeeae5221 Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Sat, 8 Mar 2014 15:50:26 -0600 Subject: functions and definitions renamed from lm_ to tiva_ --- nuttx/configs/lm3s6965-ek/README.txt | 38 +++++++++--------- nuttx/configs/lm3s6965-ek/discover/defconfig | 44 ++++++++++----------- nuttx/configs/lm3s6965-ek/include/board.h | 10 ++--- nuttx/configs/lm3s6965-ek/nsh/defconfig | 44 ++++++++++----------- nuttx/configs/lm3s6965-ek/nx/defconfig | 26 ++++++------ .../configs/lm3s6965-ek/src/lm3s6965ek_internal.h | 4 +- nuttx/configs/lm3s6965-ek/src/up_ethernet.c | 8 ++-- nuttx/configs/lm3s6965-ek/tcpecho/defconfig | 46 +++++++++++----------- 8 files changed, 110 insertions(+), 110 deletions(-) (limited to 'nuttx/configs/lm3s6965-ek') 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 # -- cgit v1.2.3