11 files changed, 255 insertions, 255 deletions
diff --git a/nuttx/configs/olimex-lpc1766stk/ftpc/defconfig b/nuttx/configs/olimex-lpc1766stk/ftpc/defconfig
index 3498195b11..6d1375e92c 100755
--- a/nuttx/configs/olimex-lpc1766stk/ftpc/defconfig
+++ b/nuttx/configs/olimex-lpc1766stk/ftpc/defconfig
@@ -433,28 +433,28 @@ CONFIG_THTTPD_URLPATTERN=n
 #
 # Additional settings for examples/thttpd
 #
-CONFIG_EXAMPLE_THTTPD_NOMAC=y
-CONFIG_EXAMPLE_THTTPD_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_THTTPD_NETMASK=0xffffff00
+CONFIG_EXAMPLES_THTTPD_NOMAC=y
+CONFIG_EXAMPLES_THTTPD_DRIPADDR=0x0a000001
+CONFIG_EXAMPLES_THTTPD_NETMASK=0xffffff00
 
 #
 # Settings for examples/uip
 #
-CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002
-CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00
-CONFIG_EXAMPLE_UIP_DHCPC=n
+CONFIG_EXAMPLES_UIP_IPADDR=0x0a000002
+CONFIG_EXAMPLES_UIP_DRIPADDR=0x0a000001
+CONFIG_EXAMPLES_UIP_NETMASK=0xffffff00
+CONFIG_EXAMPLES_UIP_DHCPC=n
 
 #
 # Settings for examples/nettest
 #
-CONFIG_EXAMPLE_NETTEST_SERVER=n
-CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n
-CONFIG_EXAMPLE_NETTEST_NOMAC=y
-CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002
-CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00
-CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001
+CONFIG_EXAMPLES_NETTEST_SERVER=n
+CONFIG_EXAMPLES_NETTEST_PERFORMANCE=n
+CONFIG_EXAMPLES_NETTEST_NOMAC=y
+CONFIG_EXAMPLES_NETTEST_IPADDR=0x0a000002
+CONFIG_EXAMPLES_NETTEST_DRIPADDR=0x0a000001
+CONFIG_EXAMPLES_NETTEST_NETMASK=0xffffff00
+CONFIG_EXAMPLES_NETTEST_CLIENTIP=0x0a000001
 
 #
 # Settings for examples/ostest
@@ -466,18 +466,18 @@ CONFIG_EXAMPLES_OSTEST_NBARRIER_THREADS=3
 #
 # Settings for examples/buttons
 #
-CONFIG_EXAMPLE_BUTTONS_MIN=0
-CONFIG_EXAMPLE_BUTTONS_MAX=7
-CONFIG_EXAMPLE_IRQBUTTONS_MIN=0
-CONFIG_EXAMPLE_IRQBUTTONS_MAX=7
-CONFIG_EXAMPLE_BUTTONS_NAME0="BUT1"
-CONFIG_EXAMPLE_BUTTONS_NAME1="BUT2"
-CONFIG_EXAMPLE_BUTTONS_NAME2="WAKE-UP"
-CONFIG_EXAMPLE_BUTTONS_NAME3="CENTER"
-CONFIG_EXAMPLE_BUTTONS_NAME4="UP"
-CONFIG_EXAMPLE_BUTTONS_NAME5="DOWN"
-CONFIG_EXAMPLE_BUTTONS_NAME6="LEFT"
-CONFIG_EXAMPLE_BUTTONS_NAME7="RIGHT"
+CONFIG_EXAMPLES_BUTTONS_MIN=0
+CONFIG_EXAMPLES_BUTTONS_MAX=7
+CONFIG_EXAMPLES_IRQBUTTONS_MIN=0
+CONFIG_EXAMPLES_IRQBUTTONS_MAX=7
+CONFIG_EXAMPLES_BUTTONS_NAME0="BUT1"
+CONFIG_EXAMPLES_BUTTONS_NAME1="BUT2"
+CONFIG_EXAMPLES_BUTTONS_NAME2="WAKE-UP"
+CONFIG_EXAMPLES_BUTTONS_NAME3="CENTER"
+CONFIG_EXAMPLES_BUTTONS_NAME4="UP"
+CONFIG_EXAMPLES_BUTTONS_NAME5="DOWN"
+CONFIG_EXAMPLES_BUTTONS_NAME6="LEFT"
+CONFIG_EXAMPLES_BUTTONS_NAME7="RIGHT"
 
 #
 # Settings for apps/nshlib
diff --git a/nuttx/configs/olimex-lpc1766stk/hidkbd/defconfig b/nuttx/configs/olimex-lpc1766stk/hidkbd/defconfig
index 9acf60d9d7..7c9fe4c4e5 100755
--- a/nuttx/configs/olimex-lpc1766stk/hidkbd/defconfig
+++ b/nuttx/configs/olimex-lpc1766stk/hidkbd/defconfig
@@ -397,21 +397,21 @@ CONFIG_USBMSC_REMOVABLE=y
 #
 # Settings for examples/uip
 #
-CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002
-CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00
-CONFIG_EXAMPLE_UIP_DHCPC=n
+CONFIG_EXAMPLES_UIP_IPADDR=0x0a000002
+CONFIG_EXAMPLES_UIP_DRIPADDR=0x0a000001
+CONFIG_EXAMPLES_UIP_NETMASK=0xffffff00
+CONFIG_EXAMPLES_UIP_DHCPC=n
 
 #
 # Settings for examples/nettest
 #
