diff --git a/configs/cloudctrl/src/up_autoleds.c b/configs/cloudctrl/src/up_autoleds.c
index 83e0b9e684f..bc45a2154fa 100644
--- a/configs/cloudctrl/src/up_autoleds.c
+++ b/configs/cloudctrl/src/up_autoleds.c
@@ -58,13 +58,11 @@
  * Definitions
  ****************************************************************************/
 
-/* Enables debug output from this file (needs CONFIG_DEBUG with
- * CONFIG_DEBUG_VERBOSE too)
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+ * with CONFIG_DEBUG_VERBOSE too)
  */
 
-#undef LED_DEBUG  /* Define to enable debug */
-
-#ifdef LED_DEBUG
+#ifdef CONFIG_DEBUG_LEDS
 #  define leddbg  lldbg
 #  define ledvdbg llvdbg
 #else
diff --git a/configs/cloudctrl/src/up_userleds.c b/configs/cloudctrl/src/up_userleds.c
index 6c39b1442c7..633aa7d9855 100644
--- a/configs/cloudctrl/src/up_userleds.c
+++ b/configs/cloudctrl/src/up_userleds.c
@@ -59,13 +59,11 @@
  * Definitions
  ****************************************************************************/
 
-/* Enables debug output from this file (needs CONFIG_DEBUG with
- * CONFIG_DEBUG_VERBOSE too)
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+ * with CONFIG_DEBUG_VERBOSE too)
  */
 
-#undef LED_DEBUG  /* Define to enable debug */
-
-#ifdef LED_DEBUG
+#ifdef CONFIG_DEBUG_LEDS
 #  define leddbg  lldbg
 #  define ledvdbg llvdbg
 #else
diff --git a/configs/demo9s12ne64/src/up_leds.c b/configs/demo9s12ne64/src/up_leds.c
index 1984d816525..49266acedaf 100644
--- a/configs/demo9s12ne64/src/up_leds.c
+++ b/configs/demo9s12ne64/src/up_leds.c
@@ -2,7 +2,7 @@
  * configs/demo9s12ne64/src/up_leds.c
  * arch/arm/src/board/up_leds.c
  *
- *   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
@@ -50,13 +50,11 @@
  * Pre-processor Definitions
  ****************************************************************************/
 
-/* Enables debug output from this file (needs CONFIG_DEBUG with
- * CONFIG_DEBUG_VERBOSE too)
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+ * with CONFIG_DEBUG_VERBOSE too)
  */
 
-#undef LED_DEBUG  /* Define to enable debug */
-
-#ifdef LED_DEBUG
+#ifdef CONFIG_DEBUG_LEDS
 #  define leddbg  lldbg
 #  define ledvdbg llvdbg
 #else
diff --git a/configs/ea3131/src/up_leds.c b/configs/ea3131/src/up_leds.c
index ab22c7657cb..021600cb937 100644
--- a/configs/ea3131/src/up_leds.c
+++ b/configs/ea3131/src/up_leds.c
@@ -2,7 +2,7 @@
  * configs/ea3131/src/up_leds.c
  * arch/arm/src/board/up_leds.c
  *
- *   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
@@ -55,13 +55,11 @@
  * Definitions
  ****************************************************************************/
 
-/* Enables debug output from this file (needs CONFIG_DEBUG with
- * CONFIG_DEBUG_VERBOSE too)
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+ * with CONFIG_DEBUG_VERBOSE too)
  */
 
-#undef LED_DEBUG  /* Define to enable debug */
-
-#ifdef LED_DEBUG
+#ifdef CONFIG_DEBUG_LEDS
 #  define leddbg  lldbg
 #  define ledvdbg llvdbg
 #else
@@ -69,8 +67,6 @@
 #  define ledvdbg(x...)
 #endif
 
-/* The following definitions map the encoded LED setting to GPIO settings */
-
 /****************************************************************************
  * Private Data
  ****************************************************************************/
diff --git a/configs/ea3152/src/up_leds.c b/configs/ea3152/src/up_leds.c
index 4c6aeea0f9d..bbd393beb1d 100644
--- a/configs/ea3152/src/up_leds.c
+++ b/configs/ea3152/src/up_leds.c
@@ -2,7 +2,7 @@
  * configs/ea3152/src/up_leds.c
  * arch/arm/src/board/up_leds.c
  *
- *   Copyright (C) 2011 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2011, 2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -55,13 +55,11 @@
  * Definitions
  ****************************************************************************/
 
-/* Enables debug output from this file (needs CONFIG_DEBUG with
- * CONFIG_DEBUG_VERBOSE too)
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+ * with CONFIG_DEBUG_VERBOSE too)
  */
 
-#undef LED_DEBUG  /* Define to enable debug */
-
-#ifdef LED_DEBUG
+#ifdef CONFIG_DEBUG_LEDS
 #  define leddbg  lldbg
 #  define ledvdbg llvdbg
 #else
@@ -69,8 +67,6 @@
 #  define ledvdbg(x...)
 #endif
 
-/* The following definitions map the encoded LED setting to GPIO settings */
-
 /****************************************************************************
  * Private Data
  ****************************************************************************/
diff --git a/configs/eagle100/src/up_leds.c b/configs/eagle100/src/up_leds.c
index 5566b58b241..4976c4bcb2f 100644
--- a/configs/eagle100/src/up_leds.c
+++ b/configs/eagle100/src/up_leds.c
@@ -2,7 +2,7 @@
  * configs/eagle100/src/up_leds.c
  * arch/arm/src/board/up_leds.c
  *
- *   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
@@ -55,13 +55,11 @@
  * Definitions
  ****************************************************************************/
 
-/* Enables debug output from this file (needs CONFIG_DEBUG with
- * CONFIG_DEBUG_VERBOSE too)
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+ * with CONFIG_DEBUG_VERBOSE too)
  */
 
-#undef LED_DEBUG  /* Define to enable debug */
-
-#ifdef LED_DEBUG
+#ifdef CONFIG_DEBUG_LEDS
 #  define leddbg  lldbg
 #  define ledvdbg llvdbg
 #else
@@ -71,7 +69,7 @@
 
 /* Dump GPIO registers */
 
-#ifdef LED_DEBUG
+#ifdef CONFIG_DEBUG_LEDS
 #  define led_dumpgpio(m) lm_dumpgpio(LED_GPIO, m)
 #else
 #  define led_dumpgpio(m)
diff --git a/configs/ekk-lm3s9b96/src/up_leds.c b/configs/ekk-lm3s9b96/src/up_leds.c
index e6abe1a8ac4..d3c940f5a85 100644
--- a/configs/ekk-lm3s9b96/src/up_leds.c
+++ b/configs/ekk-lm3s9b96/src/up_leds.c
@@ -2,7 +2,7 @@
  * configs/lm3s6965-ek/src/up_leds.c
  * arch/arm/src/board/up_leds.c
  *
