Add interrupt vector logic for the LM4F120

git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5693 42af7a65-404d-4744-a932-0658087f49c3

31 files changed, 140 insertions, 192 deletions

diff --git a/nuttx/configs/Kconfig b/nuttx/configs/Kconfig
index 7933f48e3..0f0685177 100644
--- a/nuttx/configs/Kconfig
+++ b/nuttx/configs/Kconfig
@@ -200,6 +200,15 @@ config ARCH_BOARD_LM3S8962EK
 	---help---
 		Stellaris LMS38962 Evaluation Kit.
 
+config ARCH_BOARD_LM4F120_LAUNCHPAD
+	bool "Stellaris LM4F120 LaunchPad"
+	depends on ARCH_CHIP_LM4F120
+	select ARCH_HAVE_LEDS
+	select ARCH_HAVE_BUTTONS
+	select ARCH_HAVE_IRQBUTTONS
+	---help---
+		Stellaris LM4F120 LaunchPad.
+
 config ARCH_BOARD_LPCXPRESSO
 	bool "NXP LPCExpresso LPC1768"
 	depends on ARCH_CHIP_LPC1768
@@ -700,6 +709,7 @@ config ARCH_BOARD
 	default "lm3s6432-s2e"        if ARCH_BOARD_LM3S6432S2E
 	default "lm3s6965-ek"         if ARCH_BOARD_LM3S6965EK
 	default "lm3s8962-ek"         if ARCH_BOARD_LM3S8962EK
+	default "lm4f120-launchpad"   if ARCH_BOARD_LM4F120_LAUNCHPAD
 	default "lpc4330-xplorer"     if ARCH_BOARD_LPC4330_XPLORER
 	default "lpcxpresso-lpc1768"  if ARCH_BOARD_LPCXPRESSO
 	default "m68322evb"           if ARCH_BOARD_M68332EVB
@@ -861,6 +871,9 @@ endif
 if ARCH_BOARD_LM3S8962EK
 source "configs/lm3s8962-ek/Kconfig"
 endif
+if ARCH_BOARD_LM3S8962EK
+source "configs/lm4f120-launchpad/Kconfig"
+endif
 if ARCH_BOARD_LPC4330_XPLORER
 source "configs/lpc4330-xplorer/Kconfig"
 endif
diff --git a/nuttx/configs/README.txt b/nuttx/configs/README.txt
index dd8b6a10b..b0e6b16d1 100644
--- a/nuttx/configs/README.txt
+++ b/nuttx/configs/README.txt
@@ -1781,6 +1781,12 @@ configs/lm3s6965-ek
 configs/lm3s8962-ek
   Stellaris LMS38962 Evaluation Kit.
 
+configs/lm4f120-launchpad
+  This is the port of NuttX to the Stellaris LM4F120 LaunchPad.  The
+  Stellaris® LM4F120 LaunchPad Evaluation Board is a low-cost evaluation
+  platform for ARM® Cortex™-M4F-based microcontrollers from Texas\
+  Instruments.
+
 configs/lpcxpresso-lpc1768
   Embedded Artists base board with NXP LPCExpresso LPC1768.  This board
   is based on the NXP LPC1768.  The Code Red toolchain is used by default.