-CONFIG_EXAMPLE_NETTEST_SERVER=n
-CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n
-CONFIG_EXAMPLE_NETTEST_NOMAC=y
-CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002
-CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00
-CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001
+CONFIG_EXAMPLES_NETTEST_SERVER=n
+CONFIG_EXAMPLES_NETTEST_PERFORMANCE=n
+CONFIG_EXAMPLES_NETTEST_NOMAC=y
+CONFIG_EXAMPLES_NETTEST_IPADDR=0x0a000002
+CONFIG_EXAMPLES_NETTEST_DRIPADDR=0x0a000001
+CONFIG_EXAMPLES_NETTEST_NETMASK=0xffffff00
+CONFIG_EXAMPLES_NETTEST_CLIENTIP=0x0a000001
 
 #
 # Settings for examples/ostest
@@ -423,18 +423,18 @@ CONFIG_EXAMPLES_OSTEST_NBARRIER_THREADS=3
 #
 # Settings for examples/buttons
 #
-CONFIG_EXAMPLE_BUTTONS_MIN=0
-CONFIG_EXAMPLE_BUTTONS_MAX=7
-CONFIG_EXAMPLE_IRQBUTTONS_MIN=0
-CONFIG_EXAMPLE_IRQBUTTONS_MAX=7
-CONFIG_EXAMPLE_BUTTONS_NAME0="BUT1"
-CONFIG_EXAMPLE_BUTTONS_NAME1="BUT2"
-CONFIG_EXAMPLE_BUTTONS_NAME2="WAKE-UP"
-CONFIG_EXAMPLE_BUTTONS_NAME3="CENTER"
-CONFIG_EXAMPLE_BUTTONS_NAME4="UP"
-CONFIG_EXAMPLE_BUTTONS_NAME5="DOWN"
-CONFIG_EXAMPLE_BUTTONS_NAME6="LEFT"
-CONFIG_EXAMPLE_BUTTONS_NAME7="RIGHT"
+CONFIG_EXAMPLES_BUTTONS_MIN=0
+CONFIG_EXAMPLES_BUTTONS_MAX=7
+CONFIG_EXAMPLES_IRQBUTTONS_MIN=0
+CONFIG_EXAMPLES_IRQBUTTONS_MAX=7
+CONFIG_EXAMPLES_BUTTONS_NAME0="BUT1"
+CONFIG_EXAMPLES_BUTTONS_NAME1="BUT2"
+CONFIG_EXAMPLES_BUTTONS_NAME2="WAKE-UP"
+CONFIG_EXAMPLES_BUTTONS_NAME3="CENTER"
+CONFIG_EXAMPLES_BUTTONS_NAME4="UP"
+CONFIG_EXAMPLES_BUTTONS_NAME5="DOWN"
+CONFIG_EXAMPLES_BUTTONS_NAME6="LEFT"
+CONFIG_EXAMPLES_BUTTONS_NAME7="RIGHT"
 
 #
 # Settings for apps/nshlib
diff --git a/nuttx/configs/olimex-lpc1766stk/nettest/defconfig b/nuttx/configs/olimex-lpc1766stk/nettest/defconfig
index 040b3ecff6..628ff01124 100755
--- a/nuttx/configs/olimex-lpc1766stk/nettest/defconfig
+++ b/nuttx/configs/olimex-lpc1766stk/nettest/defconfig
@@ -376,21 +376,21 @@ CONFIG_USBMSC_REMOVABLE=y
 #
 # Settings for examples/uip
 #
-CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002
-CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00
-CONFIG_EXAMPLE_UIP_DHCPC=n
+CONFIG_EXAMPLES_UIP_IPADDR=0x0a000002
+CONFIG_EXAMPLES_UIP_DRIPADDR=0x0a000001
+CONFIG_EXAMPLES_UIP_NETMASK=0xffffff00
+CONFIG_EXAMPLES_UIP_DHCPC=n
 
 #
 # Settings for examples/nettest
 #
-CONFIG_EXAMPLE_NETTEST_SERVER=n
-CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n
-CONFIG_EXAMPLE_NETTEST_NOMAC=y
-CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002
-CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00
-CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001
+CONFIG_EXAMPLES_NETTEST_SERVER=n
+CONFIG_EXAMPLES_NETTEST_PERFORMANCE=n
+CONFIG_EXAMPLES_NETTEST_NOMAC=y
+CONFIG_EXAMPLES_NETTEST_IPADDR=0x0a000002
+CONFIG_EXAMPLES_NETTEST_DRIPADDR=0x0a000001
+CONFIG_EXAMPLES_NETTEST_NETMASK=0xffffff00
+CONFIG_EXAMPLES_NETTEST_CLIENTIP=0x0a000001
 
 #
 # Settings for examples/ostest
@@ -402,18 +402,18 @@ CONFIG_EXAMPLES_OSTEST_NBARRIER_THREADS=3
 #
 # Settings for examples/buttons
 #