- *   Copyright (C) 2012 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2012-2013 Gregory Nutt. All rights reserved.
  *   Authors: Gregory Nutt <gnutt@nuttx.org>
  *            Jose Pablo Rojas V. <jrojas@nx-engineering.com>
  *
@@ -56,13 +56,11 @@
  * Definitions
  ****************************************************************************/
 
-/* Enables debug output from this file (needs CONFIG_DEBUG with
- * CONFIG_DEBUG_VERBOSE too)
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+ * with CONFIG_DEBUG_VERBOSE too)
  */
 
-#undef LED_DEBUG  /* Define to enable debug */
-
-#ifdef LED_DEBUG
+#ifdef CONFIG_DEBUG_LEDS
 #  define leddbg  lldbg
 #  define ledvdbg llvdbg
 #else
@@ -72,7 +70,7 @@
 
 /* Dump GPIO registers */
 
-#ifdef LED_DEBUG
+#ifdef CONFIG_DEBUG_LEDS
 #  define led_dumpgpio(m) lm_dumpgpio(LED_GPIO, m)
 #else
 #  define led_dumpgpio(m)
diff --git a/configs/fire-stm32v2/src/up_autoleds.c b/configs/fire-stm32v2/src/up_autoleds.c
index dcc3d8708c7..7127b860859 100644
--- a/configs/fire-stm32v2/src/up_autoleds.c
+++ b/configs/fire-stm32v2/src/up_autoleds.c
@@ -2,7 +2,7 @@
  * configs/fire-stm32v2/src/up_autoleds.c
  * arch/arm/src/board/up_autoleds.c
  *
- *   Copyright (C) 2012 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2012-2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -57,13 +57,11 @@
  * Definitions
  ****************************************************************************/
 
-/* Enables debug output from this file (needs CONFIG_DEBUG with
- * CONFIG_DEBUG_VERBOSE too)
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+ * with CONFIG_DEBUG_VERBOSE too)
  */
 
-#undef LED_DEBUG  /* Define to enable debug */
-
-#ifdef LED_DEBUG
+#ifdef CONFIG_DEBUG_LEDS
 #  define leddbg  lldbg
 #  define ledvdbg llvdbg
 #else
diff --git a/configs/fire-stm32v2/src/up_userleds.c b/configs/fire-stm32v2/src/up_userleds.c
index 574c2c5b3d8..4a996af9c72 100644
--- a/configs/fire-stm32v2/src/up_userleds.c
+++ b/configs/fire-stm32v2/src/up_userleds.c
@@ -2,7 +2,7 @@
  * configs/fire-stm32v2/src/up_userleds.c
  * arch/arm/src/board/up_userleds.c
  *
- *   Copyright (C) 2012 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2012-2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -58,13 +58,11 @@
  * Definitions
  ****************************************************************************/
 
-/* Enables debug output from this file (needs CONFIG_DEBUG with
- * CONFIG_DEBUG_VERBOSE too)
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+ * with CONFIG_DEBUG_VERBOSE too)
  */
 
-#undef LED_DEBUG  /* Define to enable debug */
-
-#ifdef LED_DEBUG
+#ifdef CONFIG_DEBUG_LEDS
 #  define leddbg  lldbg
 #  define ledvdbg llvdbg
 #else
diff --git a/configs/hymini-stm32v/src/up_leds.c b/configs/hymini-stm32v/src/up_leds.c
index 5eac5a04533..8c678cb9958 100644
--- a/configs/hymini-stm32v/src/up_leds.c
+++ b/configs/hymini-stm32v/src/up_leds.c
@@ -2,7 +2,7 @@
  * configs/hymini-stm32v/src/up_leds.c
  * arch/arm/src/board/up_leds.c
  *
- *   Copyright (C) 2009, 2011 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2009, 2011, 2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
  *           Laurent Latil <laurent@latil.nom.fr>
  *
@@ -57,13 +57,11 @@
  * Definitions
  ****************************************************************************/
 
-/* Enables debug output from this file (needs CONFIG_DEBUG with
- * CONFIG_DEBUG_VERBOSE too)
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+ * with CONFIG_DEBUG_VERBOSE too)
  */
 
-#undef LED_DEBUG  /* Define to enable debug */
-
-#ifdef LED_DEBUG
+#ifdef CONFIG_DEBUG_LEDS
 #  define leddbg  lldbg
 #  define ledvdbg llvdbg
 #else
diff --git a/configs/kwikstik-k40/src/up_leds.c b/configs/kwikstik-k40/src/up_leds.c
index a455fcc34cf..71a02df63d7 100644
--- a/configs/kwikstik-k40/src/up_leds.c
+++ b/configs/kwikstik-k40/src/up_leds.c
@@ -2,7 +2,7 @@
  * configs/kwikstik-k40/src/up_leds.c
  * arch/arm/src/board/up_leds.c
  *
- *   Copyright (C) 2011 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2011, 2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -46,13 +46,11 @@
  * Definitions
  ****************************************************************************/
 
-/* Enables debug output from this file (needs CONFIG_DEBUG with
- * CONFIG_DEBUG_VERBOSE too)
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+ * with CONFIG_DEBUG_VERBOSE too)
  */
 
-#undef LED_DEBUG  /* Define to enable debug */
-
-#ifdef LED_DEBUG
+#ifdef CONFIG_DEBUG_LEDS
 #  define leddbg  lldbg
 #  define ledvdbg llvdbg
 #else
diff --git a/configs/lincoln60/src/up_leds.c b/configs/lincoln60/src/up_leds.c
index 3b8692d9393..d0b2016caea 100644
--- a/configs/lincoln60/src/up_leds.c
+++ b/configs/lincoln60/src/up_leds.c
@@ -60,29 +60,25 @@
  * Definitions
  ****************************************************************************/
 
-/* Enables debug output from this file (needs CONFIG_DEBUG with
- * CONFIG_DEBUG_VERBOSE too)
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+ * with CONFIG_DEBUG_VERBOSE too)
  */
 
-#undef LED_DEBUG   /* Define to enable debug */
-#undef LED_VERBOSE /* Define to enable verbose debug */
-
-#ifdef LED_DEBUG
+#ifdef CONFIG_DEBUG_LEDS
 #  define leddbg  lldbg
-#  ifdef LED_VERBOSE
+#  ifdef CONFIG_DEBUG_VERBOSE
 #    define ledvdbg lldbg
 #  else
 #    define ledvdbg(x...)
 #  endif
 #else
