Eliminate arch/arc/src/lm3s/lm3s_internal.h; replace with several header files

git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5494 42af7a65-404d-4744-a932-0658087f49c3
2013-01-08 19:27:38 +00:00 · 2013-01-08 19:27:38 +00:00 · 0e7c2d25c2
commit 0e7c2d25c2
parent 6859eeea9e
31 changed files with 31 additions and 13 deletions
--- a/configs/eagle100/httpd/defconfig
+++ b/configs/eagle100/httpd/defconfig
@ -39,6 +39,7 @@ CONFIG_ARCH="arm"
 CONFIG_ARCH_ARM=y
 CONFIG_ARCH_CORTEXM3=y
 CONFIG_ARCH_CHIP="lm3s"
+CONFIG_ARCH_CHIP_LM3S=y
 CONFIG_ARCH_CHIP_LM3S6918=y
 CONFIG_ARCH_BOARD="eagle100"
 CONFIG_ARCH_BOARD_EAGLE100=y
--- a/configs/eagle100/nettest/defconfig
+++ b/configs/eagle100/nettest/defconfig
@ -39,6 +39,7 @@ CONFIG_ARCH="arm"
 CONFIG_ARCH_ARM=y
 CONFIG_ARCH_CORTEXM3=y
 CONFIG_ARCH_CHIP="lm3s"
+CONFIG_ARCH_CHIP_LM3S=y
 CONFIG_ARCH_CHIP_LM3S6918=y
 CONFIG_ARCH_BOARD="eagle100"
 CONFIG_ARCH_BOARD_EAGLE100=y
--- a/configs/eagle100/nsh/defconfig
+++ b/configs/eagle100/nsh/defconfig
@ -39,6 +39,7 @@ CONFIG_ARCH="arm"
 CONFIG_ARCH_ARM=y
 CONFIG_ARCH_CORTEXM3=y
 CONFIG_ARCH_CHIP="lm3s"
+CONFIG_ARCH_CHIP_LM3S=y
 CONFIG_ARCH_CHIP_LM3S6918=y
 CONFIG_ARCH_BOARD="eagle100"
 CONFIG_ARCH_BOARD_EAGLE100=y
--- a/configs/eagle100/nxflat/defconfig
+++ b/configs/eagle100/nxflat/defconfig
@ -39,6 +39,7 @@ CONFIG_ARCH="arm"
 CONFIG_ARCH_ARM=y
 CONFIG_ARCH_CORTEXM3=y
 CONFIG_ARCH_CHIP="lm3s"
+CONFIG_ARCH_CHIP_LM3S=y
 CONFIG_ARCH_CHIP_LM3S6918=y
 CONFIG_ARCH_BOARD="eagle100"
 CONFIG_ARCH_BOARD_EAGLE100=y
--- a/configs/eagle100/ostest/defconfig
+++ b/configs/eagle100/ostest/defconfig
@ -39,6 +39,7 @@ CONFIG_ARCH="arm"
 CONFIG_ARCH_ARM=y
 CONFIG_ARCH_CORTEXM3=y
 CONFIG_ARCH_CHIP="lm3s"
+CONFIG_ARCH_CHIP_LM3S=y
 CONFIG_ARCH_CHIP_LM3S6918=y
 CONFIG_ARCH_BOARD="eagle100"
 CONFIG_ARCH_BOARD_EAGLE100=y
--- a/configs/eagle100/src/eagle100_internal.h
+++ b/configs/eagle100/src/eagle100_internal.h
@ -45,6 +45,7 @@
 #include <nuttx/compiler.h>

 #include "chip.h"
