diff --git a/configs/eagle100/httpd/defconfig b/configs/eagle100/httpd/defconfig
index 2d8f82180ef..c2ea86bed87 100644
--- 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
diff --git a/configs/eagle100/nettest/defconfig b/configs/eagle100/nettest/defconfig
index fa074020857..2dab94846f5 100644
--- 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
diff --git a/configs/eagle100/nsh/defconfig b/configs/eagle100/nsh/defconfig
index d8041c299c0..fd141bc80de 100644
--- 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
diff --git a/configs/eagle100/nxflat/defconfig b/configs/eagle100/nxflat/defconfig
index 756902bb0f1..20cd50432c5 100644
--- 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
diff --git a/configs/eagle100/ostest/defconfig b/configs/eagle100/ostest/defconfig
index 43c77fe07ff..01f3be334ff 100644
--- 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
diff --git a/configs/eagle100/src/eagle100_internal.h b/configs/eagle100/src/eagle100_internal.h
index 88d2bf3b0e8..d8bcd6a8105 100644
--- 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
diff --git a/configs/eagle100/src/up_leds.c b/configs/eagle100/src/up_leds.c
index 59b489c1148..0124b964bd1 100644
--- 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"
 
 /****************************************************************************
diff --git a/configs/eagle100/src/up_ssi.c b/configs/eagle100/src/up_ssi.c
index fb5f99df343..b78a0d67cab 100644
--- 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 */
diff --git a/configs/eagle100/thttpd/defconfig b/configs/eagle100/thttpd/defconfig
index dceac099008..460bd64b332 100644
--- 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
diff --git a/configs/ekk-lm3s9b96/nsh/defconfig b/configs/ekk-lm3s9b96/nsh/defconfig
index 82ad3ce5ddf..d8ae63cfffd 100644
--- 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
diff --git a/configs/ekk-lm3s9b96/ostest/defconfig b/configs/ekk-lm3s9b96/ostest/defconfig
index bcf2a942621..62a092d1f2f 100644
--- 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
diff --git a/configs/ekk-lm3s9b96/src/ekklm3s9b96_internal.h b/configs/ekk-lm3s9b96/src/ekklm3s9b96_internal.h
index fd8ff3adb17..bb3315f5b26 100644
--- 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
diff --git a/configs/ekk-lm3s9b96/src/up_leds.c b/configs/ekk-lm3s9b96/src/up_leds.c
index 5ed84c2d264..7628fcfe0ae 100644
--- 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"
 
 /****************************************************************************
diff --git a/configs/ekk-lm3s9b96/src/up_ssi.c b/configs/ekk-lm3s9b96/src/up_ssi.c
index 2fe3b81c863..8f297e7a79c 100644
--- 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) 
diff --git a/configs/lm3s6432-s2e/nsh/defconfig b/configs/lm3s6432-s2e/nsh/defconfig
index 704d8ad91a8..7d1657cda5c 100644
--- 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
diff --git a/configs/lm3s6432-s2e/ostest/defconfig b/configs/lm3s6432-s2e/ostest/defconfig
index 0be2cfd4c25..90357ce7f5d 100644
--- 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
diff --git a/configs/lm3s6432-s2e/src/lm3s6432s2e_internal.h b/configs/lm3s6432-s2e/src/lm3s6432s2e_internal.h
index bd4cff77fc0..f54403c7a83 100644
--- 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
diff --git a/configs/lm3s6432-s2e/src/up_boot.c b/configs/lm3s6432-s2e/src/up_boot.c
index 5bb7b670fe8..18452963845 100644
--- 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"
 
 /************************************************************************************
diff --git a/configs/lm3s6432-s2e/src/up_leds.c b/configs/lm3s6432-s2e/src/up_leds.c
index 80fea934f91..81610db34f6 100644
--- 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"
 
 /****************************************************************************
diff --git a/configs/lm3s6432-s2e/src/up_ssi.c b/configs/lm3s6432-s2e/src/up_ssi.c
index d20e1d978ba..a7844a97916 100644
--- 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)
diff --git a/configs/lm3s6965-ek/src/lm3s6965ek_internal.h b/configs/lm3s6965-ek/src/lm3s6965ek_internal.h
index 621f00148cb..8ebd4cf65a0 100644
--- 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
diff --git a/configs/lm3s6965-ek/src/up_leds.c b/configs/lm3s6965-ek/src/up_leds.c
index 933c114467b..efa1eb73889 100644
--- 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"
 
 /****************************************************************************
diff --git a/configs/lm3s6965-ek/src/up_oled.c b/configs/lm3s6965-ek/src/up_oled.c
index 586927d5369..23ce7e036cf 100644
--- 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"
 
 /****************************************************************************
diff --git a/configs/lm3s6965-ek/src/up_ssi.c b/configs/lm3s6965-ek/src/up_ssi.c
index 16111fcdaf5..b52116f145a 100644
--- 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 */
diff --git a/configs/lm3s8962-ek/nsh/defconfig b/configs/lm3s8962-ek/nsh/defconfig
index 573ea582ef3..79f90d5f9b6 100755
--- 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
diff --git a/configs/lm3s8962-ek/nx/defconfig b/configs/lm3s8962-ek/nx/defconfig
index 30c3b895224..8424b6623de 100755
--- 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
diff --git a/configs/lm3s8962-ek/ostest/defconfig b/configs/lm3s8962-ek/ostest/defconfig
index e19cab1cc28..73fbff29fbd 100755
--- 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
diff --git a/configs/lm3s8962-ek/src/lm3s8962ek_internal.h b/configs/lm3s8962-ek/src/lm3s8962ek_internal.h
index 3b6175661b6..689472f158a 100644
--- 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
diff --git a/configs/lm3s8962-ek/src/up_leds.c b/configs/lm3s8962-ek/src/up_leds.c
index bff92043415..d5000d03798 100644
--- 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"
 
 /****************************************************************************
diff --git a/configs/lm3s8962-ek/src/up_oled.c b/configs/lm3s8962-ek/src/up_oled.c
index 7611872794a..3324b389745 100644
--- 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"
 
 /****************************************************************************
diff --git a/configs/lm3s8962-ek/src/up_ssi.c b/configs/lm3s8962-ek/src/up_ssi.c
index 00e07c85d0a..7f78b3477a7 100644
--- 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 */