From d98e830363d4710327511afcee0be9ada7543df5 Mon Sep 17 00:00:00 2001 From: patacongo Date: Tue, 8 Jan 2013 20:56:40 +0000 Subject: [PATCH] Rename arch/arm/src/lm3s to arch/arm/src/lm to allow a namespace that will include the lm4f git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5495 42af7a65-404d-4744-a932-0658087f49c3 --- arch/README.txt | 12 +++++----- arch/arm/Kconfig | 9 ++++--- arch/arm/include/{lm3s => lm}/chip.h | 8 +++---- arch/arm/include/{lm3s => lm}/irq.h | 8 +++---- arch/arm/src/{lm3s => lm}/Kconfig | 24 ++++++++++++++++--- arch/arm/src/{lm3s => lm}/Make.defs | 2 +- arch/arm/src/{lm3s => lm}/chip.h | 10 ++++---- arch/arm/src/{lm3s => lm}/chip/lm3s_epi.h | 8 +++---- .../arm/src/{lm3s => lm}/chip/lm3s_ethernet.h | 8 +++---- arch/arm/src/{lm3s => lm}/chip/lm3s_flash.h | 8 +++---- arch/arm/src/{lm3s => lm}/chip/lm3s_gpio.h | 8 +++---- arch/arm/src/{lm3s => lm}/chip/lm3s_i2c.h | 8 +++---- .../src/{lm3s => lm}/chip/lm3s_memorymap.h | 8 +++---- arch/arm/src/{lm3s => lm}/chip/lm3s_pinmap.h | 8 +++---- arch/arm/src/{lm3s => lm}/chip/lm3s_ssi.h | 8 +++---- .../src/{lm3s => lm}/chip/lm3s_syscontrol.h | 8 +++---- arch/arm/src/{lm3s => lm}/chip/lm3s_timer.h | 8 +++---- arch/arm/src/{lm3s => lm}/chip/lm3s_uart.h | 8 +++---- arch/arm/src/{lm3s => lm}/chip/lm_memorymap.h | 8 +++---- arch/arm/src/{lm3s => lm}/chip/lm_pinmap.h | 8 +++---- arch/arm/src/{lm3s => lm}/lm3s_dumpgpio.c | 2 +- arch/arm/src/{lm3s => lm}/lm3s_ethernet.c | 2 +- arch/arm/src/{lm3s => lm}/lm3s_gpio.c | 2 +- arch/arm/src/{lm3s => lm}/lm3s_gpioirq.c | 2 +- arch/arm/src/{lm3s => lm}/lm3s_irq.c | 2 +- arch/arm/src/{lm3s => lm}/lm3s_lowputc.c | 2 +- arch/arm/src/{lm3s => lm}/lm3s_serial.c | 2 +- arch/arm/src/{lm3s => lm}/lm3s_ssi.c | 0 arch/arm/src/{lm3s => lm}/lm3s_start.c | 2 +- arch/arm/src/{lm3s => lm}/lm3s_syscontrol.c | 2 +- arch/arm/src/{lm3s => lm}/lm3s_timerisr.c | 2 +- arch/arm/src/{lm3s => lm}/lm3s_vectors.S | 2 +- arch/arm/src/{lm3s => lm}/lm_ethernet.h | 8 +++---- arch/arm/src/{lm3s => lm}/lm_gpio.h | 8 +++---- arch/arm/src/{lm3s => lm}/lm_lowputc.h | 8 +++---- arch/arm/src/{lm3s => lm}/lm_ssi.h | 8 +++---- arch/arm/src/{lm3s => lm}/lm_syscontrol.h | 8 +++---- 37 files changed, 128 insertions(+), 111 deletions(-) rename arch/arm/include/{lm3s => lm}/chip.h (97%) rename arch/arm/include/{lm3s => lm}/irq.h (99%) rename arch/arm/src/{lm3s => lm}/Kconfig (88%) rename arch/arm/src/{lm3s => lm}/Make.defs (98%) rename arch/arm/src/{lm3s => lm}/chip.h (95%) rename arch/arm/src/{lm3s => lm}/chip/lm3s_epi.h (97%) rename arch/arm/src/{lm3s => lm}/chip/lm3s_ethernet.h (98%) rename arch/arm/src/{lm3s => lm}/chip/lm3s_flash.h (97%) rename arch/arm/src/{lm3s => lm}/chip/lm3s_gpio.h (99%) rename arch/arm/src/{lm3s => lm}/chip/lm3s_i2c.h (98%) rename arch/arm/src/{lm3s => lm}/chip/lm3s_memorymap.h (99%) rename arch/arm/src/{lm3s => lm}/chip/lm3s_pinmap.h (99%) rename arch/arm/src/{lm3s => lm}/chip/lm3s_ssi.h (98%) rename arch/arm/src/{lm3s => lm}/chip/lm3s_syscontrol.h (99%) rename arch/arm/src/{lm3s => lm}/chip/lm3s_timer.h (97%) rename arch/arm/src/{lm3s => lm}/chip/lm3s_uart.h (99%) rename arch/arm/src/{lm3s => lm}/chip/lm_memorymap.h (94%) rename arch/arm/src/{lm3s => lm}/chip/lm_pinmap.h (94%) rename arch/arm/src/{lm3s => lm}/lm3s_dumpgpio.c (99%) rename arch/arm/src/{lm3s => lm}/lm3s_ethernet.c (99%) rename arch/arm/src/{lm3s => lm}/lm3s_gpio.c (99%) rename arch/arm/src/{lm3s => lm}/lm3s_gpioirq.c (99%) rename arch/arm/src/{lm3s => lm}/lm3s_irq.c (99%) rename arch/arm/src/{lm3s => lm}/lm3s_lowputc.c (99%) rename arch/arm/src/{lm3s => lm}/lm3s_serial.c (99%) rename arch/arm/src/{lm3s => lm}/lm3s_ssi.c (100%) rename arch/arm/src/{lm3s => lm}/lm3s_start.c (99%) rename arch/arm/src/{lm3s => lm}/lm3s_syscontrol.c (99%) rename arch/arm/src/{lm3s => lm}/lm3s_timerisr.c (99%) rename arch/arm/src/{lm3s => lm}/lm3s_vectors.S (99%) rename arch/arm/src/{lm3s => lm}/lm_ethernet.h (95%) rename arch/arm/src/{lm3s => lm}/lm_gpio.h (98%) rename arch/arm/src/{lm3s => lm}/lm_lowputc.h (95%) rename arch/arm/src/{lm3s => lm}/lm_ssi.h (97%) rename arch/arm/src/{lm3s => lm}/lm_syscontrol.h (95%) diff --git a/arch/README.txt b/arch/README.txt index 67b99b255d..14704aa76b 100644 --- a/arch/README.txt +++ b/arch/README.txt @@ -170,12 +170,12 @@ arch/arm - ARM-based micro-controllers STATUS: This port has stalled because of development tool issues. Coding is complete on the basic port (timer, serial console, SPI). - arch/arm/include/lm3s and arch/arm/src/lm3s - These directories contain support for the Luminary LMS family, particularly - for the LM3S6918. The initial, release of this port was included in NuttX version - 0.4.6. The current port includes timer, serial console, Ethernet, SSI, and microSD - support. There are working configurations the NuttX OS test, to run the NuttShell - (NSH), the NuttX networking test, and the uIP web server. + arch/arm/include/lm and arch/arm/src/lm + These directories contain support for the Luminary LM3S/4F family. The + initial, release of this port was included in NuttX version 0.4.6. The + current port includes timer, serial console, Ethernet, SSI, and microSD + support. There are working configurations the NuttX OS test, to run the + NuttShell (NSH), the NuttX networking test, and the uIP web server. arch/arm/include/lpc214x and arch/arm/src/lpc214x These directories provide support for NXP LPC214x family of diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 4fce8efbfb..bc7634695e 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -50,9 +50,8 @@ config ARCH_CHIP_KINETIS ---help--- Freescale Kinetis Architectures (ARM Cortex-M4) -config ARCH_CHIP_LM3S +config ARCH_CHIP_LM bool "TI Stellaris" - select ARCH_CORTEXM3 select ARCH_HAVE_MPU select ARCH_IRQPRIO ---help--- @@ -151,7 +150,7 @@ config ARCH_CHIP default "dm320" if ARCH_CHIP_DM320 default "imx" if ARCH_CHIP_IMX default "kinetis" if ARCH_CHIP_KINETIS - default "lm3s" if ARCH_CHIP_LM3S + default "lm" if ARCH_CHIP_LM default "lpc17xx" if ARCH_CHIP_LPC17XX default "lpc214x" if ARCH_CHIP_LPC214X default "lpc2378" if ARCH_CHIP_LPC2378 @@ -274,8 +273,8 @@ endif if ARCH_CHIP_KINETIS source arch/arm/src/kinetis/Kconfig endif -if ARCH_CHIP_LM3S -source arch/arm/src/lm3s/Kconfig +if ARCH_CHIP_LM +source arch/arm/src/lm/Kconfig endif if ARCH_CHIP_LPC17XX source arch/arm/src/lpc17xx/Kconfig diff --git a/arch/arm/include/lm3s/chip.h b/arch/arm/include/lm/chip.h similarity index 97% rename from arch/arm/include/lm3s/chip.h rename to arch/arm/include/lm/chip.h index d7e98a4613..9eee51922e 100644 --- a/arch/arm/include/lm3s/chip.h +++ b/arch/arm/include/lm/chip.h @@ -1,5 +1,5 @@ /************************************************************************************ - * arch/arm/include/lm3s/chip.h + * arch/arm/include/lm/chip.h * * Copyright (C) 2009-2010, 2013 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __ARCH_ARM_INCLUDE_LM3S_CHIP_H -#define __ARCH_ARM_INCLUDE_LM3S_CHIP_H +#ifndef __ARCH_ARM_INCLUDE_LM_CHIP_H +#define __ARCH_ARM_INCLUDE_LM_CHIP_H /************************************************************************************ * Included Files @@ -120,4 +120,4 @@ * Public Function Prototypes ****************************************************************************/ -#endif /* __ARCH_ARM_INCLUDE_LM3S_CHIP_H */ +#endif /* __ARCH_ARM_INCLUDE_LM_CHIP_H */ diff --git a/arch/arm/include/lm3s/irq.h b/arch/arm/include/lm/irq.h similarity index 99% rename from arch/arm/include/lm3s/irq.h rename to arch/arm/include/lm/irq.h index 6ffc7dec09..a80517e40d 100644 --- a/arch/arm/include/lm3s/irq.h +++ b/arch/arm/include/lm/irq.h @@ -1,5 +1,5 @@ /************************************************************************************ - * arch/arm/include/lm3s/irq.h + * arch/arm/include/lm/irq.h * * Copyright (C) 2009-2011 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -37,8 +37,8 @@ * only indirectly through nuttx/irq.h */ -#ifndef __ARCH_ARM_INCLUDE_LM3S_IRQ_H -#define __ARCH_ARM_INCLUDE_LM3S_IRQ_H +#ifndef __ARCH_ARM_INCLUDE_LM_IRQ_H +#define __ARCH_ARM_INCLUDE_LM_IRQ_H /************************************************************************************ * Included Files @@ -493,5 +493,5 @@ EXTERN void gpio_irqdisable(int irq); #endif #endif -#endif /* __ARCH_ARM_INCLUDE_LM3S_IRQ_H */ +#endif /* __ARCH_ARM_INCLUDE_LM_IRQ_H */ diff --git a/arch/arm/src/lm3s/Kconfig b/arch/arm/src/lm/Kconfig similarity index 88% rename from arch/arm/src/lm3s/Kconfig rename to arch/arm/src/lm/Kconfig index aaf8342fa6..74d1712f32 100644 --- a/arch/arm/src/lm3s/Kconfig +++ b/arch/arm/src/lm/Kconfig @@ -3,31 +3,49 @@ # see misc/tools/kconfig-language.txt. # -comment "LM3S Configuration Options" +comment "Stellaris Configuration Options" choice - prompt "LM3S Chip Selection" + prompt "Stellaris Chip Selection" default ARCH_CHIP_LM3S6965 - depends on ARCH_CHIP_LM3S + depends on ARCH_CHIP_LM config ARCH_CHIP_LM3S6918 bool "LM3S6918" + select ARCH_CORTEXM3 + select ARCH_CHIP_LM3S select LM3S_HAVE_SSI1 config ARCH_CHIP_LM3S9B96 bool "LM3S9B96" + select ARCH_CORTEXM3 + select ARCH_CHIP_LM3S config ARCH_CHIP_LM3S6432 bool "LM3S6432" + select ARCH_CORTEXM3 + select ARCH_CHIP_LM3S config ARCH_CHIP_LM3S6965 bool "LM3S6965" + select ARCH_CORTEXM3 + select ARCH_CHIP_LM3S config ARCH_CHIP_LM3S8962 bool "LM3S8962" + select ARCH_CORTEXM3 + select ARCH_CHIP_LM3S endchoice +# Chip families + +config ARCH_CHIP_LM3S + bool + +config ARCH_CHIP_LM4F + bool + config LM3S_HAVE_SSI1 bool diff --git a/arch/arm/src/lm3s/Make.defs b/arch/arm/src/lm/Make.defs similarity index 98% rename from arch/arm/src/lm3s/Make.defs rename to arch/arm/src/lm/Make.defs index 66b8f56583..aacbb1c831 100644 --- a/arch/arm/src/lm3s/Make.defs +++ b/arch/arm/src/lm/Make.defs @@ -1,5 +1,5 @@ ############################################################################ -# arch/arm/src/lm3s/Make.defs +# arch/arm/src/lm/Make.defs # # Copyright (C) 2009-2011, 2013 Gregory Nutt. All rights reserved. # Author: Gregory Nutt diff --git a/arch/arm/src/lm3s/chip.h b/arch/arm/src/lm/chip.h similarity index 95% rename from arch/arm/src/lm3s/chip.h rename to arch/arm/src/lm/chip.h index 481a9be159..5857b30949 100644 --- a/arch/arm/src/lm3s/chip.h +++ b/arch/arm/src/lm/chip.h @@ -1,5 +1,5 @@ /************************************************************************************ - * arch/arm/src/lm3s/chip.h + * arch/arm/src/lm/chip.h * * Copyright (C) 2009-2010 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,15 +33,15 @@ * ************************************************************************************/ -#ifndef __ARCH_ARM_SRC_LM3S_CHIP_H -#define __ARCH_ARM_SRC_LM3S_CHIP_H +#ifndef __ARCH_ARM_SRC_LM_CHIP_H +#define __ARCH_ARM_SRC_LM_CHIP_H /************************************************************************************ * Included Files ************************************************************************************/ #include -#include +#include /************************************************************************************ * Pre-processor Definitions @@ -80,4 +80,4 @@ * Public Function Prototypes ****************************************************************************/ -#endif /* __ARCH_ARM_SRC_LM3S_CHIP_H */ +#endif /* __ARCH_ARM_SRC_LM_CHIP_H */ diff --git a/arch/arm/src/lm3s/chip/lm3s_epi.h b/arch/arm/src/lm/chip/lm3s_epi.h similarity index 97% rename from arch/arm/src/lm3s/chip/lm3s_epi.h rename to arch/arm/src/lm/chip/lm3s_epi.h index 5b54d44ac4..82fc94f4c7 100644 --- a/arch/arm/src/lm3s/chip/lm3s_epi.h +++ b/arch/arm/src/lm/chip/lm3s_epi.h @@ -1,5 +1,5 @@ /************************************************************************************ - * arch/arm/src/lm3s/chip/lm3s_epi.h + * arch/arm/src/lm/chip/lm3s_epi.h * * Copyright (C) 2009-2013 Max Neklyudov. All rights reserved. * Author: Max Neklyudov @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __ARCH_ARM_SRC_LM3S_CHIP_LM3S_EPI_H -#define __ARCH_ARM_SRC_LM3S_CHIP_LM3S_EPI_H +#ifndef __ARCH_ARM_SRC_LM_CHIP_LM3S_EPI_H +#define __ARCH_ARM_SRC_LM_CHIP_LM3S_EPI_H /************************************************************************************ * Included Files @@ -110,4 +110,4 @@ #define EPI_BAUD_COUNT0_MASK (0xFFFF << EPI_BAUD_COUNT0_SHIFT) # define EPI_BAUD_COUNT0(n) ((n) << EPI_BAUD_COUNT0_SHIFT) -#endif /* __ARCH_ARM_SRC_LM3S_CHIP_LM3S_EPI_H */ +#endif /* __ARCH_ARM_SRC_LM_CHIP_LM3S_EPI_H */ diff --git a/arch/arm/src/lm3s/chip/lm3s_ethernet.h b/arch/arm/src/lm/chip/lm3s_ethernet.h similarity index 98% rename from arch/arm/src/lm3s/chip/lm3s_ethernet.h rename to arch/arm/src/lm/chip/lm3s_ethernet.h index 940686e7de..512e962219 100644 --- a/arch/arm/src/lm3s/chip/lm3s_ethernet.h +++ b/arch/arm/src/lm/chip/lm3s_ethernet.h @@ -1,5 +1,5 @@ /************************************************************************************ - * arch/arm/src/lm3s/chip/lm3s_ethernet.h + * arch/arm/src/lm/chip/lm3s_ethernet.h * * Copyright (C) 2009-2010, 2012-2013 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __ARCH_ARM_SRC_LM3S_CHIP_LM3S_ETHERNET_H -#define __ARCH_ARM_SRC_LM3S_CHIP_LM3S_ETHERNET_H +#ifndef __ARCH_ARM_SRC_LM_CHIP_LM3S_ETHERNET_H +#define __ARCH_ARM_SRC_LM_CHIP_LM3S_ETHERNET_H /************************************************************************************ * Included Files @@ -200,4 +200,4 @@ * Public Function Prototypes ************************************************************************************/ -#endif /* __ARCH_ARM_SRC_LM3S_CHIP_LM3S_ETHERNET_H */ +#endif /* __ARCH_ARM_SRC_LM_CHIP_LM3S_ETHERNET_H */ diff --git a/arch/arm/src/lm3s/chip/lm3s_flash.h b/arch/arm/src/lm/chip/lm3s_flash.h similarity index 97% rename from arch/arm/src/lm3s/chip/lm3s_flash.h rename to arch/arm/src/lm/chip/lm3s_flash.h index 2bd8956b0a..2f6dc78fae 100644 --- a/arch/arm/src/lm3s/chip/lm3s_flash.h +++ b/arch/arm/src/lm/chip/lm3s_flash.h @@ -1,5 +1,5 @@ /************************************************************************************ - * arch/arm/src/lm3s/chip/lm3s_flash.h + * arch/arm/src/lm/chip/lm3s_flash.h * * Copyright (C) 2009, 2013 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __ARCH_ARM_SRC_LM3S_CHIP_LM3S_FLASH_H -#define __ARCH_ARM_SRC_LM3S_CHIP_LM3S_FLASH_H +#ifndef __ARCH_ARM_SRC_LM_CHIP_LM3S_FLASH_H +#define __ARCH_ARM_SRC_LM_CHIP_LM3S_FLASH_H /************************************************************************************ * Included Files @@ -125,4 +125,4 @@ * Public Function Prototypes ************************************************************************************/ -#endif /* __ARCH_ARM_SRC_LM3S_CHIP_LM3S_FLASH_H */ +#endif /* __ARCH_ARM_SRC_LM_CHIP_LM3S_FLASH_H */ diff --git a/arch/arm/src/lm3s/chip/lm3s_gpio.h b/arch/arm/src/lm/chip/lm3s_gpio.h similarity index 99% rename from arch/arm/src/lm3s/chip/lm3s_gpio.h rename to arch/arm/src/lm/chip/lm3s_gpio.h index 7253c1e7a8..2c199dae9d 100644 --- a/arch/arm/src/lm3s/chip/lm3s_gpio.h +++ b/arch/arm/src/lm/chip/lm3s_gpio.h @@ -1,5 +1,5 @@ /************************************************************************************ - * arch/arm/src/lm3s/chip/lm3s_gpio.h + * arch/arm/src/lm/chip/lm3s_gpio.h * * Copyright (C) 2009-2010, 2013 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __ARCH_ARM_SRC_LM3S_CHIP_LM3S_GPIO_H -#define __ARCH_ARM_SRC_LM3S_CHIP_LM3S_GPIO_H +#ifndef __ARCH_ARM_SRC_LM_CHIP_LM3S_GPIO_H +#define __ARCH_ARM_SRC_LM_CHIP_LM3S_GPIO_H /************************************************************************************ * Included Files @@ -392,4 +392,4 @@ * Public Function Prototypes ************************************************************************************/ -#endif /* __ARCH_ARM_SRC_LM3S_CHIP_LM3S_GPIO_H */ +#endif /* __ARCH_ARM_SRC_LM_CHIP_LM3S_GPIO_H */ diff --git a/arch/arm/src/lm3s/chip/lm3s_i2c.h b/arch/arm/src/lm/chip/lm3s_i2c.h similarity index 98% rename from arch/arm/src/lm3s/chip/lm3s_i2c.h rename to arch/arm/src/lm/chip/lm3s_i2c.h index 71ebe8fcf2..e029c4f3f3 100644 --- a/arch/arm/src/lm3s/chip/lm3s_i2c.h +++ b/arch/arm/src/lm/chip/lm3s_i2c.h @@ -1,5 +1,5 @@ /************************************************************************************ - * arch/arm/src/lm3s/chip/lm3s_i2c.h + * arch/arm/src/lm/chip/lm3s_i2c.h * * Copyright (C) 2009, 2013 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __ARCH_ARM_SRC_LM3S_CHIP_LM3S_I2C_H -#define __ARCH_ARM_SRC_LM3S_CHIP_LM3S_I2C_H +#ifndef __ARCH_ARM_SRC_LM_CHIP_LM3S_I2C_H +#define __ARCH_ARM_SRC_LM_CHIP_LM3S_I2C_H /************************************************************************************ * Included Files @@ -244,4 +244,4 @@ * Public Function Prototypes ****************************************************************************/ -#endif /* __ARCH_ARM_SRC_LM3S_CHIP_LM3S_I2C_H */ +#endif /* __ARCH_ARM_SRC_LM_CHIP_LM3S_I2C_H */ diff --git a/arch/arm/src/lm3s/chip/lm3s_memorymap.h b/arch/arm/src/lm/chip/lm3s_memorymap.h similarity index 99% rename from arch/arm/src/lm3s/chip/lm3s_memorymap.h rename to arch/arm/src/lm/chip/lm3s_memorymap.h index 31dc2b2490..51de04a2bd 100644 --- a/arch/arm/src/lm3s/chip/lm3s_memorymap.h +++ b/arch/arm/src/lm/chip/lm3s_memorymap.h @@ -1,5 +1,5 @@ /************************************************************************************ - * arch/arm/src/lm3s/chip/lm3s_memorymap.h + * arch/arm/src/lm/chip/lm3s_memorymap.h * * Copyright (C) 2009-2010 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __ARCH_ARM_SRC_LM3S_CHIP_LM3S_MEMORYMAP_H -#define __ARCH_ARM_SRC_LM3S_CHIP_LM3S_MEMORYMAP_H +#ifndef __ARCH_ARM_SRC_LM_CHIP_LM3S_MEMORYMAP_H +#define __ARCH_ARM_SRC_LM_CHIP_LM3S_MEMORYMAP_H /************************************************************************************ * Included Files @@ -357,4 +357,4 @@ * Public Function Prototypes ************************************************************************************/ -#endif /* __ARCH_ARM_SRC_LM3S_CHIP_LM3S_MEMORYMAP_H */ +#endif /* __ARCH_ARM_SRC_LM_CHIP_LM3S_MEMORYMAP_H */ diff --git a/arch/arm/src/lm3s/chip/lm3s_pinmap.h b/arch/arm/src/lm/chip/lm3s_pinmap.h similarity index 99% rename from arch/arm/src/lm3s/chip/lm3s_pinmap.h rename to arch/arm/src/lm/chip/lm3s_pinmap.h index 62a4a03fd0..85ec1369a3 100644 --- a/arch/arm/src/lm3s/chip/lm3s_pinmap.h +++ b/arch/arm/src/lm/chip/lm3s_pinmap.h @@ -1,5 +1,5 @@ /************************************************************************************ - * arch/arm/src/lm3s/chip/lm3s_pinmap.h + * arch/arm/src/lm/chip/lm3s_pinmap.h * * Copyright (C) 2009-2010, 2013 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __ARCH_ARM_SRC_LM3S_CHIP_LM3S_PINMAP_H -#define __ARCH_ARM_SRC_LM3S_CHIP_LM3S_PINMAP_H +#ifndef __ARCH_ARM_SRC_LM_CHIP_LM3S_PINMAP_H +#define __ARCH_ARM_SRC_LM_CHIP_LM3S_PINMAP_H /************************************************************************************ * Included Files @@ -278,4 +278,4 @@ * Public Function Prototypes ****************************************************************************/ -#endif /* __ARCH_ARM_SRC_LM3S_CHIP_LM3S_PINMAP_H */ +#endif /* __ARCH_ARM_SRC_LM_CHIP_LM3S_PINMAP_H */ diff --git a/arch/arm/src/lm3s/chip/lm3s_ssi.h b/arch/arm/src/lm/chip/lm3s_ssi.h similarity index 98% rename from arch/arm/src/lm3s/chip/lm3s_ssi.h rename to arch/arm/src/lm/chip/lm3s_ssi.h index b56ca77cb9..be5a766e54 100644 --- a/arch/arm/src/lm3s/chip/lm3s_ssi.h +++ b/arch/arm/src/lm/chip/lm3s_ssi.h @@ -1,5 +1,5 @@ /************************************************************************************ - * arch/arm/src/lm3s/chip/lm3s_ssi.h + * arch/arm/src/lm/chip/lm3s_ssi.h * * Copyright (C) 2009, 2013 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __ARCH_ARM_SRC_LM3S_CHIP_LM3S_SSI_H -#define __ARCH_ARM_SRC_LM3S_CHIP_LM3S_SSI_H +#ifndef __ARCH_ARM_SRC_LM_CHIP_LM3S_SSI_H +#define __ARCH_ARM_SRC_LM_CHIP_LM3S_SSI_H /************************************************************************************ * Included Files @@ -232,4 +232,4 @@ ************************************************************************************/ #endif /* LM3S_NSSI > 0 */ -#endif /* __ARCH_ARM_SRC_LM3S_CHIP_LM3S_SSI_H */ +#endif /* __ARCH_ARM_SRC_LM_CHIP_LM3S_SSI_H */ diff --git a/arch/arm/src/lm3s/chip/lm3s_syscontrol.h b/arch/arm/src/lm/chip/lm3s_syscontrol.h similarity index 99% rename from arch/arm/src/lm3s/chip/lm3s_syscontrol.h rename to arch/arm/src/lm/chip/lm3s_syscontrol.h index d66cfeb475..00a222ee37 100644 --- a/arch/arm/src/lm3s/chip/lm3s_syscontrol.h +++ b/arch/arm/src/lm/chip/lm3s_syscontrol.h @@ -1,5 +1,5 @@ /************************************************************************************ - * arch/arm/src/lm3s/chip/lm3s_syscontrol.h + * arch/arm/src/lm/chip/lm3s_syscontrol.h * * Copyright (C) 2009-2010, 2013 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __ARCH_ARM_SRC_LM3S_CHIP_LM3S_SYSCONTROL_H -#define __ARCH_ARM_SRC_LM3S_CHIP_LM3S_SYSCONTROL_H +#ifndef __ARCH_ARM_SRC_LM_CHIP_LM3S_SYSCONTROL_H +#define __ARCH_ARM_SRC_LM_CHIP_LM3S_SYSCONTROL_H /************************************************************************************ * Included Files @@ -492,4 +492,4 @@ * Public Functions ************************************************************************************/ -#endif /* __ARCH_ARM_SRC_LM3S_CHIP_LM3S_SYSCONTROL_H */ +#endif /* __ARCH_ARM_SRC_LM_CHIP_LM3S_SYSCONTROL_H */ diff --git a/arch/arm/src/lm3s/chip/lm3s_timer.h b/arch/arm/src/lm/chip/lm3s_timer.h similarity index 97% rename from arch/arm/src/lm3s/chip/lm3s_timer.h rename to arch/arm/src/lm/chip/lm3s_timer.h index 649737f130..6be963cc31 100644 --- a/arch/arm/src/lm3s/chip/lm3s_timer.h +++ b/arch/arm/src/lm/chip/lm3s_timer.h @@ -1,5 +1,5 @@ /************************************************************************************ - * arch/arm/src/lm3s/chip/lm3s_timer.h + * arch/arm/src/lm/chip/lm3s_timer.h * * Copyright (C) 2012 Max Nekludov. All rights reserved. * Author: Max Nekludov @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __ARCH_ARM_SRC_LM3S_CHIP_LM3S_TIMER_H -#define __ARCH_ARM_SRC_LM3S_CHIP_LM3S_TIMER_H +#ifndef __ARCH_ARM_SRC_LM_CHIP_LM3S_TIMER_H +#define __ARCH_ARM_SRC_LM_CHIP_LM3S_TIMER_H /************************************************************************************ * Included Files @@ -122,4 +122,4 @@ #define TIMER_GPTMICR_TATOCINT_SHIFT 0 /* Bits 0: GPTM Timer A Time-Out Raw Interrupt Clear*/ #define TIMER_GPTMICR_TATOCINT_MASK (0x01 << TIMER_GPTMICR_TATOCINT_SHIFT) -#endif /* __ARCH_ARM_SRC_LM3S_CHIP_LM3S_TIMER_H */ +#endif /* __ARCH_ARM_SRC_LM_CHIP_LM3S_TIMER_H */ diff --git a/arch/arm/src/lm3s/chip/lm3s_uart.h b/arch/arm/src/lm/chip/lm3s_uart.h similarity index 99% rename from arch/arm/src/lm3s/chip/lm3s_uart.h rename to arch/arm/src/lm/chip/lm3s_uart.h index 0fef5ccf7d..98dcbce128 100644 --- a/arch/arm/src/lm3s/chip/lm3s_uart.h +++ b/arch/arm/src/lm/chip/lm3s_uart.h @@ -1,5 +1,5 @@ /************************************************************************************ - * arch/arm/src/lm3s/chip/lm3s_uart.h + * arch/arm/src/lm/chip/lm3s_uart.h * * Copyright (C) 2009, 2013 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __ARCH_ARM_SRC_LM3S_CHIP_LM3S_UART_H -#define __ARCH_ARM_SRC_LM3S_CHIP_LM3S_UART_H +#ifndef __ARCH_ARM_SRC_LM_CHIP_LM3S_UART_H +#define __ARCH_ARM_SRC_LM_CHIP_LM3S_UART_H /************************************************************************************ * Included Files @@ -344,4 +344,4 @@ * Public Functions ************************************************************************************/ -#endif /* __ARCH_ARM_SRC_LM3S_CHIP_LM3S_UART_H */ +#endif /* __ARCH_ARM_SRC_LM_CHIP_LM3S_UART_H */ diff --git a/arch/arm/src/lm3s/chip/lm_memorymap.h b/arch/arm/src/lm/chip/lm_memorymap.h similarity index 94% rename from arch/arm/src/lm3s/chip/lm_memorymap.h rename to arch/arm/src/lm/chip/lm_memorymap.h index c528578476..530ecdf647 100644 --- a/arch/arm/src/lm3s/chip/lm_memorymap.h +++ b/arch/arm/src/lm/chip/lm_memorymap.h @@ -1,5 +1,5 @@ /************************************************************************************ - * arch/arm/src/lm3s/chip/lm_memorymap.h + * arch/arm/src/lm/chip/lm_memorymap.h * * Copyright (C) 2013 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __ARCH_ARM_SRC_LM3S_CHIP_LM_MEMORYMAP_H -#define __ARCH_ARM_SRC_LM3S_CHIP_LM_MEMORYMAP_H +#ifndef __ARCH_ARM_SRC_LM_CHIP_LM_MEMORYMAP_H +#define __ARCH_ARM_SRC_LM_CHIP_LM_MEMORYMAP_H /************************************************************************************ * Included Files @@ -66,4 +66,4 @@ * Public Function Prototypes ************************************************************************************/ -#endif /* __ARCH_ARM_SRC_LM3S_CHIP_LM_MEMORYMAP_H */ +#endif /* __ARCH_ARM_SRC_LM_CHIP_LM_MEMORYMAP_H */ diff --git a/arch/arm/src/lm3s/chip/lm_pinmap.h b/arch/arm/src/lm/chip/lm_pinmap.h similarity index 94% rename from arch/arm/src/lm3s/chip/lm_pinmap.h rename to arch/arm/src/lm/chip/lm_pinmap.h index b00a6e7940..b8154dd9f5 100644 --- a/arch/arm/src/lm3s/chip/lm_pinmap.h +++ b/arch/arm/src/lm/chip/lm_pinmap.h @@ -1,5 +1,5 @@ /************************************************************************************ - * arch/arm/src/lm3s/chip/lm_pinmap.h + * arch/arm/src/lm/chip/lm_pinmap.h * * Copyright (C) 2013 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __ARCH_ARM_SRC_LM3S_CHIP_LM_PINMAP_H -#define __ARCH_ARM_SRC_LM3S_CHIP_LM_PINMAP_H +#ifndef __ARCH_ARM_SRC_LM_CHIP_LM_PINMAP_H +#define __ARCH_ARM_SRC_LM_CHIP_LM_PINMAP_H /************************************************************************************ * Included Files @@ -66,4 +66,4 @@ * Public Function Prototypes ************************************************************************************/ -#endif /* __ARCH_ARM_SRC_LM3S_CHIP_LM_PINMAP_H */ +#endif /* __ARCH_ARM_SRC_LM_CHIP_LM_PINMAP_H */ diff --git a/arch/arm/src/lm3s/lm3s_dumpgpio.c b/arch/arm/src/lm/lm3s_dumpgpio.c similarity index 99% rename from arch/arm/src/lm3s/lm3s_dumpgpio.c rename to arch/arm/src/lm/lm3s_dumpgpio.c index 9d205b7634..a84dc59ddb 100644 --- a/arch/arm/src/lm3s/lm3s_dumpgpio.c +++ b/arch/arm/src/lm/lm3s_dumpgpio.c @@ -1,5 +1,5 @@ /**************************************************************************** - * arch/arm/src/lm3s/lm3s_dumpgpio.c + * arch/arm/src/lm/lm3s_dumpgpio.c * * Copyright (C) 2009-2010 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/arch/arm/src/lm3s/lm3s_ethernet.c b/arch/arm/src/lm/lm3s_ethernet.c similarity index 99% rename from arch/arm/src/lm3s/lm3s_ethernet.c rename to arch/arm/src/lm/lm3s_ethernet.c index f44b6654ff..f6edab5ae2 100644 --- a/arch/arm/src/lm3s/lm3s_ethernet.c +++ b/arch/arm/src/lm/lm3s_ethernet.c @@ -1,5 +1,5 @@ /**************************************************************************** - * arch/arm/src/lm3s/lm3s_ethernet.c + * arch/arm/src/lm/lm3s_ethernet.c * * Copyright (C) 2009-2010 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/arch/arm/src/lm3s/lm3s_gpio.c b/arch/arm/src/lm/lm3s_gpio.c similarity index 99% rename from arch/arm/src/lm3s/lm3s_gpio.c rename to arch/arm/src/lm/lm3s_gpio.c index dd005fdd19..48cbefabf7 100644 --- a/arch/arm/src/lm3s/lm3s_gpio.c +++ b/arch/arm/src/lm/lm3s_gpio.c @@ -1,5 +1,5 @@ /**************************************************************************** - * arch/arm/src/lm3s/lm3s_gpio.c + * arch/arm/src/lm/lm3s_gpio.c * arch/arm/src/chip/lm3s_gpio.c * * Copyright (C) 2009-2010 Gregory Nutt. All rights reserved. diff --git a/arch/arm/src/lm3s/lm3s_gpioirq.c b/arch/arm/src/lm/lm3s_gpioirq.c similarity index 99% rename from arch/arm/src/lm3s/lm3s_gpioirq.c rename to arch/arm/src/lm/lm3s_gpioirq.c index 511195f2d5..a54bfe335e 100644 --- a/arch/arm/src/lm3s/lm3s_gpioirq.c +++ b/arch/arm/src/lm/lm3s_gpioirq.c @@ -1,5 +1,5 @@ /**************************************************************************** - * arch/arm/src/lm3s/lm3s_gpioirq.c + * arch/arm/src/lm/lm3s_gpioirq.c * arch/arm/src/chip/lm3s_gpioirq.c * * Copyright (C) 2009-2010, 2012 Gregory Nutt. All rights reserved. diff --git a/arch/arm/src/lm3s/lm3s_irq.c b/arch/arm/src/lm/lm3s_irq.c similarity index 99% rename from arch/arm/src/lm3s/lm3s_irq.c rename to arch/arm/src/lm/lm3s_irq.c index 2f0b9fa728..2039d84a85 100644 --- a/arch/arm/src/lm3s/lm3s_irq.c +++ b/arch/arm/src/lm/lm3s_irq.c @@ -1,5 +1,5 @@ /**************************************************************************** - * arch/arm/src/lm3s/lm3s_irq.c + * arch/arm/src/lm/lm3s_irq.c * arch/arm/src/chip/lm3s_irq.c * * Copyright (C) 2009, 2011 Gregory Nutt. All rights reserved. diff --git a/arch/arm/src/lm3s/lm3s_lowputc.c b/arch/arm/src/lm/lm3s_lowputc.c similarity index 99% rename from arch/arm/src/lm3s/lm3s_lowputc.c rename to arch/arm/src/lm/lm3s_lowputc.c index bdbd5a9065..7f9a826c8f 100644 --- a/arch/arm/src/lm3s/lm3s_lowputc.c +++ b/arch/arm/src/lm/lm3s_lowputc.c @@ -1,5 +1,5 @@ /************************************************************************** - * arch/arm/src/lm3s/lm3s_lowputc.c + * arch/arm/src/lm/lm3s_lowputc.c * * Copyright (C) 2009-2010 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/arch/arm/src/lm3s/lm3s_serial.c b/arch/arm/src/lm/lm3s_serial.c similarity index 99% rename from arch/arm/src/lm3s/lm3s_serial.c rename to arch/arm/src/lm/lm3s_serial.c index 7ed9b6fa84..79628c765b 100644 --- a/arch/arm/src/lm3s/lm3s_serial.c +++ b/arch/arm/src/lm/lm3s_serial.c @@ -1,5 +1,5 @@ /**************************************************************************** - * arch/arm/src/lm3s/lm3s_serial.c + * arch/arm/src/lm/lm3s_serial.c * * Copyright (C) 2009-2010, 2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/arch/arm/src/lm3s/lm3s_ssi.c b/arch/arm/src/lm/lm3s_ssi.c similarity index 100% rename from arch/arm/src/lm3s/lm3s_ssi.c rename to arch/arm/src/lm/lm3s_ssi.c diff --git a/arch/arm/src/lm3s/lm3s_start.c b/arch/arm/src/lm/lm3s_start.c similarity index 99% rename from arch/arm/src/lm3s/lm3s_start.c rename to arch/arm/src/lm/lm3s_start.c index 341b82e507..4dfe928442 100644 --- a/arch/arm/src/lm3s/lm3s_start.c +++ b/arch/arm/src/lm/lm3s_start.c @@ -1,5 +1,5 @@ /**************************************************************************** - * arch/arm/src/lm3s/lm3s_start.c + * arch/arm/src/lm/lm3s_start.c * arch/arm/src/chip/lm3s_start.c * * Copyright (C) 2009, 2012 Gregory Nutt. All rights reserved. diff --git a/arch/arm/src/lm3s/lm3s_syscontrol.c b/arch/arm/src/lm/lm3s_syscontrol.c similarity index 99% rename from arch/arm/src/lm3s/lm3s_syscontrol.c rename to arch/arm/src/lm/lm3s_syscontrol.c index 3ad0cacb5c..87545bec7a 100644 --- a/arch/arm/src/lm3s/lm3s_syscontrol.c +++ b/arch/arm/src/lm/lm3s_syscontrol.c @@ -1,5 +1,5 @@ /**************************************************************************** - * arch/arm/src/lm3s/lm3s_syscontrol.c + * arch/arm/src/lm/lm3s_syscontrol.c * arch/arm/src/chip/lm3s_syscontrol.c * * Copyright (C) 2009 Gregory Nutt. All rights reserved. diff --git a/arch/arm/src/lm3s/lm3s_timerisr.c b/arch/arm/src/lm/lm3s_timerisr.c similarity index 99% rename from arch/arm/src/lm3s/lm3s_timerisr.c rename to arch/arm/src/lm/lm3s_timerisr.c index 9cd912249f..823d810da2 100644 --- a/arch/arm/src/lm3s/lm3s_timerisr.c +++ b/arch/arm/src/lm/lm3s_timerisr.c @@ -1,5 +1,5 @@ /**************************************************************************** - * arch/arm/src/lm3s/lm3s_timerisr.c + * arch/arm/src/lm/lm3s_timerisr.c * * Copyright (C) 2009 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/arch/arm/src/lm3s/lm3s_vectors.S b/arch/arm/src/lm/lm3s_vectors.S similarity index 99% rename from arch/arm/src/lm3s/lm3s_vectors.S rename to arch/arm/src/lm/lm3s_vectors.S index 71db122a0d..fe92fc9547 100644 --- a/arch/arm/src/lm3s/lm3s_vectors.S +++ b/arch/arm/src/lm/lm3s_vectors.S @@ -1,5 +1,5 @@ /************************************************************************************ - * arch/arm/src/lm3s/lm3s_vectors.S + * arch/arm/src/lm/lm3s_vectors.S * arch/arm/src/chip/lm3s_vectors.S * * Copyright (C) 2009-2010 Gregory Nutt. All rights reserved. diff --git a/arch/arm/src/lm3s/lm_ethernet.h b/arch/arm/src/lm/lm_ethernet.h similarity index 95% rename from arch/arm/src/lm3s/lm_ethernet.h rename to arch/arm/src/lm/lm_ethernet.h index 600955b95b..29fe4fd17b 100644 --- a/arch/arm/src/lm3s/lm_ethernet.h +++ b/arch/arm/src/lm/lm_ethernet.h @@ -1,5 +1,5 @@ /************************************************************************************ - * arch/arm/src/lm3s/lm_ethernet.h + * arch/arm/src/lm/lm_ethernet.h * * Copyright (C) 2009-2010, 2013 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __ARCH_ARM_SRC_LM3S_LM_ETHERNET_H -#define __ARCH_ARM_SRC_LM3S_LM_ETHERNET_H +#ifndef __ARCH_ARM_SRC_LM_LM_ETHERNET_H +#define __ARCH_ARM_SRC_LM_LM_ETHERNET_H /************************************************************************************ * Included Files @@ -100,4 +100,4 @@ int lm3s_ethinitialize(int intf); #endif /* __ASSEMBLY__ */ #endif /* LM3S_NETHCONTROLLERS > 1 */ -#endif /* __ARCH_ARM_SRC_LM3S_LM_ETHERNET_H */ +#endif /* __ARCH_ARM_SRC_LM_LM_ETHERNET_H */ diff --git a/arch/arm/src/lm3s/lm_gpio.h b/arch/arm/src/lm/lm_gpio.h similarity index 98% rename from arch/arm/src/lm3s/lm_gpio.h rename to arch/arm/src/lm/lm_gpio.h index 1bfb79fc90..9577fd9261 100644 --- a/arch/arm/src/lm3s/lm_gpio.h +++ b/arch/arm/src/lm/lm_gpio.h @@ -1,5 +1,5 @@ /************************************************************************************ - * arch/arm/src/lm3s/lm_gpio.h + * arch/arm/src/lm/lm_gpio.h * * Copyright (C) 2009-2010, 2013 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __ARCH_ARM_SRC_LM3S_LM_GPIO_H -#define __ARCH_ARM_SRC_LM3S_LM_GPIO_H +#ifndef __ARCH_ARM_SRC_LM_LM_GPIO_H +#define __ARCH_ARM_SRC_LM_LM_GPIO_H /************************************************************************************ * Included Files @@ -220,4 +220,4 @@ int weak_function gpio_irqinitialize(void); #endif #endif /* __ASSEMBLY__ */ -#endif /* __ARCH_ARM_SRC_LM3S_LM_GPIO_H */ +#endif /* __ARCH_ARM_SRC_LM_LM_GPIO_H */ diff --git a/arch/arm/src/lm3s/lm_lowputc.h b/arch/arm/src/lm/lm_lowputc.h similarity index 95% rename from arch/arm/src/lm3s/lm_lowputc.h rename to arch/arm/src/lm/lm_lowputc.h index 8e2858ebf3..b384bbd800 100644 --- a/arch/arm/src/lm3s/lm_lowputc.h +++ b/arch/arm/src/lm/lm_lowputc.h @@ -1,5 +1,5 @@ /************************************************************************************ - * arch/arm/src/lm3s/lm3s_lowputc.h + * arch/arm/src/lm/lm3s_lowputc.h * * Copyright (C) 2009-2010, 2013 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __ARCH_ARM_SRC_LM3S_LM_LOWPUTC_H -#define __ARCH_ARM_SRC_LM3S_LM_LOWPUTC_H +#ifndef __ARCH_ARM_SRC_LM_LM_LOWPUTC_H +#define __ARCH_ARM_SRC_LM_LM_LOWPUTC_H /************************************************************************************ * Included Files @@ -84,4 +84,4 @@ void up_lowsetup(void); #endif #endif /* __ASSEMBLY__ */ -#endif /* __ARCH_ARM_SRC_LM3S_LM_LOWPUTC_H */ +#endif /* __ARCH_ARM_SRC_LM_LM_LOWPUTC_H */ diff --git a/arch/arm/src/lm3s/lm_ssi.h b/arch/arm/src/lm/lm_ssi.h similarity index 97% rename from arch/arm/src/lm3s/lm_ssi.h rename to arch/arm/src/lm/lm_ssi.h index dd1e30817d..4e71198987 100644 --- a/arch/arm/src/lm3s/lm_ssi.h +++ b/arch/arm/src/lm/lm_ssi.h @@ -1,5 +1,5 @@ /************************************************************************************ - * arch/arm/src/lm3s/lm_ssi.h + * arch/arm/src/lm/lm_ssi.h * * Copyright (C) 2009-2010, 2013 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __ARCH_ARM_SRC_LM3S_LM_SSI_H -#define __ARCH_ARM_SRC_LM3S_LM_SSI_H +#ifndef __ARCH_ARM_SRC_LM_LM_SSI_H +#define __ARCH_ARM_SRC_LM_LM_SSI_H /************************************************************************************ * Included Files @@ -111,4 +111,4 @@ int lm3s_spicmddata(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool cmd); #endif #endif /* __ASSEMBLY__ */ -#endif /* __ARCH_ARM_SRC_LM3S_LM_SSI_H */ +#endif /* __ARCH_ARM_SRC_LM_LM_SSI_H */ diff --git a/arch/arm/src/lm3s/lm_syscontrol.h b/arch/arm/src/lm/lm_syscontrol.h similarity index 95% rename from arch/arm/src/lm3s/lm_syscontrol.h rename to arch/arm/src/lm/lm_syscontrol.h index 7c49da5658..79cc2349d1 100644 --- a/arch/arm/src/lm3s/lm_syscontrol.h +++ b/arch/arm/src/lm/lm_syscontrol.h @@ -1,5 +1,5 @@ /************************************************************************************ - * arch/arm/src/lm3s/lm3s_syscontrol.h + * arch/arm/src/lm/lm3s_syscontrol.h * * Copyright (C) 2009-2010, 2013 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __ARCH_ARM_SRC_LM3S_LM_SYSCONTROL_H -#define __ARCH_ARM_SRC_LM3S_LM_SYSCONTROL_H +#ifndef __ARCH_ARM_SRC_LM_LM_SYSCONTROL_H +#define __ARCH_ARM_SRC_LM_LM_SYSCONTROL_H /************************************************************************************ * Included Files @@ -97,4 +97,4 @@ void up_clockconfig(void); #endif #endif /* __ASSEMBLY__ */ -#endif /* __ARCH_ARM_SRC_LM3S_LM_SYSCONTROL_H */ +#endif /* __ARCH_ARM_SRC_LM_LM_SYSCONTROL_H */