Rename arch/arm/src/lm3s to arch/arm/src/lm to allow a namespace that will include the lm4f

git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5495 42af7a65-404d-4744-a932-0658087f49c3
This commit is contained in:
patacongo
2013-01-08 20:56:40 +00:00
parent 23cc9f459c
commit 3f4d206288
62 changed files with 184 additions and 148 deletions
@@ -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
@@ -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 <gnutt@nuttx.org>
@@ -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 <gnutt@nuttx.org>
@@ -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 <nuttx/config.h>
#include <arch/lm3s/chip.h>
#include <arch/lm/chip.h>
/************************************************************************************
* Pre-processor Definitions
@@ -80,4 +80,4 @@
* Public Function Prototypes
****************************************************************************/
#endif /* __ARCH_ARM_SRC_LM3S_CHIP_H */
#endif /* __ARCH_ARM_SRC_LM_CHIP_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 <macscomp@gmail.com>
@@ -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 */
@@ -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 <gnutt@nuttx.org>
@@ -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 */
@@ -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 <gnutt@nuttx.org>
@@ -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 */
@@ -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 <gnutt@nuttx.org>
@@ -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 */
@@ -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 <gnutt@nuttx.org>
@@ -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 */
@@ -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 <gnutt@nuttx.org>
@@ -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 */
@@ -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 <gnutt@nuttx.org>
@@ -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 */
@@ -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 <gnutt@nuttx.org>
@@ -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 */
@@ -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 <gnutt@nuttx.org>
@@ -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 */
@@ -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 <macscomp@gmail.com>
@@ -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 */
@@ -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 <gnutt@nuttx.org>
@@ -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 */
@@ -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 <gnutt@nuttx.org>
@@ -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 */
@@ -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 <gnutt@nuttx.org>
@@ -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 */
@@ -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 <gnutt@nuttx.org>
@@ -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 <gnutt@nuttx.org>
@@ -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.
@@ -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.
@@ -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.
@@ -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 <gnutt@nuttx.org>
@@ -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 <gnutt@nuttx.org>
@@ -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.
@@ -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.
@@ -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 <gnutt@nuttx.org>
@@ -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.
@@ -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 <gnutt@nuttx.org>
@@ -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 */
@@ -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 <gnutt@nuttx.org>
@@ -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 */
@@ -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 <gnutt@nuttx.org>
@@ -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 */
@@ -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 <gnutt@nuttx.org>
@@ -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 */
@@ -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 <gnutt@nuttx.org>
@@ -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 */