@@ -1846,6 +1852,10 @@ configs/nucleus2g
   features an NXP LPC1768 processor.  See the 2G website (http://www.2g-eng.com/)
   for more information about the Nucleus 2G.
 
+configs/nutiny-nuc120
+  This is the port of NuttX to the NuvoTon NuTiny-SDK-NUC120 board.  This
+  board has the NUC120LE3AN chip with a built-in NuLink debugger.
+
 configs/olimex-lpc1766stk
   This port uses the Olimex LPC1766-STK board and a GNU GCC toolchain* under
   Linux or Cygwin.  STATUS: Complete and mature.
diff --git a/nuttx/configs/c5471evm/Kconfig b/nuttx/configs/c5471evm/Kconfig
index 025ba5e0e..cadb1d12a 100644
--- a/nuttx/configs/c5471evm/Kconfig
+++ b/nuttx/configs/c5471evm/Kconfig
@@ -4,10 +4,4 @@
 #
 
 if ARCH_BOARD_C5471EVM
-config ARCH_LEDS
-	bool "NuttX LED support"
-	default n
-	---help---
-		"Support control of board LEDs by NuttX to indicate system state"
-
 endif
diff --git a/nuttx/configs/eagle100/Kconfig b/nuttx/configs/eagle100/Kconfig
index 40b9f8294..8f4df4305 100644
--- a/nuttx/configs/eagle100/Kconfig
+++ b/nuttx/configs/eagle100/Kconfig
@@ -4,10 +4,4 @@
 #
 
 if ARCH_BOARD_EAGLE100
-config ARCH_LEDS
-	bool "NuttX LED support"
-	default n
-	---help---
-		"Support control of board LEDs by NuttX to indicate system state"
-
 endif
diff --git a/nuttx/configs/lm3s6432-s2e/Kconfig b/nuttx/configs/lm3s6432-s2e/Kconfig
index 102f4a5f6..f970a89c2 100644
--- a/nuttx/configs/lm3s6432-s2e/Kconfig
+++ b/nuttx/configs/lm3s6432-s2e/Kconfig
@@ -4,10 +4,4 @@
 #
 
 if ARCH_BOARD_LM3S6432S2E
-config ARCH_LEDS
-	bool "NuttX LED support"
-	default n
-	---help---
-		"Support control of board LEDs by NuttX to indicate system state"
-
 endif
diff --git a/nuttx/configs/lm3s6965-ek/Kconfig b/nuttx/configs/lm3s6965-ek/Kconfig
index 809ae2fe6..d956f4733 100644
--- a/nuttx/configs/lm3s6965-ek/Kconfig
+++ b/nuttx/configs/lm3s6965-ek/Kconfig
@@ -4,10 +4,4 @@
 #
 
 if ARCH_BOARD_LM3S6965EK
-config ARCH_LEDS
-	bool "NuttX LED support"
-	default n
-	---help---
-		"Support control of board LEDs by NuttX to indicate system state"
-
 endif
diff --git a/nuttx/configs/lm3s8962-ek/Kconfig b/nuttx/configs/lm3s8962-ek/Kconfig
index 87dc03a9d..dd9739f99 100644
--- a/nuttx/configs/lm3s8962-ek/Kconfig
+++ b/nuttx/configs/lm3s8962-ek/Kconfig
@@ -4,10 +4,4 @@
 #
 
 if ARCH_BOARD_LM3S8962EK
-config ARCH_LEDS
-	bool "NuttX LED support"
-	default n
-	---help---
-		"Support control of board LEDs by NuttX to indicate system state"
-
 endif
diff --git a/nuttx/configs/lm4f120-launchpad/Kconfig b/nuttx/configs/lm4f120-launchpad/Kconfig
index 24afc84f8..0e53e4023 100644
--- a/nuttx/configs/lm4f120-launchpad/Kconfig
+++ b/nuttx/configs/lm4f120-launchpad/Kconfig
@@ -3,11 +3,5 @@
 # see misc/tools/kconfig-language.txt.
 #
 
-if ARCH_BOARD_LM4FLAUNCHPAD
-config ARCH_LEDS
-	bool "NuttX LED support"
-	default n
-	---help---
-		"Support control of board LEDs by NuttX to indicate system state"
-
+if ARCH_BOARD_LM4F120_LAUNCHPAD
 endif
diff --git a/nuttx/configs/lm4f120-launchpad/README.txt b/nuttx/configs/lm4f120-launchpad/README.txt
index d05e37966..b4d6fda93 100644
--- a/nuttx/configs/lm4f120-launchpad/README.txt
+++ b/nuttx/configs/lm4f120-launchpad/README.txt
@@ -512,7 +512,7 @@ LM4F120 LaunchPad Configuration Options
 
     CONFIG_ARCH_BOARD_name - For use in C code
 
-       CONFIG_ARCH_BOARD_LM4FLAUNCHPAD
+       CONFIG_ARCH_BOARD_LM4F120_LAUNCHPAD
 
     CONFIG_ARCH_LOOPSPERMSEC - Must be calibrated for correct operation
        of delay loops
diff --git a/nuttx/configs/lm4f120-launchpad/include/board.h b/nuttx/configs/lm4f120-launchpad/include/board.h
index 87e6dca8f..f4de4e5b6 100644
--- a/nuttx/configs/lm4f120-launchpad/include/board.h
+++ b/nuttx/configs/lm4f120-launchpad/include/board.h
@@ -142,7 +142,7 @@
 #define LED_INIRQ         2     /* NC   NC    ON  (momentary)    */
 #define LED_SIGNAL        2     /* NC   NC    ON  (momentary)    */
 #define LED_ASSERTION     3     /* ON   NC    NC  (momentary)    */
-#define LED_PANIC         3     /* ON   OFF   OFF (flashing 2Hz) */
+#define LED_PANIC         4     /* ON   OFF   OFF (flashing 2Hz) */
 
 /* LED definitions ******************************************************************/
 /* The LM32F120 has a two buttons:
diff --git a/nuttx/configs/lm4f120-launchpad/ostest/defconfig b/nuttx/configs/lm4f120-launchpad/ostest/defconfig
index fdc515995..34ae0e602 100755
--- a/nuttx/configs/lm4f120-launchpad/ostest/defconfig
+++ b/nuttx/configs/lm4f120-launchpad/ostest/defconfig
@@ -66,22 +66,22 @@ CONFIG_ARCH="arm"
 # CONFIG_ARCH_CHIP_IMX is not set
 # CONFIG_ARCH_CHIP_KINETIS is not set
 CONFIG_ARCH_CHIP_LM=y
-CONFIG_ARCH_CHIP_LM4F=y
 # CONFIG_ARCH_CHIP_LPC17XX is not set
 # CONFIG_ARCH_CHIP_LPC214X is not set
 # CONFIG_ARCH_CHIP_LPC2378 is not set
 # CONFIG_ARCH_CHIP_LPC31XX is not set
 # CONFIG_ARCH_CHIP_LPC43XX is not set
+# CONFIG_ARCH_CHIP_NUC1XX is not set
 # CONFIG_ARCH_CHIP_SAM3U is not set
 # CONFIG_ARCH_CHIP_STM32 is not set
 # CONFIG_ARCH_CHIP_STR71X is not set
 CONFIG_ARCH_CORTEXM4=y
 CONFIG_ARCH_FAMILY="armv7-m"
 CONFIG_ARCH_CHIP="lm"
+# CONFIG_ARMV7M_USEBASEPRI is not set
+# CONFIG_ARCH_FPU is not set
 CONFIG_ARCH_HAVE_MPU=y
 # CONFIG_ARMV7M_MPU is not set
-CONFIG_BOARD_LOOPSPERMSEC=4531
-# CONFIG_ARCH_CALIBRATION is not set
 
 #
 # ARMV7M Configuration Options
@@ -98,12 +98,14 @@ CONFIG_ARMV7M_OABI_TOOLCHAIN=y
 # CONFIG_ARCH_CHIP_LM3S6918 is not set
 # CONFIG_ARCH_CHIP_LM3S9B96 is not set
 # CONFIG_ARCH_CHIP_LM3S6432 is not set
-CONFIG_ARCH_CHIP_LM4F120=y
+# CONFIG_ARCH_CHIP_LM3S6965 is not set
 # CONFIG_ARCH_CHIP_LM3S8962 is not set
+CONFIG_ARCH_CHIP_LM4F120=y
+CONFIG_ARCH_CHIP_LM4F=y
 # CONFIG_LM_REVA2 is not set
 
 #
-# Select Stellaris Peripheral Support
+# Stellaris Peripheral Support
 #
 CONFIG_LM_UART0=y
 # CONFIG_LM_UART1 is not set
@@ -130,23 +132,30 @@ CONFIG_LM_DISABLE_GPIOJ_IRQS=y
 #
 CONFIG_SSI_POLLWAIT=y
 CONFIG_SSI_TXLIMIT=4
-# CONFIG_SDIO_DMA is not set
-# CONFIG_SDIO_WIDTH_D1_ONLY is not set
+
+#
+# External Memory Configuration
+#
 
 #
 # Architecture Options
 #
 # CONFIG_ARCH_NOINTC is not set
+# CONFIG_ARCH_VECNOTIRQ is not set
 # CONFIG_ARCH_DMA is not set
 CONFIG_ARCH_IRQPRIO=y
 # CONFIG_CUSTOM_STACK is not set
 # CONFIG_ADDRENV is not set
+CONFIG_ARCH_HAVE_VFORK=y
 CONFIG_ARCH_STACKDUMP=y
 # CONFIG_ENDIAN_BIG is not set
+# CONFIG_ARCH_HAVE_RAMFUNCS is not set
 
 #
 # Board Settings
 #
+CONFIG_BOARD_LOOPSPERMSEC=4531
+# CONFIG_ARCH_CALIBRATION is not set
 CONFIG_DRAM_START=0x20000000
 CONFIG_DRAM_SIZE=65536
 CONFIG_ARCH_HAVE_INTERRUPTSTACK=y
@@ -164,7 +173,7 @@ CONFIG_BOOT_RUNFROMFLASH=y
 #
 # Board Selection
 #
-CONFIG_ARCH_BOARD_LM4FLAUNCHPAD=y
+CONFIG_ARCH_BOARD_LM4F120_LAUNCHPAD=y
 # CONFIG_ARCH_BOARD_CUSTOM is not set
 CONFIG_ARCH_BOARD="lm4f120-launchpad"
 
@@ -173,6 +182,9 @@ CONFIG_ARCH_BOARD="lm4f120-launchpad"
 #
 CONFIG_ARCH_HAVE_LEDS=y
 CONFIG_ARCH_LEDS=y
+CONFIG_ARCH_HAVE_BUTTONS=y
+# CONFIG_ARCH_BUTTONS is not set
+CONFIG_ARCH_HAVE_IRQBUTTONS=y
 
 #
 # Board-Specific Options
@@ -181,10 +193,12 @@ CONFIG_ARCH_LEDS=y
 #
 # RTOS Features
 #
+# CONFIG_BOARD_INITIALIZE is not set
 CONFIG_MSEC_PER_TICK=10
 CONFIG_RR_INTERVAL=200
 # CONFIG_SCHED_INSTRUMENTATION is not set
 CONFIG_TASK_NAME_SIZE=0
+# CONFIG_SCHED_HAVE_PARENT is not set
 # CONFIG_JULIAN_TIME is not set
 CONFIG_START_YEAR=2010
 CONFIG_START_MONTH=5
@@ -197,6 +211,7 @@ CONFIG_DEV_CONSOLE=y
 CONFIG_SDCLONE_DISABLE=y
 # CONFIG_SCHED_WORKQUEUE is not set
 # CONFIG_SCHED_WAITPID is not set
+# CONFIG_SCHED_STARTHOOK is not set
 # CONFIG_SCHED_ATEXIT is not set
 # CONFIG_SCHED_ONEXIT is not set
 CONFIG_USER_ENTRYPOINT="ostest_main"
@@ -206,9 +221,15 @@ CONFIG_DISABLE_OS_API=y
 # CONFIG_DISABLE_PTHREAD is not set
 # CONFIG_DISABLE_SIGNALS is not set
 # CONFIG_DISABLE_MQUEUE is not set
-CONFIG_DISABLE_MOUNTPOINT=y
 CONFIG_DISABLE_ENVIRON=y
-CONFIG_DISABLE_POLL=y
+
+#
+# Signal Numbers
+#
+CONFIG_SIG_SIGUSR1=1
+CONFIG_SIG_SIGUSR2=2
+CONFIG_SIG_SIGALARM=3
+CONFIG_SIG_SIGCONDTIMEDOUT=16
 
 #
 # Sizes of configurable things (0 disables)
@@ -236,6 +257,7 @@ CONFIG_PTHREAD_STACK_DEFAULT=2048
 #
 # Device Drivers
 #
+CONFIG_DISABLE_POLL=y
 CONFIG_DEV_NULL=y
 # CONFIG_DEV_ZERO is not set
 # CONFIG_LOOP is not set
@@ -250,16 +272,7 @@ CONFIG_DEV_NULL=y
 # CONFIG_BCH is not set
 # CONFIG_INPUT is not set
 # CONFIG_LCD is not set
-CONFIG_MMCSD=y
-CONFIG_MMCSD_NSLOTS=1
-# CONFIG_MMCSD_READONLY is not set
-# CONFIG_MMCSD_MULTIBLOCK_DISABLE is not set
-CONFIG_MMCSD_MMCSUPPORT=y
-CONFIG_MMCSD_HAVECARDDETECT=y
-CONFIG_MMCSD_SPI=y
-CONFIG_MMCSD_SPICLOCK=12500000
-# CONFIG_MMCSD_SDIO is not set
-# CONFIG_SDIO_MUXBUS is not set
+# CONFIG_MMCSD is not set
 # CONFIG_MTD is not set
 # CONFIG_PIPES is not set
 # CONFIG_PM is not set
@@ -308,11 +321,13 @@ CONFIG_UART0_2STOP=0
 #
 # File system configuration
 #
+CONFIG_DISABLE_MOUNTPOINT=y
 # CONFIG_FS_RAMMAP is not set
 
 #
 # System Logging
 #
+# CONFIG_SYSLOG_ENABLE is not set
 # CONFIG_SYSLOG is not set
 
 #
@@ -333,6 +348,7 @@ CONFIG_MM_REGIONS=1
 # CONFIG_BINFMT_DISABLE is not set
 # CONFIG_NXFLAT is not set
 # CONFIG_ELF is not set
+# CONFIG_BUILTIN is not set
 # CONFIG_PIC is not set
 # CONFIG_SYMTAB_ORDEREDBYNAME is not set
 
@@ -353,6 +369,9 @@ CONFIG_NUNGET_CHARS=2
 # CONFIG_EOL_IS_LF is not set
 # CONFIG_EOL_IS_BOTH_CRLF is not set
 CONFIG_EOL_IS_EITHER_CRLF=y
+# CONFIG_LIBC_EXECFUNCS is not set
+CONFIG_POSIX_SPAWN_PROXY_STACKSIZE=1024
+CONFIG_TASK_SPAWN_DEFAULT_STACKSIZE=2048
 # CONFIG_LIBC_STRERROR is not set
 # CONFIG_LIBC_PERROR_STDOUT is not set
 CONFIG_ARCH_LOWPUTC=y
@@ -378,14 +397,12 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
 #
 # Built-In Applications
 #
-# CONFIG_BUILTIN is not set
 
 #
 # Examples
 #
 # CONFIG_EXAMPLES_BUTTONS is not set
 # CONFIG_EXAMPLES_CAN is not set
-# CONFIG_EXAMPLES_CDCACM is not set
 # CONFIG_EXAMPLES_COMPOSITE is not set
 # CONFIG_EXAMPLES_DHCPD is not set
 # CONFIG_EXAMPLES_ELF is not set
@@ -401,7 +418,6 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
 # CONFIG_EXAMPLES_MM is not set
 # CONFIG_EXAMPLES_MOUNT is not set
 # CONFIG_EXAMPLES_MODBUS is not set
-# CONFIG_EXAMPLES_NETTEST is not set
 # CONFIG_EXAMPLES_NSH is not set
 # CONFIG_EXAMPLES_NULL is not set
 # CONFIG_EXAMPLES_NX is not set
@@ -422,6 +438,7 @@ CONFIG_EXAMPLES_OSTEST_RR_RUNS=10
 # CONFIG_EXAMPLES_PASHELLO is not set
 # CONFIG_EXAMPLES_PIPE is not set
 # CONFIG_EXAMPLES_POLL is not set
+# CONFIG_EXAMPLES_POSIXSPAWN is not set
 # CONFIG_EXAMPLES_QENCODER is not set
 # CONFIG_EXAMPLES_RGMP is not set
 # CONFIG_EXAMPLES_ROMFS is not set
@@ -439,8 +456,9 @@ CONFIG_EXAMPLES_OSTEST_RR_RUNS=10
 # CONFIG_EXAMPLES_WATCHDOG is not set
 
 #
-# Interpreters
+# Graphics Support
 #
+# CONFIG_TIFF is not set
 
 #
 # Interpreters
@@ -470,11 +488,7 @@ CONFIG_EXAMPLES_OSTEST_RR_RUNS=10
 # CONFIG_NETUTILS_WEBCLIENT is not set
 
 #
-# ModBus
-#
-
-#
-# FreeModbus
+# FreeModBus
 #
 # CONFIG_MODBUS is not set
 
@@ -529,3 +543,7 @@ CONFIG_EXAMPLES_OSTEST_RR_RUNS=10
 # Sysinfo
 #
 # CONFIG_SYSTEM_SYSINFO is not set
+
+#
+# USB Monitor
+#
diff --git a/nuttx/configs/lm4f120-launchpad/ostest/setenv.sh b/nuttx/configs/lm4f120-launchpad/ostest/setenv.sh
index 831ad2add..a121d61d7 100755
--- a/nuttx/configs/lm4f120-launchpad/ostest/setenv.sh
+++ b/nuttx/configs/lm4f120-launchpad/ostest/setenv.sh
@@ -32,15 +32,39 @@
 # POSSIBILITY OF SUCH DAMAGE.
 #
 
-if [ "$(basename $0)" = "setenv.sh" ] ; then
+if [ "$_" = "$0" ] ; then
   echo "You must source this script, not run it!" 1>&2
   exit 1
 fi
 
-if [ -z "${PATH_ORIG}" ]; then export PATH_ORIG="${PATH}"; fi
-
 WD=`pwd`
-export BUILDROOT_BIN="${WD}/../misc/buildroot/build_arm_nofpu/staging_dir/bin"
-export PATH="${BUILDROOT_BIN}:/sbin:/usr/sbin:${PATH_ORIG}"
+if [ ! -x "setenv.sh" ]; then
+  echo "This script must be executed from the top-level NuttX build directory"
+  exit 1
+fi
+
+if [ -z "${PATH_ORIG}" ]; then
+  export PATH_ORIG="${PATH}"
+fi
+
+# This is the Cygwin path to the location where I installed the CodeSourcery
+# toolchain under windows.  You will also have to edit this if you install
+# the CodeSourcery toolchain in any other location
+#export TOOLCHAIN_BIN="/cygdrive/c/Program Files (x86)/CodeSourcery/Sourcery G++ Lite/bin"
+
+# These are the Cygwin paths to the locations where I installed the Atollic
+# toolchain under windows.  You will also have to edit this if you install
+# the Atollic toolchain in any other location.  /usr/bin is added before
+# the Atollic bin path because there is are binaries named gcc.exe and g++.exe
+# at those locations as well.
+#export TOOLCHAIN_BIN="/usr/bin:/cygdrive/c/Program Files (x86)/Atollic/TrueSTUDIO for ARM Pro 2.3.0/ARMTools/bin"
+#export TOOLCHAIN_BIN="/usr/bin:/cygdrive/c/Program Files (x86)/Atollic/TrueSTUDIO for STMicroelectronics STM32 Lite 2.3.0/ARMTools/bin"
+
+# This is the Cygwin path to the location where I build the buildroot
+# toolchain.
+export TOOLCHAIN_BIN="${WD}/../misc/buildroot/build_arm_nofpu/staging_dir/bin"
+
+# Add the path to the toolchain to the PATH varialble
+export PATH="${TOOLCHAIN_BIN}:/sbin:/usr/sbin:${PATH_ORIG}"
 
 echo "PATH : ${PATH}"
diff --git a/nuttx/configs/lm4f120-launchpad/src/lm4f_autoleds.c b/nuttx/configs/lm4f120-launchpad/src/lm4f_autoleds.c
index 313c995da..9b26b9536 100644
--- a/nuttx/configs/lm4f120-launchpad/src/lm4f_autoleds.c
+++ b/nuttx/configs/lm4f120-launchpad/src/lm4f_autoleds.c
@@ -93,7 +93,7 @@
  * LED_INIRQ         2      NC   NC    ON  (momentary)
  * LED_SIGNAL        2      NC   NC    ON  (momentary)
  * LED_ASSERTION     3      ON   NC    NC  (momentary)
- * LED_PANIC         3      ON   OFF   OFF (flashing 2Hz)
+ * LED_PANIC         4      ON   OFF   OFF (flashing 2Hz)
  */
 
 /* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
@@ -130,6 +130,10 @@
 
 /****************************************************************************
  * Name: lm4f_ledinit
+ *
+ * Description:
+ *   Called to initialize the on-board LEDs.
+ *
  ****************************************************************************/
 
 #ifdef CONFIG_ARCH_LEDS
@@ -157,35 +161,31 @@ void up_ledon(int led)
       /* All components stay off until the file initialization step */
 
       default:
-      case LED_STARTED:
-      case LED_HEAPALLOCATE:
-      case LED_IRQSENABLED:
-      default:
+      case 0:
         break;
 
       /* The GREEN component is illuminated at the final initialization step */
 
-      case LED_STACKCREATED:
-        lm_gpiowrite(GPIO_LED_GREEN, false);
+      case 1:
+        lm_gpiowrite(GPIO_LED_G, false);
         break;
 
       /* These will illuminate the BLUE component with on effect no RED and GREEN */
 
-      case LED_INIRQ:
-      case LED_SIGNAL:
-        lm_gpiowrite(GPIO_LED_BLUE, false);
+      case 2:
+        lm_gpiowrite(GPIO_LED_B, false);
         break;
 
       /* This will turn off RED and GREEN and turn RED on */
 
-      case LED_PANIC:
-        lm_gpiowrite(GPIO_LED_GREEN, true);
-        lm_gpiowrite(GPIO_LED_BLUE, true);
+      case 4:
+        lm_gpiowrite(GPIO_LED_G, true);
+        lm_gpiowrite(GPIO_LED_B, true);
 
       /* This will illuminate the RED component with no effect on RED and GREEN */
 
-      case LED_ASSERTION:
-        lm_gpiowrite(GPIO_LED_RED, false);
+      case 3:
+        lm_gpiowrite(GPIO_LED_R, false);
         break;
     }
 }