-CONFIG_EXAMPLE_BUTTONS_MIN=0
-CONFIG_EXAMPLE_BUTTONS_MAX=7
-CONFIG_EXAMPLE_IRQBUTTONS_MIN=0
-CONFIG_EXAMPLE_IRQBUTTONS_MAX=7
-CONFIG_EXAMPLE_BUTTONS_NAME0="BUT1"
-CONFIG_EXAMPLE_BUTTONS_NAME1="BUT2"
-CONFIG_EXAMPLE_BUTTONS_NAME2="WAKE-UP"
-CONFIG_EXAMPLE_BUTTONS_NAME3="CENTER"
-CONFIG_EXAMPLE_BUTTONS_NAME4="UP"
-CONFIG_EXAMPLE_BUTTONS_NAME5="DOWN"
-CONFIG_EXAMPLE_BUTTONS_NAME6="LEFT"
-CONFIG_EXAMPLE_BUTTONS_NAME7="RIGHT"
+CONFIG_EXAMPLES_BUTTONS_MIN=0
+CONFIG_EXAMPLES_BUTTONS_MAX=7
+CONFIG_EXAMPLES_IRQBUTTONS_MIN=0
+CONFIG_EXAMPLES_IRQBUTTONS_MAX=7
+CONFIG_EXAMPLES_BUTTONS_NAME0="BUT1"
+CONFIG_EXAMPLES_BUTTONS_NAME1="BUT2"
+CONFIG_EXAMPLES_BUTTONS_NAME2="WAKE-UP"
+CONFIG_EXAMPLES_BUTTONS_NAME3="CENTER"
+CONFIG_EXAMPLES_BUTTONS_NAME4="UP"
+CONFIG_EXAMPLES_BUTTONS_NAME5="DOWN"
+CONFIG_EXAMPLES_BUTTONS_NAME6="LEFT"
+CONFIG_EXAMPLES_BUTTONS_NAME7="RIGHT"
 
 #
 # Settings for apps/nshlib
diff --git a/nuttx/configs/olimex-lpc1766stk/nsh/defconfig b/nuttx/configs/olimex-lpc1766stk/nsh/defconfig
index 1324ca5d47..c2722cb9be 100755
--- a/nuttx/configs/olimex-lpc1766stk/nsh/defconfig
+++ b/nuttx/configs/olimex-lpc1766stk/nsh/defconfig
@@ -420,21 +420,21 @@ CONFIG_USBMSC_REMOVABLE=y
 #
 # Settings for examples/uip
 #
-CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002
-CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00
-CONFIG_EXAMPLE_UIP_DHCPC=n
+CONFIG_EXAMPLES_UIP_IPADDR=0x0a000002
+CONFIG_EXAMPLES_UIP_DRIPADDR=0x0a000001
+CONFIG_EXAMPLES_UIP_NETMASK=0xffffff00
+CONFIG_EXAMPLES_UIP_DHCPC=n
 
 #
 # Settings for examples/nettest
 #
-CONFIG_EXAMPLE_NETTEST_SERVER=n
-CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n
-CONFIG_EXAMPLE_NETTEST_NOMAC=y
-CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002
-CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00
-CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001
+CONFIG_EXAMPLES_NETTEST_SERVER=n
+CONFIG_EXAMPLES_NETTEST_PERFORMANCE=n
+CONFIG_EXAMPLES_NETTEST_NOMAC=y
+CONFIG_EXAMPLES_NETTEST_IPADDR=0x0a000002
+CONFIG_EXAMPLES_NETTEST_DRIPADDR=0x0a000001
+CONFIG_EXAMPLES_NETTEST_NETMASK=0xffffff00
+CONFIG_EXAMPLES_NETTEST_CLIENTIP=0x0a000001
 
 #
 # Settings for examples/ostest
@@ -446,18 +446,18 @@ CONFIG_EXAMPLES_OSTEST_NBARRIER_THREADS=3
 #
 # Settings for examples/buttons
 #
-CONFIG_EXAMPLE_BUTTONS_MIN=0
-CONFIG_EXAMPLE_BUTTONS_MAX=7
-CONFIG_EXAMPLE_IRQBUTTONS_MIN=0
-CONFIG_EXAMPLE_IRQBUTTONS_MAX=7
-CONFIG_EXAMPLE_BUTTONS_NAME0="BUT1"
-CONFIG_EXAMPLE_BUTTONS_NAME1="BUT2"
-CONFIG_EXAMPLE_BUTTONS_NAME2="WAKE-UP"
-CONFIG_EXAMPLE_BUTTONS_NAME3="CENTER"
-CONFIG_EXAMPLE_BUTTONS_NAME4="UP"
-CONFIG_EXAMPLE_BUTTONS_NAME5="DOWN"
-CONFIG_EXAMPLE_BUTTONS_NAME6="LEFT"
-CONFIG_EXAMPLE_BUTTONS_NAME7="RIGHT"
+CONFIG_EXAMPLES_BUTTONS_MIN=0
+CONFIG_EXAMPLES_BUTTONS_MAX=7
+CONFIG_EXAMPLES_IRQBUTTONS_MIN=0
+CONFIG_EXAMPLES_IRQBUTTONS_MAX=7
+CONFIG_EXAMPLES_BUTTONS_NAME0="BUT1"
+CONFIG_EXAMPLES_BUTTONS_NAME1="BUT2"
+CONFIG_EXAMPLES_BUTTONS_NAME2="WAKE-UP"
+CONFIG_EXAMPLES_BUTTONS_NAME3="CENTER"
+CONFIG_EXAMPLES_BUTTONS_NAME4="UP"
+CONFIG_EXAMPLES_BUTTONS_NAME5="DOWN"
+CONFIG_EXAMPLES_BUTTONS_NAME6="LEFT"
+CONFIG_EXAMPLES_BUTTONS_NAME7="RIGHT"
 
 #
 # Settings for apps/nshlib