+#include "lm_gpio.h"

 /************************************************************************************
 * Definitions
--- a/configs/eagle100/src/up_leds.c
+++ b/configs/eagle100/src/up_leds.c
@ -48,7 +48,7 @@
 #include "chip.h"
 #include "up_arch.h"
 #include "up_internal.h"
-#include "lm3s_internal.h"
+#include "lm_gpio.h"
 #include "eagle100_internal.h"

 /****************************************************************************
--- a/configs/eagle100/src/up_ssi.c
+++ b/configs/eagle100/src/up_ssi.c
@ -49,7 +49,7 @@

 #include "up_arch.h"
 #include "chip.h"
-#include "lm3s_internal.h"
+#include "lm_gpio.h"
 #include "eagle100_internal.h"

 /* The Eagle100 microSD CS is on SSI0 */
--- a/configs/eagle100/thttpd/defconfig
+++ b/configs/eagle100/thttpd/defconfig
@ -39,6 +39,7 @@ CONFIG_ARCH="arm"
 CONFIG_ARCH_ARM=y
 CONFIG_ARCH_CORTEXM3=y
 CONFIG_ARCH_CHIP="lm3s"
+CONFIG_ARCH_CHIP_LM3S=y
 CONFIG_ARCH_CHIP_LM3S6918=y
 CONFIG_ARCH_BOARD="eagle100"
 CONFIG_ARCH_BOARD_EAGLE100=y
--- a/configs/ekk-lm3s9b96/nsh/defconfig
+++ b/configs/ekk-lm3s9b96/nsh/defconfig
@ -40,6 +40,7 @@ CONFIG_ARCH="arm"
 CONFIG_ARCH_ARM=y
 CONFIG_ARCH_CORTEXM3=y
 CONFIG_ARCH_CHIP="lm3s"
+CONFIG_ARCH_CHIP_LM3S=y
 CONFIG_ARCH_CHIP_LM3S9B96=y
 CONFIG_ARCH_BOARD="ekk-lm3s9b96"
 CONFIG_ARCH_BOARD_EKKLM3S9B96=y
--- a/configs/ekk-lm3s9b96/ostest/defconfig
+++ b/configs/ekk-lm3s9b96/ostest/defconfig
@ -40,6 +40,7 @@ CONFIG_ARCH="arm"
 CONFIG_ARCH_ARM=y
 CONFIG_ARCH_CORTEXM3=y
 CONFIG_ARCH_CHIP="lm3s"
+CONFIG_ARCH_CHIP_LM3S=y
 CONFIG_ARCH_CHIP_LM3S9B96=y
 CONFIG_ARCH_BOARD="ekk-lm3s9b96"
 CONFIG_ARCH_BOARD_EKKLM3S9B96=y
--- a/configs/ekk-lm3s9b96/src/ekklm3s9b96_internal.h
+++ b/configs/ekk-lm3s9b96/src/ekklm3s9b96_internal.h
@ -46,6 +46,7 @@
 #include <nuttx/compiler.h>

 #include "chip.h"