@@ -201,25 +201,21 @@ void up_ledoff(int led)
       /* These should not happen and are ignored */
 
       default:
-      case LED_STARTED:
-      case LED_HEAPALLOCATE:
-      case LED_IRQSENABLED:
-      case LED_STACKCREATED:
-      default:
+      case 0:
+      case 1:
         break;
 
       /* These will extinguish the BLUE component with no effect on RED and GREEN */
 
-      case LED_INIRQ:
-      case LED_SIGNAL:
-        lm_gpiowrite(GPIO_LED_BLUE, true);
+      case 2:
+        lm_gpiowrite(GPIO_LED_B, true);
         break;
 
       /* These will extinguish the RED component with on effect on RED and GREEN */
 
-      case LED_INIRQ:
-      case LED_SIGNAL:
-        lm_gpiowrite(GPIO_LED_RED, true);
+      case 3:
+      case 4:
+        lm_gpiowrite(GPIO_LED_R, true);
         break;
     }
 }
diff --git a/nuttx/configs/lm4f120-launchpad/src/lm4f_nsh.c b/nuttx/configs/lm4f120-launchpad/src/lm4f_nsh.c
index 3efcf4c72..ed1547e04 100644
--- a/nuttx/configs/lm4f120-launchpad/src/lm4f_nsh.c
+++ b/nuttx/configs/lm4f120-launchpad/src/lm4f_nsh.c
@@ -55,7 +55,7 @@
 
 /* PORT and SLOT number probably depend on the board configuration */
 