diff --git a/nuttx/configs/olimex-lpc1766stk/nx/defconfig b/nuttx/configs/olimex-lpc1766stk/nx/defconfig
index de5763c0e9..d86b8b83fd 100755
--- a/nuttx/configs/olimex-lpc1766stk/nx/defconfig
+++ b/nuttx/configs/olimex-lpc1766stk/nx/defconfig
@@ -441,21 +441,21 @@ CONFIG_LCD_MAXPOWER=127
 #
 # Settings for examples/uip
 #
-CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002
-CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00
-CONFIG_EXAMPLE_UIP_DHCPC=n
+CONFIG_EXAMPLES_UIP_IPADDR=0x0a000002
+CONFIG_EXAMPLES_UIP_DRIPADDR=0x0a000001
+CONFIG_EXAMPLES_UIP_NETMASK=0xffffff00
+CONFIG_EXAMPLES_UIP_DHCPC=n
 
 #
 # Settings for examples/nettest
 #
-CONFIG_EXAMPLE_NETTEST_SERVER=n
-CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n
-CONFIG_EXAMPLE_NETTEST_NOMAC=y
-CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002
-CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00
-CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001
+CONFIG_EXAMPLES_NETTEST_SERVER=n
+CONFIG_EXAMPLES_NETTEST_PERFORMANCE=n
+CONFIG_EXAMPLES_NETTEST_NOMAC=y
+CONFIG_EXAMPLES_NETTEST_IPADDR=0x0a000002
+CONFIG_EXAMPLES_NETTEST_DRIPADDR=0x0a000001
+CONFIG_EXAMPLES_NETTEST_NETMASK=0xffffff00
+CONFIG_EXAMPLES_NETTEST_CLIENTIP=0x0a000001
 
 #
 # Settings for examples/ostest
@@ -467,18 +467,18 @@ CONFIG_EXAMPLES_OSTEST_NBARRIER_THREADS=3
 #
 # Settings for examples/buttons
 #
-CONFIG_EXAMPLE_BUTTONS_MIN=0
-CONFIG_EXAMPLE_BUTTONS_MAX=7
-CONFIG_EXAMPLE_IRQBUTTONS_MIN=0
-CONFIG_EXAMPLE_IRQBUTTONS_MAX=7
-CONFIG_EXAMPLE_BUTTONS_NAME0="BUT1"
-CONFIG_EXAMPLE_BUTTONS_NAME1="BUT2"
-CONFIG_EXAMPLE_BUTTONS_NAME2="WAKE-UP"
-CONFIG_EXAMPLE_BUTTONS_NAME3="CENTER"
-CONFIG_EXAMPLE_BUTTONS_NAME4="UP"
-CONFIG_EXAMPLE_BUTTONS_NAME5="DOWN"
-CONFIG_EXAMPLE_BUTTONS_NAME6="LEFT"
-CONFIG_EXAMPLE_BUTTONS_NAME7="RIGHT"
+CONFIG_EXAMPLES_BUTTONS_MIN=0
+CONFIG_EXAMPLES_BUTTONS_MAX=7
+CONFIG_EXAMPLES_IRQBUTTONS_MIN=0
+CONFIG_EXAMPLES_IRQBUTTONS_MAX=7
+CONFIG_EXAMPLES_BUTTONS_NAME0="BUT1"
+CONFIG_EXAMPLES_BUTTONS_NAME1="BUT2"
+CONFIG_EXAMPLES_BUTTONS_NAME2="WAKE-UP"
+CONFIG_EXAMPLES_BUTTONS_NAME3="CENTER"
+CONFIG_EXAMPLES_BUTTONS_NAME4="UP"
+CONFIG_EXAMPLES_BUTTONS_NAME5="DOWN"
+CONFIG_EXAMPLES_BUTTONS_NAME6="LEFT"
+CONFIG_EXAMPLES_BUTTONS_NAME7="RIGHT"
 
 #
 # Settings for apps/nshlib
diff --git a/nuttx/configs/olimex-lpc1766stk/ostest/defconfig b/nuttx/configs/olimex-lpc1766stk/ostest/defconfig
index f36f911e60..a11c022764 100755
--- a/nuttx/configs/olimex-lpc1766stk/ostest/defconfig
+++ b/nuttx/configs/olimex-lpc1766stk/ostest/defconfig
@@ -369,21 +369,21 @@ CONFIG_USBMSC_REMOVABLE=y
 #
 # Settings for examples/uip
 #
-CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002
-CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00
-CONFIG_EXAMPLE_UIP_DHCPC=n
+CONFIG_EXAMPLES_UIP_IPADDR=0x0a000002
+CONFIG_EXAMPLES_UIP_DRIPADDR=0x0a000001
+CONFIG_EXAMPLES_UIP_NETMASK=0xffffff00
+CONFIG_EXAMPLES_UIP_DHCPC=n
 
 #
 # Settings for examples/nettest
 #
-CONFIG_EXAMPLE_NETTEST_SERVER=n
-CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n
-CONFIG_EXAMPLE_NETTEST_NOMAC=y
-CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002
-CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00
-CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001
+CONFIG_EXAMPLES_NETTEST_SERVER=n
+CONFIG_EXAMPLES_NETTEST_PERFORMANCE=n
+CONFIG_EXAMPLES_NETTEST_NOMAC=y
+CONFIG_EXAMPLES_NETTEST_IPADDR=0x0a000002
+CONFIG_EXAMPLES_NETTEST_DRIPADDR=0x0a000001
+CONFIG_EXAMPLES_NETTEST_NETMASK=0xffffff00
+CONFIG_EXAMPLES_NETTEST_CLIENTIP=0x0a000001
 
 #
 # Settings for examples/ostest