-#  undef LED_VERBOSE
 #  define leddbg(x...)
 #  define ledvdbg(x...)
 #endif
 
 /* Dump GPIO registers */
 
-#ifdef LED_VERBOSE
+#if defined(CONFIG_DEBUG_VERBOSE) && defined(CONFIG_DEBUG_LEDS)
 #  define led_dumpgpio(m) lpc17_dumpgpio(LINCOLN60_LED2, m)
 #else
 #  define led_dumpgpio(m)
diff --git a/configs/lm3s6432-s2e/src/up_leds.c b/configs/lm3s6432-s2e/src/up_leds.c
index e0dd53f28e3..a159cbb508b 100644
--- a/configs/lm3s6432-s2e/src/up_leds.c
+++ b/configs/lm3s6432-s2e/src/up_leds.c
@@ -2,7 +2,7 @@
  * configs/lm3s6432-s2e/src/up_leds.c
  * arch/arm/src/board/up_leds.c
  *
- *   Copyright (C) 2010 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2010, 2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -55,13 +55,11 @@
  * Definitions
  ****************************************************************************/
 
-/* Enables debug output from this file (needs CONFIG_DEBUG with
- * CONFIG_DEBUG_VERBOSE too)
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+ * with CONFIG_DEBUG_VERBOSE too)
  */
 
-#undef LED_DEBUG  /* Define to enable debug */
-
-#ifdef LED_DEBUG
+#ifdef CONFIG_DEBUG_LEDS
 #  define leddbg  lldbg
 #  define ledvdbg llvdbg
 #else
@@ -71,7 +69,7 @@
 
 /* Dump GPIO registers */
 
-#ifdef LED_DEBUG
+#ifdef CONFIG_DEBUG_LEDS
 #  define led_dumpgpio(m) lm_dumpgpio(LED_GPIO, m)
 #else
 #  define led_dumpgpio(m)
diff --git a/configs/lm3s6965-ek/src/up_leds.c b/configs/lm3s6965-ek/src/up_leds.c
index 0e6c5e50f12..6139a79221c 100644
--- a/configs/lm3s6965-ek/src/up_leds.c
+++ b/configs/lm3s6965-ek/src/up_leds.c
@@ -2,7 +2,7 @@
  * configs/lm3s6965-ek/src/up_leds.c
  * arch/arm/src/board/up_leds.c
  *
- *   Copyright (C) 2010 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2010, 2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -55,13 +55,11 @@
  * Definitions
  ****************************************************************************/
 
-/* Enables debug output from this file (needs CONFIG_DEBUG with
- * CONFIG_DEBUG_VERBOSE too)
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+ * with CONFIG_DEBUG_VERBOSE too)
  */
 
-#undef LED_DEBUG  /* Define to enable debug */
-
-#ifdef LED_DEBUG
+#ifdef CONFIG_DEBUG_LEDS
 #  define leddbg  lldbg
 #  define ledvdbg llvdbg
 #else
@@ -71,7 +69,7 @@
 
 /* Dump GPIO registers */
 
-#ifdef LED_DEBUG
+#ifdef CONFIG_DEBUG_LEDS
 #  define led_dumpgpio(m) lm_dumpgpio(LED_GPIO, m)
 #else
 #  define led_dumpgpio(m)
diff --git a/configs/lm3s8962-ek/src/up_leds.c b/configs/lm3s8962-ek/src/up_leds.c
index a20617f1e18..5adf27d42ef 100644
--- a/configs/lm3s8962-ek/src/up_leds.c
+++ b/configs/lm3s8962-ek/src/up_leds.c
@@ -2,7 +2,7 @@
  * configs/lm3s8962-ek/src/up_leds.c
  * arch/arm/src/board/up_leds.c
  *
- *   Copyright (C) 2010 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2010, 2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -55,13 +55,11 @@
  * Definitions
  ****************************************************************************/
 
-/* Enables debug output from this file (needs CONFIG_DEBUG with
- * CONFIG_DEBUG_VERBOSE too)
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+ * with CONFIG_DEBUG_VERBOSE too)
  */
 
-#undef LED_DEBUG  /* Define to enable debug */
-
-#ifdef LED_DEBUG
+#ifdef CONFIG_DEBUG_LEDS
 #  define leddbg  lldbg
 #  define ledvdbg llvdbg
 #else
@@ -71,7 +69,7 @@
 
 /* Dump GPIO registers */
 
-#ifdef LED_DEBUG
+#ifdef CONFIG_DEBUG_LEDS
 #  define led_dumpgpio(m) lm_dumpgpio(LED_GPIO, m)
 #else
 #  define led_dumpgpio(m)
diff --git a/configs/lpc4330-xplorer/src/up_autoleds.c b/configs/lpc4330-xplorer/src/up_autoleds.c
index b19e334591c..badeb9a160e 100644
--- a/configs/lpc4330-xplorer/src/up_autoleds.c
+++ b/configs/lpc4330-xplorer/src/up_autoleds.c
@@ -2,7 +2,7 @@
  * configs/lpc4330-xplorer/src/up_autoleds.c
  * arch/arm/src/board/up_autoleds.c
  *
- *   Copyright (C) 2012 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2012-2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -90,11 +90,11 @@
  */
 
 /* Debug definitions ********************************************************/
-/* Enables debug output from this file (needs CONFIG_DEBUG with
- * CONFIG_DEBUG_VERBOSE too)
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+ * with CONFIG_DEBUG_VERBOSE too)
  */
 
-#ifdef CONFIG_DEBUG_LED
+#ifdef CONFIG_DEBUG_LEDS
 #  define leddbg  lldbg
 #  ifdef CONFIG_DEBUG_VERBOSE
 #    define LED_VERBOSE 1
diff --git a/configs/lpc4330-xplorer/src/up_userleds.c b/configs/lpc4330-xplorer/src/up_userleds.c
index 2d8b5b51153..c91f4df3ba7 100644
--- a/configs/lpc4330-xplorer/src/up_userleds.c
+++ b/configs/lpc4330-xplorer/src/up_userleds.c
@@ -2,7 +2,7 @@
  * configs/lpc4330-xplorer/src/up_userleds.c
  * arch/arm/src/board/up_userleds.c
  *
- *   Copyright (C) 2012 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2012-2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -68,11 +68,11 @@
  */
 
 /* Debug definitions ********************************************************/
-/* Enables debug output from this file (needs CONFIG_DEBUG with
- * CONFIG_DEBUG_VERBOSE too)
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+ * with CONFIG_DEBUG_VERBOSE too)
  */
 
