From f0e6e06a37123d789e0bf9a4d35072d42b341e30 Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Sat, 1 Dec 2018 12:22:05 -0600 Subject: [PATCH] Squashed commit of the following: arch/arm/src/tiva/hardwar: Move LM3S and LM4F include files to hardware/lm/ sub-directory. Move all TM4C header files files to hardware/tm4c/ sub-directory. arch/arm: Add basic configuration/build support for CC13xx parts. Conditioned on EXPERIMENTAL. --- arch/arm/Kconfig | 15 +++- arch/arm/include/tiva/chip.h | 75 +++++++++++++++++- arch/arm/src/tiva/Kconfig | 79 ++++++++++++++++--- arch/arm/src/tiva/Make.defs | 4 + arch/arm/src/tiva/common/tiva_pwm.c | 2 +- arch/arm/src/tiva/common/tiva_qencoder.c | 2 +- .../tiva/hardware/{ => lm}/lm3s_ethernet.h | 8 +- .../src/tiva/hardware/{ => lm}/lm3s_flash.h | 8 +- .../tiva/hardware/{ => lm}/lm3s_memorymap.h | 8 +- .../src/tiva/hardware/{ => lm}/lm3s_pinmap.h | 8 +- .../tiva/hardware/{ => lm}/lm3s_syscontrol.h | 8 +- .../tiva/hardware/{ => lm}/lm4f_memorymap.h | 8 +- .../src/tiva/hardware/{ => lm}/lm4f_pinmap.h | 8 +- .../tiva/hardware/{ => lm}/lm4f_syscontrol.h | 8 +- arch/arm/src/tiva/hardware/tiva_ethernet.h | 4 +- arch/arm/src/tiva/hardware/tiva_flash.h | 4 +- arch/arm/src/tiva/hardware/tiva_memorymap.h | 6 +- arch/arm/src/tiva/hardware/tiva_pinmap.h | 6 +- arch/arm/src/tiva/hardware/tiva_syscontrol.h | 8 +- .../hardware/{ => tm4c}/tm4c123_syscontrol.h | 8 +- .../hardware/{ => tm4c}/tm4c129_syscontrol.h | 8 +- .../tiva/hardware/{ => tm4c}/tm4c_ethernet.h | 8 +- .../src/tiva/hardware/{ => tm4c}/tm4c_flash.h | 8 +- .../tiva/hardware/{ => tm4c}/tm4c_memorymap.h | 8 +- .../tiva/hardware/{ => tm4c}/tm4c_pinmap.h | 8 +- 25 files changed, 232 insertions(+), 85 deletions(-) rename arch/arm/src/tiva/hardware/{ => lm}/lm3s_ethernet.h (97%) rename arch/arm/src/tiva/hardware/{ => lm}/lm3s_flash.h (97%) rename arch/arm/src/tiva/hardware/{ => lm}/lm3s_memorymap.h (99%) rename arch/arm/src/tiva/hardware/{ => lm}/lm3s_pinmap.h (99%) rename arch/arm/src/tiva/hardware/{ => lm}/lm3s_syscontrol.h (99%) rename arch/arm/src/tiva/hardware/{ => lm}/lm4f_memorymap.h (97%) rename arch/arm/src/tiva/hardware/{ => lm}/lm4f_pinmap.h (98%) rename arch/arm/src/tiva/hardware/{ => lm}/lm4f_syscontrol.h (99%) rename arch/arm/src/tiva/hardware/{ => tm4c}/tm4c123_syscontrol.h (99%) rename arch/arm/src/tiva/hardware/{ => tm4c}/tm4c129_syscontrol.h (99%) rename arch/arm/src/tiva/hardware/{ => tm4c}/tm4c_ethernet.h (99%) rename arch/arm/src/tiva/hardware/{ => tm4c}/tm4c_flash.h (99%) rename arch/arm/src/tiva/hardware/{ => tm4c}/tm4c_memorymap.h (99%) rename arch/arm/src/tiva/hardware/{ => tm4c}/tm4c_pinmap.h (99%) diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index c453eddcee..d5a17acc30 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -275,6 +275,16 @@ config ARCH_CHIP_SAMV7 ---help--- Atmel SAMV7 (ARM Cortex-M7) architectures +config ARCH_CHIP_SIMPLELINK + bool "TI SimpleLink" + select ARCH_HAVE_MPU + select ARM_HAVE_MPU_UNIFIED + select ARCH_HAVE_FPU + select ARCH_HAVE_FETCHADD + depends on EXPERIMENTAL + ---help--- + TI SimpleLink CCxxx architectures (ARM Cortex-M3 or M4) + config ARCH_CHIP_STM32 bool "STMicro STM32 F1/F2/F3/F4/L1" select ARCH_HAVE_MPU @@ -363,7 +373,6 @@ config ARCH_CHIP_TIVA bool "TI Tiva" select ARCH_HAVE_MPU select ARM_HAVE_MPU_UNIFIED - select ARCH_HAVE_FPU select ARCH_HAVE_FETCHADD ---help--- TI Tiva TM4C architectures (ARM Cortex-M4) @@ -589,7 +598,7 @@ config ARCH_CHIP default "kinetis" if ARCH_CHIP_KINETIS default "kl" if ARCH_CHIP_KL default "lc823450" if ARCH_CHIP_LC823450 - default "tiva" if ARCH_CHIP_LM || ARCH_CHIP_TIVA + default "tiva" if ARCH_CHIP_LM || ARCH_CHIP_TIVA ||ARCH_CHIP_SIMPLELINK default "lpc11xx" if ARCH_CHIP_LPC11XX default "lpc17xx" if ARCH_CHIP_LPC17XX default "lpc214x" if ARCH_CHIP_LPC214X @@ -807,7 +816,7 @@ endif if ARCH_CHIP_LC823450 source arch/arm/src/lc823450/Kconfig endif -if ARCH_CHIP_LM || ARCH_CHIP_TIVA +if ARCH_CHIP_LM || ARCH_CHIP_TIVA || ARCH_CHIP_SIMPLELINK source arch/arm/src/tiva/Kconfig endif if ARCH_CHIP_LPC11XX diff --git a/arch/arm/include/tiva/chip.h b/arch/arm/include/tiva/chip.h index 9c6487ea56..053ba098d3 100644 --- a/arch/arm/include/tiva/chip.h +++ b/arch/arm/include/tiva/chip.h @@ -48,12 +48,13 @@ * Pre-processor Definitions ************************************************************************************/ -/* Get customizations for each supported chip (only the LM3S6918 and 65 right now) */ +/* Get customizations for each supported chip */ #if defined(CONFIG_ARCH_CHIP_LM3S6918) # define LM3S 1 /* LM3S family */ # undef LM4F /* Not LM4F family */ # undef TM4C /* Not TM4C family */ +# undef SIMPLELINK /* Not SimpleLink family */ # define TIVA_NTIMERS 4 /* Four 16/32-bit timers */ # define TIVA_NWIDETIMERS 0 /* No 32/64-bit timers */ # define TIVA_NWDT 1 /* One watchdog timer */ @@ -78,6 +79,7 @@ # define LM3S 1 /* LM3S family */ # undef LM4F /* Not LM4F family */ # undef TM4C /* Not TM4C family */ +# undef SIMPLELINK /* Not SimpleLink family */ # define TIVA_NTIMERS 3 /* Three 16/32-bit timers */ # define TIVA_NWIDETIMERS 0 /* No 32/64-bit timers */ # define TIVA_NWDT 1 /* One watchdog timer */ @@ -102,6 +104,7 @@ # define LM3S 1 /* LM3S family */ # undef LM4F /* Not LM4F family */ # undef TM4C /* Not TM4C family */ +# undef SIMPLELINK /* Not SimpleLink family */ # define TIVA_NTIMERS 4 /* Four 16/32-bit timers */ # define TIVA_NWIDETIMERS 0 /* No 32/64-bit timers */ # define TIVA_NWDT 1 /* One watchdog timer */ @@ -126,6 +129,7 @@ # define LM3S 1 /* LM3S family */ # undef LM4F /* Not LM4F family */ # undef TM4C /* Not TM4C family */ +# undef SIMPLELINK /* Not SimpleLink family */ # define TIVA_NTIMERS 4 /* Four 16/32-bit timers */ # define TIVA_NWIDETIMERS 0 /* No 32/64-bit timers */ # define TIVA_NWDT 1 /* One watchdog timer */ @@ -151,6 +155,7 @@ # define LM3S 1 /* LM3S family */ # undef LM4F /* Not LM4F family */ # undef TM4C /* Not TM4C family */ +# undef SIMPLELINK /* Not SimpleLink family */ # define TIVA_NTIMERS 6 /* Four 16/32-bit timers */ # define TIVA_NWIDETIMERS 0 /* No 32/64-bit timers */ # define TIVA_NWDT 1 /* One watchdog timer */ @@ -174,6 +179,7 @@ # undef LM3S /* Not LM3S family */ # define LM4F 1 /* LM4F family */ # undef TM4C /* Not TM4C family */ +# undef SIMPLELINK /* Not SimpleLink family */ # define TIVA_NTIMERS 6 /* Six 16/32-bit timers */ # define TIVA_NWIDETIMERS 6 /* Six 32/64-bit timers */ # define TIVA_NWDT 2 /* Two watchdog timer timers */ @@ -198,6 +204,7 @@ # undef LM3S /* Not LM3S family */ # undef LM4F /* Not LM4F family */ # define TM4C 1 /* TM4C family */ +# undef SIMPLELINK /* Not SimpleLink family */ # define TIVA_NTIMERS 6 /* Six 16/32-bit timers */ # define TIVA_NWIDETIMERS 6 /* Six 32/64-bit timers */ # define TIVA_NWDT 2 /* Two watchdog timers */ @@ -221,6 +228,7 @@ # undef LM3S /* Not LM3S family */ # undef LM4F /* Not LM4F family */ # define TM4C 1 /* TM4C family */ +# undef SIMPLELINK /* Not SimpleLink family */ # define TIVA_NTIMERS 6 /* Six 16/32-bit timers */ # define TIVA_NWIDETIMERS 6 /* Six 32/64-bit timers */ # define TIVA_NWDT 2 /* Two watchdog timers */ @@ -244,6 +252,7 @@ # undef LM3S /* Not LM3S family */ # undef LM4F /* Not LM4F family */ # define TM4C 1 /* TM4C family */ +# undef SIMPLELINK /* Not SimpleLink family */ # define TIVA_NTIMERS 8 /* Eight Dual 16/32-bit timers A/B */ # define TIVA_NWIDETIMERS 0 /* No 32/64-bit timers */ # define TIVA_NWDT 2 /* Two watchdog timers */ @@ -267,6 +276,7 @@ # undef LM3S /* Not LM3S family */ # undef LM4F /* Not LM4F family */ # define TM4C 1 /* TM4C family */ +# undef SIMPLELINK /* Not SimpleLink family */ # define TIVA_NTIMERS 8 /* Eight Dual 16/32-bit timers A/B */ # define TIVA_NWIDETIMERS 0 /* No 32/64-bit timers */ # define TIVA_NWDT 2 /* Two watchdog timers */ @@ -286,6 +296,69 @@ # define TIVA_NAES 1 /* One AES module */ # define TIVA_NDES 1 /* One DES module */ # define TIVA_NHASH 1 /* One SHA1/MD5 hash module */ +#elif defined(CONFIG_ARCH_CHIP_CC13X0) +# undef LM3S /* Not LM3S family */ +# undef LM4F /* Not LM4F family */ +# undef TM4C /* Not TM4C family */ +# define SIMPLELINK 1 /* SimpleLink family */ +# define TIVA_NTIMERS 4 /* Eight 16- or four 32-bit GPTM timers */ +# define TIVA_NWIDETIMERS 0 /* No 32/64-bit timers */ +# define TIVA_NWDT 1 /* One watchdog timers */ + /* One RF timer */ +# define TIVA_NETHCONTROLLERS 0 /* No Ethernet controller */ +# define TIVA_NLCD 0 /* No LCD controller */ +# define TIVA_NSSI 2 /* Two SSI modules */ +# define TIVA_NUARTS 1 /* One UART module */ +# define TIVA_NI2C 1 /* One I2C module */ + /* One I2S module */ +# define TIVA_NADC 1 /* One 12-bit, 8 channel ADC module */ + /* One continuous time comparator */ + /* Ultra low power clocked comparator */ + /* Programmable current source */ +# define TIVA_NPWM 0 /* No PWM generator modules */ +# define TIVA_NQEI 0 /* No quadrature encoder modules */ +# define TIVA_NPORTS 1 /* One Ports */ +# define TIVA_NCANCONTROLLER 0 /* No CAN controllers */ +# define TIVA_NUSBOTGFS 0 /* No USB 2.0 OTG FS */ +# define TIVA_NUSBOTGHS 0 /* No USB 2.0 OTG HS */ +# define TIVA_NCRC 0 /* No CRC module */ +# define TIVA_NAES 1 /* One AES-128 module */ +# define TIVA_NDES 0 /* No DES module */ +# define TIVA_NHASH 0 /* No SHA1/MD5 hash module */ + /* One TRNG module */ + /* Capacitive sensing, up to 8 channels */ + /* Integrated temperatore sensor */ +#elif defined(CONFIG_ARCH_CHIP_CC13X2) +# undef LM3S /* Not LM3S family */ +# undef LM4F /* Not LM4F family */ +# undef TM4C /* Not TM4C family */ +# define SIMPLELINK 1 /* SimpleLink family */ +# define TIVA_NTIMERS 4 /* Eight 16- or four 32-bit GPTM timers */ +# define TIVA_NWIDETIMERS 0 /* No 32/64-bit timers */ +# define TIVA_NWDT 1 /* One watchdog timers */ +# define TIVA_NETHCONTROLLERS 0 /* No Ethernet controller */ +# define TIVA_NLCD 0 /* No LCD controller */ +# define TIVA_NSSI 2 /* Two SSI modules */ +# define TIVA_NUARTS 2 /* Two UART module */ +# define TIVA_NI2C 1 /* One I2C module */ + /* One I2S module */ + /* One RTC */ +# define TIVA_NADC 1 /* One 12-bit, 8 channel ADC module */ + /* Two comparators with reference DAC */ +# define TIVA_NPWM 0 /* No PWM generator modules */ +# define TIVA_NQEI 0 /* No quadrature encoder modules */ +# define TIVA_NPORTS 1 /* One Ports */ +# define TIVA_NCANCONTROLLER 0 /* No CAN controllers */ +# define TIVA_NUSBOTGFS 0 /* No USB 2.0 OTG FS */ +# define TIVA_NUSBOTGHS 0 /* No USB 2.0 OTG HS */ +# define TIVA_NCRC 0 /* No CRC module */ +# define TIVA_NAES 1 /* One AES-256 module */ +# define TIVA_NDES 0 /* No DES module */ +# define TIVA_NHASH 1 /* SHA2 Accelerator (up to SHA-512) */ + /* ECC and RSA Public Key Hardware Accelerator */ + /* One TRNG module */ + /* Capacitive sensing, up to 8 channels */ + /* Integrated temperature and battery monitor */ #else # error "Capabilities not specified for this TIVA/Stellaris chip" #endif diff --git a/arch/arm/src/tiva/Kconfig b/arch/arm/src/tiva/Kconfig index 68875778ef..a2bd3bc02d 100644 --- a/arch/arm/src/tiva/Kconfig +++ b/arch/arm/src/tiva/Kconfig @@ -8,7 +8,7 @@ comment "Tiva/Stellaris Configuration Options" choice prompt "Tiva/Stellaris Chip Selection" default ARCH_CHIP_LM3S6965 - depends on ARCH_CHIP_LM || ARCH_CHIP_TIVA + depends on ARCH_CHIP_LM || ARCH_CHIP_TIVA || ARCH_CHIP_SIMPLELINK config ARCH_CHIP_LM3S6918 bool "LM3S6918" @@ -108,6 +108,22 @@ config ARCH_CHIP_TM4C129XNC select ARCH_CHIP_TM4C select ARCH_CHIP_TM4C129 select TIVA_HAVE_ETHERNET + +config ARCH_CHIP_CC1310 + bool "CC1310 SimpleLink" + depends on ARCH_CHIP_SIMPLELINK || EXPERIMENTAL + select ARCH_CHIP_CC13X0 + +config ARCH_CHIP_CC1312R1 + bool "CC1312R1 SimpleLink" + depends on ARCH_CHIP_SIMPLELINK || EXPERIMENTAL + select ARCH_CHIP_CC13X2 + +config ARCH_CHIP_CC1312R1 + bool "CC1312R1 SimpleLink" + depends on ARCH_CHIP_SIMPLELINK || EXPERIMENTAL + select ARCH_CHIP_CC13X2 + endchoice # Chip families @@ -122,6 +138,9 @@ config ARCH_CHIP_LM3S select TIVA_HAVE_GPIOF_IRQS select TIVA_HAVE_GPIOG_IRQS select TIVA_HAVE_SSI0 + select TIVA_HAVE_UART1 + select TIVA_HAVE_UART2 + select TIVA_HAVE_UART3 config ARCH_CHIP_LM4F bool @@ -136,6 +155,8 @@ config ARCH_CHIP_LM4F select TIVA_HAVE_I2C1 select TIVA_HAVE_I2C2 select TIVA_HAVE_I2C3 + select TIVA_HAVE_UART1 + select TIVA_HAVE_UART2 select TIVA_HAVE_UART3 select TIVA_HAVE_UART4 select TIVA_HAVE_UART5 @@ -164,6 +185,9 @@ config ARCH_CHIP_TM4C129 select TIVA_HAVE_I2C9 select TIVA_HAVE_TIMER6 select TIVA_HAVE_TIMER7 + select TIVA_HAVE_UART1 + select TIVA_HAVE_UART2 + select TIVA_HAVE_UART3 config ARCH_CHIP_TM4C bool @@ -175,11 +199,6 @@ config ARCH_CHIP_TM4C select TIVA_HAVE_I2C1 select TIVA_HAVE_I2C2 select TIVA_HAVE_I2C3 - select TIVA_HAVE_UART3 - select TIVA_HAVE_UART4 - select TIVA_HAVE_UART5 - select TIVA_HAVE_UART6 - select TIVA_HAVE_UART7 select TIVA_HAVE_SSI0 select TIVA_HAVE_SSI1 select TIVA_HAVE_SSI2 @@ -190,6 +209,38 @@ config ARCH_CHIP_TM4C select TIVA_HAVE_TIMER3 select TIVA_HAVE_TIMER4 select TIVA_HAVE_TIMER5 + select TIVA_HAVE_UART1 + select TIVA_HAVE_UART2 + select TIVA_HAVE_UART3 + select TIVA_HAVE_UART4 + select TIVA_HAVE_UART5 + select TIVA_HAVE_UART6 + select TIVA_HAVE_UART7 + +config ARCH_CHIP_CC13X0 + bool + select ARCH_CORTEXM3 + select TIVA_HAVE_ADC0 + select TIVA_HAVE_SSI0 + select TIVA_HAVE_SSI1 + select TIVA_HAVE_TIMER0 + select TIVA_HAVE_TIMER1 + select TIVA_HAVE_TIMER2 + select TIVA_HAVE_TIMER3 + +config ARCH_CHIP_CC13X2 + bool + select ARCH_CORTEXM4 + select ARCH_HAVE_FPU + select TIVA_HAVE_ADC0 + select TIVA_HAVE_I2C1 + select TIVA_HAVE_SSI0 + select TIVA_HAVE_SSI1 + select TIVA_HAVE_TIMER0 + select TIVA_HAVE_TIMER1 + select TIVA_HAVE_TIMER2 + select TIVA_HAVE_TIMER3 + select TIVA_HAVE_UART1 config LM_REVA2 bool "Rev A2" @@ -257,6 +308,14 @@ config TIVA_HAVE_I2C9 bool default n +config TIVA_HAVE_UART1 + bool + default n + +config TIVA_HAVE_UART2 + bool + default n + config TIVA_HAVE_UART3 bool default n @@ -412,18 +471,20 @@ config TIVA_I2C9 config TIVA_UART0 bool "UART0" - select UART0_SERIALDRIVER default n + select UART0_SERIALDRIVER config TIVA_UART1 bool "UART1" - select UART1_SERIALDRIVER default n + depends on TIVA_HAVE_UART1 + select UART1_SERIALDRIVER config TIVA_UART2 bool "UART2" - select UART2_SERIALDRIVER default n + depends on TIVA_HAVE_UART2 + select UART2_SERIALDRIVER config TIVA_UART3 bool "UART3" diff --git a/arch/arm/src/tiva/Make.defs b/arch/arm/src/tiva/Make.defs index e559eae9c5..a91ef674b5 100644 --- a/arch/arm/src/tiva/Make.defs +++ b/arch/arm/src/tiva/Make.defs @@ -153,4 +153,8 @@ ifeq ($(CONFIG_ARCH_CHIP_LM),y) VPATH += chip/lm else ifeq ($(CONFIG_ARCH_CHIP_TM4C),y) VPATH += chip/tm4c +else ifeq ($(CONFIG_ARCH_CHIP_CC13X0),y) +VPATH += chip/cc13x0 +else ifeq ($(CONFIG_ARCH_CHIP_CC13X2),y) +VPATH += chip/cc13x2 endif diff --git a/arch/arm/src/tiva/common/tiva_pwm.c b/arch/arm/src/tiva/common/tiva_pwm.c index 59dadb351a..38e91db388 100644 --- a/arch/arm/src/tiva/common/tiva_pwm.c +++ b/arch/arm/src/tiva/common/tiva_pwm.c @@ -59,7 +59,7 @@ #include "hardware/tiva_pwm.h" #include "hardware/tiva_pinmap.h" -#include "hardware/tm4c_memorymap.h" +#include "hardware/tiva_memorymap.h" /************************************************************************************ * Private Types diff --git a/arch/arm/src/tiva/common/tiva_qencoder.c b/arch/arm/src/tiva/common/tiva_qencoder.c index 7e60563092..b3a9072b0a 100644 --- a/arch/arm/src/tiva/common/tiva_qencoder.c +++ b/arch/arm/src/tiva/common/tiva_qencoder.c @@ -58,7 +58,7 @@ #include "hardware/tiva_qencoder.h" #include "hardware/tiva_pinmap.h" -#include "hardware/tm4c_memorymap.h" +#include "hardware/tiva_memorymap.h" /************************************************************************************ * Private Types diff --git a/arch/arm/src/tiva/hardware/lm3s_ethernet.h b/arch/arm/src/tiva/hardware/lm/lm3s_ethernet.h similarity index 97% rename from arch/arm/src/tiva/hardware/lm3s_ethernet.h rename to arch/arm/src/tiva/hardware/lm/lm3s_ethernet.h index d23e20efce..eeb35492c9 100644 --- a/arch/arm/src/tiva/hardware/lm3s_ethernet.h +++ b/arch/arm/src/tiva/hardware/lm/lm3s_ethernet.h @@ -1,5 +1,5 @@ /************************************************************************************ - * arch/arm/src/tiva/hardwarelm3s_ethernet.h + * arch/arm/src/tiva/hardmware/lm/3s_ethernet.h * * Copyright (C) 2009-2010, 2012-2014 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __ARCH_ARM_SRC_TIVA_HARDWARE_LM3S_ETHERNET_H -#define __ARCH_ARM_SRC_TIVA_HARDWARE_LM3S_ETHERNET_H +#ifndef __ARCH_ARM_SRC_TIVA_HARDWARE_LM_LM3S_ETHERNET_H +#define __ARCH_ARM_SRC_TIVA_HARDWARE_LM_LM3S_ETHERNET_H /************************************************************************************ * Included Files @@ -200,4 +200,4 @@ * Public Function Prototypes ************************************************************************************/ -#endif /* __ARCH_ARM_SRC_TIVA_HARDWARE_LM3S_ETHERNET_H */ +#endif /* __ARCH_ARM_SRC_TIVA_HARDWARE_LM_LM3S_ETHERNET_H */ diff --git a/arch/arm/src/tiva/hardware/lm3s_flash.h b/arch/arm/src/tiva/hardware/lm/lm3s_flash.h similarity index 97% rename from arch/arm/src/tiva/hardware/lm3s_flash.h rename to arch/arm/src/tiva/hardware/lm/lm3s_flash.h index befcbeb991..0e1408db9b 100644 --- a/arch/arm/src/tiva/hardware/lm3s_flash.h +++ b/arch/arm/src/tiva/hardware/lm/lm3s_flash.h @@ -1,5 +1,5 @@ /************************************************************************************ - * arch/arm/src/tiva/hardwarelm3s_flash.h + * arch/arm/src/tiva/hardmware/lm/3s_flash.h * * Copyright (C) 2009, 2013-2014 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __ARCH_ARM_SRC_TIVA_HARDWARE_LM3S_FLASH_H -#define __ARCH_ARM_SRC_TIVA_HARDWARE_LM3S_FLASH_H +#ifndef __ARCH_ARM_SRC_TIVA_HARDWARE_LM_LM3S_FLASH_H +#define __ARCH_ARM_SRC_TIVA_HARDWARE_LM_LM3S_FLASH_H /************************************************************************************ * Included Files @@ -160,4 +160,4 @@ * Public Function Prototypes ************************************************************************************/ -#endif /* __ARCH_ARM_SRC_TIVA_HARDWARE_LM3S_FLASH_H */ +#endif /* __ARCH_ARM_SRC_TIVA_HARDWARE_LM_LM3S_FLASH_H */ diff --git a/arch/arm/src/tiva/hardware/lm3s_memorymap.h b/arch/arm/src/tiva/hardware/lm/lm3s_memorymap.h similarity index 99% rename from arch/arm/src/tiva/hardware/lm3s_memorymap.h rename to arch/arm/src/tiva/hardware/lm/lm3s_memorymap.h index f8c0647cfa..f69603fec7 100644 --- a/arch/arm/src/tiva/hardware/lm3s_memorymap.h +++ b/arch/arm/src/tiva/hardware/lm/lm3s_memorymap.h @@ -1,5 +1,5 @@ /************************************************************************************ - * arch/arm/src/tiva/hardwarelm3s_memorymap.h + * arch/arm/src/tiva/hardmware/lm/3s_memorymap.h * * Copyright (C) 2009-2010 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __ARCH_ARM_SRC_TIVA_HARDWARE_LM3S_MEMORYMAP_H -#define __ARCH_ARM_SRC_TIVA_HARDWARE_LM3S_MEMORYMAP_H +#ifndef __ARCH_ARM_SRC_TIVA_HARDWARE_LM_LM3S_MEMORYMAP_H +#define __ARCH_ARM_SRC_TIVA_HARDWARE_LM_LM3S_MEMORYMAP_H /************************************************************************************ * Included Files @@ -349,4 +349,4 @@ * Public Function Prototypes ************************************************************************************/ -#endif /* __ARCH_ARM_SRC_TIVA_HARDWARE_LM3S_MEMORYMAP_H */ +#endif /* __ARCH_ARM_SRC_TIVA_HARDWARE_LM_LM3S_MEMORYMAP_H */ diff --git a/arch/arm/src/tiva/hardware/lm3s_pinmap.h b/arch/arm/src/tiva/hardware/lm/lm3s_pinmap.h similarity index 99% rename from arch/arm/src/tiva/hardware/lm3s_pinmap.h rename to arch/arm/src/tiva/hardware/lm/lm3s_pinmap.h index b7e1fbb34e..69414e11bd 100644 --- a/arch/arm/src/tiva/hardware/lm3s_pinmap.h +++ b/arch/arm/src/tiva/hardware/lm/lm3s_pinmap.h @@ -1,5 +1,5 @@ /************************************************************************************ - * arch/arm/src/tiva/hardwarelm3s_pinmap.h + * arch/arm/src/tiva/hardmware/lm/3s_pinmap.h * * Copyright (C) 2009-2010, 2013 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __ARCH_ARM_SRC_TIVA_HARDWARE_LM3S_PINMAP_H -#define __ARCH_ARM_SRC_TIVA_HARDWARE_LM3S_PINMAP_H +#ifndef __ARCH_ARM_SRC_TIVA_HARDWARE_LM_LM3S_PINMAP_H +#define __ARCH_ARM_SRC_TIVA_HARDWARE_LM_LM3S_PINMAP_H /************************************************************************************ * Included Files @@ -278,4 +278,4 @@ * Public Function Prototypes ****************************************************************************/ -#endif /* __ARCH_ARM_SRC_TIVA_HARDWARE_LM3S_PINMAP_H */ +#endif /* __ARCH_ARM_SRC_TIVA_HARDWARE_LM_LM3S_PINMAP_H */ diff --git a/arch/arm/src/tiva/hardware/lm3s_syscontrol.h b/arch/arm/src/tiva/hardware/lm/lm3s_syscontrol.h similarity index 99% rename from arch/arm/src/tiva/hardware/lm3s_syscontrol.h rename to arch/arm/src/tiva/hardware/lm/lm3s_syscontrol.h index 374eb48716..c5fc0a9b9d 100644 --- a/arch/arm/src/tiva/hardware/lm3s_syscontrol.h +++ b/arch/arm/src/tiva/hardware/lm/lm3s_syscontrol.h @@ -1,5 +1,5 @@ /************************************************************************************ - * arch/arm/src/tiva/hardwarelm3s_syscontrol.h + * arch/arm/src/tiva/hardmware/lm/3s_syscontrol.h * * Copyright (C) 2009-2010, 2013 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __ARCH_ARM_SRC_TIVA_HARDWARE_LM3S_SYSCONTROL_H -#define __ARCH_ARM_SRC_TIVA_HARDWARE_LM3S_SYSCONTROL_H +#ifndef __ARCH_ARM_SRC_TIVA_HARDWARE_LM_LM3S_SYSCONTROL_H +#define __ARCH_ARM_SRC_TIVA_HARDWARE_LM_LM3S_SYSCONTROL_H /************************************************************************************ * Included Files @@ -492,4 +492,4 @@ * Public Functions ************************************************************************************/ -#endif /* __ARCH_ARM_SRC_TIVA_HARDWARE_LM3S_SYSCONTROL_H */ +#endif /* __ARCH_ARM_SRC_TIVA_HARDWARE_LM_LM3S_SYSCONTROL_H */ diff --git a/arch/arm/src/tiva/hardware/lm4f_memorymap.h b/arch/arm/src/tiva/hardware/lm/lm4f_memorymap.h similarity index 97% rename from arch/arm/src/tiva/hardware/lm4f_memorymap.h rename to arch/arm/src/tiva/hardware/lm/lm4f_memorymap.h index 0514228871..63cb4e1696 100644 --- a/arch/arm/src/tiva/hardware/lm4f_memorymap.h +++ b/arch/arm/src/tiva/hardware/lm/lm4f_memorymap.h @@ -1,5 +1,5 @@ /************************************************************************************ - * arch/arm/src/tiva/hardwarelm4f_memorymap.h + * arch/arm/src/tiva/hardmware/lm/4f_memorymap.h * * Copyright (C) 2013 Gregory Nutt. All rights reserved. * Authors: Gregory Nutt @@ -34,8 +34,8 @@ * ************************************************************************************/ -#ifndef __ARCH_ARM_SRC_TIVA_HARDWARE_LM4F_MEMORYMAP_H -#define __ARCH_ARM_SRC_TIVA_HARDWARE_LM4F_MEMORYMAP_H +#ifndef __ARCH_ARM_SRC_TIVA_HARDWARE_LM_LM4F_MEMORYMAP_H +#define __ARCH_ARM_SRC_TIVA_HARDWARE_LM_LM4F_MEMORYMAP_H /************************************************************************************ * Included Files @@ -160,4 +160,4 @@ * Public Function Prototypes ************************************************************************************/ -#endif /* __ARCH_ARM_SRC_TIVA_HARDWARE_LM4F_MEMORYMAP_H */ +#endif /* __ARCH_ARM_SRC_TIVA_HARDWARE_LM_LM4F_MEMORYMAP_H */ diff --git a/arch/arm/src/tiva/hardware/lm4f_pinmap.h b/arch/arm/src/tiva/hardware/lm/lm4f_pinmap.h similarity index 98% rename from arch/arm/src/tiva/hardware/lm4f_pinmap.h rename to arch/arm/src/tiva/hardware/lm/lm4f_pinmap.h index 392ae374aa..fec57c3405 100644 --- a/arch/arm/src/tiva/hardware/lm4f_pinmap.h +++ b/arch/arm/src/tiva/hardware/lm/lm4f_pinmap.h @@ -1,5 +1,5 @@ /************************************************************************************ - * arch/arm/src/tiva/hardwarelm4f_pinmap.h + * arch/arm/src/tiva/hardmware/lm/4f_pinmap.h * * Copyright (C) 2013 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __ARCH_ARM_SRC_TIVA_HARDWARE_LM4F_PINMAP_H -#define __ARCH_ARM_SRC_TIVA_HARDWARE_LM4F_PINMAP_H +#ifndef __ARCH_ARM_SRC_TIVA_HARDWARE_LM_LM4F_PINMAP_H +#define __ARCH_ARM_SRC_TIVA_HARDWARE_LM_LM4F_PINMAP_H /************************************************************************************ * Included Files @@ -212,4 +212,4 @@ * Public Function Prototypes ****************************************************************************/ -#endif /* __ARCH_ARM_SRC_TIVA_HARDWARE_LM4F_PINMAP_H */ +#endif /* __ARCH_ARM_SRC_TIVA_HARDWARE_LM_LM4F_PINMAP_H */ diff --git a/arch/arm/src/tiva/hardware/lm4f_syscontrol.h b/arch/arm/src/tiva/hardware/lm/lm4f_syscontrol.h similarity index 99% rename from arch/arm/src/tiva/hardware/lm4f_syscontrol.h rename to arch/arm/src/tiva/hardware/lm/lm4f_syscontrol.h index 176fa2489a..53df4de3e9 100644 --- a/arch/arm/src/tiva/hardware/lm4f_syscontrol.h +++ b/arch/arm/src/tiva/hardware/lm/lm4f_syscontrol.h @@ -1,5 +1,5 @@ /******************************************************************************************** - * arch/arm/src/tiva/hardwarelm4f_syscontrol.h + * arch/arm/src/tiva/hardmware/lm/4f_syscontrol.h * * Copyright (C) 2009-2010, 2013 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ********************************************************************************************/ -#ifndef __ARCH_ARM_SRC_TIVA_HARDWARE_LM4F_SYSCONTROL_H -#define __ARCH_ARM_SRC_TIVA_HARDWARE_LM4F_SYSCONTROL_H +#ifndef __ARCH_ARM_SRC_TIVA_HARDWARE_LM_LM4F_SYSCONTROL_H +#define __ARCH_ARM_SRC_TIVA_HARDWARE_LM_LM4F_SYSCONTROL_H /******************************************************************************************** * Included Files @@ -1533,4 +1533,4 @@ * Public Functions ********************************************************************************************/ -#endif /* __ARCH_ARM_SRC_TIVA_HARDWARE_LM4F_SYSCONTROL_H */ +#endif /* __ARCH_ARM_SRC_TIVA_HARDWARE_LM_LM4F_SYSCONTROL_H */ diff --git a/arch/arm/src/tiva/hardware/tiva_ethernet.h b/arch/arm/src/tiva/hardware/tiva_ethernet.h index b9c5d52826..8165e75788 100644 --- a/arch/arm/src/tiva/hardware/tiva_ethernet.h +++ b/arch/arm/src/tiva/hardware/tiva_ethernet.h @@ -43,9 +43,9 @@ #include #if defined(CONFIG_ARCH_CHIP_TM4C) -# include "hardware/tm4c_ethernet.h" +# include "hardware/tm4c/tm4c_ethernet.h" #elif defined(CONFIG_ARCH_CHIP_LM3S) -# include "hardware/lm3s_ethernet.h" +# include "hardware/lm/lm3s_ethernet.h" #endif #endif /* __ARCH_ARM_SRC_TIVA_HARDWARE_TIVA_ETHERNET_H */ diff --git a/arch/arm/src/tiva/hardware/tiva_flash.h b/arch/arm/src/tiva/hardware/tiva_flash.h index a52576d998..003d1be178 100644 --- a/arch/arm/src/tiva/hardware/tiva_flash.h +++ b/arch/arm/src/tiva/hardware/tiva_flash.h @@ -45,12 +45,12 @@ /* The TM4C129 family has a different FLASH register layout */ #if defined(CONFIG_ARCH_CHIP_TM4C129) -# include "hardware/tm4c_flash.h" +# include "hardware/tm4c/tm4c_flash.h" /* Others (including LM4F and TM4C123) are similar to the LM3S family */ #else -# include "hardware/lm3s_flash.h" +# include "hardware/lm/lm3s_flash.h" #endif #endif /* __ARCH_ARM_SRC_TIVA_HARDWARE_TIVA_FLASH_H */ diff --git a/arch/arm/src/tiva/hardware/tiva_memorymap.h b/arch/arm/src/tiva/hardware/tiva_memorymap.h index 8538924cf9..ffbc690d75 100644 --- a/arch/arm/src/tiva/hardware/tiva_memorymap.h +++ b/arch/arm/src/tiva/hardware/tiva_memorymap.h @@ -45,11 +45,11 @@ /* Include the memory map file for the specific Tiva/Stellaris chip */ #if defined(CONFIG_ARCH_CHIP_LM3S) -# include "hardware/lm3s_memorymap.h" +# include "hardware/lm/lm3s_memorymap.h" #elif defined(CONFIG_ARCH_CHIP_LM4F) -# include "hardware/lm4f_memorymap.h" +# include "hardware/lm/lm4f_memorymap.h" #elif defined(CONFIG_ARCH_CHIP_TM4C) -# include "hardware/tm4c_memorymap.h" +# include "hardware/tm4c/tm4c_memorymap.h" #else # error "Unsupported Tiva/Stellaris memory map" #endif diff --git a/arch/arm/src/tiva/hardware/tiva_pinmap.h b/arch/arm/src/tiva/hardware/tiva_pinmap.h index 835d2689fc..4b79abdefd 100644 --- a/arch/arm/src/tiva/hardware/tiva_pinmap.h +++ b/arch/arm/src/tiva/hardware/tiva_pinmap.h @@ -45,11 +45,11 @@ /* Include the pin mapping file for the specific Tiva/Stellaris chip */ #if defined(CONFIG_ARCH_CHIP_LM3S) -# include "hardware/lm3s_pinmap.h" +# include "hardware/lm/lm3s_pinmap.h" #elif defined(CONFIG_ARCH_CHIP_LM4F) -# include "hardware/lm4f_pinmap.h" +# include "hardware/lm/lm4f_pinmap.h" #elif defined(CONFIG_ARCH_CHIP_TM4C) -# include "hardware/tm4c_pinmap.h" +# include "hardware/tm4c/tm4c_pinmap.h" #else # error "Unsupported Tiva/Stellaris PIN mapping" #endif diff --git a/arch/arm/src/tiva/hardware/tiva_syscontrol.h b/arch/arm/src/tiva/hardware/tiva_syscontrol.h index b279bf2b41..261fe960ea 100644 --- a/arch/arm/src/tiva/hardware/tiva_syscontrol.h +++ b/arch/arm/src/tiva/hardware/tiva_syscontrol.h @@ -46,13 +46,13 @@ /* Include the system control header file for the specific Tiva/Stellaris chip */ #if defined(CONFIG_ARCH_CHIP_LM3S) -# include "hardware/lm3s_syscontrol.h" +# include "hardware/lm/lm3s_syscontrol.h" #elif defined(CONFIG_ARCH_CHIP_LM4F) -# include "hardware/lm4f_syscontrol.h" +# include "hardware/lm/lm4f_syscontrol.h" #elif defined(CONFIG_ARCH_CHIP_TM4C123) -# include "hardware/tm4c123_syscontrol.h" +# include "hardware/tm4c/tm4c123_syscontrol.h" #elif defined(CONFIG_ARCH_CHIP_TM4C129) -# include "hardware/tm4c129_syscontrol.h" +# include "hardware/tm4c/tm4c129_syscontrol.h" #else # error "Unsupported Tiva/Stellaris system control module" #endif diff --git a/arch/arm/src/tiva/hardware/tm4c123_syscontrol.h b/arch/arm/src/tiva/hardware/tm4c/tm4c123_syscontrol.h similarity index 99% rename from arch/arm/src/tiva/hardware/tm4c123_syscontrol.h rename to arch/arm/src/tiva/hardware/tm4c/tm4c123_syscontrol.h index 273b12327c..249ff42166 100644 --- a/arch/arm/src/tiva/hardware/tm4c123_syscontrol.h +++ b/arch/arm/src/tiva/hardware/tm4c/tm4c123_syscontrol.h @@ -1,5 +1,5 @@ /******************************************************************************************** - * arch/arm/src/tiva/hardwaretm4c123_syscontrol.h + * arch/arm/src/tiva/hardware/tm4c/tm4c123_syscontrol.h * * Copyright (C) 2013 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ********************************************************************************************/ -#ifndef __ARCH_ARM_SRC_TIVA_HARDWARE_TM4C123_SYSCONTROL_H -#define __ARCH_ARM_SRC_TIVA_HARDWARE_TM4C123_SYSCONTROL_H +#ifndef __ARCH_ARM_SRC_TIVA_HARDWARE_TM4C_TM4C123_SYSCONTROL_H +#define __ARCH_ARM_SRC_TIVA_HARDWARE_TM4C_TM4C123_SYSCONTROL_H /******************************************************************************************** * Included Files @@ -1860,4 +1860,4 @@ * Public Functions ********************************************************************************************/ -#endif /* __ARCH_ARM_SRC_TIVA_HARDWARE_TM4C123_SYSCONTROL_H */ +#endif /* __ARCH_ARM_SRC_TIVA_HARDWARE_TM4C_TM4C123_SYSCONTROL_H */ diff --git a/arch/arm/src/tiva/hardware/tm4c129_syscontrol.h b/arch/arm/src/tiva/hardware/tm4c/tm4c129_syscontrol.h similarity index 99% rename from arch/arm/src/tiva/hardware/tm4c129_syscontrol.h rename to arch/arm/src/tiva/hardware/tm4c/tm4c129_syscontrol.h index ef0ec78f72..2ccd1f5097 100644 --- a/arch/arm/src/tiva/hardware/tm4c129_syscontrol.h +++ b/arch/arm/src/tiva/hardware/tm4c/tm4c129_syscontrol.h @@ -1,5 +1,5 @@ /******************************************************************************************** - * arch/arm/src/tiva/hardwaretm4c129_syscontrol.h + * arch/arm/src/tiva/hardware/tm4c/tm4c129_syscontrol.h * * Copyright (C) 2014 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ********************************************************************************************/ -#ifndef __ARCH_ARM_SRC_TIVA_HARDWARE_TM4C129_SYSCONTROL_H -#define __ARCH_ARM_SRC_TIVA_HARDWARE_TM4C129_SYSCONTROL_H +#ifndef __ARCH_ARM_SRC_TIVA_HARDWARE_TM4C_TM4C129_SYSCONTROL_H +#define __ARCH_ARM_SRC_TIVA_HARDWARE_TM4C_TM4C129_SYSCONTROL_H /******************************************************************************************** * Included Files @@ -2166,4 +2166,4 @@ * Public Functions ********************************************************************************************/ -#endif /* __ARCH_ARM_SRC_TIVA_HARDWARE_TM4C129_SYSCONTROL_H */ +#endif /* __ARCH_ARM_SRC_TIVA_HARDWARE_TM4C_TM4C129_SYSCONTROL_H */ diff --git a/arch/arm/src/tiva/hardware/tm4c_ethernet.h b/arch/arm/src/tiva/hardware/tm4c/tm4c_ethernet.h similarity index 99% rename from arch/arm/src/tiva/hardware/tm4c_ethernet.h rename to arch/arm/src/tiva/hardware/tm4c/tm4c_ethernet.h index 1afba1ed3f..a7e6516021 100644 --- a/arch/arm/src/tiva/hardware/tm4c_ethernet.h +++ b/arch/arm/src/tiva/hardware/tm4c/tm4c_ethernet.h @@ -1,5 +1,5 @@ /************************************************************************************ - * arch/arm/src/tiva/hardwaretm4c_ethernet.h + * arch/arm/src/tiva/hardware/tm4c/tm4c_ethernet.h * * Copyright (C) 2014 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -38,8 +38,8 @@ * ************************************************************************************/ -#ifndef __ARCH_ARM_SRC_TIVA_HARDWARE_TM4C_ETHERNET_H -#define __ARCH_ARM_SRC_TIVA_HARDWARE_TM4C_ETHERNET_H +#ifndef __ARCH_ARM_SRC_TIVA_HARDWARE_TM4C_TM4C_ETHERNET_H +#define __ARCH_ARM_SRC_TIVA_HARDWARE_TM4C_TM4C_ETHERNET_H /************************************************************************************ * Included Files @@ -1387,4 +1387,4 @@ struct emac_rxdesc_s ************************************************************************************/ #endif /* __ASSEMBLY__ */ -#endif /* __ARCH_ARM_SRC_TIVA_HARDWARE_TM4C_ETHERNET_H */ +#endif /* __ARCH_ARM_SRC_TIVA_HARDWARE_TM4C_TM4C_ETHERNET_H */ diff --git a/arch/arm/src/tiva/hardware/tm4c_flash.h b/arch/arm/src/tiva/hardware/tm4c/tm4c_flash.h similarity index 99% rename from arch/arm/src/tiva/hardware/tm4c_flash.h rename to arch/arm/src/tiva/hardware/tm4c/tm4c_flash.h index 841f69ef5f..3626372a37 100644 --- a/arch/arm/src/tiva/hardware/tm4c_flash.h +++ b/arch/arm/src/tiva/hardware/tm4c/tm4c_flash.h @@ -1,5 +1,5 @@ /************************************************************************************ - * arch/arm/src/tiva/hardwaretm4c_flash.h + * arch/arm/src/tiva/hardware/tm4c/tm4c_flash.h * * Copyright (C) 2015 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -38,8 +38,8 @@ * ************************************************************************************/ -#ifndef __ARCH_ARM_SRC_TIVA_HARDWARE_TM4C_FLASH_H -#define __ARCH_ARM_SRC_TIVA_HARDWARE_TM4C_FLASH_H +#ifndef __ARCH_ARM_SRC_TIVA_HARDWARE_TM4C_TM4C_FLASH_H +#define __ARCH_ARM_SRC_TIVA_HARDWARE_TM4C_TM4C_FLASH_H /************************************************************************************ * Included Files @@ -401,4 +401,4 @@ /* Flash Memory Protection Read Enable 0-15 (32-bit, bit-encoded) */ /* Flash Memory Protection Program Enable 0-15 (32-bit, bit-encoded) */ -#endif // __ARCH_ARM_SRC_TIVA_HARDWARE_TM4C_FLASH_H +#endif // __ARCH_ARM_SRC_TIVA_HARDWARE_TM4C_TM4C_FLASH_H diff --git a/arch/arm/src/tiva/hardware/tm4c_memorymap.h b/arch/arm/src/tiva/hardware/tm4c/tm4c_memorymap.h similarity index 99% rename from arch/arm/src/tiva/hardware/tm4c_memorymap.h rename to arch/arm/src/tiva/hardware/tm4c/tm4c_memorymap.h index cac0682d4e..4e4dca5819 100644 --- a/arch/arm/src/tiva/hardware/tm4c_memorymap.h +++ b/arch/arm/src/tiva/hardware/tm4c/tm4c_memorymap.h @@ -1,5 +1,5 @@ /************************************************************************************ - * arch/arm/src/tiva/hardwaretm4c_memorymap.h + * arch/arm/src/tiva/hardware/tm4c/tm4c_memorymap.h * * Copyright (C) 2014 Gregory Nutt. All rights reserved. * Authors: Gregory Nutt @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __ARCH_ARM_SRC_TIVA_HARDWARE_TM4C_MEMORYMAP_H -#define __ARCH_ARM_SRC_TIVA_HARDWARE_TM4C_MEMORYMAP_H +#ifndef __ARCH_ARM_SRC_TIVA_HARDWARE_TM4C_TM4C_MEMORYMAP_H +#define __ARCH_ARM_SRC_TIVA_HARDWARE_TM4C_TM4C_MEMORYMAP_H /************************************************************************************ * Included Files @@ -574,4 +574,4 @@ * Public Function Prototypes ************************************************************************************/ -#endif /* __ARCH_ARM_SRC_TIVA_HARDWARE_TM4C_MEMORYMAP_H */ +#endif /* __ARCH_ARM_SRC_TIVA_HARDWARE_TM4C_TM4C_MEMORYMAP_H */ diff --git a/arch/arm/src/tiva/hardware/tm4c_pinmap.h b/arch/arm/src/tiva/hardware/tm4c/tm4c_pinmap.h similarity index 99% rename from arch/arm/src/tiva/hardware/tm4c_pinmap.h rename to arch/arm/src/tiva/hardware/tm4c/tm4c_pinmap.h index e7479b4954..be1a0f802e 100644 --- a/arch/arm/src/tiva/hardware/tm4c_pinmap.h +++ b/arch/arm/src/tiva/hardware/tm4c/tm4c_pinmap.h @@ -1,5 +1,5 @@ /************************************************************************************ - * arch/arm/src/tiva/hardwaretm4c_pinmap.h + * arch/arm/src/tiva/hardware/tm4c/tm4c_pinmap.h * * Copyright (C) 2014 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __ARCH_ARM_SRC_TIVA_HARDWARE_TM4C_PINMAP_H -#define __ARCH_ARM_SRC_TIVA_HARDWARE_TM4C_PINMAP_H +#ifndef __ARCH_ARM_SRC_TIVA_HARDWARE_TM4C_TM4C_PINMAP_H +#define __ARCH_ARM_SRC_TIVA_HARDWARE_TM4C_TM4C_PINMAP_H /************************************************************************************ * Included Files @@ -1426,4 +1426,4 @@ * Public Function Prototypes ****************************************************************************/ -#endif /* __ARCH_ARM_SRC_TIVA_HARDWARE_TM4C_PINMAP_H */ +#endif /* __ARCH_ARM_SRC_TIVA_HARDWARE_TM4C_TM4C_PINMAP_H */