-#ifdef CONFIG_ARCH_BOARD_LM4FLAUNCHPAD
+#ifdef CONFIG_ARCH_BOARD_LM4F120_LAUNCHPAD
 #  undef NSH_HAVEUSBDEV
 #else
 #  error "Unrecognized lm3s board"
diff --git a/nuttx/configs/lm4f120-launchpad/src/lm4f_ssi.c b/nuttx/configs/lm4f120-launchpad/src/lm4f_ssi.c
index 92b68d082..29c31409e 100644
--- a/nuttx/configs/lm4f120-launchpad/src/lm4f_ssi.c
+++ b/nuttx/configs/lm4f120-launchpad/src/lm4f_ssi.c
@@ -54,7 +54,7 @@
 
 /* The LM4F LaunchPad microSD CS is on SSI0 */
 
-#if !defined(CONFIG_SSI0_DISABLE)  || !defined(CONFIG_SSI1_DISABLE)
+#if !defined(CONFIG_SSI0_DISABLE) || !defined(CONFIG_SSI1_DISABLE)
 
 /************************************************************************************
  * Definitions
@@ -64,7 +64,6 @@
 
 #ifdef CONFIG_DEBUG_SPI
 #  define ssidbg lldbg
-#  endif
 #else
 #  define ssidbg(x...)
 #endif
diff --git a/nuttx/configs/lm4f120-launchpad/src/lmf4120-launchpad.h b/nuttx/configs/lm4f120-launchpad/src/lmf4120-launchpad.h
index 5f5812645..95dfc052a 100644
--- a/nuttx/configs/lm4f120-launchpad/src/lmf4120-launchpad.h
+++ b/nuttx/configs/lm4f120-launchpad/src/lmf4120-launchpad.h
@@ -136,7 +136,19 @@
  *
  ************************************************************************************/
 