+#include "lm_gpio.h"

 /************************************************************************************
 * Definitions
--- a/configs/ekk-lm3s9b96/src/up_leds.c
+++ b/configs/ekk-lm3s9b96/src/up_leds.c
@ -49,7 +49,7 @@
 #include "chip.h"
 #include "up_arch.h"
 #include "up_internal.h"
-#include "lm3s_internal.h"
+#include "lm_gpio.h"
 #include "ekklm3s9b96_internal.h"

 /****************************************************************************
--- a/configs/ekk-lm3s9b96/src/up_ssi.c
+++ b/configs/ekk-lm3s9b96/src/up_ssi.c
@ -50,7 +50,7 @@

 #include "up_arch.h"
 #include "chip.h"
-#include "lm3s_internal.h"
+#include "lm_gpio.h"
 #include "ekklm3s9b96_internal.h"

 #if !defined(CONFIG_SSI0_DISABLE)  || !defined(CONFIG_SSI1_DISABLE) 
--- a/configs/lm3s6432-s2e/nsh/defconfig
+++ b/configs/lm3s6432-s2e/nsh/defconfig
@ -39,6 +39,7 @@ CONFIG_ARCH="arm"
 CONFIG_ARCH_ARM=y
 CONFIG_ARCH_CORTEXM3=y
 CONFIG_ARCH_CHIP="lm3s"
+CONFIG_ARCH_CHIP_LM3S=y
 CONFIG_ARCH_CHIP_LM3S6432=y
 CONFIG_ARCH_BOARD="lm3s6432-s2e"
 CONFIG_ARCH_BOARD_LM3S6432S2E=y
--- a/configs/lm3s6432-s2e/ostest/defconfig
+++ b/configs/lm3s6432-s2e/ostest/defconfig
@ -39,6 +39,7 @@ CONFIG_ARCH="arm"
 CONFIG_ARCH_ARM=y
 CONFIG_ARCH_CORTEXM3=y
 CONFIG_ARCH_CHIP="lm3s"
+CONFIG_ARCH_CHIP_LM3S=y
 CONFIG_ARCH_CHIP_LM3S6432=y
 CONFIG_ARCH_BOARD="lm3s6432-s2e"
 CONFIG_ARCH_BOARD_LM3S6432S2E=y
--- a/configs/lm3s6432-s2e/src/lm3s6432s2e_internal.h
+++ b/configs/lm3s6432-s2e/src/lm3s6432s2e_internal.h
@ -44,6 +44,7 @@
 #include <nuttx/compiler.h>

 #include "chip.h"
+#include "lm_gpio.h"

 /************************************************************************************
 * Definitions
--- a/configs/lm3s6432-s2e/src/up_boot.c
+++ b/configs/lm3s6432-s2e/src/up_boot.c
@ -47,7 +47,7 @@
 #include "up_arch.h"
 #include "chip.h"
 #include "up_internal.h"
-#include "lm3s_internal.h"
+#include "lm_gpio.h"
 #include "lm3s6432s2e_internal.h"

 /************************************************************************************
--- a/configs/lm3s6432-s2e/src/up_leds.c
+++ b/configs/lm3s6432-s2e/src/up_leds.c
@ -48,7 +48,7 @@
 #include "chip.h"
 #include "up_arch.h"
 #include "up_internal.h"
-#include "lm3s_internal.h"
+#include "lm_gpio.h"
 #include "lm3s6432s2e_internal.h"

 /****************************************************************************
--- a/configs/lm3s6432-s2e/src/up_ssi.c
+++ b/configs/lm3s6432-s2e/src/up_ssi.c
@ -49,7 +49,7 @@

 #include "up_arch.h"
 #include "chip.h"
-#include "lm3s_internal.h"
+#include "lm_gpio.h"
 #include "lm3s6432s2e_internal.h"

 #if !defined(CONFIG_SSI0_DISABLE)
--- a/configs/lm3s6965-ek/src/lm3s6965ek_internal.h
+++ b/configs/lm3s6965-ek/src/lm3s6965ek_internal.h
@ -45,6 +45,7 @@
 #include <nuttx/compiler.h>

 #include "chip.h"
+#include "lm_gpio.h"

 /************************************************************************************
 * Definitions
--- a/configs/lm3s6965-ek/src/up_leds.c
+++ b/configs/lm3s6965-ek/src/up_leds.c
@ -48,7 +48,7 @@
 #include "chip.h"
 #include "up_arch.h"
 #include "up_internal.h"
-#include "lm3s_internal.h"
+#include "lm_gpio.h"
 #include "lm3s6965ek_internal.h"

 /****************************************************************************
--- a/configs/lm3s6965-ek/src/up_oled.c
+++ b/configs/lm3s6965-ek/src/up_oled.c
@ -48,7 +48,7 @@
 #include <nuttx/lcd/lcd.h>
 #include <nuttx/lcd/p14201.h>

-#include "lm3s_internal.h"
+#include "lm_gpio.h"
 #include "lm3s6965ek_internal.h"

 /****************************************************************************
--- a/configs/lm3s6965-ek/src/up_ssi.c
+++ b/configs/lm3s6965-ek/src/up_ssi.c
@ -49,7 +49,7 @@

 #include "up_arch.h"
 #include "chip.h"
-#include "lm3s_internal.h"
+#include "lm_gpio.h"
 #include "lm3s6965ek_internal.h"

 /* The LM3S6965 Eval Kit microSD CS is on SSI0 */