-#ifdef CONFIG_DEBUG_LED
+#ifdef CONFIG_DEBUG_LEDS
 #  define leddbg  lldbg
 #  ifdef CONFIG_DEBUG_VERBOSE
 #    define LED_VERBOSE 1
diff --git a/configs/lpcxpresso-lpc1768/src/up_leds.c b/configs/lpcxpresso-lpc1768/src/up_leds.c
index 85539b3787d..d0dc197279d 100644
--- a/configs/lpcxpresso-lpc1768/src/up_leds.c
+++ b/configs/lpcxpresso-lpc1768/src/up_leds.c
@@ -55,22 +55,18 @@
  * Definitions
  ****************************************************************************/
 
-/* Enables debug output from this file (needs CONFIG_DEBUG with
- * CONFIG_DEBUG_VERBOSE too)
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+ * with CONFIG_DEBUG_VERBOSE too)
  */
 
-#undef LED_DEBUG   /* Define to enable debug */
-#undef LED_VERBOSE /* Define to enable verbose debug */
-
-#ifdef LED_DEBUG
+#ifdef CONFIG_DEBUG_LEDS
 #  define leddbg  lldbg
-#  ifdef LED_VERBOSE
+#  ifdef CONFIG_DEBUG_VERBOSE
 #    define ledvdbg lldbg
 #  else
 #    define ledvdbg(x...)
 #  endif
 #else
-#  undef LED_VERBOSE
 #  define leddbg(x...)
 #  define ledvdbg(x...)
 #endif
diff --git a/configs/mbed/src/up_leds.c b/configs/mbed/src/up_leds.c
index c8c78e3add5..3a2f160ed39 100644
--- a/configs/mbed/src/up_leds.c
+++ b/configs/mbed/src/up_leds.c
@@ -60,29 +60,25 @@
  * Definitions
  ****************************************************************************/
 
-/* Enables debug output from this file (needs CONFIG_DEBUG with
- * CONFIG_DEBUG_VERBOSE too)
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+ * with CONFIG_DEBUG_VERBOSE too)
  */
 
-#undef LED_DEBUG   /* Define to enable debug */
-#undef LED_VERBOSE /* Define to enable verbose debug */
-
-#ifdef LED_DEBUG
+#ifdef CONFIG_DEBUG_LEDS
 #  define leddbg  lldbg
-#  ifdef LED_VERBOSE
+#  ifdef CONFIG_DEBUG_VERBOSE
 #    define ledvdbg lldbg
 #  else
 #    define ledvdbg(x...)
 #  endif
 #else
-#  undef LED_VERBOSE
 #  define leddbg(x...)
 #  define ledvdbg(x...)
 #endif
 
 /* Dump GPIO registers */
 
-#ifdef LED_VERBOSE
+#if defined(CONFIG_DEBUG_VERBOSE) && defined(CONFIG_DEBUG_LEDS)
 #  define led_dumpgpio(m) lpc17_dumpgpio(MBED_LED3, m)
 #else
 #  define led_dumpgpio(m)
diff --git a/configs/ne64badge/src/up_leds.c b/configs/ne64badge/src/up_leds.c
index 73991f5708d..d4aab0d3b9a 100644
--- a/configs/ne64badge/src/up_leds.c
+++ b/configs/ne64badge/src/up_leds.c
@@ -2,7 +2,7 @@
  * configs/ne64badge/src/up_leds.c
  * arch/arm/src/board/up_leds.c
  *
- *   Copyright (C) 2011 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2011, 2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -52,29 +52,25 @@
  * Pre-processor Definitions
  ****************************************************************************/
 
-/* Enables debug output from this file (needs CONFIG_DEBUG with
- * CONFIG_DEBUG_VERBOSE too)
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+ * with CONFIG_DEBUG_VERBOSE too)
  */
 
-#undef LED_DEBUG   /* Define to enable debug */
-#undef LED_VERBOSE /* Define to enable verbose debug */
-
-#ifdef LED_DEBUG
+#ifdef CONFIG_DEBUG_LEDS
 #  define leddbg  lldbg
-#  ifdef LED_VERBOSE
+#  ifdef CONFIG_DEBUG_VERBOSE
 #    define ledvdbg lldbg
 #  else
 #    define ledvdbg(x...)
 #  endif
 #else
-#  undef LED_VERBOSE
 #  define leddbg(x...)
 #  define ledvdbg(x...)
 #endif
 
 /* Dump GPIO registers */
 
-#ifdef LED_VERBOSE
+#if defined(CONFIG_DEBUG_VERBOSE) && defined(CONFIG_DEBUG_LEDS)
 #  define led_dumpgpio(m) m9s12_dumpgpio(m)
 #else
 #  define led_dumpgpio(m)
diff --git a/configs/nucleus2g/src/up_leds.c b/configs/nucleus2g/src/up_leds.c
index e1c39f5155f..a3d4569ccae 100644
--- a/configs/nucleus2g/src/up_leds.c
+++ b/configs/nucleus2g/src/up_leds.c
@@ -60,29 +60,25 @@
  * Definitions
  ****************************************************************************/
 
-/* Enables debug output from this file (needs CONFIG_DEBUG with
- * CONFIG_DEBUG_VERBOSE too)
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+ * with CONFIG_DEBUG_VERBOSE too)
  */
 
-#undef LED_DEBUG   /* Define to enable debug */
-#undef LED_VERBOSE /* Define to enable verbose debug */
-
-#ifdef LED_DEBUG
+#ifdef CONFIG_DEBUG_LEDS
 #  define leddbg  lldbg
-#  ifdef LED_VERBOSE
+#  ifdef CONFIG_DEBUG_VERBOSE
 #    define ledvdbg lldbg
 #  else
 #    define ledvdbg(x...)
 #  endif
 #else
-#  undef LED_VERBOSE
 #  define leddbg(x...)
 #  define ledvdbg(x...)
 #endif
 
 /* Dump GPIO registers */
 
-#ifdef LED_VERBOSE
+#if defined(CONFIG_DEBUG_VERBOSE) && defined(CONFIG_DEBUG_LEDS)
 #  define led_dumpgpio(m) lpc17_dumpgpio(NUCLEUS2G_LED1_A, m)
 #else
 #  define led_dumpgpio(m)
diff --git a/configs/nutiny-nuc120/src/nuc_led.c b/configs/nutiny-nuc120/src/nuc_led.c
index 2482e7da061..64c34ad2b30 100644
--- a/configs/nutiny-nuc120/src/nuc_led.c
+++ b/configs/nutiny-nuc120/src/nuc_led.c
@@ -76,20 +76,30 @@
  * Definitions
  ****************************************************************************/
 
-/* Enables debug output from this file (needs CONFIG_DEBUG with
- * CONFIG_DEBUG_VERBOSE too)
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+ * with CONFIG_DEBUG_VERBOSE too)
  */
 