-extern void weak_function lm4f_ssiinitialize(void);
+void weak_function lm4f_ssiinitialize(void);
+
+/****************************************************************************
+ * Name: lm4f_ledinit
+ *
+ * Description:
+ *   Called to initialize the on-board LEDs.
+ *
+ ****************************************************************************/
+
+#ifdef CONFIG_ARCH_LEDS
+void lm4f_ledinit(void);
+#endif
 
 #endif /* __ASSEMBLY__ */
 #endif /* __CONFIGS_LM4F120_LAUNCHPAD_LM4F120_LAUNCHPAD_H */
diff --git a/nuttx/configs/lpcxpresso-lpc1768/Kconfig b/nuttx/configs/lpcxpresso-lpc1768/Kconfig
index 944df07b7..e0504027c 100644
--- a/nuttx/configs/lpcxpresso-lpc1768/Kconfig
+++ b/nuttx/configs/lpcxpresso-lpc1768/Kconfig
@@ -4,10 +4,4 @@
 #
 
 if ARCH_BOARD_LPCXPRESSO
-config ARCH_LEDS
-	bool "NuttX LED support"
-	default n
-	---help---
-		"Support control of board LEDs by NuttX to indicate system state"
-
 endif
diff --git a/nuttx/configs/mbed/Kconfig b/nuttx/configs/mbed/Kconfig
index 84d7d461e..5ef86f3b5 100644
--- a/nuttx/configs/mbed/Kconfig
+++ b/nuttx/configs/mbed/Kconfig
@@ -4,10 +4,4 @@
 #
 
 if ARCH_BOARD_MBED