@@ -395,18 +395,18 @@ CONFIG_EXAMPLES_OSTEST_NBARRIER_THREADS=3
 #
 # Settings for examples/buttons
 #
-CONFIG_EXAMPLE_BUTTONS_MIN=0
-CONFIG_EXAMPLE_BUTTONS_MAX=7
-CONFIG_EXAMPLE_IRQBUTTONS_MIN=0
-CONFIG_EXAMPLE_IRQBUTTONS_MAX=7
-CONFIG_EXAMPLE_BUTTONS_NAME0="BUT1"
-CONFIG_EXAMPLE_BUTTONS_NAME1="BUT2"
-CONFIG_EXAMPLE_BUTTONS_NAME2="WAKE-UP"
-CONFIG_EXAMPLE_BUTTONS_NAME3="CENTER"
-CONFIG_EXAMPLE_BUTTONS_NAME4="UP"
-CONFIG_EXAMPLE_BUTTONS_NAME5="DOWN"
-CONFIG_EXAMPLE_BUTTONS_NAME6="LEFT"
-CONFIG_EXAMPLE_BUTTONS_NAME7="RIGHT"
+CONFIG_EXAMPLES_BUTTONS_MIN=0
+CONFIG_EXAMPLES_BUTTONS_MAX=7
+CONFIG_EXAMPLES_IRQBUTTONS_MIN=0
+CONFIG_EXAMPLES_IRQBUTTONS_MAX=7
+CONFIG_EXAMPLES_BUTTONS_NAME0="BUT1"
+CONFIG_EXAMPLES_BUTTONS_NAME1="BUT2"
+CONFIG_EXAMPLES_BUTTONS_NAME2="WAKE-UP"
+CONFIG_EXAMPLES_BUTTONS_NAME3="CENTER"
+CONFIG_EXAMPLES_BUTTONS_NAME4="UP"
+CONFIG_EXAMPLES_BUTTONS_NAME5="DOWN"
+CONFIG_EXAMPLES_BUTTONS_NAME6="LEFT"
+CONFIG_EXAMPLES_BUTTONS_NAME7="RIGHT"
 
 #
 # Settings for apps/nshlib
diff --git a/nuttx/configs/olimex-lpc1766stk/slip-httpd/defconfig b/nuttx/configs/olimex-lpc1766stk/slip-httpd/defconfig
index a30c2b9a6c..32092d216f 100755
--- a/nuttx/configs/olimex-lpc1766stk/slip-httpd/defconfig
+++ b/nuttx/configs/olimex-lpc1766stk/slip-httpd/defconfig
@@ -412,28 +412,28 @@ CONFIG_THTTPD_URLPATTERN=n
 #
 # Additional settings for examples/thttpd
 #
-CONFIG_EXAMPLE_THTTPD_NOMAC=y
-CONFIG_EXAMPLE_THTTPD_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_THTTPD_NETMASK=0xffffff00
+CONFIG_EXAMPLES_THTTPD_NOMAC=y
+CONFIG_EXAMPLES_THTTPD_DRIPADDR=0x0a000001
+CONFIG_EXAMPLES_THTTPD_NETMASK=0xffffff00
 
 #
 # Settings for examples/uip
 #
-CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002
-CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00
-CONFIG_EXAMPLE_UIP_DHCPC=n
+CONFIG_EXAMPLES_UIP_IPADDR=0x0a000002
+CONFIG_EXAMPLES_UIP_DRIPADDR=0x0a000001
+CONFIG_EXAMPLES_UIP_NETMASK=0xffffff00
+CONFIG_EXAMPLES_UIP_DHCPC=n
 
 #
 # Settings for examples/nettest
 #
-CONFIG_EXAMPLE_NETTEST_SERVER=n
-CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n
-CONFIG_EXAMPLE_NETTEST_NOMAC=y
-CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002
-CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00
-CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001
+CONFIG_EXAMPLES_NETTEST_SERVER=n
+CONFIG_EXAMPLES_NETTEST_PERFORMANCE=n
+CONFIG_EXAMPLES_NETTEST_NOMAC=y
+CONFIG_EXAMPLES_NETTEST_IPADDR=0x0a000002
+CONFIG_EXAMPLES_NETTEST_DRIPADDR=0x0a000001
+CONFIG_EXAMPLES_NETTEST_NETMASK=0xffffff00
+CONFIG_EXAMPLES_NETTEST_CLIENTIP=0x0a000001
 
 #
 # Settings for examples/ostest
@@ -445,18 +445,18 @@ CONFIG_EXAMPLES_OSTEST_NBARRIER_THREADS=3
 #
 # Settings for examples/buttons
 #
