summaryrefslogtreecommitdiff
path: root/nuttx/arch/arm/src
diff options
context:
space:
mode:
authorpatacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>2013-01-08 16:25:30 +0000
committerpatacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>2013-01-08 16:25:30 +0000
commit4c8b88b97559ddc6714fc17e9a281a13a65f88c0 (patch)
treebe370af4ffb6147bbbf103f66fcc69ed55bf5893 /nuttx/arch/arm/src
parent2e5aef172a920610e3071325b4be95b71a83948a (diff)
downloadpx4-nuttx-4c8b88b97559ddc6714fc17e9a281a13a65f88c0.tar.gz
px4-nuttx-4c8b88b97559ddc6714fc17e9a281a13a65f88c0.tar.bz2
px4-nuttx-4c8b88b97559ddc6714fc17e9a281a13a65f88c0.zip
Add execv() and execl(); Move lm3s header files for compatibility
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5492 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx/arch/arm/src')
-rw-r--r--nuttx/arch/arm/src/lm3s/chip.h79
-rw-r--r--nuttx/arch/arm/src/lm3s/chip/lm3s_epi.h (renamed from nuttx/arch/arm/src/lm3s/lm3s_epi.h)10
-rw-r--r--nuttx/arch/arm/src/lm3s/chip/lm3s_ethernet.h (renamed from nuttx/arch/arm/src/lm3s/lm3s_ethernet.h)10
-rw-r--r--nuttx/arch/arm/src/lm3s/chip/lm3s_flash.h (renamed from nuttx/arch/arm/src/lm3s/lm3s_flash.h)10
-rw-r--r--nuttx/arch/arm/src/lm3s/chip/lm3s_gpio.h (renamed from nuttx/arch/arm/src/lm3s/lm3s_gpio.h)10
-rw-r--r--nuttx/arch/arm/src/lm3s/chip/lm3s_i2c.h (renamed from nuttx/arch/arm/src/lm3s/lm3s_i2c.h)10
-rw-r--r--nuttx/arch/arm/src/lm3s/chip/lm3s_memorymap.h (renamed from nuttx/arch/arm/src/lm3s/lm3s_memorymap.h)8
-rw-r--r--nuttx/arch/arm/src/lm3s/chip/lm3s_ssi.h (renamed from nuttx/arch/arm/src/lm3s/lm3s_ssi.h)10
-rw-r--r--nuttx/arch/arm/src/lm3s/chip/lm3s_syscontrol.h (renamed from nuttx/arch/arm/src/lm3s/lm3s_syscontrol.h)10
-rw-r--r--nuttx/arch/arm/src/lm3s/chip/lm3s_timer.h (renamed from nuttx/arch/arm/src/lm3s/lm3s_timer.h)8
-rw-r--r--nuttx/arch/arm/src/lm3s/chip/lm3s_uart.h (renamed from nuttx/arch/arm/src/lm3s/lm3s_uart.h)10
-rw-r--r--nuttx/arch/arm/src/lm3s/chip/lm_memorymap.h69
12 files changed, 126 insertions, 118 deletions
diff --git a/nuttx/arch/arm/src/lm3s/chip.h b/nuttx/arch/arm/src/lm3s/chip.h
index 1e22f6221..1e96b5222 100644
--- a/nuttx/arch/arm/src/lm3s/chip.h
+++ b/nuttx/arch/arm/src/lm3s/chip.h
@@ -41,83 +41,22 @@
************************************************************************************/
#include <nuttx/config.h>
+#include <arch/lm3s/chip.h>
/************************************************************************************
* Pre-processor Definitions
************************************************************************************/
-/* Get customizations for each supported chip (only the LM3S6918 and 65 right now) */
-
-#if defined(CONFIG_ARCH_CHIP_LM3S6918)
-# define LM3S_NTIMERS 4 /* Four general purpose timers */
-# define LM3S_NETHCONTROLLERS 1 /* One Ethernet controller */
-# undef LM3S_ETHTS /* No timestamp register */
-# define LM3S_NSSI 2 /* Two SSI modules */
-# define LM3S_NUARTS 2 /* Two UART modules */
-# define LM3S_NI2C 2 /* Two I2C modules */
-# define LM3S_NADC 1 /* One ADC module */
-# define LM2S_NPWM 0 /* No PWM generator modules */
-# define LM3S_NQEI 0 /* No quadrature encoders */
-# define LM3S_NPORTS 8 /* 8 Ports (GPIOA-H) 5-38 GPIOs */
-#elif defined(CONFIG_ARCH_CHIP_LM3S6432)
-# define LM3S_NTIMERS 3 /* Three general purpose timers */
-# define LM3S_NETHCONTROLLERS 1 /* One Ethernet controller */
-# undef LM3S_ETHTS /* No timestamp register */
-# define LM3S_NSSI 1 /* One SSI module */
-# define LM3S_NUARTS 2 /* Two UART modules */
-# define LM3S_NI2C 1 /* Two I2C modules */
-# define LM3S_NADC 1 /* One ADC module */
-# define LM2S_NPWM 1 /* One PWM generator module */
-# define LM3S_NQEI 0 /* No quadrature encoders */
-# define LM3S_NPORTS 7 /* 7 Ports (GPIOA-G), 0-42 GPIOs */
-#elif defined(CONFIG_ARCH_CHIP_LM3S6965)
-# define LM3S_NTIMERS 4 /* Four general purpose timers */
-# define LM3S_NETHCONTROLLERS 1 /* One Ethernet controller */
-# undef LM3S_ETHTS /* No timestamp register */
-# define LM3S_NSSI 1 /* One SSI module */
-# define LM3S_NUARTS 3 /* Three UART modules */
-# define LM3S_NI2C 2 /* Two I2C modules */
-# define LM3S_NADC 1 /* One ADC module */
-# define LM2S_NPWM 3 /* Three PWM generator modules */
-# define LM3S_NQEI 2 /* Two quadrature encoders */
-# define LM3S_NPORTS 7 /* 7 Ports (GPIOA-G), 0-42 GPIOs */
-#elif defined(CONFIG_ARCH_CHIP_LM3S9B96)
-# define LM3S_NTIMERS 4 /* Four general purpose timers */
-# define LM3S_NETHCONTROLLERS 1 /* One Ethernet controller */
-# undef LM3S_ETHTS /* No timestamp register */
-# define LM3S_NSSI 2 /* Two SSI modules */
-# define LM3S_NUARTS 3 /* Three UART modules */
-# define LM3S_NI2C 2 /* Two I2C modules */
-# define LM3S_NADC 2 /* Two ADC module */
-# define LM3S_CAN 2 /* Two CAN module */
-# define LM3S_NPWM 4 /* Four PWM generator modules */
-# define LM3S_NQEI 2 /* Two quadrature encoders */
-# define LM3S_NPORTS 9 /* 9 Ports (GPIOA-H,J) 0-65 GPIOs */
-#elif defined(CONFIG_ARCH_CHIP_LM3S8962)
-# define LM3S_NTIMERS 4 /* Four general purpose timers */
-# define LM3S_NETHCONTROLLERS 1 /* One Ethernet controller */
-# define LM3S_NSSI 1 /* One SSI module */
-# define LM3S_NUARTS 3 /* Two UART modules */
-# define LM3S_NI2C 2 /* One I2C module */
-# define LM3S_NADC 1 /* One ADC module */
-# define LM2S_NPWM 3 /* Three PWM generator modules */
-# define LM3S_NQEI 2 /* Two quadrature encoders */
-# define LM3S_NPORTS 7 /* 7 Ports (GPIOA-G), 5-42 GPIOs */
-# define LC3S_CANCONTROLLER 1 /* One CAN controller */
-#else
-# error "Capabilities not specified for this LM3S chip"
-#endif
-
/* Then get all of the register definitions */
-#include "lm3s_memorymap.h" /* Memory map */
-#include "lm3s_syscontrol.h" /* System control module */
-#include "lm3s_gpio.h" /* GPIO modules */
-#include "lm3s_uart.h" /* UART modules */
-#include "lm3s_i2c.h" /* I2C modules */
-#include "lm3s_ssi.h" /* SSI modules */
-#include "lm3s_ethernet.h" /* Ethernet MAC and PHY */
-#include "lm3s_flash.h" /* FLASH */
+#include "chip/lm_memorymap.h" /* Memory map */
+#include "chip/lm3s_syscontrol.h" /* System control module */
+#include "chip/lm3s_gpio.h" /* GPIO modules */
+#include "chip/lm3s_uart.h" /* UART modules */
+#include "chip/lm3s_i2c.h" /* I2C modules */
+#include "chip/lm3s_ssi.h" /* SSI modules */
+#include "chip/lm3s_ethernet.h" /* Ethernet MAC and PHY */
+#include "chip/lm3s_flash.h" /* FLASH */
/************************************************************************************
* Public Types
diff --git a/nuttx/arch/arm/src/lm3s/lm3s_epi.h b/nuttx/arch/arm/src/lm3s/chip/lm3s_epi.h
index 90c9bfb7f..5b54d44ac 100644
--- a/nuttx/arch/arm/src/lm3s/lm3s_epi.h
+++ b/nuttx/arch/arm/src/lm3s/chip/lm3s_epi.h
@@ -1,7 +1,7 @@
/************************************************************************************
- * arch/arm/src/lm3s/lm3s_epi.h
+ * arch/arm/src/lm3s/chip/lm3s_epi.h
*
- * Copyright (C) 2009-2012 Max Neklyudov. All rights reserved.
+ * Copyright (C) 2009-2013 Max Neklyudov. All rights reserved.
* Author: Max Neklyudov <macscomp@gmail.com>
*
* Redistribution and use in source and binary forms, with or without
@@ -33,8 +33,8 @@
*
************************************************************************************/
-#ifndef __ARCH_ARM_SRC_LM3S_LM3S_EPI_H
-#define __ARCH_ARM_SRC_LM3S_LM3S_EPI_H
+#ifndef __ARCH_ARM_SRC_LM3S_CHIP_LM3S_EPI_H
+#define __ARCH_ARM_SRC_LM3S_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_LM3S_EPI_H */
+#endif /* __ARCH_ARM_SRC_LM3S_CHIP_LM3S_EPI_H */
diff --git a/nuttx/arch/arm/src/lm3s/lm3s_ethernet.h b/nuttx/arch/arm/src/lm3s/chip/lm3s_ethernet.h
index 71833b271..940686e7d 100644
--- a/nuttx/arch/arm/src/lm3s/lm3s_ethernet.h
+++ b/nuttx/arch/arm/src/lm3s/chip/lm3s_ethernet.h
@@ -1,7 +1,7 @@
/************************************************************************************
- * arch/arm/src/lm3s/lm3s_ethernet.h
+ * arch/arm/src/lm3s/chip/lm3s_ethernet.h
*
- * Copyright (C) 2009-2010, 2012 Gregory Nutt. All rights reserved.
+ * Copyright (C) 2009-2010, 2012-2013 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
*
* Redistribution and use in source and binary forms, with or without
@@ -33,8 +33,8 @@
*
************************************************************************************/
-#ifndef __ARCH_ARM_SRC_LM3S_LM3S_ETHERNET_H
-#define __ARCH_ARM_SRC_LM3S_LM3S_ETHERNET_H
+#ifndef __ARCH_ARM_SRC_LM3S_CHIP_LM3S_ETHERNET_H
+#define __ARCH_ARM_SRC_LM3S_CHIP_LM3S_ETHERNET_H
/************************************************************************************
* Included Files
@@ -200,4 +200,4 @@
* Public Function Prototypes
************************************************************************************/
-#endif /* __ARCH_ARM_SRC_LM3S_LM3S_ETHERNET_H */
+#endif /* __ARCH_ARM_SRC_LM3S_CHIP_LM3S_ETHERNET_H */
diff --git a/nuttx/arch/arm/src/lm3s/lm3s_flash.h b/nuttx/arch/arm/src/lm3s/chip/lm3s_flash.h
index 83e388921..2bd8956b0 100644
--- a/nuttx/arch/arm/src/lm3s/lm3s_flash.h
+++ b/nuttx/arch/arm/src/lm3s/chip/lm3s_flash.h
@@ -1,7 +1,7 @@
/************************************************************************************
- * arch/arm/src/lm3s/lm3s_flash.h
+ * arch/arm/src/lm3s/chip/lm3s_flash.h
*
- * Copyright (C) 2009 Gregory Nutt. All rights reserved.
+ * Copyright (C) 2009, 2013 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
*
* Redistribution and use in source and binary forms, with or without
@@ -33,8 +33,8 @@
*
************************************************************************************/
-#ifndef __ARCH_ARM_SRC_LM3S_LM3S_FLASH_H
-#define __ARCH_ARM_SRC_LM3S_LM3S_FLASH_H
+#ifndef __ARCH_ARM_SRC_LM3S_CHIP_LM3S_FLASH_H
+#define __ARCH_ARM_SRC_LM3S_CHIP_LM3S_FLASH_H
/************************************************************************************
* Included Files
@@ -125,4 +125,4 @@
* Public Function Prototypes
************************************************************************************/
-#endif /* __ARCH_ARM_SRC_LM3S_LM3S_FLASH_H */
+#endif /* __ARCH_ARM_SRC_LM3S_CHIP_LM3S_FLASH_H */
diff --git a/nuttx/arch/arm/src/lm3s/lm3s_gpio.h b/nuttx/arch/arm/src/lm3s/chip/lm3s_gpio.h
index 066666432..7253c1e7a 100644
--- a/nuttx/arch/arm/src/lm3s/lm3s_gpio.h
+++ b/nuttx/arch/arm/src/lm3s/chip/lm3s_gpio.h
@@ -1,7 +1,7 @@
/************************************************************************************
- * arch/arm/src/lm3s/lm3s_gpio.h
+ * arch/arm/src/lm3s/chip/lm3s_gpio.h
*
- * Copyright (C) 2009-2010 Gregory Nutt. All rights reserved.
+ * Copyright (C) 2009-2010, 2013 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
*
* Redistribution and use in source and binary forms, with or without
@@ -33,8 +33,8 @@
*
************************************************************************************/
-#ifndef __ARCH_ARM_SRC_LM3S_LM3S_GPIO_H
-#define __ARCH_ARM_SRC_LM3S_LM3S_GPIO_H
+#ifndef __ARCH_ARM_SRC_LM3S_CHIP_LM3S_GPIO_H
+#define __ARCH_ARM_SRC_LM3S_CHIP_LM3S_GPIO_H
/************************************************************************************
* Included Files
@@ -392,4 +392,4 @@
* Public Function Prototypes
************************************************************************************/
-#endif /* __ARCH_ARM_SRC_LM3S_LM3S_GPIO_H */
+#endif /* __ARCH_ARM_SRC_LM3S_CHIP_LM3S_GPIO_H */
diff --git a/nuttx/arch/arm/src/lm3s/lm3s_i2c.h b/nuttx/arch/arm/src/lm3s/chip/lm3s_i2c.h
index a5f0567b9..71ebe8fcf 100644
--- a/nuttx/arch/arm/src/lm3s/lm3s_i2c.h
+++ b/nuttx/arch/arm/src/lm3s/chip/lm3s_i2c.h
@@ -1,7 +1,7 @@
/************************************************************************************
- * arch/arm/src/lm3s/lm3s_i2c.h
+ * arch/arm/src/lm3s/chip/lm3s_i2c.h
*
- * Copyright (C) 2009 Gregory Nutt. All rights reserved.
+ * Copyright (C) 2009, 2013 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
*
* Redistribution and use in source and binary forms, with or without
@@ -33,8 +33,8 @@
*
************************************************************************************/
-#ifndef __ARCH_ARM_SRC_LM3S_LM3S_I2C_H
-#define __ARCH_ARM_SRC_LM3S_LM3S_I2C_H
+#ifndef __ARCH_ARM_SRC_LM3S_CHIP_LM3S_I2C_H
+#define __ARCH_ARM_SRC_LM3S_CHIP_LM3S_I2C_H
/************************************************************************************
* Included Files
@@ -244,4 +244,4 @@
* Public Function Prototypes
****************************************************************************/
-#endif /* __ARCH_ARM_SRC_LM3S_LM3S_I2C_H */
+#endif /* __ARCH_ARM_SRC_LM3S_CHIP_LM3S_I2C_H */
diff --git a/nuttx/arch/arm/src/lm3s/lm3s_memorymap.h b/nuttx/arch/arm/src/lm3s/chip/lm3s_memorymap.h
index be0d8b58d..31dc2b249 100644
--- a/nuttx/arch/arm/src/lm3s/lm3s_memorymap.h
+++ b/nuttx/arch/arm/src/lm3s/chip/lm3s_memorymap.h
@@ -1,5 +1,5 @@
/************************************************************************************
- * arch/arm/src/lm3s/lm3s_memorymap.h
+ * arch/arm/src/lm3s/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_LM3S_MEMORYMAP_H
-#define __ARCH_ARM_SRC_LM3S_LM3S_MEMORYMAP_H
+#ifndef __ARCH_ARM_SRC_LM3S_CHIP_LM3S_MEMORYMAP_H
+#define __ARCH_ARM_SRC_LM3S_CHIP_LM3S_MEMORYMAP_H
/************************************************************************************
* Included Files
@@ -357,4 +357,4 @@
* Public Function Prototypes
************************************************************************************/
-#endif /* __ARCH_ARM_SRC_LM3S_LM3S_MEMORYMAP_H */
+#endif /* __ARCH_ARM_SRC_LM3S_CHIP_LM3S_MEMORYMAP_H */
diff --git a/nuttx/arch/arm/src/lm3s/lm3s_ssi.h b/nuttx/arch/arm/src/lm3s/chip/lm3s_ssi.h
index 482dab326..b56ca77cb 100644
--- a/nuttx/arch/arm/src/lm3s/lm3s_ssi.h
+++ b/nuttx/arch/arm/src/lm3s/chip/lm3s_ssi.h
@@ -1,7 +1,7 @@
/************************************************************************************
- * arch/arm/src/lm3s/lm3s_ssi.h
+ * arch/arm/src/lm3s/chip/lm3s_ssi.h
*
- * Copyright (C) 2009 Gregory Nutt. All rights reserved.
+ * Copyright (C) 2009, 2013 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
*
* Redistribution and use in source and binary forms, with or without
@@ -33,8 +33,8 @@
*
************************************************************************************/
-#ifndef __ARCH_ARM_SRC_LM3S_LM3S_SSI_H
-#define __ARCH_ARM_SRC_LM3S_LM3S_SSI_H
+#ifndef __ARCH_ARM_SRC_LM3S_CHIP_LM3S_SSI_H
+#define __ARCH_ARM_SRC_LM3S_CHIP_LM3S_SSI_H
/************************************************************************************
* Included Files
@@ -232,4 +232,4 @@
************************************************************************************/
#endif /* LM3S_NSSI > 0 */
-#endif /* __ARCH_ARM_SRC_LM3S_LM3S_SSI_H */
+#endif /* __ARCH_ARM_SRC_LM3S_CHIP_LM3S_SSI_H */
diff --git a/nuttx/arch/arm/src/lm3s/lm3s_syscontrol.h b/nuttx/arch/arm/src/lm3s/chip/lm3s_syscontrol.h
index c59b921c4..d66cfeb47 100644
--- a/nuttx/arch/arm/src/lm3s/lm3s_syscontrol.h
+++ b/nuttx/arch/arm/src/lm3s/chip/lm3s_syscontrol.h
@@ -1,7 +1,7 @@
/************************************************************************************
- * arch/arm/src/lm3s/lm3s_syscontrol.h
+ * arch/arm/src/lm3s/chip/lm3s_syscontrol.h
*
- * Copyright (C) 2009-2010 Gregory Nutt. All rights reserved.
+ * Copyright (C) 2009-2010, 2013 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
*
* Redistribution and use in source and binary forms, with or without
@@ -33,8 +33,8 @@
*
************************************************************************************/
-#ifndef __ARCH_ARM_SRC_LM3S_LM3S_SYSCONTROL_H
-#define __ARCH_ARM_SRC_LM3S_LM3S_SYSCONTROL_H
+#ifndef __ARCH_ARM_SRC_LM3S_CHIP_LM3S_SYSCONTROL_H
+#define __ARCH_ARM_SRC_LM3S_CHIP_LM3S_SYSCONTROL_H
/************************************************************************************
* Included Files
@@ -492,4 +492,4 @@
* Public Functions
************************************************************************************/
-#endif /* __ARCH_ARM_SRC_LM3S_LM3S_SYSCONTROL_H */
+#endif /* __ARCH_ARM_SRC_LM3S_CHIP_LM3S_SYSCONTROL_H */
diff --git a/nuttx/arch/arm/src/lm3s/lm3s_timer.h b/nuttx/arch/arm/src/lm3s/chip/lm3s_timer.h
index 7c4166293..649737f13 100644
--- a/nuttx/arch/arm/src/lm3s/lm3s_timer.h
+++ b/nuttx/arch/arm/src/lm3s/chip/lm3s_timer.h
@@ -1,5 +1,5 @@
/************************************************************************************
- * arch/arm/src/lm3s/lm3s_timer.h
+ * arch/arm/src/lm3s/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_LM3S_TIMER_H
-#define __ARCH_ARM_SRC_LM3S_LM3S_TIMER_H
+#ifndef __ARCH_ARM_SRC_LM3S_CHIP_LM3S_TIMER_H
+#define __ARCH_ARM_SRC_LM3S_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_LM3S_TIMER_H */
+#endif /* __ARCH_ARM_SRC_LM3S_CHIP_LM3S_TIMER_H */
diff --git a/nuttx/arch/arm/src/lm3s/lm3s_uart.h b/nuttx/arch/arm/src/lm3s/chip/lm3s_uart.h
index 91bfb2266..0fef5ccf7 100644
--- a/nuttx/arch/arm/src/lm3s/lm3s_uart.h
+++ b/nuttx/arch/arm/src/lm3s/chip/lm3s_uart.h
@@ -1,7 +1,7 @@
/************************************************************************************
- * arch/arm/src/lm3s/lm3s_uart.h
+ * arch/arm/src/lm3s/chip/lm3s_uart.h
*
- * Copyright (C) 2009 Gregory Nutt. All rights reserved.
+ * Copyright (C) 2009, 2013 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
*
* Redistribution and use in source and binary forms, with or without
@@ -33,8 +33,8 @@
*
************************************************************************************/
-#ifndef __ARCH_ARM_SRC_LM3S_LM3S_UART_H
-#define __ARCH_ARM_SRC_LM3S_LM3S_UART_H
+#ifndef __ARCH_ARM_SRC_LM3S_CHIP_LM3S_UART_H
+#define __ARCH_ARM_SRC_LM3S_CHIP_LM3S_UART_H
/************************************************************************************
* Included Files
@@ -344,4 +344,4 @@
* Public Functions
************************************************************************************/
-#endif /* __ARCH_ARM_SRC_LM3S_LM3S_UART_H */
+#endif /* __ARCH_ARM_SRC_LM3S_CHIP_LM3S_UART_H */
diff --git a/nuttx/arch/arm/src/lm3s/chip/lm_memorymap.h b/nuttx/arch/arm/src/lm3s/chip/lm_memorymap.h
new file mode 100644
index 000000000..c52857847
--- /dev/null
+++ b/nuttx/arch/arm/src/lm3s/chip/lm_memorymap.h
@@ -0,0 +1,69 @@
+/************************************************************************************
+ * arch/arm/src/lm3s/chip/lm_memorymap.h
+ *
+ * Copyright (C) 2013 Gregory Nutt. All rights reserved.
+ * Author: Gregory Nutt <gnutt@nuttx.org>
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in
+ * the documentation and/or other materials provided with the
+ * distribution.
+ * 3. Neither the name NuttX nor the names of its contributors may be
+ * used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+ * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+ * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ ************************************************************************************/
+
+#ifndef __ARCH_ARM_SRC_LM3S_CHIP_LM_MEMORYMAP_H
+#define __ARCH_ARM_SRC_LM3S_CHIP_LM_MEMORYMAP_H
+
+/************************************************************************************
+ * Included Files
+ ************************************************************************************/
+
+#include <nuttx/config.h>
+
+/* Include the memory map file for the specific Stellaris chip */
+
+#ifdef CONFIG_ARCH_CHIP_LM3S
+# include "chip/lm3s_memorymap.h"
+#else
+# error "Unsupported Stellaris memory map"
+#endif
+
+/************************************************************************************
+ * Pre-processor Definitions
+ ************************************************************************************/
+
+/************************************************************************************
+ * Public Types
+ ************************************************************************************/
+
+/************************************************************************************
+ * Public Data
+ ************************************************************************************/
+
+/************************************************************************************
+ * Public Function Prototypes
+ ************************************************************************************/
+
+#endif /* __ARCH_ARM_SRC_LM3S_CHIP_LM_MEMORYMAP_H */