-#undef LED_DEBUG  /* Define to enable debug */
-
-#ifdef LED_DEBUG
+#ifdef CONFIG_DEBUG_LEDS
 #  define leddbg  lldbg
-#  define ledvdbg llvdbg
+#  ifdef CONFIG_DEBUG_VERBOSE
+#    define ledvdbg lldbg
+#  else
+#    define ledvdbg(x...)
+#  endif
 #else
 #  define leddbg(x...)
 #  define ledvdbg(x...)
 #endif
 
+/* Dump GPIO registers */
+
+#if defined(CONFIG_DEBUG_VERBOSE) && defined(CONFIG_DEBUG_LEDS)
+#  define led_dumpgpio(m) nuc_dumpgpio(GPIO_LED, m)
+#else
+#  define led_dumpgpio(m)
+#endif
+
 /****************************************************************************
  * Private Data
  ****************************************************************************/
@@ -112,7 +122,9 @@
 
 void nuc_ledinit(void)
 {
+  led_dumpgpio("Before configuration");
   nuc_configgpio(GPIO_LED);
+  led_dumpgpio("After configuration");
 }
 
 /****************************************************************************
diff --git a/configs/olimex-lpc1766stk/src/up_leds.c b/configs/olimex-lpc1766stk/src/up_leds.c
index e590be39f46..b55d3a76ff9 100644
--- a/configs/olimex-lpc1766stk/src/up_leds.c
+++ b/configs/olimex-lpc1766stk/src/up_leds.c
@@ -2,7 +2,7 @@
  * configs/olimex-lpc1766stk/src/up_leds.c
  * arch/arm/src/board/up_leds.c
  *
- *   Copyright (C) 2010-2011 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2010-2011, 2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -58,30 +58,26 @@
  * Definitions
  ****************************************************************************/
 
-/* Enables debug output from this file (needs CONFIG_DEBUG with
- * CONFIG_DEBUG_VERBOSE too)
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+ * with CONFIG_DEBUG_VERBOSE too)
  */
 
-#undef LED_DEBUG   /* Define to enable debug */
-#undef LED_VERBOSE /* Define to enable verbose debug */
-
-#ifdef LED_DEBUG
-#  define leddbg  lldbg
-#  ifdef LED_VERBOSE
+#ifdef CONFIG_DEBUG_LEDS
+#  define leddbg lldbg
+#  ifdef CONFIG_DEBUG_VERBOSE
 #    define ledvdbg lldbg
 #  else
 #    define ledvdbg(x...)
 #  endif
 #else
-#  undef LED_VERBOSE
 #  define leddbg(x...)
 #  define ledvdbg(x...)
 #endif
 
 /* Dump GPIO registers */
 
-#ifdef LED_VERBOSE
-#  define led_dumpgpio(m) lpc17_dumpgpio(???, m)
+#if defined(CONFIG_DEBUG_VERBOSE) && defined(CONFIG_DEBUG_LEDS)
+#  define led_dumpgpio(m) lpc17_dumpgpio(LPC1766STK_LED1, m)
 #else
 #  define led_dumpgpio(m)
 #endif
diff --git a/configs/open1788/src/lpc17_autoleds.c b/configs/open1788/src/lpc17_autoleds.c
index 66cfc1734e0..80d682df5d0 100644
--- a/configs/open1788/src/lpc17_autoleds.c
+++ b/configs/open1788/src/lpc17_autoleds.c
@@ -134,29 +134,25 @@
 #define LED_IDLE_OFF_SETBITS         ((0) << OFF_SETBITS_SHIFT)
 #define LED_IDLE_OFF_CLRBITS         ((OPEN1788_LED4) << OFF_CLRBITS_SHIFT)
 
-/* Enables debug output from this file (needs CONFIG_DEBUG with
- * CONFIG_DEBUG_VERBOSE too)
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+ * with CONFIG_DEBUG_VERBOSE too)
  */
 
-#undef LED_DEBUG   /* Define to enable debug */
-#undef LED_VERBOSE /* Define to enable verbose debug */
-
-#ifdef LED_DEBUG
-#  define leddbg  lldbg
-#  ifdef LED_VERBOSE
+#ifdef CONFIG_DEBUG_LEDS
+#  define leddbg lldbg
+#  ifdef CONFIG_DEBUG_VERBOSE
 #    define ledvdbg lldbg
 #  else
 #    define ledvdbg(x...)
 #  endif
 #else
-#  undef LED_VERBOSE
 #  define leddbg(x...)
 #  define ledvdbg(x...)
 #endif
 
 /* Dump GPIO registers */
 
-#ifdef LED_VERBOSE
+#if defined(CONFIG_DEBUG_VERBOSE) && defined(CONFIG_DEBUG_LEDS)
 #  define led_dumpgpio(m) lpc17_dumpgpio(???, m)
 #else
 #  define led_dumpgpio(m)
diff --git a/configs/open1788/src/lpc17_userleds.c b/configs/open1788/src/lpc17_userleds.c
index dacea5a1cdf..bf0300e2507 100644
--- a/configs/open1788/src/lpc17_userleds.c
+++ b/configs/open1788/src/lpc17_userleds.c
@@ -60,20 +60,30 @@
  * Definitions
  ****************************************************************************/
 
-/* Enables debug output from this file (needs CONFIG_DEBUG with
- * CONFIG_DEBUG_VERBOSE too)
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+ * with CONFIG_DEBUG_VERBOSE too)
  */
 
-#undef LED_DEBUG  /* Define to enable debug */
-
-#ifdef LED_DEBUG
-#  define leddbg  lldbg
-#  define ledvdbg llvdbg
+#ifdef CONFIG_DEBUG_LEDS
+#  define leddbg lldbg
+#  ifdef CONFIG_DEBUG_VERBOSE
+#    define ledvdbg lldbg
+#  else
+#    define ledvdbg(x...)
+#  endif
 #else
 #  define leddbg(x...)
 #  define ledvdbg(x...)
 #endif
 
+/* Dump GPIO registers */
+
+#if defined(CONFIG_DEBUG_VERBOSE) && defined(CONFIG_DEBUG_LEDS)
+#  define led_dumpgpio(m) lpc17_dumpgpio(???, m)
+#else
+#  define led_dumpgpio(m)
+#endif
+
 /****************************************************************************
  * Private Data
  ****************************************************************************/