--- a/configs/lm3s8962-ek/nsh/defconfig
+++ b/configs/lm3s8962-ek/nsh/defconfig
@ -39,6 +39,7 @@ CONFIG_ARCH="arm"
 CONFIG_ARCH_ARM=y
 CONFIG_ARCH_CORTEXM3=y
 CONFIG_ARCH_CHIP="lm3s"
+CONFIG_ARCH_CHIP_LM3S=y
 CONFIG_ARCH_CHIP_LM3S8962=y
 CONFIG_ARCH_BOARD="lm3s8962-ek"
 CONFIG_ARCH_BOARD_LM3S8962EK=y
--- a/configs/lm3s8962-ek/nx/defconfig
+++ b/configs/lm3s8962-ek/nx/defconfig
@ -39,6 +39,7 @@ CONFIG_ARCH="arm"
 CONFIG_ARCH_ARM=y
 CONFIG_ARCH_CORTEXM3=y
 CONFIG_ARCH_CHIP="lm3s"
+CONFIG_ARCH_CHIP_LM3S=y
 CONFIG_ARCH_CHIP_LM3S8962=y
 CONFIG_ARCH_BOARD="lm3s8962-ek"
 CONFIG_ARCH_BOARD_LM3S8962EK=y
--- a/configs/lm3s8962-ek/ostest/defconfig
+++ b/configs/lm3s8962-ek/ostest/defconfig
@ -39,6 +39,7 @@ CONFIG_ARCH="arm"
 CONFIG_ARCH_ARM=y
 CONFIG_ARCH_CORTEXM3=y
 CONFIG_ARCH_CHIP="lm3s"
+CONFIG_ARCH_CHIP_LM3S=y
 CONFIG_ARCH_CHIP_LM3S8962=y
 CONFIG_ARCH_BOARD="lm3s8962-ek"
 CONFIG_ARCH_BOARD_LM3S8962EK=y
--- a/configs/lm3s8962-ek/src/lm3s8962ek_internal.h
+++ b/configs/lm3s8962-ek/src/lm3s8962ek_internal.h
@ -45,6 +45,7 @@
 #include <nuttx/compiler.h>

 #include "chip.h"
+#include "lm_gpio.h"

 /************************************************************************************
 * Definitions
--- a/configs/lm3s8962-ek/src/up_leds.c
+++ b/configs/lm3s8962-ek/src/up_leds.c
@ -48,7 +48,7 @@
 #include "chip.h"
 #include "up_arch.h"
 #include "up_internal.h"
-#include "lm3s_internal.h"
+#include "lm_gpio.h"
 #include "lm3s8962ek_internal.h"

 /****************************************************************************
--- a/configs/lm3s8962-ek/src/up_oled.c
+++ b/configs/lm3s8962-ek/src/up_oled.c
@ -48,7 +48,7 @@
 #include <nuttx/lcd/lcd.h>
 #include <nuttx/lcd/p14201.h>

-#include "lm3s_internal.h"
+#include "lm_gpio.h"
 #include "lm3s8962ek_internal.h"

 /****************************************************************************
--- a/configs/lm3s8962-ek/src/up_ssi.c
+++ b/configs/lm3s8962-ek/src/up_ssi.c
@ -49,7 +49,7 @@

 #include "up_arch.h"
 #include "chip.h"
-#include "lm3s_internal.h"
+#include "lm_gpio.h"
 #include "lm3s8962ek_internal.h"

 /* The LM3S8962 Eval Kit microSD CS is on SSI0 */