-config ARCH_LEDS
-	bool "NuttX LED support"
-	default n
-	---help---
-		"Support control of board LEDs by NuttX to indicate system state"
-
 endif
diff --git a/nuttx/configs/mcu123-lpc214x/Kconfig b/nuttx/configs/mcu123-lpc214x/Kconfig
index e429d3d75..f5582e0e8 100644
--- a/nuttx/configs/mcu123-lpc214x/Kconfig
+++ b/nuttx/configs/mcu123-lpc214x/Kconfig
@@ -4,10 +4,4 @@
 #
 
 if ARCH_BOARD_MCU123
-config ARCH_LEDS
-	bool "NuttX LED support"
-	default n
-	---help---
-		"Support control of board LEDs by NuttX to indicate system state"
-
 endif
diff --git a/nuttx/configs/mirtoo/Kconfig b/nuttx/configs/mirtoo/Kconfig
index 1ff7e4246..736707186 100644
--- a/nuttx/configs/mirtoo/Kconfig
+++ b/nuttx/configs/mirtoo/Kconfig
@@ -4,15 +4,11 @@
 #
 
 if ARCH_BOARD_MIRTOO
-config ARCH_LEDS
-	bool "NuttX LED support"
-	default n
-	---help---
-		"Support control of board LEDs by NuttX to indicate system state"
 
 config MIRTOO_RELEASE
 	int "Mirtoo Release 1 (R1)"
 	default 2
 	---help---
 		Select the Mirtoo release number