diff --git a/configs/pjrc-8051/src/up_leds.c b/configs/pjrc-8051/src/up_leds.c
index 64446b5e397..18e7b461df4 100644
--- a/configs/pjrc-8051/src/up_leds.c
+++ b/configs/pjrc-8051/src/up_leds.c
@@ -1,7 +1,7 @@
 /************************************************************************
  * up_leds.c
  *
- *   Copyright (C) 2007, 2009 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2007, 2009, 2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -57,7 +57,7 @@ static uint8_t g_ledstate;
  * Private Functions
  ************************************************************************/
 
-#if defined(CONFIG_LED_DEBUG) && defined(CONFIG_ARCH_LEDS)
+#if defined(CONFIG_DEBUG_LEDS) && defined(CONFIG_ARCH_LEDS)
 static void _up_puthex(uint8_t hex) __naked
 {
   hex; /* To avoid unreferenced argument warning */
diff --git a/configs/sam3u-ek/src/up_leds.c b/configs/sam3u-ek/src/up_leds.c
index 28a2cead545..72c565bd14b 100644
--- a/configs/sam3u-ek/src/up_leds.c
+++ b/configs/sam3u-ek/src/up_leds.c
@@ -58,13 +58,11 @@
  * Definitions
  ****************************************************************************/
 
-/* Enables debug output from this file (needs CONFIG_DEBUG with
- * CONFIG_DEBUG_VERBOSE too)
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+ * with CONFIG_DEBUG_VERBOSE too)
  */
 
-#undef LED_DEBUG  /* Define to enable debug */
-
-#ifdef LED_DEBUG
+#ifdef CONFIG_DEBUG_LEDS
 #  define leddbg  lldbg
 #  define ledvdbg llvdbg
 #else
diff --git a/configs/shenzhou/src/up_autoleds.c b/configs/shenzhou/src/up_autoleds.c
index 1ce25e80e9b..522859f3eff 100644
--- a/configs/shenzhou/src/up_autoleds.c
+++ b/configs/shenzhou/src/up_autoleds.c
@@ -2,7 +2,7 @@
  * configs/shenzhou/src/up_autoleds.c
  * arch/arm/src/board/up_autoleds.c
  *
- *   Copyright (C) 2012 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2012-2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -57,13 +57,11 @@
  * Definitions
  ****************************************************************************/
 
-/* Enables debug output from this file (needs CONFIG_DEBUG with
- * CONFIG_DEBUG_VERBOSE too)
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+ * with CONFIG_DEBUG_VERBOSE too)
  */
 
-#undef LED_DEBUG  /* Define to enable debug */
-
-#ifdef LED_DEBUG
+#ifdef CONFIG_DEBUG_LEDS
 #  define leddbg  lldbg
 #  define ledvdbg llvdbg
 #else
diff --git a/configs/shenzhou/src/up_userleds.c b/configs/shenzhou/src/up_userleds.c
index 0e690e82543..60fa7d9c3f3 100644
--- a/configs/shenzhou/src/up_userleds.c
+++ b/configs/shenzhou/src/up_userleds.c
@@ -2,7 +2,7 @@
  * configs/shenzhou/src/up_userleds.c
  * arch/arm/src/board/up_userleds.c
  *
- *   Copyright (C) 2012 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2012-2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -58,13 +58,11 @@
  * Definitions
  ****************************************************************************/
 
-/* Enables debug output from this file (needs CONFIG_DEBUG with
- * CONFIG_DEBUG_VERBOSE too)
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+ * with CONFIG_DEBUG_VERBOSE too)
  */
 
-#undef LED_DEBUG  /* Define to enable debug */
-
-#ifdef LED_DEBUG
+#ifdef CONFIG_DEBUG_LEDS
 #  define leddbg  lldbg
 #  define ledvdbg llvdbg
 #else
diff --git a/configs/stm3210e-eval/src/up_leds.c b/configs/stm3210e-eval/src/up_leds.c
index 45a24684b35..1266b7203c6 100644
--- a/configs/stm3210e-eval/src/up_leds.c
+++ b/configs/stm3210e-eval/src/up_leds.c
@@ -2,7 +2,7 @@
  * configs/stm3210e_eval/src/up_leds.c
  * arch/arm/src/board/up_leds.c
  *
- *   Copyright (C) 2009-2012 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
@@ -57,13 +57,11 @@
  * Definitions
  ****************************************************************************/
 
-/* Enables debug output from this file (needs CONFIG_DEBUG with
- * CONFIG_DEBUG_VERBOSE too)
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+ * with CONFIG_DEBUG_VERBOSE too)
  */
 
-#undef LED_DEBUG  /* Define to enable debug */
-
-#ifdef LED_DEBUG
+#ifdef CONFIG_DEBUG_LEDS
 #  define leddbg  lldbg
 #  define ledvdbg llvdbg
 #else
diff --git a/configs/stm3220g-eval/src/up_autoleds.c b/configs/stm3220g-eval/src/up_autoleds.c
index 068c07ab492..85010c504a7 100644
--- a/configs/stm3220g-eval/src/up_autoleds.c
+++ b/configs/stm3220g-eval/src/up_autoleds.c
@@ -58,13 +58,11 @@
  * Definitions
  ****************************************************************************/
 
-/* Enables debug output from this file (needs CONFIG_DEBUG with
- * CONFIG_DEBUG_VERBOSE too)
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+ * with CONFIG_DEBUG_VERBOSE too)
  */
 
-#undef LED_DEBUG  /* Define to enable debug */
-
-#ifdef LED_DEBUG
+#ifdef CONFIG_DEBUG_LEDS
 #  define leddbg  lldbg
 #  define ledvdbg llvdbg
 #else
diff --git a/configs/stm3220g-eval/src/up_userleds.c b/configs/stm3220g-eval/src/up_userleds.c
index cc29349e97f..682809afdfc 100644
--- a/configs/stm3220g-eval/src/up_userleds.c
+++ b/configs/stm3220g-eval/src/up_userleds.c
@@ -2,7 +2,7 @@
  * configs/stm3220g_eval/src/up_leds.c
  * arch/arm/src/board/up_leds.c
  *
- *   Copyright (C) 2012 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2012-2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -58,13 +58,11 @@
  * Definitions
  ****************************************************************************/
 
-/* Enables debug output from this file (needs CONFIG_DEBUG with
- * CONFIG_DEBUG_VERBOSE too)
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+ * with CONFIG_DEBUG_VERBOSE too)
  */
 
-#undef LED_DEBUG  /* Define to enable debug */
-
-#ifdef LED_DEBUG
+#ifdef CONFIG_DEBUG_LEDS
 #  define leddbg  lldbg
 #  define ledvdbg llvdbg
 #else
diff --git a/configs/stm3240g-eval/src/up_autoleds.c b/configs/stm3240g-eval/src/up_autoleds.c
index 8e7f40da30c..8474a047653 100644
--- a/configs/stm3240g-eval/src/up_autoleds.c
+++ b/configs/stm3240g-eval/src/up_autoleds.c
@@ -2,7 +2,7 @@
  * configs/stm3240g_eval/src/up_autoleds.c
  * arch/arm/src/board/up_autoleds.c
  *
- *   Copyright (C) 2011 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2011, 2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -58,13 +58,11 @@
  * Definitions
  ****************************************************************************/
 
-/* Enables debug output from this file (needs CONFIG_DEBUG with
- * CONFIG_DEBUG_VERBOSE too)
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+ * with CONFIG_DEBUG_VERBOSE too)
  */
 
-#undef LED_DEBUG  /* Define to enable debug */
-
-#ifdef LED_DEBUG
+#ifdef CONFIG_DEBUG_LEDS
 #  define leddbg  lldbg
 #  define ledvdbg llvdbg
 #else
diff --git a/configs/stm3240g-eval/src/up_userleds.c b/configs/stm3240g-eval/src/up_userleds.c
index 4faf0dfd2fe..6607bb6165d 100644
--- a/configs/stm3240g-eval/src/up_userleds.c
+++ b/configs/stm3240g-eval/src/up_userleds.c
@@ -2,7 +2,7 @@
  * configs/stm3240g_eval/src/up_userleds.c
  * arch/arm/src/board/up_userleds.c
  *
- *   Copyright (C) 2011 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2011, 2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -58,13 +58,11 @@
  * Definitions
  ****************************************************************************/
 
-/* Enables debug output from this file (needs CONFIG_DEBUG with
- * CONFIG_DEBUG_VERBOSE too)
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+ * with CONFIG_DEBUG_VERBOSE too)
  */
 
-#undef LED_DEBUG  /* Define to enable debug */
-
-#ifdef LED_DEBUG
+#ifdef CONFIG_DEBUG_LEDS
 #  define leddbg  lldbg
 #  define ledvdbg llvdbg
 #else
diff --git a/configs/stm32f100rc_generic/src/up_leds.c b/configs/stm32f100rc_generic/src/up_leds.c
index c7cf27d8657..83e1761dc76 100644
--- a/configs/stm32f100rc_generic/src/up_leds.c
+++ b/configs/stm32f100rc_generic/src/up_leds.c
@@ -1,7 +1,7 @@
 /****************************************************************************
  * configs/stm32f100rc_generic/src/up_leds.c
  *
- *   Copyright (C) 2012 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2012-2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
  *           Freddie Chopin <freddie_chopin@op.pl>
  *
@@ -57,13 +57,11 @@
  * Definitions
  ****************************************************************************/
 
-/* Enables debug output from this file (needs CONFIG_DEBUG with
- * CONFIG_DEBUG_VERBOSE too)
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+ * with CONFIG_DEBUG_VERBOSE too)
  */
 
-#undef LED_DEBUG  /* Define to enable debug */
-
-#ifdef LED_DEBUG
+#ifdef CONFIG_DEBUG_LEDS
 #  define leddbg  lldbg
 #  define ledvdbg llvdbg
 #else
diff --git a/configs/stm32f3discovery/src/up_autoleds.c b/configs/stm32f3discovery/src/up_autoleds.c
index d56b7db65ac..1191fb689ce 100644
--- a/configs/stm32f3discovery/src/up_autoleds.c
+++ b/configs/stm32f3discovery/src/up_autoleds.c
@@ -56,13 +56,11 @@
  * Definitions
  ****************************************************************************/
 
-/* Enables debug output from this file (needs CONFIG_DEBUG with
- * CONFIG_DEBUG_VERBOSE too)
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+ * with CONFIG_DEBUG_VERBOSE too)
  */
 
-#undef LED_DEBUG  /* Define to enable debug */
-
-#ifdef LED_DEBUG
+#ifdef CONFIG_DEBUG_LEDS
 #  define leddbg  lldbg
 #  define ledvdbg llvdbg
 #else
diff --git a/configs/stm32f3discovery/src/up_userleds.c b/configs/stm32f3discovery/src/up_userleds.c
index 1b13de53559..85b8b83460b 100644
--- a/configs/stm32f3discovery/src/up_userleds.c
+++ b/configs/stm32f3discovery/src/up_userleds.c
@@ -56,13 +56,11 @@
  * Definitions
  ****************************************************************************/
 
-/* Enables debug output from this file (needs CONFIG_DEBUG with
- * CONFIG_DEBUG_VERBOSE too)
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+ * with CONFIG_DEBUG_VERBOSE too)
  */
 
-#undef LED_DEBUG  /* Define to enable debug */
-
-#ifdef LED_DEBUG
+#ifdef CONFIG_DEBUG_LEDS
 #  define leddbg  lldbg
 #  define ledvdbg llvdbg
 #else
diff --git a/configs/stm32f4discovery/src/up_autoleds.c b/configs/stm32f4discovery/src/up_autoleds.c
index c72a54a026f..985c1000fa2 100644
--- a/configs/stm32f4discovery/src/up_autoleds.c
+++ b/configs/stm32f4discovery/src/up_autoleds.c
@@ -2,7 +2,7 @@
  * configs/stm32f4discovery/src/up_autoleds.c
  * arch/arm/src/board/up_autoleds.c
  *
- *   Copyright (C) 2011-2012 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2011-2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -58,13 +58,11 @@
  * Definitions
  ****************************************************************************/
 
-/* Enables debug output from this file (needs CONFIG_DEBUG with
- * CONFIG_DEBUG_VERBOSE too)
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+ * with CONFIG_DEBUG_VERBOSE too)
  */
 
-#undef LED_DEBUG  /* Define to enable debug */
-
-#ifdef LED_DEBUG
+#ifdef CONFIG_DEBUG_LEDS
 #  define leddbg  lldbg
 #  define ledvdbg llvdbg
 #else
diff --git a/configs/stm32f4discovery/src/up_userleds.c b/configs/stm32f4discovery/src/up_userleds.c
index 5981a12e6a8..919919c3ee3 100644
--- a/configs/stm32f4discovery/src/up_userleds.c
+++ b/configs/stm32f4discovery/src/up_userleds.c
@@ -59,13 +59,11 @@
  * Definitions
  ****************************************************************************/
 
-/* Enables debug output from this file (needs CONFIG_DEBUG with
- * CONFIG_DEBUG_VERBOSE too)
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+ * with CONFIG_DEBUG_VERBOSE too)
  */
 
-#undef LED_DEBUG  /* Define to enable debug */
-
-#ifdef LED_DEBUG
+#ifdef CONFIG_DEBUG_LEDS
 #  define leddbg  lldbg
 #  define ledvdbg llvdbg
 #else
diff --git a/configs/teensy/src/up_leds.c b/configs/teensy/src/up_leds.c
index ce83b499926..5451487099d 100644
--- a/configs/teensy/src/up_leds.c
+++ b/configs/teensy/src/up_leds.c
@@ -2,7 +2,7 @@
  * configs/teensy/src/up_leds.c
  * arch/arm/src/board/up_leds.c
  *
- *   Copyright (C) 2011 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2011, 2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -56,22 +56,18 @@
  * Definitions
  ****************************************************************************/
 
-/* Enables debug output from this file (needs CONFIG_DEBUG with
- * CONFIG_DEBUG_VERBOSE too)
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+ * with CONFIG_DEBUG_VERBOSE too)
  */
 
-#undef LED_DEBUG   /* Define to enable debug */
-#undef LED_VERBOSE /* Define to enable verbose debug */
-
-#ifdef LED_DEBUG
+#ifdef CONFIG_DEBUG_LEDS
 #  define leddbg  lldbg
-#  ifdef LED_VERBOSE
+#  ifdef CONFIG_DEBUG_VERBOSE
 #    define ledvdbg lldbg
 #  else
 #    define ledvdbg(x...)
 #  endif
 #else
-#  undef LED_VERBOSE
 #  define leddbg(x...)
 #  define ledvdbg(x...)
 #endif
diff --git a/configs/twr-k60n512/src/up_leds.c b/configs/twr-k60n512/src/up_leds.c
index df7aeeaa589..4c3c350060d 100644
--- a/configs/twr-k60n512/src/up_leds.c
+++ b/configs/twr-k60n512/src/up_leds.c
@@ -2,7 +2,7 @@
  * configs/twr-k60n512/src/up_leds.c
  * arch/arm/src/board/up_leds.c
  *
- *   Copyright (C) 2011 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2011, 2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -118,13 +118,11 @@
 #define LED_PANIC_OFF_SETBITS        ((0) << OFF_SETBITS_SHIFT)
 #define LED_PANIC_OFF_CLRBITS        ((K60_LED4) << OFF_CLRBITS_SHIFT)
 
-/* Enables debug output from this file (needs CONFIG_DEBUG with
- * CONFIG_DEBUG_VERBOSE too)
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+ * with CONFIG_DEBUG_VERBOSE too)
  */
 
-#undef LED_DEBUG  /* Define to enable debug */
-
-#ifdef LED_DEBUG
+#ifdef CONFIG_DEBUG_LEDS
 #  define leddbg  lldbg
 #  define ledvdbg llvdbg
 #else
diff --git a/configs/vsn/src/leds.c b/configs/vsn/src/leds.c
index e440e5fce3d..5a674465d94 100644
--- a/configs/vsn/src/leds.c
+++ b/configs/vsn/src/leds.c
@@ -53,18 +53,15 @@
 
 #include "vsn.h"
 
-
 /****************************************************************************
  * Definitions
  ****************************************************************************/
 
-/* Enables debug output from this file (needs CONFIG_DEBUG with
- * CONFIG_DEBUG_VERBOSE too)
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+ * with CONFIG_DEBUG_VERBOSE too)
  */
 
-#undef LED_DEBUG  /* Define to enable debug */
-
-#ifdef LED_DEBUG
+#ifdef CONFIG_DEBUG_LEDS
 #  define leddbg  lldbg
 #  define ledvdbg llvdbg
 #else
@@ -72,14 +69,12 @@
 #  define ledvdbg(x...)
 #endif
 
-
 /****************************************************************************
  * Private Data
  ****************************************************************************/
  
 irqstate_t irqidle_mask;
 
-
 /****************************************************************************
  * Private Functions
  ****************************************************************************/
diff --git a/configs/zkit-arm-1769/README.txt b/configs/zkit-arm-1769/README.txt
index 6dbc8a80985..43fbf8428bf 100644
--- a/configs/zkit-arm-1769/README.txt
+++ b/configs/zkit-arm-1769/README.txt
@@ -584,5 +584,11 @@ Where <subdir> is one of the following:
        CONFIG_HOST_LINUX=y                 : Builds under Windows (or Cygwin)
        CONFIG_ARMV7M_TOOLCHAIN_BUILDROOT=y : NuttX buildroot toolchain
 
-    3. You will need to build the NXFLAT toolchain as described above in
+    3. TCP/IP (only) networking is enabled with this configuration:
+
+       CONFIG_EXAMPLES_THTTPD_NOMAC=y             : Will use MAC 00:e0:de:ad:be:ef
+       CONFIG_EXAMPLES_THTTPD_DRIPADDR=0xac100002 : Gateway 172.16.00.02
+       CONFIG_EXAMPLES_THTTPD_NETMASK=0xffffff00  : Netmask 255.255.255.0
+
+    4. You will need to build the NXFLAT toolchain as described above in
        order to use this example.
diff --git a/configs/zkit-arm-1769/src/up_leds.c b/configs/zkit-arm-1769/src/up_leds.c
index 124c14af96a..2b2dfb1e4fb 100644
--- a/configs/zkit-arm-1769/src/up_leds.c
+++ b/configs/zkit-arm-1769/src/up_leds.c
@@ -60,11 +60,11 @@
  * Definitions
  ****************************************************************************/
 
-/* CONFIG_DEBUG_LED enables debug output from this file (needs CONFIG_DEBUG
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
  * and pherhaps CONFIG_DEBUG_VERBOSE too)
  */
 
-#ifdef CONFIG_DEBUG_LED
+#ifdef CONFIG_DEBUG_LEDS
 #  define leddbg  lldbg
 #  ifdef CONFIG_DEBUG_VERBOSE
 #    define ledvdbg lldbg
diff --git a/configs/zkit-arm-1769/thttpd/defconfig b/configs/zkit-arm-1769/thttpd/defconfig
index fab04c704ef..27f9ca861ab 100644
--- a/configs/zkit-arm-1769/thttpd/defconfig
+++ b/configs/zkit-arm-1769/thttpd/defconfig
@@ -548,7 +548,7 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
 # CONFIG_EXAMPLES_TELNETD is not set
 CONFIG_EXAMPLES_THTTPD=y
 CONFIG_EXAMPLES_THTTPD_NOMAC=y
-CONFIG_EXAMPLES_THTTPD_DRIPADDR=0xa0000001
+CONFIG_EXAMPLES_THTTPD_DRIPADDR=0xac100002
 CONFIG_EXAMPLES_THTTPD_NETMASK=0xffffff00
 # CONFIG_EXAMPLES_TIFF is not set
 # CONFIG_EXAMPLES_TOUCHSCREEN is not set