diff options
author | Gregory Nutt <gnutt@nuttx.org> | 2014-03-08 15:50:26 -0600 |
---|---|---|
committer | Gregory Nutt <gnutt@nuttx.org> | 2014-03-08 15:50:26 -0600 |
commit | fc300bda7bf9d68ac5d75fa7b732692eeeae5221 (patch) | |
tree | 295b1a1ffbbfea2990cdee1d05a05ca2577c42c0 /nuttx/configs/lm3s6432-s2e | |
parent | 3100722cdd78ff94412a760138e2fd4fdc319548 (diff) | |
download | nuttx-fc300bda7bf9d68ac5d75fa7b732692eeeae5221.tar.gz nuttx-fc300bda7bf9d68ac5d75fa7b732692eeeae5221.tar.bz2 nuttx-fc300bda7bf9d68ac5d75fa7b732692eeeae5221.zip |
functions and definitions renamed from lm_ to tiva_
Diffstat (limited to 'nuttx/configs/lm3s6432-s2e')
-rw-r--r-- | nuttx/configs/lm3s6432-s2e/README.txt | 38 | ||||
-rw-r--r-- | nuttx/configs/lm3s6432-s2e/include/board.h | 14 | ||||
-rw-r--r-- | nuttx/configs/lm3s6432-s2e/nsh/defconfig | 46 | ||||
-rw-r--r-- | nuttx/configs/lm3s6432-s2e/src/lm3s6432s2e_internal.h | 2 | ||||
-rw-r--r-- | nuttx/configs/lm3s6432-s2e/src/up_boot.c | 2 | ||||
-rw-r--r-- | nuttx/configs/lm3s6432-s2e/src/up_ethernet.c | 8 |
6 files changed, 55 insertions, 55 deletions
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); |