+
 endif
diff --git a/nuttx/configs/mx1ads/Kconfig b/nuttx/configs/mx1ads/Kconfig
index ba83e1cf7..4a1c14517 100644
--- a/nuttx/configs/mx1ads/Kconfig
+++ b/nuttx/configs/mx1ads/Kconfig
@@ -4,10 +4,4 @@
 #
 
 if ARCH_BOARD_MX1ADS
-config ARCH_LEDS
-	bool "NuttX LED support"
-	default n
-	---help---
-		"Support control of board LEDs by NuttX to indicate system state"
-
 endif
diff --git a/nuttx/configs/ntosd-dm320/Kconfig b/nuttx/configs/ntosd-dm320/Kconfig
index 67681a845..326f73f6c 100644
--- a/nuttx/configs/ntosd-dm320/Kconfig
+++ b/nuttx/configs/ntosd-dm320/Kconfig
@@ -4,10 +4,4 @@
 #
 
 if ARCH_BOARD_NTOSD_DM320
-config ARCH_LEDS
-	bool "NuttX LED support"
-	default n
-	---help---
-		"Support control of board LEDs by NuttX to indicate system state"
-
 endif
diff --git a/nuttx/configs/nucleus2g/Kconfig b/nuttx/configs/nucleus2g/Kconfig
index 32a7fae76..457b6bb86 100644
--- a/nuttx/configs/nucleus2g/Kconfig
+++ b/nuttx/configs/nucleus2g/Kconfig
@@ -4,10 +4,4 @@
 #
 
 if ARCH_BOARD_NUCLEUS2G