-CONFIG_EXAMPLE_BUTTONS_MIN=0
-CONFIG_EXAMPLE_BUTTONS_MAX=7
-CONFIG_EXAMPLE_IRQBUTTONS_MIN=0
-CONFIG_EXAMPLE_IRQBUTTONS_MAX=7
-CONFIG_EXAMPLE_BUTTONS_NAME0="BUT1"
-CONFIG_EXAMPLE_BUTTONS_NAME1="BUT2"
-CONFIG_EXAMPLE_BUTTONS_NAME2="WAKE-UP"
-CONFIG_EXAMPLE_BUTTONS_NAME3="CENTER"
-CONFIG_EXAMPLE_BUTTONS_NAME4="UP"
-CONFIG_EXAMPLE_BUTTONS_NAME5="DOWN"
-CONFIG_EXAMPLE_BUTTONS_NAME6="LEFT"
-CONFIG_EXAMPLE_BUTTONS_NAME7="RIGHT"
+CONFIG_EXAMPLES_BUTTONS_MIN=0
+CONFIG_EXAMPLES_BUTTONS_MAX=7
+CONFIG_EXAMPLES_IRQBUTTONS_MIN=0
+CONFIG_EXAMPLES_IRQBUTTONS_MAX=7
+CONFIG_EXAMPLES_BUTTONS_NAME0="BUT1"
+CONFIG_EXAMPLES_BUTTONS_NAME1="BUT2"
+CONFIG_EXAMPLES_BUTTONS_NAME2="WAKE-UP"
+CONFIG_EXAMPLES_BUTTONS_NAME3="CENTER"
+CONFIG_EXAMPLES_BUTTONS_NAME4="UP"
+CONFIG_EXAMPLES_BUTTONS_NAME5="DOWN"
+CONFIG_EXAMPLES_BUTTONS_NAME6="LEFT"
+CONFIG_EXAMPLES_BUTTONS_NAME7="RIGHT"
 
 #
 # Settings for apps/nshlib
diff --git a/nuttx/configs/olimex-lpc1766stk/thttpd/defconfig b/nuttx/configs/olimex-lpc1766stk/thttpd/defconfig
index 1c287cfca9..94ac19f42e 100755
--- a/nuttx/configs/olimex-lpc1766stk/thttpd/defconfig
+++ b/nuttx/configs/olimex-lpc1766stk/thttpd/defconfig
@@ -407,28 +407,28 @@ CONFIG_THTTPD_URLPATTERN=n
 #
 # Additional settings for examples/thttpd
 #
-CONFIG_EXAMPLE_THTTPD_NOMAC=y
-CONFIG_EXAMPLE_THTTPD_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_THTTPD_NETMASK=0xffffff00
+CONFIG_EXAMPLES_THTTPD_NOMAC=y
+CONFIG_EXAMPLES_THTTPD_DRIPADDR=0x0a000001
+CONFIG_EXAMPLES_THTTPD_NETMASK=0xffffff00
 
 #
 # Settings for examples/uip
 #
-CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002
-CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00
-CONFIG_EXAMPLE_UIP_DHCPC=n
+CONFIG_EXAMPLES_UIP_IPADDR=0x0a000002
+CONFIG_EXAMPLES_UIP_DRIPADDR=0x0a000001
+CONFIG_EXAMPLES_UIP_NETMASK=0xffffff00
+CONFIG_EXAMPLES_UIP_DHCPC=n
 
 #
 # Settings for examples/nettest
 #
-CONFIG_EXAMPLE_NETTEST_SERVER=n
-CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n
-CONFIG_EXAMPLE_NETTEST_NOMAC=y
-CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002
-CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00
-CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001
+CONFIG_EXAMPLES_NETTEST_SERVER=n
+CONFIG_EXAMPLES_NETTEST_PERFORMANCE=n
+CONFIG_EXAMPLES_NETTEST_NOMAC=y
+CONFIG_EXAMPLES_NETTEST_IPADDR=0x0a000002
+CONFIG_EXAMPLES_NETTEST_DRIPADDR=0x0a000001
+CONFIG_EXAMPLES_NETTEST_NETMASK=0xffffff00
+CONFIG_EXAMPLES_NETTEST_CLIENTIP=0x0a000001
 
 #
 # Settings for examples/ostest
@@ -440,18 +440,18 @@ CONFIG_EXAMPLES_OSTEST_NBARRIER_THREADS=3
 #
 # Settings for examples/buttons
 #
-CONFIG_EXAMPLE_BUTTONS_MIN=0
-CONFIG_EXAMPLE_BUTTONS_MAX=7
-CONFIG_EXAMPLE_IRQBUTTONS_MIN=0
-CONFIG_EXAMPLE_IRQBUTTONS_MAX=7
-CONFIG_EXAMPLE_BUTTONS_NAME0="BUT1"
-CONFIG_EXAMPLE_BUTTONS_NAME1="BUT2"
-CONFIG_EXAMPLE_BUTTONS_NAME2="WAKE-UP"
-CONFIG_EXAMPLE_BUTTONS_NAME3="CENTER"
-CONFIG_EXAMPLE_BUTTONS_NAME4="UP"
-CONFIG_EXAMPLE_BUTTONS_NAME5="DOWN"
-CONFIG_EXAMPLE_BUTTONS_NAME6="LEFT"
-CONFIG_EXAMPLE_BUTTONS_NAME7="RIGHT"
+CONFIG_EXAMPLES_BUTTONS_MIN=0
+CONFIG_EXAMPLES_BUTTONS_MAX=7
+CONFIG_EXAMPLES_IRQBUTTONS_MIN=0
+CONFIG_EXAMPLES_IRQBUTTONS_MAX=7
+CONFIG_EXAMPLES_BUTTONS_NAME0="BUT1"
+CONFIG_EXAMPLES_BUTTONS_NAME1="BUT2"
+CONFIG_EXAMPLES_BUTTONS_NAME2="WAKE-UP"
+CONFIG_EXAMPLES_BUTTONS_NAME3="CENTER"
+CONFIG_EXAMPLES_BUTTONS_NAME4="UP"
+CONFIG_EXAMPLES_BUTTONS_NAME5="DOWN"
+CONFIG_EXAMPLES_BUTTONS_NAME6="LEFT"
+CONFIG_EXAMPLES_BUTTONS_NAME7="RIGHT"
 
 #
 # Settings for apps/nshlib