-config ARCH_LEDS
-	bool "NuttX LED support"
-	default n
-	---help---
-		"Support control of board LEDs by NuttX to indicate system state"
-
 endif
diff --git a/nuttx/configs/nutiny-nuc120/Kconfig b/nuttx/configs/nutiny-nuc120/Kconfig
index 3c0c7a1e5..416063f7d 100644
--- a/nuttx/configs/nutiny-nuc120/Kconfig
+++ b/nuttx/configs/nutiny-nuc120/Kconfig
@@ -4,10 +4,4 @@
 #
 
 if ARCH_BOARD_NUTINY_NUC120
-config ARCH_LEDS
-	bool "NuttX LED support"
-	default n
-	---help---
-		"Support control of the on-board LED by NuttX to indicate system state"
-
 endif
diff --git a/nuttx/configs/olimex-lpc2378/Kconfig b/nuttx/configs/olimex-lpc2378/Kconfig
index 962ea29de..f479970f0 100644
--- a/nuttx/configs/olimex-lpc2378/Kconfig
+++ b/nuttx/configs/olimex-lpc2378/Kconfig
@@ -5,10 +5,4 @@
 #
 
 if ARCH_BOARD_OLIMEXLPC2378
-config ARCH_LEDS
-	bool "NuttX LED support"
-	default n
-	---help---
-		"Support control of board LEDs by NuttX to indicate system state"
-
 endif
diff --git a/nuttx/configs/pic32-starterkit/Kconfig b/nuttx/configs/pic32-starterkit/Kconfig
index d2dbdba15..7689eee13 100644
--- a/nuttx/configs/pic32-starterkit/Kconfig
+++ b/nuttx/configs/pic32-starterkit/Kconfig
@@ -4,10 +4,4 @@
 #
 
 if ARCH_BOARD_PIC32_STARTERKIT
-config ARCH_LEDS
-	bool "NuttX LED support"
-	default n
-	---help---
-		"Support control of board LEDs by NuttX to indicate system state"
-
 endif
diff --git a/nuttx/configs/pic32mx7mmb/Kconfig b/nuttx/configs/pic32mx7mmb/Kconfig
index 41c5a7896..f83241651 100644
--- a/nuttx/configs/pic32mx7mmb/Kconfig
+++ b/nuttx/configs/pic32mx7mmb/Kconfig
@@ -4,10 +4,4 @@
 #
 
 if ARCH_BOARD_PIC32_PIC32MX7MMB
-config ARCH_LEDS
-	bool "NuttX LED support"
-	default n
-	---help---
-		"Support control of board LEDs by NuttX to indicate system state"
-
 endif
diff --git a/nuttx/configs/pjrc-8051/Kconfig b/nuttx/configs/pjrc-8051/Kconfig
index afa9f6a9f..921bc732c 100644
--- a/nuttx/configs/pjrc-8051/Kconfig
+++ b/nuttx/configs/pjrc-8051/Kconfig
@@ -4,10 +4,4 @@
 #
 
 if ARCH_BOARD_PJRC_87C52
-config ARCH_LEDS
-	bool "NuttX LED support"
-	default n
-	---help---
-		"Support control of board LEDs by NuttX to indicate system state"
-
 endif
diff --git a/nuttx/configs/teensy/Kconfig b/nuttx/configs/teensy/Kconfig
index 5b751c285..11cf2e798 100644
--- a/nuttx/configs/teensy/Kconfig
+++ b/nuttx/configs/teensy/Kconfig
@@ -4,10 +4,4 @@
 #
 
 if ARCH_BOARD_TEENSY
-config ARCH_LEDS
-	bool "NuttX LED support"
-	default n
-	---help---
-		"Support control of board LEDs by NuttX to indicate system state"
-
 endif
diff --git a/nuttx/configs/us7032evb1/Kconfig b/nuttx/configs/us7032evb1/Kconfig
index d054a1624..94e6b725a 100644
--- a/nuttx/configs/us7032evb1/Kconfig
+++ b/nuttx/configs/us7032evb1/Kconfig
@@ -4,10 +4,4 @@
 #
 
 if ARCH_BOARD_TWR_K60N512
-config ARCH_LEDS
-	bool "NuttX LED support"
-	default n
-	---help---
-		"Support control of board LEDs by NuttX to indicate system state"
-
 endif
diff --git a/nuttx/configs/zkit-arm-1769/Kconfig b/nuttx/configs/zkit-arm-1769/Kconfig
index 42ed37151..ab80e40dd 100644
--- a/nuttx/configs/zkit-arm-1769/Kconfig
+++ b/nuttx/configs/zkit-arm-1769/Kconfig
@@ -4,10 +4,4 @@
 #
 
 if ARCH_BOARD_ZKITARM
-config ARCH_LEDS
-	bool "NuttX LED support"
-	default n
-	---help---
-		"Support control of board LEDs by NuttX to indicate system state"
-
 endif