diff --git a/nuttx/configs/olimex-lpc1766stk/usbserial/defconfig b/nuttx/configs/olimex-lpc1766stk/usbserial/defconfig
index 4ead7ffebe..2bd892cc30 100755
--- a/nuttx/configs/olimex-lpc1766stk/usbserial/defconfig
+++ b/nuttx/configs/olimex-lpc1766stk/usbserial/defconfig
@@ -370,21 +370,21 @@ CONFIG_USBMSC_REMOVABLE=y
 #
 # Settings for examples/uip
 #
-CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002
-CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00
-CONFIG_EXAMPLE_UIP_DHCPC=n
+CONFIG_EXAMPLES_UIP_IPADDR=0x0a000002
+CONFIG_EXAMPLES_UIP_DRIPADDR=0x0a000001
+CONFIG_EXAMPLES_UIP_NETMASK=0xffffff00
+CONFIG_EXAMPLES_UIP_DHCPC=n
 
 #
 # Settings for examples/nettest
 #
-CONFIG_EXAMPLE_NETTEST_SERVER=n
-CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n
-CONFIG_EXAMPLE_NETTEST_NOMAC=y
-CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002
-CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00
-CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001
+CONFIG_EXAMPLES_NETTEST_SERVER=n
+CONFIG_EXAMPLES_NETTEST_PERFORMANCE=n
+CONFIG_EXAMPLES_NETTEST_NOMAC=y
+CONFIG_EXAMPLES_NETTEST_IPADDR=0x0a000002
+CONFIG_EXAMPLES_NETTEST_DRIPADDR=0x0a000001
+CONFIG_EXAMPLES_NETTEST_NETMASK=0xffffff00
+CONFIG_EXAMPLES_NETTEST_CLIENTIP=0x0a000001
 
 #
 # Settings for examples/ostest
@@ -396,18 +396,18 @@ CONFIG_EXAMPLES_OSTEST_NBARRIER_THREADS=3
 #
 # Settings for examples/buttons
 #
-CONFIG_EXAMPLE_BUTTONS_MIN=0
-CONFIG_EXAMPLE_BUTTONS_MAX=7
-CONFIG_EXAMPLE_IRQBUTTONS_MIN=0
-CONFIG_EXAMPLE_IRQBUTTONS_MAX=7
-CONFIG_EXAMPLE_BUTTONS_NAME0="BUT1"
-CONFIG_EXAMPLE_BUTTONS_NAME1="BUT2"
-CONFIG_EXAMPLE_BUTTONS_NAME2="WAKE-UP"
-CONFIG_EXAMPLE_BUTTONS_NAME3="CENTER"
-CONFIG_EXAMPLE_BUTTONS_NAME4="UP"
-CONFIG_EXAMPLE_BUTTONS_NAME5="DOWN"
-CONFIG_EXAMPLE_BUTTONS_NAME6="LEFT"
-CONFIG_EXAMPLE_BUTTONS_NAME7="RIGHT"
+CONFIG_EXAMPLES_BUTTONS_MIN=0
+CONFIG_EXAMPLES_BUTTONS_MAX=7
+CONFIG_EXAMPLES_IRQBUTTONS_MIN=0
+CONFIG_EXAMPLES_IRQBUTTONS_MAX=7
+CONFIG_EXAMPLES_BUTTONS_NAME0="BUT1"
+CONFIG_EXAMPLES_BUTTONS_NAME1="BUT2"
+CONFIG_EXAMPLES_BUTTONS_NAME2="WAKE-UP"
+CONFIG_EXAMPLES_BUTTONS_NAME3="CENTER"
+CONFIG_EXAMPLES_BUTTONS_NAME4="UP"
+CONFIG_EXAMPLES_BUTTONS_NAME5="DOWN"
+CONFIG_EXAMPLES_BUTTONS_NAME6="LEFT"
+CONFIG_EXAMPLES_BUTTONS_NAME7="RIGHT"
 
 #
 # Settings for apps/nshlib
diff --git a/nuttx/configs/olimex-lpc1766stk/usbstorage/defconfig b/nuttx/configs/olimex-lpc1766stk/usbstorage/defconfig
index 53cf8001c5..8b55cc94d8 100755
--- a/nuttx/configs/olimex-lpc1766stk/usbstorage/defconfig
+++ b/nuttx/configs/olimex-lpc1766stk/usbstorage/defconfig
@@ -371,21 +371,21 @@ CONFIG_USBMSC_REMOVABLE=y
 #
 # Settings for examples/uip
 #
-CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002
-CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00
-CONFIG_EXAMPLE_UIP_DHCPC=n
+CONFIG_EXAMPLES_UIP_IPADDR=0x0a000002
+CONFIG_EXAMPLES_UIP_DRIPADDR=0x0a000001
+CONFIG_EXAMPLES_UIP_NETMASK=0xffffff00
+CONFIG_EXAMPLES_UIP_DHCPC=n
 
 #
 # Settings for examples/nettest
 #
-CONFIG_EXAMPLE_NETTEST_SERVER=n
-CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n
-CONFIG_EXAMPLE_NETTEST_NOMAC=y
-CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002
-CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00
-CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001
+CONFIG_EXAMPLES_NETTEST_SERVER=n
+CONFIG_EXAMPLES_NETTEST_PERFORMANCE=n
+CONFIG_EXAMPLES_NETTEST_NOMAC=y
+CONFIG_EXAMPLES_NETTEST_IPADDR=0x0a000002
+CONFIG_EXAMPLES_NETTEST_DRIPADDR=0x0a000001
+CONFIG_EXAMPLES_NETTEST_NETMASK=0xffffff00
+CONFIG_EXAMPLES_NETTEST_CLIENTIP=0x0a000001
 
 #
 # Settings for examples/ostest
@@ -397,18 +397,18 @@ CONFIG_EXAMPLES_OSTEST_NBARRIER_THREADS=3
 #
 # Settings for examples/buttons
 #
-CONFIG_EXAMPLE_BUTTONS_MIN=0
-CONFIG_EXAMPLE_BUTTONS_MAX=7
-CONFIG_EXAMPLE_IRQBUTTONS_MIN=0
-CONFIG_EXAMPLE_IRQBUTTONS_MAX=7
-CONFIG_EXAMPLE_BUTTONS_NAME0="BUT1"
-CONFIG_EXAMPLE_BUTTONS_NAME1="BUT2"
-CONFIG_EXAMPLE_BUTTONS_NAME2="WAKE-UP"
-CONFIG_EXAMPLE_BUTTONS_NAME3="CENTER"
-CONFIG_EXAMPLE_BUTTONS_NAME4="UP"
-CONFIG_EXAMPLE_BUTTONS_NAME5="DOWN"
-CONFIG_EXAMPLE_BUTTONS_NAME6="LEFT"
-CONFIG_EXAMPLE_BUTTONS_NAME7="RIGHT"
+CONFIG_EXAMPLES_BUTTONS_MIN=0
+CONFIG_EXAMPLES_BUTTONS_MAX=7
+CONFIG_EXAMPLES_IRQBUTTONS_MIN=0
+CONFIG_EXAMPLES_IRQBUTTONS_MAX=7
+CONFIG_EXAMPLES_BUTTONS_NAME0="BUT1"
+CONFIG_EXAMPLES_BUTTONS_NAME1="BUT2"
+CONFIG_EXAMPLES_BUTTONS_NAME2="WAKE-UP"
+CONFIG_EXAMPLES_BUTTONS_NAME3="CENTER"
+CONFIG_EXAMPLES_BUTTONS_NAME4="UP"
+CONFIG_EXAMPLES_BUTTONS_NAME5="DOWN"
+CONFIG_EXAMPLES_BUTTONS_NAME6="LEFT"
+CONFIG_EXAMPLES_BUTTONS_NAME7="RIGHT"
 
 #
 # Settings for apps/nshlib
diff --git a/nuttx/configs/olimex-lpc1766stk/wlan/defconfig b/nuttx/configs/olimex-lpc1766stk/wlan/defconfig
index 0df5f2cf72..4d73807e0c 100755
--- a/nuttx/configs/olimex-lpc1766stk/wlan/defconfig
+++ b/nuttx/configs/olimex-lpc1766stk/wlan/defconfig
@@ -390,30 +390,30 @@ CONFIG_USBMSC_REMOVABLE=y
 #
 # Settings for examples/uip
 #
-CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002
-CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00
-CONFIG_EXAMPLE_UIP_DHCPC=n
+CONFIG_EXAMPLES_UIP_IPADDR=0x0a000002
+CONFIG_EXAMPLES_UIP_DRIPADDR=0x0a000001
+CONFIG_EXAMPLES_UIP_NETMASK=0xffffff00
+CONFIG_EXAMPLES_UIP_DHCPC=n
 
 #
 # Settings for examples/nettest
 #
-CONFIG_EXAMPLE_NETTEST_SERVER=n
-CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n
-CONFIG_EXAMPLE_NETTEST_NOMAC=n
-CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002
-CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00
-CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001
+CONFIG_EXAMPLES_NETTEST_SERVER=n
+CONFIG_EXAMPLES_NETTEST_PERFORMANCE=n
+CONFIG_EXAMPLES_NETTEST_NOMAC=n
+CONFIG_EXAMPLES_NETTEST_IPADDR=0x0a000002
+CONFIG_EXAMPLES_NETTEST_DRIPADDR=0x0a000001
+CONFIG_EXAMPLES_NETTEST_NETMASK=0xffffff00
+CONFIG_EXAMPLES_NETTEST_CLIENTIP=0x0a000001
 
 #
 # Settings for apps/examples/wlan
 #
-CONFIG_EXAMPLE_WLAN_DHCPC=n
-CONFIG_EXAMPLE_WLAN_NOMAC=n
-CONFIG_EXAMPLE_WLAN_IPADDR=0xc0a800c9
-CONFIG_EXAMPLE_WLAN_DRIPADDR=0xc0a80001
-CONFIG_EXAMPLE_WLAN_NETMASK=0xffffff00
+CONFIG_EXAMPLES_WLAN_DHCPC=n
+CONFIG_EXAMPLES_WLAN_NOMAC=n
+CONFIG_EXAMPLES_WLAN_IPADDR=0xc0a800c9
+CONFIG_EXAMPLES_WLAN_DRIPADDR=0xc0a80001
+CONFIG_EXAMPLES_WLAN_NETMASK=0xffffff00
 
 #
 # Settings for examples/ostest