aboutsummaryrefslogtreecommitdiff
path: root/nuttx
diff options
context:
space:
mode:
authorpatacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>2012-10-04 17:36:07 +0000
committerpatacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>2012-10-04 17:36:07 +0000
commit44a18f5361f2cd78d5f71584869cd087ab3dabf7 (patch)
tree64bb2a8bfc5fdae5e8a88464b3b89054f602259e /nuttx
parentb0eb4f3ccee248a2f70fab8ab1972ad4907a9e22 (diff)
downloadpx4-firmware-44a18f5361f2cd78d5f71584869cd087ab3dabf7.tar.gz
px4-firmware-44a18f5361f2cd78d5f71584869cd087ab3dabf7.tar.bz2
px4-firmware-44a18f5361f2cd78d5f71584869cd087ab3dabf7.zip
Change all occurrences of CONFIG_EXAMPLE_ to CONFIG_EXAMPLES_ for consistency; fleshed out a few more Kconfig files
git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5211 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx')
-rw-r--r--nuttx/ChangeLog2
-rw-r--r--nuttx/Documentation/NuttXRelated.html1
-rw-r--r--nuttx/arch/sim/src/up_tapdev.c2
-rw-r--r--nuttx/arch/sim/src/up_wpcap.c2
-rw-r--r--nuttx/configs/amber/hello/defconfig22
-rwxr-xr-xnuttx/configs/avr32dev1/nsh/defconfig22
-rwxr-xr-xnuttx/configs/avr32dev1/ostest/defconfig22
-rw-r--r--nuttx/configs/c5471evm/httpd/defconfig34
-rw-r--r--nuttx/configs/c5471evm/nettest/defconfig34
-rw-r--r--nuttx/configs/c5471evm/nsh/defconfig34
-rw-r--r--nuttx/configs/c5471evm/ostest/defconfig34
-rw-r--r--nuttx/configs/compal_e88/nsh_highram/defconfig34
-rw-r--r--nuttx/configs/compal_e99/nsh_compalram/defconfig34
-rw-r--r--nuttx/configs/compal_e99/nsh_highram/defconfig34
-rwxr-xr-xnuttx/configs/demo9s12ne64/ostest/defconfig22
-rw-r--r--nuttx/configs/ea3131/nsh/defconfig22
-rw-r--r--nuttx/configs/ea3131/ostest/defconfig22
-rw-r--r--nuttx/configs/ea3131/pgnsh/defconfig22
-rw-r--r--nuttx/configs/ea3131/usbserial/defconfig22
-rw-r--r--nuttx/configs/ea3131/usbstorage/defconfig22
-rw-r--r--nuttx/configs/ea3152/ostest/defconfig22
-rw-r--r--nuttx/configs/eagle100/httpd/defconfig30
-rw-r--r--nuttx/configs/eagle100/nettest/defconfig22
-rw-r--r--nuttx/configs/eagle100/nsh/defconfig22
-rw-r--r--nuttx/configs/eagle100/nxflat/defconfig22
-rw-r--r--nuttx/configs/eagle100/ostest/defconfig22
-rw-r--r--nuttx/configs/eagle100/thttpd/defconfig28
-rw-r--r--nuttx/configs/ekk-lm3s9b96/nsh/defconfig22
-rw-r--r--nuttx/configs/ekk-lm3s9b96/ostest/defconfig22
-rw-r--r--nuttx/configs/ez80f910200kitg/ostest/defconfig32
-rw-r--r--nuttx/configs/ez80f910200zco/dhcpd/defconfig48
-rw-r--r--nuttx/configs/ez80f910200zco/httpd/defconfig48
-rw-r--r--nuttx/configs/ez80f910200zco/nettest/defconfig40
-rw-r--r--nuttx/configs/ez80f910200zco/nsh/defconfig40
-rw-r--r--nuttx/configs/ez80f910200zco/ostest/defconfig40
-rw-r--r--nuttx/configs/ez80f910200zco/poll/defconfig40
-rw-r--r--nuttx/configs/fire-stm32v2/nsh/defconfig2
-rw-r--r--nuttx/configs/hymini-stm32v/buttons/defconfig46
-rwxr-xr-xnuttx/configs/hymini-stm32v/nsh/defconfig22
-rw-r--r--nuttx/configs/hymini-stm32v/nx/defconfig22
-rwxr-xr-xnuttx/configs/hymini-stm32v/usbserial/defconfig22
-rwxr-xr-xnuttx/configs/hymini-stm32v/usbstorage/defconfig22
-rwxr-xr-xnuttx/configs/kwikstik-k40/ostest/defconfig22
-rw-r--r--nuttx/configs/lincoln60/nsh/defconfig22
-rw-r--r--nuttx/configs/lincoln60/ostest/defconfig46
-rw-r--r--nuttx/configs/lm3s6432-s2e/nsh/defconfig22
-rw-r--r--nuttx/configs/lm3s6432-s2e/ostest/defconfig22
-rwxr-xr-xnuttx/configs/lm3s6965-ek/nsh/defconfig22
-rwxr-xr-xnuttx/configs/lm3s6965-ek/nx/defconfig22
-rwxr-xr-xnuttx/configs/lm3s6965-ek/ostest/defconfig22
-rwxr-xr-xnuttx/configs/lm3s8962-ek/nsh/defconfig22
-rwxr-xr-xnuttx/configs/lm3s8962-ek/nx/defconfig22
-rwxr-xr-xnuttx/configs/lm3s8962-ek/ostest/defconfig22
-rw-r--r--nuttx/configs/lpc4330-xplorer/nsh/defconfig32
-rw-r--r--nuttx/configs/lpc4330-xplorer/ostest/defconfig32
-rwxr-xr-xnuttx/configs/lpcxpresso-lpc1768/dhcpd/defconfig30
-rwxr-xr-xnuttx/configs/lpcxpresso-lpc1768/nsh/defconfig22
-rwxr-xr-xnuttx/configs/lpcxpresso-lpc1768/nx/defconfig22
-rwxr-xr-xnuttx/configs/lpcxpresso-lpc1768/ostest/defconfig22
-rwxr-xr-xnuttx/configs/lpcxpresso-lpc1768/thttpd/defconfig28
-rwxr-xr-xnuttx/configs/lpcxpresso-lpc1768/usbstorage/defconfig22
-rw-r--r--nuttx/configs/mbed/hidkbd/defconfig22
-rwxr-xr-xnuttx/configs/mbed/nsh/defconfig22
-rw-r--r--nuttx/configs/micropendous3/hello/defconfig22
-rw-r--r--nuttx/configs/mirtoo/nsh/defconfig22
-rw-r--r--nuttx/configs/mirtoo/nxffs/defconfig22
-rw-r--r--nuttx/configs/mirtoo/ostest/defconfig22
-rw-r--r--nuttx/configs/mx1ads/ostest/defconfig22
-rwxr-xr-xnuttx/configs/ne64badge/ostest/defconfig22
-rw-r--r--nuttx/configs/ntosd-dm320/nettest/defconfig22
-rw-r--r--nuttx/configs/ntosd-dm320/nsh/defconfig22
-rw-r--r--nuttx/configs/ntosd-dm320/ostest/defconfig22
-rw-r--r--nuttx/configs/ntosd-dm320/poll/defconfig30
-rw-r--r--nuttx/configs/ntosd-dm320/thttpd/defconfig28
-rw-r--r--nuttx/configs/ntosd-dm320/udp/defconfig32
-rw-r--r--nuttx/configs/ntosd-dm320/uip/defconfig22
-rwxr-xr-xnuttx/configs/nucleus2g/nsh/defconfig22
-rwxr-xr-xnuttx/configs/nucleus2g/ostest/defconfig22
-rwxr-xr-xnuttx/configs/nucleus2g/usbserial/defconfig22
-rwxr-xr-xnuttx/configs/nucleus2g/usbstorage/defconfig22
-rwxr-xr-xnuttx/configs/olimex-lpc1766stk/ftpc/defconfig52
-rwxr-xr-xnuttx/configs/olimex-lpc1766stk/hidkbd/defconfig46
-rwxr-xr-xnuttx/configs/olimex-lpc1766stk/nettest/defconfig46
-rwxr-xr-xnuttx/configs/olimex-lpc1766stk/nsh/defconfig46
-rwxr-xr-xnuttx/configs/olimex-lpc1766stk/nx/defconfig46
-rwxr-xr-xnuttx/configs/olimex-lpc1766stk/ostest/defconfig46
-rwxr-xr-xnuttx/configs/olimex-lpc1766stk/slip-httpd/defconfig52
-rwxr-xr-xnuttx/configs/olimex-lpc1766stk/thttpd/defconfig52
-rwxr-xr-xnuttx/configs/olimex-lpc1766stk/usbserial/defconfig46
-rwxr-xr-xnuttx/configs/olimex-lpc1766stk/usbstorage/defconfig46
-rwxr-xr-xnuttx/configs/olimex-lpc1766stk/wlan/defconfig32
-rw-r--r--nuttx/configs/olimex-stm32-p107/nsh/defconfig22
-rw-r--r--nuttx/configs/olimex-stm32-p107/ostest/defconfig22
-rwxr-xr-xnuttx/configs/olimex-strp711/nettest/defconfig14
-rw-r--r--nuttx/configs/pcblogic-pic32mx/nsh/defconfig22
-rw-r--r--nuttx/configs/pcblogic-pic32mx/ostest/defconfig22
-rw-r--r--nuttx/configs/pic32-starterkit/nsh/defconfig22
-rw-r--r--nuttx/configs/pic32-starterkit/nsh2/defconfig22
-rw-r--r--nuttx/configs/pic32-starterkit/ostest/defconfig22
-rw-r--r--nuttx/configs/pic32mx7mmb/nsh/defconfig22
-rw-r--r--nuttx/configs/pic32mx7mmb/ostest/defconfig22
-rw-r--r--nuttx/configs/qemu-i486/nsh/defconfig22
-rw-r--r--nuttx/configs/qemu-i486/ostest/defconfig22
-rw-r--r--nuttx/configs/rgmp/arm/default/defconfig22
-rw-r--r--nuttx/configs/rgmp/arm/nsh/defconfig22
-rw-r--r--nuttx/configs/rgmp/x86/default/defconfig22
-rw-r--r--nuttx/configs/rgmp/x86/nsh/defconfig22
-rwxr-xr-xnuttx/configs/sam3u-ek/knsh/defconfig22
-rwxr-xr-xnuttx/configs/sam3u-ek/nsh/defconfig22
-rwxr-xr-xnuttx/configs/sam3u-ek/nx/defconfig22
-rwxr-xr-xnuttx/configs/sam3u-ek/ostest/defconfig22
-rwxr-xr-xnuttx/configs/sam3u-ek/touchscreen/defconfig22
-rw-r--r--nuttx/configs/shenzhou/nsh/defconfig2
-rw-r--r--nuttx/configs/shenzhou/nxwm/defconfig2
-rw-r--r--nuttx/configs/sim/README.txt2
-rw-r--r--nuttx/configs/sim/mount/defconfig22
-rw-r--r--nuttx/configs/sim/nettest/defconfig22
-rw-r--r--nuttx/configs/sim/nsh/defconfig22
-rw-r--r--nuttx/configs/sim/nsh2/defconfig22
-rw-r--r--nuttx/configs/sim/nx/defconfig22
-rw-r--r--nuttx/configs/sim/nx11/defconfig22
-rw-r--r--nuttx/configs/sim/nxffs/defconfig22
-rw-r--r--nuttx/configs/sim/nxwm/defconfig22
-rw-r--r--nuttx/configs/sim/ostest/defconfig22
-rw-r--r--nuttx/configs/sim/pashello/defconfig22
-rw-r--r--nuttx/configs/sim/touchscreen/defconfig22
-rw-r--r--nuttx/configs/skp16c26/ostest/defconfig22
-rwxr-xr-xnuttx/configs/stm3210e-eval/RIDE/defconfig22
-rw-r--r--nuttx/configs/stm3210e-eval/buttons/defconfig46
-rwxr-xr-xnuttx/configs/stm3210e-eval/composite/defconfig22
-rwxr-xr-xnuttx/configs/stm3210e-eval/nsh/defconfig22
-rw-r--r--nuttx/configs/stm3210e-eval/nsh2/defconfig22
-rw-r--r--nuttx/configs/stm3210e-eval/nx/defconfig22
-rw-r--r--nuttx/configs/stm3210e-eval/nxconsole/defconfig22
-rw-r--r--nuttx/configs/stm3210e-eval/nxlines/defconfig22
-rw-r--r--nuttx/configs/stm3210e-eval/nxtext/defconfig22
-rwxr-xr-xnuttx/configs/stm3210e-eval/ostest/defconfig22
-rw-r--r--nuttx/configs/stm3210e-eval/pm/defconfig42
-rwxr-xr-xnuttx/configs/stm3210e-eval/usbserial/defconfig22
-rwxr-xr-xnuttx/configs/stm3210e-eval/usbstorage/defconfig22
-rw-r--r--nuttx/configs/stm3220g-eval/README.txt10
-rw-r--r--nuttx/configs/stm3220g-eval/dhcpd/defconfig30
-rw-r--r--nuttx/configs/stm3220g-eval/nettest/defconfig22
-rw-r--r--nuttx/configs/stm3220g-eval/nsh/defconfig22
-rw-r--r--nuttx/configs/stm3220g-eval/nsh2/defconfig22
-rw-r--r--nuttx/configs/stm3220g-eval/nxwm/defconfig22
-rw-r--r--nuttx/configs/stm3220g-eval/ostest/defconfig36
-rw-r--r--nuttx/configs/stm3220g-eval/telnetd/defconfig30
-rw-r--r--nuttx/configs/stm3240g-eval/README.txt18
-rw-r--r--nuttx/configs/stm3240g-eval/dhcpd/defconfig30
-rw-r--r--nuttx/configs/stm3240g-eval/discover/defconfig10
-rw-r--r--nuttx/configs/stm3240g-eval/nettest/defconfig22
-rw-r--r--nuttx/configs/stm3240g-eval/nsh/defconfig22
-rw-r--r--nuttx/configs/stm3240g-eval/nsh2/defconfig22
-rw-r--r--nuttx/configs/stm3240g-eval/nxconsole/defconfig22
-rw-r--r--nuttx/configs/stm3240g-eval/nxwm/defconfig22
-rw-r--r--nuttx/configs/stm3240g-eval/ostest/defconfig36
-rw-r--r--nuttx/configs/stm3240g-eval/telnetd/defconfig30
-rw-r--r--nuttx/configs/stm3240g-eval/webserver/defconfig24
-rw-r--r--nuttx/configs/stm3240g-eval/xmlrpc/defconfig2
-rw-r--r--nuttx/configs/stm32f4discovery/nsh/defconfig22
-rw-r--r--nuttx/configs/stm32f4discovery/nxlines/defconfig22
-rw-r--r--nuttx/configs/stm32f4discovery/ostest/defconfig36
-rw-r--r--nuttx/configs/stm32f4discovery/pm/defconfig22
-rw-r--r--nuttx/configs/sure-pic32mx/nsh/defconfig22
-rw-r--r--nuttx/configs/sure-pic32mx/ostest/defconfig22
-rw-r--r--nuttx/configs/sure-pic32mx/usbnsh/defconfig22
-rw-r--r--nuttx/configs/teensy/hello/defconfig22
-rwxr-xr-xnuttx/configs/teensy/nsh/defconfig22
-rwxr-xr-xnuttx/configs/teensy/usbstorage/defconfig22
-rw-r--r--nuttx/configs/twr-k60n512/nsh/defconfig22
-rw-r--r--nuttx/configs/twr-k60n512/ostest/defconfig22
-rw-r--r--nuttx/configs/ubw32/nsh/defconfig22
-rw-r--r--nuttx/configs/ubw32/ostest/defconfig22
-rwxr-xr-xnuttx/configs/vsn/nsh/defconfig22
175 files changed, 2181 insertions, 2178 deletions
diff --git a/nuttx/ChangeLog b/nuttx/ChangeLog
index 4ea03f34f..eb85a8e7c 100644
--- a/nuttx/ChangeLog
+++ b/nuttx/ChangeLog
@@ -3461,3 +3461,5 @@
* board.h file for shenzhou, fire-stm32v2, and olimex-stm32-p107:
Add frequencies for HSE, HSI, LSE, and LSI. These are needed
by the STM32 watchdog driver.
+ * CONFIG_EXAMPLES_*: To make things consistent, changed all occurrences
+ of CONFIG_EXAMPLE_* to CONFIG_EXAMPLES_*.
diff --git a/nuttx/Documentation/NuttXRelated.html b/nuttx/Documentation/NuttXRelated.html
index bc55bbfc1..978eb1d44 100644
--- a/nuttx/Documentation/NuttXRelated.html
+++ b/nuttx/Documentation/NuttXRelated.html
@@ -41,6 +41,7 @@
<li><a href="http://osmocom.org/" target="top">Osmocom-BB</a></li>
<li><a href="https://pixhawk.ethz.ch/px4/" target="top">PX4 Autopilot</a></li>
<li><a href="http://rgmp.sourceforge.net/wiki/index.php/Main_Page" target="top">RGMP</a></li>
+ <li><a href="http://code.google.com/p/tmr/" target="top">Top Multi-Rotor (TMR)</a></li>
</tr>
<tr>
<td align="center" valign="top" width="22">
diff --git a/nuttx/arch/sim/src/up_tapdev.c b/nuttx/arch/sim/src/up_tapdev.c
index d0deea6d9..f2bbcc14a 100644
--- a/nuttx/arch/sim/src/up_tapdev.c
+++ b/nuttx/arch/sim/src/up_tapdev.c
@@ -72,7 +72,7 @@ extern int uipdriver_setmacaddr(unsigned char *macaddr);
#define DEVTAP "/dev/net/tun"
-#ifndef CONFIG_EXAMPLE_UIP_DHCPC
+#ifndef CONFIG_EXAMPLES_UIP_DHCPC
# define UIP_IPADDR0 192
# define UIP_IPADDR1 168
# define UIP_IPADDR2 0
diff --git a/nuttx/arch/sim/src/up_wpcap.c b/nuttx/arch/sim/src/up_wpcap.c
index 42e8764f8..62f0b6ad0 100644
--- a/nuttx/arch/sim/src/up_wpcap.c
+++ b/nuttx/arch/sim/src/up_wpcap.c
@@ -62,7 +62,7 @@ extern int uipdriver_setmacaddr(unsigned char *macaddr);
#define BUF ((struct uip_eth_hdr *)&uip_buf[0])
-#ifndef CONFIG_EXAMPLE_UIP_DHCPC
+#ifndef CONFIG_EXAMPLES_UIP_DHCPC
# define UIP_IPADDR (10 << 24 | 0 << 16 | 0 << 8 | 1)
#else
# define UIP_IPADDR (0)
diff --git a/nuttx/configs/amber/hello/defconfig b/nuttx/configs/amber/hello/defconfig
index 66127604e..fece8db36 100644
--- a/nuttx/configs/amber/hello/defconfig
+++ b/nuttx/configs/amber/hello/defconfig
@@ -318,21 +318,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
diff --git a/nuttx/configs/avr32dev1/nsh/defconfig b/nuttx/configs/avr32dev1/nsh/defconfig
index b9f6e35a6..7e75380c0 100755
--- a/nuttx/configs/avr32dev1/nsh/defconfig
+++ b/nuttx/configs/avr32dev1/nsh/defconfig
@@ -341,20 +341,20 @@ 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 examples/ostest
diff --git a/nuttx/configs/avr32dev1/ostest/defconfig b/nuttx/configs/avr32dev1/ostest/defconfig
index 74ac8f072..b70cbb6af 100755
--- a/nuttx/configs/avr32dev1/ostest/defconfig
+++ b/nuttx/configs/avr32dev1/ostest/defconfig
@@ -341,20 +341,20 @@ 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 examples/ostest
diff --git a/nuttx/configs/c5471evm/httpd/defconfig b/nuttx/configs/c5471evm/httpd/defconfig
index 1e599d9a1..372fb330f 100644
--- a/nuttx/configs/c5471evm/httpd/defconfig
+++ b/nuttx/configs/c5471evm/httpd/defconfig
@@ -210,21 +210,21 @@ CONFIG_NET_RESOLV_ENTRIES=4
#
# Settings for examples/uip
-CONFIG_EXAMPLE_UIP_NOMAC=y
-CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002
-CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00
-CONFIG_EXAMPLE_UIP_DHCPC=y
+CONFIG_EXAMPLES_UIP_NOMAC=y
+CONFIG_EXAMPLES_UIP_IPADDR=0x0a000002
+CONFIG_EXAMPLES_UIP_DRIPADDR=0x0a000001
+CONFIG_EXAMPLES_UIP_NETMASK=0xffffff00
+CONFIG_EXAMPLES_UIP_DHCPC=y
#
# 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/nsh
@@ -241,11 +241,11 @@ CONFIG_NSH_NETMASK=0xffffff00
#
# Settings for examples/wget
#
-CONFIG_EXAMPLE_WGET_URL="http://www.nuttx.org/index.html"
-CONFIG_EXAMPLE_WGET_NOMAC=y
-CONFIG_EXAMPLE_WGET_IPADDR=0x0a000002
-CONFIG_EXAMPLE_WGET_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_WGET_NETMASK=0xffffff00
+CONFIG_EXAMPLES_WGET_URL="http://www.nuttx.org/index.html"
+CONFIG_EXAMPLES_WGET_NOMAC=y
+CONFIG_EXAMPLES_WGET_IPADDR=0x0a000002
+CONFIG_EXAMPLES_WGET_DRIPADDR=0x0a000001
+CONFIG_EXAMPLES_WGET_NETMASK=0xffffff00
#
# Stack and heap information
diff --git a/nuttx/configs/c5471evm/nettest/defconfig b/nuttx/configs/c5471evm/nettest/defconfig
index 807a23f15..179b4c185 100644
--- a/nuttx/configs/c5471evm/nettest/defconfig
+++ b/nuttx/configs/c5471evm/nettest/defconfig
@@ -210,21 +210,21 @@ CONFIG_NET_RESOLV_ENTRIES=4
#
# Settings for examples/uip
-CONFIG_EXAMPLE_UIP_NOMAC=y
-CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002
-CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00
-CONFIG_EXAMPLE_UIP_DHCPC=n
+CONFIG_EXAMPLES_UIP_NOMAC=y
+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/nsh
@@ -241,11 +241,11 @@ CONFIG_NSH_NETMASK=0xffffff00
#
# Settings for examples/wget
#
-CONFIG_EXAMPLE_WGET_URL="http://www.nuttx.org/index.html"
-CONFIG_EXAMPLE_WGET_NOMAC=y
-CONFIG_EXAMPLE_WGET_IPADDR=0x0a000002
-CONFIG_EXAMPLE_WGET_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_WGET_NETMASK=0xffffff00
+CONFIG_EXAMPLES_WGET_URL="http://www.nuttx.org/index.html"
+CONFIG_EXAMPLES_WGET_NOMAC=y
+CONFIG_EXAMPLES_WGET_IPADDR=0x0a000002
+CONFIG_EXAMPLES_WGET_DRIPADDR=0x0a000001
+CONFIG_EXAMPLES_WGET_NETMASK=0xffffff00
#
# Stack and heap information
diff --git a/nuttx/configs/c5471evm/nsh/defconfig b/nuttx/configs/c5471evm/nsh/defconfig
index 9f5bc6373..5746f833a 100644
--- a/nuttx/configs/c5471evm/nsh/defconfig
+++ b/nuttx/configs/c5471evm/nsh/defconfig
@@ -210,21 +210,21 @@ CONFIG_NET_RESOLV_ENTRIES=4
#
# Settings for examples/uip
-CONFIG_EXAMPLE_UIP_NOMAC=y
-CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002
-CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00
-CONFIG_EXAMPLE_UIP_DHCPC=n
+CONFIG_EXAMPLES_UIP_NOMAC=y
+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/nsh
@@ -241,11 +241,11 @@ CONFIG_NSH_NETMASK=0xffffff00
#
# Settings for examples/wget
#
-CONFIG_EXAMPLE_WGET_URL="http://www.nuttx.org/index.html"
-CONFIG_EXAMPLE_WGET_NOMAC=y
-CONFIG_EXAMPLE_WGET_IPADDR=0x0a000002
-CONFIG_EXAMPLE_WGET_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_WGET_NETMASK=0xffffff00
+CONFIG_EXAMPLES_WGET_URL="http://www.nuttx.org/index.html"
+CONFIG_EXAMPLES_WGET_NOMAC=y
+CONFIG_EXAMPLES_WGET_IPADDR=0x0a000002
+CONFIG_EXAMPLES_WGET_DRIPADDR=0x0a000001
+CONFIG_EXAMPLES_WGET_NETMASK=0xffffff00
#
# Stack and heap information
diff --git a/nuttx/configs/c5471evm/ostest/defconfig b/nuttx/configs/c5471evm/ostest/defconfig
index 4921b59e6..e0c6297c1 100644
--- a/nuttx/configs/c5471evm/ostest/defconfig
+++ b/nuttx/configs/c5471evm/ostest/defconfig
@@ -210,21 +210,21 @@ CONFIG_NET_RESOLV_ENTRIES=4
#
# Settings for examples/uip
-CONFIG_EXAMPLE_UIP_NOMAC=y
-CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002
-CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00
-CONFIG_EXAMPLE_UIP_DHCPC=n
+CONFIG_EXAMPLES_UIP_NOMAC=y
+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/nsh
@@ -241,11 +241,11 @@ CONFIG_NSH_NETMASK=0xffffff00
#
# Settings for examples/wget
#
-CONFIG_EXAMPLE_WGET_URL="http://www.nuttx.org/index.html"
-CONFIG_EXAMPLE_WGET_NOMAC=y
-CONFIG_EXAMPLE_WGET_IPADDR=0x0a000002
-CONFIG_EXAMPLE_WGET_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_WGET_NETMASK=0xffffff00
+CONFIG_EXAMPLES_WGET_URL="http://www.nuttx.org/index.html"
+CONFIG_EXAMPLES_WGET_NOMAC=y
+CONFIG_EXAMPLES_WGET_IPADDR=0x0a000002
+CONFIG_EXAMPLES_WGET_DRIPADDR=0x0a000001
+CONFIG_EXAMPLES_WGET_NETMASK=0xffffff00
#
# Stack and heap information
diff --git a/nuttx/configs/compal_e88/nsh_highram/defconfig b/nuttx/configs/compal_e88/nsh_highram/defconfig
index bfb3017d2..3cf0af629 100644
--- a/nuttx/configs/compal_e88/nsh_highram/defconfig
+++ b/nuttx/configs/compal_e88/nsh_highram/defconfig
@@ -223,21 +223,21 @@ CONFIG_NET_RESOLV_ENTRIES=4
#
# Settings for examples/uip
-CONFIG_EXAMPLE_UIP_NOMAC=y
-CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002
-CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00
-CONFIG_EXAMPLE_UIP_DHCPC=n
+CONFIG_EXAMPLES_UIP_NOMAC=y
+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/nsh
@@ -260,11 +260,11 @@ CONFIG_EXAMPLES_HELLO_BUILTIN=y
#
# Settings for examples/wget
#
-CONFIG_EXAMPLE_WGET_URL="http://www.nuttx.org/index.html"
-CONFIG_EXAMPLE_WGET_NOMAC=y
-CONFIG_EXAMPLE_WGET_IPADDR=0x0a000002
-CONFIG_EXAMPLE_WGET_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_WGET_NETMASK=0xffffff00
+CONFIG_EXAMPLES_WGET_URL="http://www.nuttx.org/index.html"
+CONFIG_EXAMPLES_WGET_NOMAC=y
+CONFIG_EXAMPLES_WGET_IPADDR=0x0a000002
+CONFIG_EXAMPLES_WGET_DRIPADDR=0x0a000001
+CONFIG_EXAMPLES_WGET_NETMASK=0xffffff00
#
# Stack and heap information
diff --git a/nuttx/configs/compal_e99/nsh_compalram/defconfig b/nuttx/configs/compal_e99/nsh_compalram/defconfig
index 5bd924d7d..f9bf23af6 100644
--- a/nuttx/configs/compal_e99/nsh_compalram/defconfig
+++ b/nuttx/configs/compal_e99/nsh_compalram/defconfig
@@ -229,21 +229,21 @@ CONFIG_EXAMPLES_HELLO_BUILTIN=y
#
# Settings for examples/uip
-CONFIG_EXAMPLE_UIP_NOMAC=y
-CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002
-CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00
-CONFIG_EXAMPLE_UIP_DHCPC=n
+CONFIG_EXAMPLES_UIP_NOMAC=y
+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/nsh
@@ -262,11 +262,11 @@ CONFIG_NSH_BUILTIN_APPS=y
#
# Settings for examples/wget
#
-CONFIG_EXAMPLE_WGET_URL="http://www.nuttx.org/index.html"
-CONFIG_EXAMPLE_WGET_NOMAC=y
-CONFIG_EXAMPLE_WGET_IPADDR=0x0a000002
-CONFIG_EXAMPLE_WGET_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_WGET_NETMASK=0xffffff00
+CONFIG_EXAMPLES_WGET_URL="http://www.nuttx.org/index.html"
+CONFIG_EXAMPLES_WGET_NOMAC=y
+CONFIG_EXAMPLES_WGET_IPADDR=0x0a000002
+CONFIG_EXAMPLES_WGET_DRIPADDR=0x0a000001
+CONFIG_EXAMPLES_WGET_NETMASK=0xffffff00
#
# Stack and heap information
diff --git a/nuttx/configs/compal_e99/nsh_highram/defconfig b/nuttx/configs/compal_e99/nsh_highram/defconfig
index e3f3dd816..f5323c664 100644
--- a/nuttx/configs/compal_e99/nsh_highram/defconfig
+++ b/nuttx/configs/compal_e99/nsh_highram/defconfig
@@ -226,21 +226,21 @@ CONFIG_NET_RESOLV_ENTRIES=4
#
# Settings for examples/uip
-CONFIG_EXAMPLE_UIP_NOMAC=y
-CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002
-CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00
-CONFIG_EXAMPLE_UIP_DHCPC=n
+CONFIG_EXAMPLES_UIP_NOMAC=y
+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/nsh
@@ -306,11 +306,11 @@ CONFIG_EXAMPLES_NXTEXT_DEVNO=0
#
# Settings for examples/wget
#
-CONFIG_EXAMPLE_WGET_URL="http://www.nuttx.org/index.html"
-CONFIG_EXAMPLE_WGET_NOMAC=y
-CONFIG_EXAMPLE_WGET_IPADDR=0x0a000002
-CONFIG_EXAMPLE_WGET_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_WGET_NETMASK=0xffffff00
+CONFIG_EXAMPLES_WGET_URL="http://www.nuttx.org/index.html"
+CONFIG_EXAMPLES_WGET_NOMAC=y
+CONFIG_EXAMPLES_WGET_IPADDR=0x0a000002
+CONFIG_EXAMPLES_WGET_DRIPADDR=0x0a000001
+CONFIG_EXAMPLES_WGET_NETMASK=0xffffff00
#
# Stack and heap information
diff --git a/nuttx/configs/demo9s12ne64/ostest/defconfig b/nuttx/configs/demo9s12ne64/ostest/defconfig
index 6265e6e53..a45fc7e47 100755
--- a/nuttx/configs/demo9s12ne64/ostest/defconfig
+++ b/nuttx/configs/demo9s12ne64/ostest/defconfig
@@ -311,20 +311,20 @@ 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 examples/ostest
diff --git a/nuttx/configs/ea3131/nsh/defconfig b/nuttx/configs/ea3131/nsh/defconfig
index 32521f012..38caf93aa 100644
--- a/nuttx/configs/ea3131/nsh/defconfig
+++ b/nuttx/configs/ea3131/nsh/defconfig
@@ -312,21 +312,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=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 examples/ostest
diff --git a/nuttx/configs/ea3131/ostest/defconfig b/nuttx/configs/ea3131/ostest/defconfig
index 1ef35f969..abc2c8ba5 100644
--- a/nuttx/configs/ea3131/ostest/defconfig
+++ b/nuttx/configs/ea3131/ostest/defconfig
@@ -312,21 +312,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=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 examples/ostest
diff --git a/nuttx/configs/ea3131/pgnsh/defconfig b/nuttx/configs/ea3131/pgnsh/defconfig
index 995bc90d9..f03432e8d 100644
--- a/nuttx/configs/ea3131/pgnsh/defconfig
+++ b/nuttx/configs/ea3131/pgnsh/defconfig
@@ -355,21 +355,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=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 examples/ostest
diff --git a/nuttx/configs/ea3131/usbserial/defconfig b/nuttx/configs/ea3131/usbserial/defconfig
index 4e45989df..3314de254 100644
--- a/nuttx/configs/ea3131/usbserial/defconfig
+++ b/nuttx/configs/ea3131/usbserial/defconfig
@@ -315,21 +315,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=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 examples/ostest
diff --git a/nuttx/configs/ea3131/usbstorage/defconfig b/nuttx/configs/ea3131/usbstorage/defconfig
index 772de7e69..a857523df 100644
--- a/nuttx/configs/ea3131/usbstorage/defconfig
+++ b/nuttx/configs/ea3131/usbstorage/defconfig
@@ -316,21 +316,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=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 examples/ostest
diff --git a/nuttx/configs/ea3152/ostest/defconfig b/nuttx/configs/ea3152/ostest/defconfig
index 845faf60b..5b7b5b59d 100644
--- a/nuttx/configs/ea3152/ostest/defconfig
+++ b/nuttx/configs/ea3152/ostest/defconfig
@@ -313,21 +313,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=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 examples/ostest
diff --git a/nuttx/configs/eagle100/httpd/defconfig b/nuttx/configs/eagle100/httpd/defconfig
index 0fdddc2df..7c47f4467 100644
--- a/nuttx/configs/eagle100/httpd/defconfig
+++ b/nuttx/configs/eagle100/httpd/defconfig
@@ -263,21 +263,21 @@ CONFIG_NETUTILS_HTTPD_DUMPPSTATE=n
#
# 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 examples/ostest
@@ -324,10 +324,10 @@ CONFIG_NSH_MMCSDMINOR=0
#
# Settings for examples/dhcpd
#
-CONFIG_EXAMPLE_DHCPD_NOMAC=y
-CONFIG_EXAMPLE_DHCPD_IPADDR=0x0a000001
-CONFIG_EXAMPLE_DHCPD_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_DHCPD_NETMASK=0xffffff00
+CONFIG_EXAMPLES_DHCPD_NOMAC=y
+CONFIG_EXAMPLES_DHCPD_IPADDR=0x0a000001
+CONFIG_EXAMPLES_DHCPD_DRIPADDR=0x0a000001
+CONFIG_EXAMPLES_DHCPD_NETMASK=0xffffff00
#
# Stack and heap information
diff --git a/nuttx/configs/eagle100/nettest/defconfig b/nuttx/configs/eagle100/nettest/defconfig
index 943f46223..4f2721045 100644
--- a/nuttx/configs/eagle100/nettest/defconfig
+++ b/nuttx/configs/eagle100/nettest/defconfig
@@ -254,21 +254,21 @@ CONFIG_NET_RESOLV_ENTRIES=4
#
# 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 examples/ostest
diff --git a/nuttx/configs/eagle100/nsh/defconfig b/nuttx/configs/eagle100/nsh/defconfig
index 2e04850b3..4848e957b 100644
--- a/nuttx/configs/eagle100/nsh/defconfig
+++ b/nuttx/configs/eagle100/nsh/defconfig
@@ -256,20 +256,20 @@ CONFIG_NET_RESOLV_ENTRIES=4
#
# 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 examples/ostest
diff --git a/nuttx/configs/eagle100/nxflat/defconfig b/nuttx/configs/eagle100/nxflat/defconfig
index d4228f16b..01931b0d3 100644
--- a/nuttx/configs/eagle100/nxflat/defconfig
+++ b/nuttx/configs/eagle100/nxflat/defconfig
@@ -258,20 +258,20 @@ CONFIG_NET_RESOLV_ENTRIES=4
#
# 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 examples/ostest
diff --git a/nuttx/configs/eagle100/ostest/defconfig b/nuttx/configs/eagle100/ostest/defconfig
index 6cffe1450..13a316ca4 100644
--- a/nuttx/configs/eagle100/ostest/defconfig
+++ b/nuttx/configs/eagle100/ostest/defconfig
@@ -252,20 +252,20 @@ CONFIG_NET_RESOLV_ENTRIES=4
#
# 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 examples/ostest
diff --git a/nuttx/configs/eagle100/thttpd/defconfig b/nuttx/configs/eagle100/thttpd/defconfig
index afb7dbce8..412a89e9c 100644
--- a/nuttx/configs/eagle100/thttpd/defconfig
+++ b/nuttx/configs/eagle100/thttpd/defconfig
@@ -289,27 +289,27 @@ CONFIG_THTTPD_URLPATTERN=n
#
# Additional settings for examples/thttpd
#
-CONFIG_EXAMPLE_THTTPD_NOMAC=n
-CONFIG_EXAMPLE_THTTPD_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_THTTPD_NETMASK=0xffffff00
+CONFIG_EXAMPLES_THTTPD_NOMAC=n
+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=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 examples/ostest
diff --git a/nuttx/configs/ekk-lm3s9b96/nsh/defconfig b/nuttx/configs/ekk-lm3s9b96/nsh/defconfig
index 1e162a4a1..11407295f 100644
--- a/nuttx/configs/ekk-lm3s9b96/nsh/defconfig
+++ b/nuttx/configs/ekk-lm3s9b96/nsh/defconfig
@@ -271,20 +271,20 @@ CONFIG_NET_RESOLV_ENTRIES=4
#
# 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 examples/ostest
diff --git a/nuttx/configs/ekk-lm3s9b96/ostest/defconfig b/nuttx/configs/ekk-lm3s9b96/ostest/defconfig
index d08e99077..734ad031e 100644
--- a/nuttx/configs/ekk-lm3s9b96/ostest/defconfig
+++ b/nuttx/configs/ekk-lm3s9b96/ostest/defconfig
@@ -268,20 +268,20 @@ CONFIG_NET_RESOLV_ENTRIES=4
#
# 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 examples/ostest
diff --git a/nuttx/configs/ez80f910200kitg/ostest/defconfig b/nuttx/configs/ez80f910200kitg/ostest/defconfig
index adc92f879..22b627542 100644
--- a/nuttx/configs/ez80f910200kitg/ostest/defconfig
+++ b/nuttx/configs/ez80f910200kitg/ostest/defconfig
@@ -306,20 +306,20 @@ CONFIG_NX_MXCLIENTMSGS=16
#
# Settings for examples/uip
-CONFIG_EXAMPLE_UIP_IPADDR=0xc0a80080
-CONFIG_EXAMPLE_UIP_DRIPADDR=0xc0a80001
-CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00
-CONFIG_EXAMPLE_UIP_DHCPC=n
+CONFIG_EXAMPLES_UIP_IPADDR=0xc0a80080
+CONFIG_EXAMPLES_UIP_DRIPADDR=0xc0a80001
+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=0xc0a80080
-CONFIG_EXAMPLE_NETTEST_DRIPADDR=0xc0a80001
-CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00
-CONFIG_EXAMPLE_NETTEST_CLIENTIP=0xc0a8006a
+CONFIG_EXAMPLES_NETTEST_SERVER=n
+CONFIG_EXAMPLES_NETTEST_PERFORMANCE=n
+CONFIG_EXAMPLES_NETTEST_NOMAC=n
+CONFIG_EXAMPLES_NETTEST_IPADDR=0xc0a80080
+CONFIG_EXAMPLES_NETTEST_DRIPADDR=0xc0a80001
+CONFIG_EXAMPLES_NETTEST_NETMASK=0xffffff00
+CONFIG_EXAMPLES_NETTEST_CLIENTIP=0xc0a8006a
#
# Settings for examples/ostest
@@ -386,11 +386,11 @@ CONFIG_EXAMPLES_MOUNT_DEVNAME="/dev/ram0"
#
# Settings for examples/wget
#
-CONFIG_EXAMPLE_WGET_URL="http://www.nuttx.org/index.html"
-CONFIG_EXAMPLE_WGET_NOMAC=y
-CONFIG_EXAMPLE_WGET_IPADDR=0x0a000002
-CONFIG_EXAMPLE_WGET_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_WGET_NETMASK=0xffffff00
+CONFIG_EXAMPLES_WGET_URL="http://www.nuttx.org/index.html"
+CONFIG_EXAMPLES_WGET_NOMAC=y
+CONFIG_EXAMPLES_WGET_IPADDR=0x0a000002
+CONFIG_EXAMPLES_WGET_DRIPADDR=0x0a000001
+CONFIG_EXAMPLES_WGET_NETMASK=0xffffff00
#
# Stack and heap information
diff --git a/nuttx/configs/ez80f910200zco/dhcpd/defconfig b/nuttx/configs/ez80f910200zco/dhcpd/defconfig
index 8f7b6479f..ea9844dc2 100644
--- a/nuttx/configs/ez80f910200zco/dhcpd/defconfig
+++ b/nuttx/configs/ez80f910200zco/dhcpd/defconfig
@@ -312,28 +312,28 @@ CONFIG_NX_MXCLIENTMSGS=16
#
# Settings for examples/poll
-CONFIG_EXAMPLE_POLL_NOMAC=y
-CONFIG_EXAMPLE_POLL_IPADDR=0x0a000002
-CONFIG_EXAMPLE_POLL_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_POLL_NETMASK=0xffffff00
+CONFIG_EXAMPLES_POLL_NOMAC=y
+CONFIG_EXAMPLES_POLL_IPADDR=0x0a000002
+CONFIG_EXAMPLES_POLL_DRIPADDR=0x0a000001
+CONFIG_EXAMPLES_POLL_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
@@ -376,10 +376,10 @@ CONFIG_NSH_MMCSDMINOR=0
#
# Settings for examples/dhcpd
-CONFIG_EXAMPLE_DHCPD_NOMAC=y
-CONFIG_EXAMPLE_DHCPD_IPADDR=0x0a000001
-CONFIG_EXAMPLE_DHCPD_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_DHCPD_NETMASK=0xffffff00
+CONFIG_EXAMPLES_DHCPD_NOMAC=y
+CONFIG_EXAMPLES_DHCPD_IPADDR=0x0a000001
+CONFIG_EXAMPLES_DHCPD_DRIPADDR=0x0a000001
+CONFIG_EXAMPLES_DHCPD_NETMASK=0xffffff00
#
# Settings for examples/nx
@@ -407,11 +407,11 @@ CONFIG_EXAMPLES_MOUNT_DEVNAME="/dev/ram0"
#
# Settings for examples/wget
#
-CONFIG_EXAMPLE_WGET_URL="http://www.nuttx.org/index.html"
-CONFIG_EXAMPLE_WGET_NOMAC=y
-CONFIG_EXAMPLE_WGET_IPADDR=0x0a000002
-CONFIG_EXAMPLE_WGET_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_WGET_NETMASK=0xffffff00
+CONFIG_EXAMPLES_WGET_URL="http://www.nuttx.org/index.html"
+CONFIG_EXAMPLES_WGET_NOMAC=y
+CONFIG_EXAMPLES_WGET_IPADDR=0x0a000002
+CONFIG_EXAMPLES_WGET_DRIPADDR=0x0a000001
+CONFIG_EXAMPLES_WGET_NETMASK=0xffffff00
#
# Stack and heap information
diff --git a/nuttx/configs/ez80f910200zco/httpd/defconfig b/nuttx/configs/ez80f910200zco/httpd/defconfig
index 296521a9e..ddf34285a 100644
--- a/nuttx/configs/ez80f910200zco/httpd/defconfig
+++ b/nuttx/configs/ez80f910200zco/httpd/defconfig
@@ -320,28 +320,28 @@ CONFIG_NETUTILS_HTTPD_DUMPPSTATE=n
#
# Settings for examples/poll
-CONFIG_EXAMPLE_POLL_NOMAC=y
-CONFIG_EXAMPLE_POLL_IPADDR=0x0a000002
-CONFIG_EXAMPLE_POLL_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_POLL_NETMASK=0xffffff00
+CONFIG_EXAMPLES_POLL_NOMAC=y
+CONFIG_EXAMPLES_POLL_IPADDR=0x0a000002
+CONFIG_EXAMPLES_POLL_DRIPADDR=0x0a000001
+CONFIG_EXAMPLES_POLL_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
@@ -384,10 +384,10 @@ CONFIG_NSH_MMCSDMINOR=0
#
# Settings for examples/dhcpd
-CONFIG_EXAMPLE_DHCPD_NOMAC=y
-CONFIG_EXAMPLE_DHCPD_IPADDR=0x0a000001
-CONFIG_EXAMPLE_DHCPD_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_DHCPD_NETMASK=0xffffff00
+CONFIG_EXAMPLES_DHCPD_NOMAC=y
+CONFIG_EXAMPLES_DHCPD_IPADDR=0x0a000001
+CONFIG_EXAMPLES_DHCPD_DRIPADDR=0x0a000001
+CONFIG_EXAMPLES_DHCPD_NETMASK=0xffffff00
#
# Settings for examples/nx
@@ -415,11 +415,11 @@ CONFIG_EXAMPLES_MOUNT_DEVNAME="/dev/ram0"
#
# Settings for examples/wget
#
-CONFIG_EXAMPLE_WGET_URL="http://www.nuttx.org/index.html"
-CONFIG_EXAMPLE_WGET_NOMAC=y
-CONFIG_EXAMPLE_WGET_IPADDR=0x0a000002
-CONFIG_EXAMPLE_WGET_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_WGET_NETMASK=0xffffff00
+CONFIG_EXAMPLES_WGET_URL="http://www.nuttx.org/index.html"
+CONFIG_EXAMPLES_WGET_NOMAC=y
+CONFIG_EXAMPLES_WGET_IPADDR=0x0a000002
+CONFIG_EXAMPLES_WGET_DRIPADDR=0x0a000001
+CONFIG_EXAMPLES_WGET_NETMASK=0xffffff00
#
# Stack and heap information
diff --git a/nuttx/configs/ez80f910200zco/nettest/defconfig b/nuttx/configs/ez80f910200zco/nettest/defconfig
index fb424a766..7b1415bf4 100644
--- a/nuttx/configs/ez80f910200zco/nettest/defconfig
+++ b/nuttx/configs/ez80f910200zco/nettest/defconfig
@@ -312,28 +312,28 @@ CONFIG_NX_MXCLIENTMSGS=16
#
# Settings for examples/poll
-CONFIG_EXAMPLE_POLL_NOMAC=y
-CONFIG_EXAMPLE_POLL_IPADDR=0x0a000002
-CONFIG_EXAMPLE_POLL_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_POLL_NETMASK=0xffffff00
+CONFIG_EXAMPLES_POLL_NOMAC=y
+CONFIG_EXAMPLES_POLL_IPADDR=0x0a000002
+CONFIG_EXAMPLES_POLL_DRIPADDR=0x0a000001
+CONFIG_EXAMPLES_POLL_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
@@ -400,11 +400,11 @@ CONFIG_EXAMPLES_MOUNT_DEVNAME="/dev/ram0"
#
# Settings for examples/wget
#
-CONFIG_EXAMPLE_WGET_URL="http://www.nuttx.org/index.html"
-CONFIG_EXAMPLE_WGET_NOMAC=y
-CONFIG_EXAMPLE_WGET_IPADDR=0x0a000002
-CONFIG_EXAMPLE_WGET_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_WGET_NETMASK=0xffffff00
+CONFIG_EXAMPLES_WGET_URL="http://www.nuttx.org/index.html"
+CONFIG_EXAMPLES_WGET_NOMAC=y
+CONFIG_EXAMPLES_WGET_IPADDR=0x0a000002
+CONFIG_EXAMPLES_WGET_DRIPADDR=0x0a000001
+CONFIG_EXAMPLES_WGET_NETMASK=0xffffff00
#
# Stack and heap information
diff --git a/nuttx/configs/ez80f910200zco/nsh/defconfig b/nuttx/configs/ez80f910200zco/nsh/defconfig
index 9c4b5aaee..fa701253d 100644
--- a/nuttx/configs/ez80f910200zco/nsh/defconfig
+++ b/nuttx/configs/ez80f910200zco/nsh/defconfig
@@ -312,28 +312,28 @@ CONFIG_NX_MXCLIENTMSGS=16
#
# Settings for examples/poll
-CONFIG_EXAMPLE_POLL_NOMAC=y
-CONFIG_EXAMPLE_POLL_IPADDR=0x0a000002
-CONFIG_EXAMPLE_POLL_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_POLL_NETMASK=0xffffff00
+CONFIG_EXAMPLES_POLL_NOMAC=y
+CONFIG_EXAMPLES_POLL_IPADDR=0x0a000002
+CONFIG_EXAMPLES_POLL_DRIPADDR=0x0a000001
+CONFIG_EXAMPLES_POLL_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
@@ -400,11 +400,11 @@ CONFIG_EXAMPLES_MOUNT_DEVNAME="/dev/ram0"
#
# Settings for examples/wget
#
-CONFIG_EXAMPLE_WGET_URL="http://www.nuttx.org/index.html"
-CONFIG_EXAMPLE_WGET_NOMAC=y
-CONFIG_EXAMPLE_WGET_IPADDR=0x0a000002
-CONFIG_EXAMPLE_WGET_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_WGET_NETMASK=0xffffff00
+CONFIG_EXAMPLES_WGET_URL="http://www.nuttx.org/index.html"
+CONFIG_EXAMPLES_WGET_NOMAC=y
+CONFIG_EXAMPLES_WGET_IPADDR=0x0a000002
+CONFIG_EXAMPLES_WGET_DRIPADDR=0x0a000001
+CONFIG_EXAMPLES_WGET_NETMASK=0xffffff00
#
# Stack and heap information
diff --git a/nuttx/configs/ez80f910200zco/ostest/defconfig b/nuttx/configs/ez80f910200zco/ostest/defconfig
index 548ce3376..f16ddee39 100644
--- a/nuttx/configs/ez80f910200zco/ostest/defconfig
+++ b/nuttx/configs/ez80f910200zco/ostest/defconfig
@@ -308,27 +308,27 @@ CONFIG_NX_MXCLIENTMSGS=16
#
# Settings for examples/poll
-CONFIG_EXAMPLE_POLL_NOMAC=y
-CONFIG_EXAMPLE_POLL_IPADDR=0x0a000002
-CONFIG_EXAMPLE_POLL_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_POLL_NETMASK=0xffffff00
+CONFIG_EXAMPLES_POLL_NOMAC=y
+CONFIG_EXAMPLES_POLL_IPADDR=0x0a000002
+CONFIG_EXAMPLES_POLL_DRIPADDR=0x0a000001
+CONFIG_EXAMPLES_POLL_NETMASK=0xffffff00
#
# Settings for examples/uip
-CONFIG_EXAMPLE_UIP_IPADDR=0xc0a80080
-CONFIG_EXAMPLE_UIP_DRIPADDR=0xc0a80001
-CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00
-CONFIG_EXAMPLE_UIP_DHCPC=n
+CONFIG_EXAMPLES_UIP_IPADDR=0xc0a80080
+CONFIG_EXAMPLES_UIP_DRIPADDR=0xc0a80001
+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=0xc0a80080
-CONFIG_EXAMPLE_NETTEST_DRIPADDR=0xc0a80001
-CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00
-CONFIG_EXAMPLE_NETTEST_CLIENTIP=0xc0a8006a
+CONFIG_EXAMPLES_NETTEST_SERVER=n
+CONFIG_EXAMPLES_NETTEST_PERFORMANCE=n
+CONFIG_EXAMPLES_NETTEST_NOMAC=n
+CONFIG_EXAMPLES_NETTEST_IPADDR=0xc0a80080
+CONFIG_EXAMPLES_NETTEST_DRIPADDR=0xc0a80001
+CONFIG_EXAMPLES_NETTEST_NETMASK=0xffffff00
+CONFIG_EXAMPLES_NETTEST_CLIENTIP=0xc0a8006a
#
# Settings for examples/ostest
@@ -395,11 +395,11 @@ CONFIG_EXAMPLES_MOUNT_DEVNAME="/dev/ram0"
#
# Settings for examples/wget
#
-CONFIG_EXAMPLE_WGET_URL="http://www.nuttx.org/index.html"
-CONFIG_EXAMPLE_WGET_NOMAC=y
-CONFIG_EXAMPLE_WGET_IPADDR=0x0a000002
-CONFIG_EXAMPLE_WGET_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_WGET_NETMASK=0xffffff00
+CONFIG_EXAMPLES_WGET_URL="http://www.nuttx.org/index.html"
+CONFIG_EXAMPLES_WGET_NOMAC=y
+CONFIG_EXAMPLES_WGET_IPADDR=0x0a000002
+CONFIG_EXAMPLES_WGET_DRIPADDR=0x0a000001
+CONFIG_EXAMPLES_WGET_NETMASK=0xffffff00
#
# Stack and heap information
diff --git a/nuttx/configs/ez80f910200zco/poll/defconfig b/nuttx/configs/ez80f910200zco/poll/defconfig
index 0334ebc26..6ad505dc5 100644
--- a/nuttx/configs/ez80f910200zco/poll/defconfig
+++ b/nuttx/configs/ez80f910200zco/poll/defconfig
@@ -312,28 +312,28 @@ CONFIG_NX_MXCLIENTMSGS=16
#
# Settings for examples/poll
-CONFIG_EXAMPLE_POLL_NOMAC=y
-CONFIG_EXAMPLE_POLL_IPADDR=0x0a000002
-CONFIG_EXAMPLE_POLL_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_POLL_NETMASK=0xffffff00
+CONFIG_EXAMPLES_POLL_NOMAC=y
+CONFIG_EXAMPLES_POLL_IPADDR=0x0a000002
+CONFIG_EXAMPLES_POLL_DRIPADDR=0x0a000001
+CONFIG_EXAMPLES_POLL_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
@@ -400,11 +400,11 @@ CONFIG_EXAMPLES_MOUNT_DEVNAME="/dev/ram0"
#
# Settings for examples/wget
#
-CONFIG_EXAMPLE_WGET_URL="http://www.nuttx.org/index.html"
-CONFIG_EXAMPLE_WGET_NOMAC=y
-CONFIG_EXAMPLE_WGET_IPADDR=0x0a000002
-CONFIG_EXAMPLE_WGET_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_WGET_NETMASK=0xffffff00
+CONFIG_EXAMPLES_WGET_URL="http://www.nuttx.org/index.html"
+CONFIG_EXAMPLES_WGET_NOMAC=y
+CONFIG_EXAMPLES_WGET_IPADDR=0x0a000002
+CONFIG_EXAMPLES_WGET_DRIPADDR=0x0a000001
+CONFIG_EXAMPLES_WGET_NETMASK=0xffffff00
#
# Stack and heap information
diff --git a/nuttx/configs/fire-stm32v2/nsh/defconfig b/nuttx/configs/fire-stm32v2/nsh/defconfig
index 25e782dfe..5edde6ed1 100644
--- a/nuttx/configs/fire-stm32v2/nsh/defconfig
+++ b/nuttx/configs/fire-stm32v2/nsh/defconfig
@@ -751,7 +751,7 @@ CONFIG_EXAMPLES_NSH=y
#
# UDP Discovery Daemon Example
#
-# CONFIG_EXAMPLE_DISCOVER is not set
+# CONFIG_EXAMPLES_DISCOVER is not set
#
# uIP Web Server Example
diff --git a/nuttx/configs/hymini-stm32v/buttons/defconfig b/nuttx/configs/hymini-stm32v/buttons/defconfig
index 59b7b111f..44dcf3c41 100644
--- a/nuttx/configs/hymini-stm32v/buttons/defconfig
+++ b/nuttx/configs/hymini-stm32v/buttons/defconfig
@@ -373,36 +373,36 @@ CONFIG_WATCHDOG=n
#
# 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 examples/buttons
#
-CONFIG_EXAMPLE_BUTTONS_MIN=0
-CONFIG_EXAMPLE_BUTTONS_MAX=7
-CONFIG_EXAMPLE_IRQBUTTONS_MIN=2
-CONFIG_EXAMPLE_IRQBUTTONS_MAX=7
-CONFIG_EXAMPLE_BUTTONS_NAME0="WAKEUP"
-CONFIG_EXAMPLE_BUTTONS_NAME1="TAMPER"
-CONFIG_EXAMPLE_BUTTONS_NAME2="KEY"
-CONFIG_EXAMPLE_BUTTONS_NAME3="SELECT"
-CONFIG_EXAMPLE_BUTTONS_NAME4="DOWN"
-CONFIG_EXAMPLE_BUTTONS_NAME5="LEFT"
-CONFIG_EXAMPLE_BUTTONS_NAME6="RIGHT"
-CONFIG_EXAMPLE_BUTTONS_NAME7="UP"
+CONFIG_EXAMPLES_BUTTONS_MIN=0
+CONFIG_EXAMPLES_BUTTONS_MAX=7
+CONFIG_EXAMPLES_IRQBUTTONS_MIN=2
+CONFIG_EXAMPLES_IRQBUTTONS_MAX=7
+CONFIG_EXAMPLES_BUTTONS_NAME0="WAKEUP"
+CONFIG_EXAMPLES_BUTTONS_NAME1="TAMPER"
+CONFIG_EXAMPLES_BUTTONS_NAME2="KEY"
+CONFIG_EXAMPLES_BUTTONS_NAME3="SELECT"
+CONFIG_EXAMPLES_BUTTONS_NAME4="DOWN"
+CONFIG_EXAMPLES_BUTTONS_NAME5="LEFT"
+CONFIG_EXAMPLES_BUTTONS_NAME6="RIGHT"
+CONFIG_EXAMPLES_BUTTONS_NAME7="UP"
#
# Settings for examples/ostest
diff --git a/nuttx/configs/hymini-stm32v/nsh/defconfig b/nuttx/configs/hymini-stm32v/nsh/defconfig
index 1b0944d02..52da9f6f6 100755
--- a/nuttx/configs/hymini-stm32v/nsh/defconfig
+++ b/nuttx/configs/hymini-stm32v/nsh/defconfig
@@ -373,20 +373,20 @@ CONFIG_WATCHDOG=n
#
# 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 examples/ostest
diff --git a/nuttx/configs/hymini-stm32v/nx/defconfig b/nuttx/configs/hymini-stm32v/nx/defconfig
index 645feac1b..e411baf83 100644
--- a/nuttx/configs/hymini-stm32v/nx/defconfig
+++ b/nuttx/configs/hymini-stm32v/nx/defconfig
@@ -435,20 +435,20 @@ CONFIG_LCD_BACKLIGHT=n
#
# 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 examples/ostest
diff --git a/nuttx/configs/hymini-stm32v/usbserial/defconfig b/nuttx/configs/hymini-stm32v/usbserial/defconfig
index 379e51a5e..7883db827 100755
--- a/nuttx/configs/hymini-stm32v/usbserial/defconfig
+++ b/nuttx/configs/hymini-stm32v/usbserial/defconfig
@@ -395,20 +395,20 @@ CONFIG_WATCHDOG=n
#
# 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 examples/ostest
diff --git a/nuttx/configs/hymini-stm32v/usbstorage/defconfig b/nuttx/configs/hymini-stm32v/usbstorage/defconfig
index b56f62754..c3434e3a4 100755
--- a/nuttx/configs/hymini-stm32v/usbstorage/defconfig
+++ b/nuttx/configs/hymini-stm32v/usbstorage/defconfig
@@ -380,20 +380,20 @@ CONFIG_WATCHDOG=n
#
# 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 examples/ostest
diff --git a/nuttx/configs/kwikstik-k40/ostest/defconfig b/nuttx/configs/kwikstik-k40/ostest/defconfig
index 29bed1244..2cf29894b 100755
--- a/nuttx/configs/kwikstik-k40/ostest/defconfig
+++ b/nuttx/configs/kwikstik-k40/ostest/defconfig
@@ -377,20 +377,20 @@ 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 examples/ostest
diff --git a/nuttx/configs/lincoln60/nsh/defconfig b/nuttx/configs/lincoln60/nsh/defconfig
index a120e2c74..43944f0a6 100644
--- a/nuttx/configs/lincoln60/nsh/defconfig
+++ b/nuttx/configs/lincoln60/nsh/defconfig
@@ -359,20 +359,20 @@ 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 examples/ostest
diff --git a/nuttx/configs/lincoln60/ostest/defconfig b/nuttx/configs/lincoln60/ostest/defconfig
index 6c74a9f54..6dd51eb07 100644
--- a/nuttx/configs/lincoln60/ostest/defconfig
+++ b/nuttx/configs/lincoln60/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/lm3s6432-s2e/nsh/defconfig b/nuttx/configs/lm3s6432-s2e/nsh/defconfig
index b4dd453ac..f0cf503ef 100644
--- a/nuttx/configs/lm3s6432-s2e/nsh/defconfig
+++ b/nuttx/configs/lm3s6432-s2e/nsh/defconfig
@@ -271,20 +271,20 @@ CONFIG_NET_RESOLV_ENTRIES=4
#
# Settings for examples/uip
#
-#CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002
-#CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001
-#CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00
-CONFIG_EXAMPLE_UIP_DHCPC=y
+#CONFIG_EXAMPLES_UIP_IPADDR=0x0a000002
+#CONFIG_EXAMPLES_UIP_DRIPADDR=0x0a000001
+#CONFIG_EXAMPLES_UIP_NETMASK=0xffffff00
+CONFIG_EXAMPLES_UIP_DHCPC=y
#
# 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 examples/ostest
diff --git a/nuttx/configs/lm3s6432-s2e/ostest/defconfig b/nuttx/configs/lm3s6432-s2e/ostest/defconfig
index e04f3da8d..daeac0177 100644
--- a/nuttx/configs/lm3s6432-s2e/ostest/defconfig
+++ b/nuttx/configs/lm3s6432-s2e/ostest/defconfig
@@ -268,20 +268,20 @@ CONFIG_NET_RESOLV_ENTRIES=4
#
# 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 examples/ostest
diff --git a/nuttx/configs/lm3s6965-ek/nsh/defconfig b/nuttx/configs/lm3s6965-ek/nsh/defconfig
index bfad857f0..2771a3dc9 100755
--- a/nuttx/configs/lm3s6965-ek/nsh/defconfig
+++ b/nuttx/configs/lm3s6965-ek/nsh/defconfig
@@ -273,20 +273,20 @@ CONFIG_NET_RESOLV_ENTRIES=4
#
# 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 examples/ostest
diff --git a/nuttx/configs/lm3s6965-ek/nx/defconfig b/nuttx/configs/lm3s6965-ek/nx/defconfig
index 4bc7d73a6..83b338161 100755
--- a/nuttx/configs/lm3s6965-ek/nx/defconfig
+++ b/nuttx/configs/lm3s6965-ek/nx/defconfig
@@ -322,20 +322,20 @@ CONFIG_P14201_FRAMEBUFFER=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 examples/ostest
diff --git a/nuttx/configs/lm3s6965-ek/ostest/defconfig b/nuttx/configs/lm3s6965-ek/ostest/defconfig
index 8aeef4a00..0bfe9ef72 100755
--- a/nuttx/configs/lm3s6965-ek/ostest/defconfig
+++ b/nuttx/configs/lm3s6965-ek/ostest/defconfig
@@ -269,20 +269,20 @@ CONFIG_NET_RESOLV_ENTRIES=4
#
# 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 examples/ostest
diff --git a/nuttx/configs/lm3s8962-ek/nsh/defconfig b/nuttx/configs/lm3s8962-ek/nsh/defconfig
index 8c3d834f5..001a87387 100755
--- a/nuttx/configs/lm3s8962-ek/nsh/defconfig
+++ b/nuttx/configs/lm3s8962-ek/nsh/defconfig
@@ -271,20 +271,20 @@ CONFIG_NET_RESOLV_ENTRIES=4
#
# 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 examples/ostest
diff --git a/nuttx/configs/lm3s8962-ek/nx/defconfig b/nuttx/configs/lm3s8962-ek/nx/defconfig
index 49bbe0675..dbae4b2aa 100755
--- a/nuttx/configs/lm3s8962-ek/nx/defconfig
+++ b/nuttx/configs/lm3s8962-ek/nx/defconfig
@@ -320,20 +320,20 @@ CONFIG_P14201_FRAMEBUFFER=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 examples/ostest
diff --git a/nuttx/configs/lm3s8962-ek/ostest/defconfig b/nuttx/configs/lm3s8962-ek/ostest/defconfig
index adb806b9c..aeb0a1ecf 100755
--- a/nuttx/configs/lm3s8962-ek/ostest/defconfig
+++ b/nuttx/configs/lm3s8962-ek/ostest/defconfig
@@ -268,20 +268,20 @@ CONFIG_NET_RESOLV_ENTRIES=4
#
# 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 examples/ostest
diff --git a/nuttx/configs/lpc4330-xplorer/nsh/defconfig b/nuttx/configs/lpc4330-xplorer/nsh/defconfig
index 406f6f2ba..e4269ea67 100644
--- a/nuttx/configs/lpc4330-xplorer/nsh/defconfig
+++ b/nuttx/configs/lpc4330-xplorer/nsh/defconfig
@@ -468,21 +468,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=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 examples/ostest
@@ -541,11 +541,11 @@ CONFIG_I2CTOOL_DEFFREQ=100000
#
# Settings for examples/buttons
#
-CONFIG_EXAMPLE_BUTTONS_MIN=0
-CONFIG_EXAMPLE_BUTTONS_MAX=0
-CONFIG_EXAMPLE_IRQBUTTONS_MIN=0
-CONFIG_EXAMPLE_IRQBUTTONS_MAX=0
-CONFIG_EXAMPLE_BUTTONS_NAME1="SW2"
+CONFIG_EXAMPLES_BUTTONS_MIN=0
+CONFIG_EXAMPLES_BUTTONS_MAX=0
+CONFIG_EXAMPLES_IRQBUTTONS_MIN=0
+CONFIG_EXAMPLES_IRQBUTTONS_MAX=0
+CONFIG_EXAMPLES_BUTTONS_NAME1="SW2"
#
# examples/modbus
diff --git a/nuttx/configs/lpc4330-xplorer/ostest/defconfig b/nuttx/configs/lpc4330-xplorer/ostest/defconfig
index 560e3327b..d5ac58ef1 100644
--- a/nuttx/configs/lpc4330-xplorer/ostest/defconfig
+++ b/nuttx/configs/lpc4330-xplorer/ostest/defconfig
@@ -452,20 +452,20 @@ 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 examples/ostest
@@ -524,11 +524,11 @@ CONFIG_I2CTOOL_DEFFREQ=100000
#
# Settings for examples/buttons
#
-CONFIG_EXAMPLE_BUTTONS_MIN=0
-CONFIG_EXAMPLE_BUTTONS_MAX=0
-CONFIG_EXAMPLE_IRQBUTTONS_MIN=0
-CONFIG_EXAMPLE_IRQBUTTONS_MAX=0
-CONFIG_EXAMPLE_BUTTONS_NAME1="SW2"
+CONFIG_EXAMPLES_BUTTONS_MIN=0
+CONFIG_EXAMPLES_BUTTONS_MAX=0
+CONFIG_EXAMPLES_IRQBUTTONS_MIN=0
+CONFIG_EXAMPLES_IRQBUTTONS_MAX=0
+CONFIG_EXAMPLES_BUTTONS_NAME1="SW2"
#
# Settings for examples/usbserial
diff --git a/nuttx/configs/lpcxpresso-lpc1768/dhcpd/defconfig b/nuttx/configs/lpcxpresso-lpc1768/dhcpd/defconfig
index 0b7f1c153..01c54fa9f 100755
--- a/nuttx/configs/lpcxpresso-lpc1768/dhcpd/defconfig
+++ b/nuttx/configs/lpcxpresso-lpc1768/dhcpd/defconfig
@@ -375,29 +375,29 @@ 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/dhcpd
#
-CONFIG_EXAMPLE_DHCPD_NOMAC=y
-CONFIG_EXAMPLE_DHCPD_IPADDR=0x0a000001
-CONFIG_EXAMPLE_DHCPD_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_DHCPD_NETMASK=0xffffff00
+CONFIG_EXAMPLES_DHCPD_NOMAC=y
+CONFIG_EXAMPLES_DHCPD_IPADDR=0x0a000001
+CONFIG_EXAMPLES_DHCPD_DRIPADDR=0x0a000001
+CONFIG_EXAMPLES_DHCPD_NETMASK=0xffffff00
#
# Settings for examples/ostest
diff --git a/nuttx/configs/lpcxpresso-lpc1768/nsh/defconfig b/nuttx/configs/lpcxpresso-lpc1768/nsh/defconfig
index cb78f88cc..6d0be8400 100755
--- a/nuttx/configs/lpcxpresso-lpc1768/nsh/defconfig
+++ b/nuttx/configs/lpcxpresso-lpc1768/nsh/defconfig
@@ -393,21 +393,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
diff --git a/nuttx/configs/lpcxpresso-lpc1768/nx/defconfig b/nuttx/configs/lpcxpresso-lpc1768/nx/defconfig
index 54c6828a8..a94571a83 100755
--- a/nuttx/configs/lpcxpresso-lpc1768/nx/defconfig
+++ b/nuttx/configs/lpcxpresso-lpc1768/nx/defconfig
@@ -426,21 +426,21 @@ CONFIG_UG9664HSWAG01_POWER=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
diff --git a/nuttx/configs/lpcxpresso-lpc1768/ostest/defconfig b/nuttx/configs/lpcxpresso-lpc1768/ostest/defconfig
index a808333ff..f58c78773 100755
--- a/nuttx/configs/lpcxpresso-lpc1768/ostest/defconfig
+++ b/nuttx/configs/lpcxpresso-lpc1768/ostest/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
diff --git a/nuttx/configs/lpcxpresso-lpc1768/thttpd/defconfig b/nuttx/configs/lpcxpresso-lpc1768/thttpd/defconfig
index 227bbdebd..08d251d43 100755
--- a/nuttx/configs/lpcxpresso-lpc1768/thttpd/defconfig
+++ b/nuttx/configs/lpcxpresso-lpc1768/thttpd/defconfig
@@ -403,28 +403,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
diff --git a/nuttx/configs/lpcxpresso-lpc1768/usbstorage/defconfig b/nuttx/configs/lpcxpresso-lpc1768/usbstorage/defconfig
index 4aca6768c..08f4ad1cf 100755
--- a/nuttx/configs/lpcxpresso-lpc1768/usbstorage/defconfig
+++ b/nuttx/configs/lpcxpresso-lpc1768/usbstorage/defconfig
@@ -367,21 +367,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
diff --git a/nuttx/configs/mbed/hidkbd/defconfig b/nuttx/configs/mbed/hidkbd/defconfig
index edcf8e181..3ec691276 100644
--- a/nuttx/configs/mbed/hidkbd/defconfig
+++ b/nuttx/configs/mbed/hidkbd/defconfig
@@ -387,21 +387,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
diff --git a/nuttx/configs/mbed/nsh/defconfig b/nuttx/configs/mbed/nsh/defconfig
index c1a35e4b1..dba89ec7b 100755
--- a/nuttx/configs/mbed/nsh/defconfig
+++ b/nuttx/configs/mbed/nsh/defconfig
@@ -359,20 +359,20 @@ 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 examples/ostest
diff --git a/nuttx/configs/micropendous3/hello/defconfig b/nuttx/configs/micropendous3/hello/defconfig
index 4563a12e3..4e0ea0e99 100644
--- a/nuttx/configs/micropendous3/hello/defconfig
+++ b/nuttx/configs/micropendous3/hello/defconfig
@@ -313,21 +313,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
diff --git a/nuttx/configs/mirtoo/nsh/defconfig b/nuttx/configs/mirtoo/nsh/defconfig
index c210c134b..4e3cb684e 100644
--- a/nuttx/configs/mirtoo/nsh/defconfig
+++ b/nuttx/configs/mirtoo/nsh/defconfig
@@ -396,21 +396,21 @@ CONFIG_PGA11X_MULTIPLE=n
#
# 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
diff --git a/nuttx/configs/mirtoo/nxffs/defconfig b/nuttx/configs/mirtoo/nxffs/defconfig
index 1dbb2c02c..31e3ef89b 100644
--- a/nuttx/configs/mirtoo/nxffs/defconfig
+++ b/nuttx/configs/mirtoo/nxffs/defconfig
@@ -395,21 +395,21 @@ CONFIG_PGA11X_MULTIPLE=n
#
# 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
diff --git a/nuttx/configs/mirtoo/ostest/defconfig b/nuttx/configs/mirtoo/ostest/defconfig
index 702b01bc8..a3af96fbc 100644
--- a/nuttx/configs/mirtoo/ostest/defconfig
+++ b/nuttx/configs/mirtoo/ostest/defconfig
@@ -372,21 +372,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
diff --git a/nuttx/configs/mx1ads/ostest/defconfig b/nuttx/configs/mx1ads/ostest/defconfig
index c699aab51..9e425975d 100644
--- a/nuttx/configs/mx1ads/ostest/defconfig
+++ b/nuttx/configs/mx1ads/ostest/defconfig
@@ -270,20 +270,20 @@ 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 examples/nsh
diff --git a/nuttx/configs/ne64badge/ostest/defconfig b/nuttx/configs/ne64badge/ostest/defconfig
index 59f52f661..ee36399f1 100755
--- a/nuttx/configs/ne64badge/ostest/defconfig
+++ b/nuttx/configs/ne64badge/ostest/defconfig
@@ -317,20 +317,20 @@ 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 examples/ostest
diff --git a/nuttx/configs/ntosd-dm320/nettest/defconfig b/nuttx/configs/ntosd-dm320/nettest/defconfig
index 848cf2f9d..178638054 100644
--- a/nuttx/configs/ntosd-dm320/nettest/defconfig
+++ b/nuttx/configs/ntosd-dm320/nettest/defconfig
@@ -266,20 +266,20 @@ 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 examples/nsh
diff --git a/nuttx/configs/ntosd-dm320/nsh/defconfig b/nuttx/configs/ntosd-dm320/nsh/defconfig
index d824f55fc..33cf33c24 100644
--- a/nuttx/configs/ntosd-dm320/nsh/defconfig
+++ b/nuttx/configs/ntosd-dm320/nsh/defconfig
@@ -271,20 +271,20 @@ 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 examples/ostest
diff --git a/nuttx/configs/ntosd-dm320/ostest/defconfig b/nuttx/configs/ntosd-dm320/ostest/defconfig
index edc991880..52ebe0bd9 100644
--- a/nuttx/configs/ntosd-dm320/ostest/defconfig
+++ b/nuttx/configs/ntosd-dm320/ostest/defconfig
@@ -262,20 +262,20 @@ 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 examples/nsh
diff --git a/nuttx/configs/ntosd-dm320/poll/defconfig b/nuttx/configs/ntosd-dm320/poll/defconfig
index 7386ff966..f27dcc2c3 100644
--- a/nuttx/configs/ntosd-dm320/poll/defconfig
+++ b/nuttx/configs/ntosd-dm320/poll/defconfig
@@ -266,27 +266,27 @@ CONFIG_USBMSC_REMOVABLE=y
#
# Settings for examples/poll
-CONFIG_EXAMPLE_POLL_NOMAC=n
-CONFIG_EXAMPLE_POLL_IPADDR=0x0a000002
-CONFIG_EXAMPLE_POLL_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_POLL_NETMASK=0xffffff00
+CONFIG_EXAMPLES_POLL_NOMAC=n
+CONFIG_EXAMPLES_POLL_IPADDR=0x0a000002
+CONFIG_EXAMPLES_POLL_DRIPADDR=0x0a000001
+CONFIG_EXAMPLES_POLL_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=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 examples/nsh
diff --git a/nuttx/configs/ntosd-dm320/thttpd/defconfig b/nuttx/configs/ntosd-dm320/thttpd/defconfig
index 90f84c5e3..becec2ef1 100644
--- a/nuttx/configs/ntosd-dm320/thttpd/defconfig
+++ b/nuttx/configs/ntosd-dm320/thttpd/defconfig
@@ -318,26 +318,26 @@ CONFIG_THTTPD_URLPATTERN=n
#
# Additional settings for examples/thttpd
#
-CONFIG_EXAMPLE_THTTPD_NOMAC=n
-CONFIG_EXAMPLE_THTTPD_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_THTTPD_NETMASK=0xffffff00
+CONFIG_EXAMPLES_THTTPD_NOMAC=n
+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=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 examples/nsh
diff --git a/nuttx/configs/ntosd-dm320/udp/defconfig b/nuttx/configs/ntosd-dm320/udp/defconfig
index 4bc4b4bc8..869f2e442 100644
--- a/nuttx/configs/ntosd-dm320/udp/defconfig
+++ b/nuttx/configs/ntosd-dm320/udp/defconfig
@@ -266,28 +266,28 @@ 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 examples/udp
-CONFIG_EXAMPLE_UDP_SERVER=n
-CONFIG_EXAMPLE_UDP_IPADDR=0x0a000002
-CONFIG_EXAMPLE_UDP_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_UDP_NETMASK=0xffffff00
-CONFIG_EXAMPLE_UDP_SERVERIP=0x0a000001
+CONFIG_EXAMPLES_UDP_SERVER=n
+CONFIG_EXAMPLES_UDP_IPADDR=0x0a000002
+CONFIG_EXAMPLES_UDP_DRIPADDR=0x0a000001
+CONFIG_EXAMPLES_UDP_NETMASK=0xffffff00
+CONFIG_EXAMPLES_UDP_SERVERIP=0x0a000001
#
# Settings for examples/nsh
diff --git a/nuttx/configs/ntosd-dm320/uip/defconfig b/nuttx/configs/ntosd-dm320/uip/defconfig
index 88a45f94d..19ffe452a 100644
--- a/nuttx/configs/ntosd-dm320/uip/defconfig
+++ b/nuttx/configs/ntosd-dm320/uip/defconfig
@@ -274,20 +274,20 @@ CONFIG_NETUTILS_HTTPD_DUMPPSTATE=n
#
# 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 examples/nsh
diff --git a/nuttx/configs/nucleus2g/nsh/defconfig b/nuttx/configs/nucleus2g/nsh/defconfig
index 9397820cd..080c48770 100755
--- a/nuttx/configs/nucleus2g/nsh/defconfig
+++ b/nuttx/configs/nucleus2g/nsh/defconfig
@@ -381,21 +381,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=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 examples/ostest
diff --git a/nuttx/configs/nucleus2g/ostest/defconfig b/nuttx/configs/nucleus2g/ostest/defconfig
index 848fafdba..02eb31633 100755
--- a/nuttx/configs/nucleus2g/ostest/defconfig
+++ b/nuttx/configs/nucleus2g/ostest/defconfig
@@ -359,20 +359,20 @@ 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 examples/ostest
diff --git a/nuttx/configs/nucleus2g/usbserial/defconfig b/nuttx/configs/nucleus2g/usbserial/defconfig
index d0decf903..300d30ab3 100755
--- a/nuttx/configs/nucleus2g/usbserial/defconfig
+++ b/nuttx/configs/nucleus2g/usbserial/defconfig
@@ -360,20 +360,20 @@ 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 examples/ostest
diff --git a/nuttx/configs/nucleus2g/usbstorage/defconfig b/nuttx/configs/nucleus2g/usbstorage/defconfig
index ec79e8fd3..7887818fb 100755
--- a/nuttx/configs/nucleus2g/usbstorage/defconfig
+++ b/nuttx/configs/nucleus2g/usbstorage/defconfig
@@ -361,20 +361,20 @@ 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 examples/ostest
diff --git a/nuttx/configs/olimex-lpc1766stk/ftpc/defconfig b/nuttx/configs/olimex-lpc1766stk/ftpc/defconfig
index 3498195b1..6d1375e92 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 9acf60d9d..7c9fe4c4e 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 040b3ecff..628ff0112 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 1324ca5d4..c2722cb9b 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 de5763c0e..d86b8b83f 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 f36f911e6..a11c02276 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 a30c2b9a6..32092d216 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 1c287cfca..94ac19f42 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 4ead7ffeb..2bd892cc3 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 53cf8001c..8b55cc94d 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 0df5f2cf7..4d73807e0 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
diff --git a/nuttx/configs/olimex-stm32-p107/nsh/defconfig b/nuttx/configs/olimex-stm32-p107/nsh/defconfig
index e3fb69ca2..67a153f9a 100644
--- a/nuttx/configs/olimex-stm32-p107/nsh/defconfig
+++ b/nuttx/configs/olimex-stm32-p107/nsh/defconfig
@@ -443,20 +443,20 @@ CONFIG_WATCHDOG=n
#
# 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 examples/ostest
diff --git a/nuttx/configs/olimex-stm32-p107/ostest/defconfig b/nuttx/configs/olimex-stm32-p107/ostest/defconfig
index 36fade11b..26a8470d2 100644
--- a/nuttx/configs/olimex-stm32-p107/ostest/defconfig
+++ b/nuttx/configs/olimex-stm32-p107/ostest/defconfig
@@ -420,20 +420,20 @@ CONFIG_WATCHDOG=n
#
# 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 examples/ostest
diff --git a/nuttx/configs/olimex-strp711/nettest/defconfig b/nuttx/configs/olimex-strp711/nettest/defconfig
index e8455ab94..c401fe8c6 100755
--- a/nuttx/configs/olimex-strp711/nettest/defconfig
+++ b/nuttx/configs/olimex-strp711/nettest/defconfig
@@ -338,13 +338,13 @@ CONFIG_USBMSC_REMOVABLE=y
#
# 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
diff --git a/nuttx/configs/pcblogic-pic32mx/nsh/defconfig b/nuttx/configs/pcblogic-pic32mx/nsh/defconfig
index 09febe7b1..1e439e466 100644
--- a/nuttx/configs/pcblogic-pic32mx/nsh/defconfig
+++ b/nuttx/configs/pcblogic-pic32mx/nsh/defconfig
@@ -373,21 +373,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
diff --git a/nuttx/configs/pcblogic-pic32mx/ostest/defconfig b/nuttx/configs/pcblogic-pic32mx/ostest/defconfig
index dc76a54bb..868ba4669 100644
--- a/nuttx/configs/pcblogic-pic32mx/ostest/defconfig
+++ b/nuttx/configs/pcblogic-pic32mx/ostest/defconfig
@@ -363,21 +363,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
diff --git a/nuttx/configs/pic32-starterkit/nsh/defconfig b/nuttx/configs/pic32-starterkit/nsh/defconfig
index 5c19d2e43..17cb151a7 100644
--- a/nuttx/configs/pic32-starterkit/nsh/defconfig
+++ b/nuttx/configs/pic32-starterkit/nsh/defconfig
@@ -537,21 +537,21 @@ CONFIG_NX_MXCLIENTMSGS=16
#
# 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
diff --git a/nuttx/configs/pic32-starterkit/nsh2/defconfig b/nuttx/configs/pic32-starterkit/nsh2/defconfig
index 8d9bd8e27..c751591b2 100644
--- a/nuttx/configs/pic32-starterkit/nsh2/defconfig
+++ b/nuttx/configs/pic32-starterkit/nsh2/defconfig
@@ -536,21 +536,21 @@ CONFIG_NX_MXCLIENTMSGS=16
#
# 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
diff --git a/nuttx/configs/pic32-starterkit/ostest/defconfig b/nuttx/configs/pic32-starterkit/ostest/defconfig
index 687b63970..c8e32419e 100644
--- a/nuttx/configs/pic32-starterkit/ostest/defconfig
+++ b/nuttx/configs/pic32-starterkit/ostest/defconfig
@@ -534,21 +534,21 @@ CONFIG_NX_MXCLIENTMSGS=16
#
# 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
diff --git a/nuttx/configs/pic32mx7mmb/nsh/defconfig b/nuttx/configs/pic32mx7mmb/nsh/defconfig
index bb9531694..052363656 100644
--- a/nuttx/configs/pic32mx7mmb/nsh/defconfig
+++ b/nuttx/configs/pic32mx7mmb/nsh/defconfig
@@ -583,21 +583,21 @@ CONFIG_LCD_RPORTRAIT=n
#
# 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
diff --git a/nuttx/configs/pic32mx7mmb/ostest/defconfig b/nuttx/configs/pic32mx7mmb/ostest/defconfig
index a14fa9948..851f6022f 100644
--- a/nuttx/configs/pic32mx7mmb/ostest/defconfig
+++ b/nuttx/configs/pic32mx7mmb/ostest/defconfig
@@ -534,21 +534,21 @@ CONFIG_NX_MXCLIENTMSGS=16
#
# 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
diff --git a/nuttx/configs/qemu-i486/nsh/defconfig b/nuttx/configs/qemu-i486/nsh/defconfig
index 72e97539a..9085eb5fa 100644
--- a/nuttx/configs/qemu-i486/nsh/defconfig
+++ b/nuttx/configs/qemu-i486/nsh/defconfig
@@ -250,20 +250,20 @@ CONFIG_NET_RESOLV_ENTRIES=4
#
# Settings for examples/uip
-CONFIG_EXAMPLE_UIP_IPADDR=0xc0a80080
-CONFIG_EXAMPLE_UIP_DRIPADDR=0xc0a80001
-CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00
-CONFIG_EXAMPLE_UIP_DHCPC=n
+CONFIG_EXAMPLES_UIP_IPADDR=0xc0a80080
+CONFIG_EXAMPLES_UIP_DRIPADDR=0xc0a80001
+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=0xc0a80080
-CONFIG_EXAMPLE_NETTEST_DRIPADDR=0xc0a80001
-CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00
-CONFIG_EXAMPLE_NETTEST_CLIENTIP=0xc0a8006a
+CONFIG_EXAMPLES_NETTEST_SERVER=n
+CONFIG_EXAMPLES_NETTEST_PERFORMANCE=n
+CONFIG_EXAMPLES_NETTEST_NOMAC=n
+CONFIG_EXAMPLES_NETTEST_IPADDR=0xc0a80080
+CONFIG_EXAMPLES_NETTEST_DRIPADDR=0xc0a80001
+CONFIG_EXAMPLES_NETTEST_NETMASK=0xffffff00
+CONFIG_EXAMPLES_NETTEST_CLIENTIP=0xc0a8006a
#
# Settings for examples/ostest
diff --git a/nuttx/configs/qemu-i486/ostest/defconfig b/nuttx/configs/qemu-i486/ostest/defconfig
index 3f87e11cd..a9867fdc9 100644
--- a/nuttx/configs/qemu-i486/ostest/defconfig
+++ b/nuttx/configs/qemu-i486/ostest/defconfig
@@ -182,20 +182,20 @@ CONFIG_NET_RESOLV_ENTRIES=4
#
# Settings for examples/uip
-CONFIG_EXAMPLE_UIP_IPADDR=0xc0a80080
-CONFIG_EXAMPLE_UIP_DRIPADDR=0xc0a80001
-CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00
-CONFIG_EXAMPLE_UIP_DHCPC=n
+CONFIG_EXAMPLES_UIP_IPADDR=0xc0a80080
+CONFIG_EXAMPLES_UIP_DRIPADDR=0xc0a80001
+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=0xc0a80080
-CONFIG_EXAMPLE_NETTEST_DRIPADDR=0xc0a80001
-CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00
-CONFIG_EXAMPLE_NETTEST_CLIENTIP=0xc0a8006a
+CONFIG_EXAMPLES_NETTEST_SERVER=n
+CONFIG_EXAMPLES_NETTEST_PERFORMANCE=n
+CONFIG_EXAMPLES_NETTEST_NOMAC=n
+CONFIG_EXAMPLES_NETTEST_IPADDR=0xc0a80080
+CONFIG_EXAMPLES_NETTEST_DRIPADDR=0xc0a80001
+CONFIG_EXAMPLES_NETTEST_NETMASK=0xffffff00
+CONFIG_EXAMPLES_NETTEST_CLIENTIP=0xc0a8006a
#
# Settings for examples/ostest
diff --git a/nuttx/configs/rgmp/arm/default/defconfig b/nuttx/configs/rgmp/arm/default/defconfig
index d722dd5e7..186c68724 100644
--- a/nuttx/configs/rgmp/arm/default/defconfig
+++ b/nuttx/configs/rgmp/arm/default/defconfig
@@ -181,20 +181,20 @@ CONFIG_NET_RESOLV_ENTRIES=4
#
# Settings for examples/uip
-CONFIG_EXAMPLE_UIP_IPADDR=0xc0a80a02
-CONFIG_EXAMPLE_UIP_DRIPADDR=0xc0a80a01
-CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00
-CONFIG_EXAMPLE_UIP_DHCPC=n
+CONFIG_EXAMPLES_UIP_IPADDR=0xc0a80a02
+CONFIG_EXAMPLES_UIP_DRIPADDR=0xc0a80a01
+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=0xc0a80080
-CONFIG_EXAMPLE_NETTEST_DRIPADDR=0xc0a80001
-CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00
-CONFIG_EXAMPLE_NETTEST_CLIENTIP=0xc0a8006a
+CONFIG_EXAMPLES_NETTEST_SERVER=n
+CONFIG_EXAMPLES_NETTEST_PERFORMANCE=n
+CONFIG_EXAMPLES_NETTEST_NOMAC=n
+CONFIG_EXAMPLES_NETTEST_IPADDR=0xc0a80080
+CONFIG_EXAMPLES_NETTEST_DRIPADDR=0xc0a80001
+CONFIG_EXAMPLES_NETTEST_NETMASK=0xffffff00
+CONFIG_EXAMPLES_NETTEST_CLIENTIP=0xc0a8006a
#
# Settings for examples/nsh
diff --git a/nuttx/configs/rgmp/arm/nsh/defconfig b/nuttx/configs/rgmp/arm/nsh/defconfig
index 279437d47..8fbbc7b8b 100644
--- a/nuttx/configs/rgmp/arm/nsh/defconfig
+++ b/nuttx/configs/rgmp/arm/nsh/defconfig
@@ -181,20 +181,20 @@ CONFIG_NET_RESOLV_ENTRIES=4
#
# Settings for examples/uip
-CONFIG_EXAMPLE_UIP_IPADDR=0xc0a80080
-CONFIG_EXAMPLE_UIP_DRIPADDR=0xc0a80001
-CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00
-CONFIG_EXAMPLE_UIP_DHCPC=n
+CONFIG_EXAMPLES_UIP_IPADDR=0xc0a80080
+CONFIG_EXAMPLES_UIP_DRIPADDR=0xc0a80001
+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=0xc0a80080
-CONFIG_EXAMPLE_NETTEST_DRIPADDR=0xc0a80001
-CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00
-CONFIG_EXAMPLE_NETTEST_CLIENTIP=0xc0a8006a
+CONFIG_EXAMPLES_NETTEST_SERVER=n
+CONFIG_EXAMPLES_NETTEST_PERFORMANCE=n
+CONFIG_EXAMPLES_NETTEST_NOMAC=n
+CONFIG_EXAMPLES_NETTEST_IPADDR=0xc0a80080
+CONFIG_EXAMPLES_NETTEST_DRIPADDR=0xc0a80001
+CONFIG_EXAMPLES_NETTEST_NETMASK=0xffffff00
+CONFIG_EXAMPLES_NETTEST_CLIENTIP=0xc0a8006a
#
# Settings for apps/nshlib
diff --git a/nuttx/configs/rgmp/x86/default/defconfig b/nuttx/configs/rgmp/x86/default/defconfig
index 4e37d9092..9b4b58d89 100644
--- a/nuttx/configs/rgmp/x86/default/defconfig
+++ b/nuttx/configs/rgmp/x86/default/defconfig
@@ -181,20 +181,20 @@ CONFIG_NET_RESOLV_ENTRIES=4
#
# Settings for examples/uip
-CONFIG_EXAMPLE_UIP_IPADDR=0xc0a80a02
-CONFIG_EXAMPLE_UIP_DRIPADDR=0xc0a80a01
-CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00
-CONFIG_EXAMPLE_UIP_DHCPC=n
+CONFIG_EXAMPLES_UIP_IPADDR=0xc0a80a02
+CONFIG_EXAMPLES_UIP_DRIPADDR=0xc0a80a01
+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=0xc0a80080
-CONFIG_EXAMPLE_NETTEST_DRIPADDR=0xc0a80001
-CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00
-CONFIG_EXAMPLE_NETTEST_CLIENTIP=0xc0a8006a
+CONFIG_EXAMPLES_NETTEST_SERVER=n
+CONFIG_EXAMPLES_NETTEST_PERFORMANCE=n
+CONFIG_EXAMPLES_NETTEST_NOMAC=n
+CONFIG_EXAMPLES_NETTEST_IPADDR=0xc0a80080
+CONFIG_EXAMPLES_NETTEST_DRIPADDR=0xc0a80001
+CONFIG_EXAMPLES_NETTEST_NETMASK=0xffffff00
+CONFIG_EXAMPLES_NETTEST_CLIENTIP=0xc0a8006a
#
# Settings for examples/nsh
diff --git a/nuttx/configs/rgmp/x86/nsh/defconfig b/nuttx/configs/rgmp/x86/nsh/defconfig
index 363ef609d..7af320ff7 100644
--- a/nuttx/configs/rgmp/x86/nsh/defconfig
+++ b/nuttx/configs/rgmp/x86/nsh/defconfig
@@ -181,20 +181,20 @@ CONFIG_NET_RESOLV_ENTRIES=4
#
# Settings for examples/uip
-CONFIG_EXAMPLE_UIP_IPADDR=0xc0a80080
-CONFIG_EXAMPLE_UIP_DRIPADDR=0xc0a80001
-CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00
-CONFIG_EXAMPLE_UIP_DHCPC=n
+CONFIG_EXAMPLES_UIP_IPADDR=0xc0a80080
+CONFIG_EXAMPLES_UIP_DRIPADDR=0xc0a80001
+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=0xc0a80080
-CONFIG_EXAMPLE_NETTEST_DRIPADDR=0xc0a80001
-CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00
-CONFIG_EXAMPLE_NETTEST_CLIENTIP=0xc0a8006a
+CONFIG_EXAMPLES_NETTEST_SERVER=n
+CONFIG_EXAMPLES_NETTEST_PERFORMANCE=n
+CONFIG_EXAMPLES_NETTEST_NOMAC=n
+CONFIG_EXAMPLES_NETTEST_IPADDR=0xc0a80080
+CONFIG_EXAMPLES_NETTEST_DRIPADDR=0xc0a80001
+CONFIG_EXAMPLES_NETTEST_NETMASK=0xffffff00
+CONFIG_EXAMPLES_NETTEST_CLIENTIP=0xc0a8006a
#
# Settings for apps/nshlib
diff --git a/nuttx/configs/sam3u-ek/knsh/defconfig b/nuttx/configs/sam3u-ek/knsh/defconfig
index 82616f338..9aba512ed 100755
--- a/nuttx/configs/sam3u-ek/knsh/defconfig
+++ b/nuttx/configs/sam3u-ek/knsh/defconfig
@@ -395,20 +395,20 @@ CONFIG_NX_MXCLIENTMSGS=16
#
# 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 examples/ostest
diff --git a/nuttx/configs/sam3u-ek/nsh/defconfig b/nuttx/configs/sam3u-ek/nsh/defconfig
index 56071d223..02b980418 100755
--- a/nuttx/configs/sam3u-ek/nsh/defconfig
+++ b/nuttx/configs/sam3u-ek/nsh/defconfig
@@ -370,20 +370,20 @@ CONFIG_NX_MXCLIENTMSGS=16
#
# 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 examples/ostest
diff --git a/nuttx/configs/sam3u-ek/nx/defconfig b/nuttx/configs/sam3u-ek/nx/defconfig
index 943c47cfc..82e9e3cbc 100755
--- a/nuttx/configs/sam3u-ek/nx/defconfig
+++ b/nuttx/configs/sam3u-ek/nx/defconfig
@@ -379,20 +379,20 @@ CONFIG_NX_MXCLIENTMSGS=16
#
# 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 examples/ostest
diff --git a/nuttx/configs/sam3u-ek/ostest/defconfig b/nuttx/configs/sam3u-ek/ostest/defconfig
index 098fc3600..da582acb6 100755
--- a/nuttx/configs/sam3u-ek/ostest/defconfig
+++ b/nuttx/configs/sam3u-ek/ostest/defconfig
@@ -370,20 +370,20 @@ CONFIG_NX_MXCLIENTMSGS=16
#
# 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 examples/ostest
diff --git a/nuttx/configs/sam3u-ek/touchscreen/defconfig b/nuttx/configs/sam3u-ek/touchscreen/defconfig
index 2165dec4b..f3ced72cc 100755
--- a/nuttx/configs/sam3u-ek/touchscreen/defconfig
+++ b/nuttx/configs/sam3u-ek/touchscreen/defconfig
@@ -410,20 +410,20 @@ CONFIG_LCD_PORTRAIT=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 examples/ostest
diff --git a/nuttx/configs/shenzhou/nsh/defconfig b/nuttx/configs/shenzhou/nsh/defconfig
index 21b7fcf90..fdc065c48 100644
--- a/nuttx/configs/shenzhou/nsh/defconfig
+++ b/nuttx/configs/shenzhou/nsh/defconfig
@@ -694,7 +694,7 @@ CONFIG_EXAMPLES_NSH=y
#
# UDP Discovery Daemon Example
#
-# CONFIG_EXAMPLE_DISCOVER is not set
+# CONFIG_EXAMPLES_DISCOVER is not set
#
# uIP Web Server Example
diff --git a/nuttx/configs/shenzhou/nxwm/defconfig b/nuttx/configs/shenzhou/nxwm/defconfig
index 0bdc9f45c..e4316d1fe 100644
--- a/nuttx/configs/shenzhou/nxwm/defconfig
+++ b/nuttx/configs/shenzhou/nxwm/defconfig
@@ -794,7 +794,7 @@ CONFIG_NAMEDAPP=y
#
# UDP Discovery Daemon Example
#
-# CONFIG_EXAMPLE_DISCOVER is not set
+# CONFIG_EXAMPLES_DISCOVER is not set
#
# uIP Web Server Example
diff --git a/nuttx/configs/sim/README.txt b/nuttx/configs/sim/README.txt
index b8a921e7f..ee262e49a 100644
--- a/nuttx/configs/sim/README.txt
+++ b/nuttx/configs/sim/README.txt
@@ -221,7 +221,7 @@ nettest
NOTE that the IP address is hard-coded in arch/sim/src/up_wpcap.c.
You will either need to edit your configuration files to use 10.0.0.1
- on the "target" (CONFIG_EXAMPLE_NETTEST_*) or edit up_wpcap.c to
+ on the "target" (CONFIG_EXAMPLES_NETTEST_*) or edit up_wpcap.c to
select the IP address that you want to use.
nsh
diff --git a/nuttx/configs/sim/mount/defconfig b/nuttx/configs/sim/mount/defconfig
index f5d28054f..b980b38dd 100644
--- a/nuttx/configs/sim/mount/defconfig
+++ b/nuttx/configs/sim/mount/defconfig
@@ -173,20 +173,20 @@ CONFIG_NET_RESOLV_ENTRIES=4
#
# Settings for examples/uip
-CONFIG_EXAMPLE_UIP_IPADDR=0xc0a80080
-CONFIG_EXAMPLE_UIP_DRIPADDR=0xc0a80001
-CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00
-CONFIG_EXAMPLE_UIP_DHCPC=n
+CONFIG_EXAMPLES_UIP_IPADDR=0xc0a80080
+CONFIG_EXAMPLES_UIP_DRIPADDR=0xc0a80001
+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=0xc0a80080
-CONFIG_EXAMPLE_NETTEST_DRIPADDR=0xc0a80001
-CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00
-CONFIG_EXAMPLE_NETTEST_CLIENTIP=0xc0a8006a
+CONFIG_EXAMPLES_NETTEST_SERVER=n
+CONFIG_EXAMPLES_NETTEST_PERFORMANCE=n
+CONFIG_EXAMPLES_NETTEST_NOMAC=n
+CONFIG_EXAMPLES_NETTEST_IPADDR=0xc0a80080
+CONFIG_EXAMPLES_NETTEST_DRIPADDR=0xc0a80001
+CONFIG_EXAMPLES_NETTEST_NETMASK=0xffffff00
+CONFIG_EXAMPLES_NETTEST_CLIENTIP=0xc0a8006a
#
# Settings for examples/ostest
diff --git a/nuttx/configs/sim/nettest/defconfig b/nuttx/configs/sim/nettest/defconfig
index 83de44c36..d72404640 100644
--- a/nuttx/configs/sim/nettest/defconfig
+++ b/nuttx/configs/sim/nettest/defconfig
@@ -173,20 +173,20 @@ CONFIG_NET_RESOLV_ENTRIES=4
#
# Settings for examples/uip
-CONFIG_EXAMPLE_UIP_IPADDR=0xc0a80080
-CONFIG_EXAMPLE_UIP_DRIPADDR=0xc0a80001
-CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00
-CONFIG_EXAMPLE_UIP_DHCPC=n
+CONFIG_EXAMPLES_UIP_IPADDR=0xc0a80080
+CONFIG_EXAMPLES_UIP_DRIPADDR=0xc0a80001
+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=0xc0a80080
-CONFIG_EXAMPLE_NETTEST_DRIPADDR=0xc0a80001
-CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00
-CONFIG_EXAMPLE_NETTEST_CLIENTIP=0xc0a8006a
+CONFIG_EXAMPLES_NETTEST_SERVER=n
+CONFIG_EXAMPLES_NETTEST_PERFORMANCE=n
+CONFIG_EXAMPLES_NETTEST_NOMAC=n
+CONFIG_EXAMPLES_NETTEST_IPADDR=0xc0a80080
+CONFIG_EXAMPLES_NETTEST_DRIPADDR=0xc0a80001
+CONFIG_EXAMPLES_NETTEST_NETMASK=0xffffff00
+CONFIG_EXAMPLES_NETTEST_CLIENTIP=0xc0a8006a
#
# Settings for examples/ostest
diff --git a/nuttx/configs/sim/nsh/defconfig b/nuttx/configs/sim/nsh/defconfig
index 3f0ceab26..cd1fc8c7b 100644
--- a/nuttx/configs/sim/nsh/defconfig
+++ b/nuttx/configs/sim/nsh/defconfig
@@ -202,20 +202,20 @@ CONFIG_NET_RESOLV_ENTRIES=4
#
# Settings for examples/uip
-CONFIG_EXAMPLE_UIP_IPADDR=0xc0a80080
-CONFIG_EXAMPLE_UIP_DRIPADDR=0xc0a80001
-CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00
-CONFIG_EXAMPLE_UIP_DHCPC=n
+CONFIG_EXAMPLES_UIP_IPADDR=0xc0a80080
+CONFIG_EXAMPLES_UIP_DRIPADDR=0xc0a80001
+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=0xc0a80080
-CONFIG_EXAMPLE_NETTEST_DRIPADDR=0xc0a80001
-CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00
-CONFIG_EXAMPLE_NETTEST_CLIENTIP=0xc0a8006a
+CONFIG_EXAMPLES_NETTEST_SERVER=n
+CONFIG_EXAMPLES_NETTEST_PERFORMANCE=n
+CONFIG_EXAMPLES_NETTEST_NOMAC=n
+CONFIG_EXAMPLES_NETTEST_IPADDR=0xc0a80080
+CONFIG_EXAMPLES_NETTEST_DRIPADDR=0xc0a80001
+CONFIG_EXAMPLES_NETTEST_NETMASK=0xffffff00
+CONFIG_EXAMPLES_NETTEST_CLIENTIP=0xc0a8006a
#
# Settings for examples/ostest
diff --git a/nuttx/configs/sim/nsh2/defconfig b/nuttx/configs/sim/nsh2/defconfig
index f6f36bf51..787e388c7 100644
--- a/nuttx/configs/sim/nsh2/defconfig
+++ b/nuttx/configs/sim/nsh2/defconfig
@@ -250,21 +250,21 @@ CONFIG_NX_MXCLIENTMSGS=16
#
# Settings for examples/uip
#
-CONFIG_EXAMPLE_UIP_IPADDR=0xc0a80080
-CONFIG_EXAMPLE_UIP_DRIPADDR=0xc0a80001
-CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00
-CONFIG_EXAMPLE_UIP_DHCPC=n
+CONFIG_EXAMPLES_UIP_IPADDR=0xc0a80080
+CONFIG_EXAMPLES_UIP_DRIPADDR=0xc0a80001
+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=0xc0a80080
-CONFIG_EXAMPLE_NETTEST_DRIPADDR=0xc0a80001
-CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00
-CONFIG_EXAMPLE_NETTEST_CLIENTIP=0xc0a8006a
+CONFIG_EXAMPLES_NETTEST_SERVER=n
+CONFIG_EXAMPLES_NETTEST_PERFORMANCE=n
+CONFIG_EXAMPLES_NETTEST_NOMAC=n
+CONFIG_EXAMPLES_NETTEST_IPADDR=0xc0a80080
+CONFIG_EXAMPLES_NETTEST_DRIPADDR=0xc0a80001
+CONFIG_EXAMPLES_NETTEST_NETMASK=0xffffff00
+CONFIG_EXAMPLES_NETTEST_CLIENTIP=0xc0a8006a
#
# Settings for examples/ostest
diff --git a/nuttx/configs/sim/nx/defconfig b/nuttx/configs/sim/nx/defconfig
index 34d86f384..5b48d72a7 100644
--- a/nuttx/configs/sim/nx/defconfig
+++ b/nuttx/configs/sim/nx/defconfig
@@ -228,21 +228,21 @@ CONFIG_NXCONSOLE_MXCHARS=256
#
# Settings for examples/uip
#
-CONFIG_EXAMPLE_UIP_IPADDR=0xc0a80080
-CONFIG_EXAMPLE_UIP_DRIPADDR=0xc0a80001
-CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00
-CONFIG_EXAMPLE_UIP_DHCPC=n
+CONFIG_EXAMPLES_UIP_IPADDR=0xc0a80080
+CONFIG_EXAMPLES_UIP_DRIPADDR=0xc0a80001
+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=0xc0a80080
-CONFIG_EXAMPLE_NETTEST_DRIPADDR=0xc0a80001
-CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00
-CONFIG_EXAMPLE_NETTEST_CLIENTIP=0xc0a8006a
+CONFIG_EXAMPLES_NETTEST_SERVER=n
+CONFIG_EXAMPLES_NETTEST_PERFORMANCE=n
+CONFIG_EXAMPLES_NETTEST_NOMAC=n
+CONFIG_EXAMPLES_NETTEST_IPADDR=0xc0a80080
+CONFIG_EXAMPLES_NETTEST_DRIPADDR=0xc0a80001
+CONFIG_EXAMPLES_NETTEST_NETMASK=0xffffff00
+CONFIG_EXAMPLES_NETTEST_CLIENTIP=0xc0a8006a
#
# Settings for examples/ostest
diff --git a/nuttx/configs/sim/nx11/defconfig b/nuttx/configs/sim/nx11/defconfig
index 8734ebc69..43d57bd50 100644
--- a/nuttx/configs/sim/nx11/defconfig
+++ b/nuttx/configs/sim/nx11/defconfig
@@ -235,21 +235,21 @@ CONFIG_NXCONSOLE_MXCHARS=256
#
# Settings for examples/uip
#
-CONFIG_EXAMPLE_UIP_IPADDR=0xc0a80080
-CONFIG_EXAMPLE_UIP_DRIPADDR=0xc0a80001
-CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00
-CONFIG_EXAMPLE_UIP_DHCPC=n
+CONFIG_EXAMPLES_UIP_IPADDR=0xc0a80080
+CONFIG_EXAMPLES_UIP_DRIPADDR=0xc0a80001
+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=0xc0a80080
-CONFIG_EXAMPLE_NETTEST_DRIPADDR=0xc0a80001
-CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00
-CONFIG_EXAMPLE_NETTEST_CLIENTIP=0xc0a8006a
+CONFIG_EXAMPLES_NETTEST_SERVER=n
+CONFIG_EXAMPLES_NETTEST_PERFORMANCE=n
+CONFIG_EXAMPLES_NETTEST_NOMAC=n
+CONFIG_EXAMPLES_NETTEST_IPADDR=0xc0a80080
+CONFIG_EXAMPLES_NETTEST_DRIPADDR=0xc0a80001
+CONFIG_EXAMPLES_NETTEST_NETMASK=0xffffff00
+CONFIG_EXAMPLES_NETTEST_CLIENTIP=0xc0a8006a
#
# Settings for examples/ostest
diff --git a/nuttx/configs/sim/nxffs/defconfig b/nuttx/configs/sim/nxffs/defconfig
index 22746a2f6..c30227bd8 100644
--- a/nuttx/configs/sim/nxffs/defconfig
+++ b/nuttx/configs/sim/nxffs/defconfig
@@ -174,20 +174,20 @@ CONFIG_NET_RESOLV_ENTRIES=4
#
# Settings for examples/uip
-CONFIG_EXAMPLE_UIP_IPADDR=0xc0a80080
-CONFIG_EXAMPLE_UIP_DRIPADDR=0xc0a80001
-CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00
-CONFIG_EXAMPLE_UIP_DHCPC=n
+CONFIG_EXAMPLES_UIP_IPADDR=0xc0a80080
+CONFIG_EXAMPLES_UIP_DRIPADDR=0xc0a80001
+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=0xc0a80080
-CONFIG_EXAMPLE_NETTEST_DRIPADDR=0xc0a80001
-CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00
-CONFIG_EXAMPLE_NETTEST_CLIENTIP=0xc0a8006a
+CONFIG_EXAMPLES_NETTEST_SERVER=n
+CONFIG_EXAMPLES_NETTEST_PERFORMANCE=n
+CONFIG_EXAMPLES_NETTEST_NOMAC=n
+CONFIG_EXAMPLES_NETTEST_IPADDR=0xc0a80080
+CONFIG_EXAMPLES_NETTEST_DRIPADDR=0xc0a80001
+CONFIG_EXAMPLES_NETTEST_NETMASK=0xffffff00
+CONFIG_EXAMPLES_NETTEST_CLIENTIP=0xc0a8006a
#
# Settings for examples/ostest
diff --git a/nuttx/configs/sim/nxwm/defconfig b/nuttx/configs/sim/nxwm/defconfig
index 812233cbf..d34202e05 100644
--- a/nuttx/configs/sim/nxwm/defconfig
+++ b/nuttx/configs/sim/nxwm/defconfig
@@ -283,21 +283,21 @@ CONFIG_NXCONSOLE_MXCHARS=256
#
# Settings for examples/uip
#
-CONFIG_EXAMPLE_UIP_IPADDR=0xc0a80080
-CONFIG_EXAMPLE_UIP_DRIPADDR=0xc0a80001
-CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00
-CONFIG_EXAMPLE_UIP_DHCPC=n
+CONFIG_EXAMPLES_UIP_IPADDR=0xc0a80080
+CONFIG_EXAMPLES_UIP_DRIPADDR=0xc0a80001
+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=0xc0a80080
-CONFIG_EXAMPLE_NETTEST_DRIPADDR=0xc0a80001
-CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00
-CONFIG_EXAMPLE_NETTEST_CLIENTIP=0xc0a8006a
+CONFIG_EXAMPLES_NETTEST_SERVER=n
+CONFIG_EXAMPLES_NETTEST_PERFORMANCE=n
+CONFIG_EXAMPLES_NETTEST_NOMAC=n
+CONFIG_EXAMPLES_NETTEST_IPADDR=0xc0a80080
+CONFIG_EXAMPLES_NETTEST_DRIPADDR=0xc0a80001
+CONFIG_EXAMPLES_NETTEST_NETMASK=0xffffff00
+CONFIG_EXAMPLES_NETTEST_CLIENTIP=0xc0a8006a
#
# Settings for examples/ostest
diff --git a/nuttx/configs/sim/ostest/defconfig b/nuttx/configs/sim/ostest/defconfig
index 92c696dc6..0d3669a25 100644
--- a/nuttx/configs/sim/ostest/defconfig
+++ b/nuttx/configs/sim/ostest/defconfig
@@ -173,20 +173,20 @@ CONFIG_NET_RESOLV_ENTRIES=4
#
# Settings for examples/uip
-CONFIG_EXAMPLE_UIP_IPADDR=0xc0a80080
-CONFIG_EXAMPLE_UIP_DRIPADDR=0xc0a80001
-CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00
-CONFIG_EXAMPLE_UIP_DHCPC=n
+CONFIG_EXAMPLES_UIP_IPADDR=0xc0a80080
+CONFIG_EXAMPLES_UIP_DRIPADDR=0xc0a80001
+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=0xc0a80080
-CONFIG_EXAMPLE_NETTEST_DRIPADDR=0xc0a80001
-CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00
-CONFIG_EXAMPLE_NETTEST_CLIENTIP=0xc0a8006a
+CONFIG_EXAMPLES_NETTEST_SERVER=n
+CONFIG_EXAMPLES_NETTEST_PERFORMANCE=n
+CONFIG_EXAMPLES_NETTEST_NOMAC=n
+CONFIG_EXAMPLES_NETTEST_IPADDR=0xc0a80080
+CONFIG_EXAMPLES_NETTEST_DRIPADDR=0xc0a80001
+CONFIG_EXAMPLES_NETTEST_NETMASK=0xffffff00
+CONFIG_EXAMPLES_NETTEST_CLIENTIP=0xc0a8006a
#
# Settings for examples/ostest
diff --git a/nuttx/configs/sim/pashello/defconfig b/nuttx/configs/sim/pashello/defconfig
index 57530d3bb..e3cf3a7b5 100644
--- a/nuttx/configs/sim/pashello/defconfig
+++ b/nuttx/configs/sim/pashello/defconfig
@@ -173,20 +173,20 @@ CONFIG_NET_RESOLV_ENTRIES=4
#
# Settings for examples/uip
-CONFIG_EXAMPLE_UIP_IPADDR=0xc0a80080
-CONFIG_EXAMPLE_UIP_DRIPADDR=0xc0a80001
-CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00
-CONFIG_EXAMPLE_UIP_DHCPC=n
+CONFIG_EXAMPLES_UIP_IPADDR=0xc0a80080
+CONFIG_EXAMPLES_UIP_DRIPADDR=0xc0a80001
+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=0xc0a80080
-CONFIG_EXAMPLE_NETTEST_DRIPADDR=0xc0a80001
-CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00
-CONFIG_EXAMPLE_NETTEST_CLIENTIP=0xc0a8006a
+CONFIG_EXAMPLES_NETTEST_SERVER=n
+CONFIG_EXAMPLES_NETTEST_PERFORMANCE=n
+CONFIG_EXAMPLES_NETTEST_NOMAC=n
+CONFIG_EXAMPLES_NETTEST_IPADDR=0xc0a80080
+CONFIG_EXAMPLES_NETTEST_DRIPADDR=0xc0a80001
+CONFIG_EXAMPLES_NETTEST_NETMASK=0xffffff00
+CONFIG_EXAMPLES_NETTEST_CLIENTIP=0xc0a8006a
#
# Settings for examples/nsh
diff --git a/nuttx/configs/sim/touchscreen/defconfig b/nuttx/configs/sim/touchscreen/defconfig
index b9630c8e2..b112449b3 100644
--- a/nuttx/configs/sim/touchscreen/defconfig
+++ b/nuttx/configs/sim/touchscreen/defconfig
@@ -224,20 +224,20 @@ CONFIG_NX_MXCLIENTMSGS=16
#
# Settings for examples/uip
-CONFIG_EXAMPLE_UIP_IPADDR=0xc0a80080
-CONFIG_EXAMPLE_UIP_DRIPADDR=0xc0a80001
-CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00
-CONFIG_EXAMPLE_UIP_DHCPC=n
+CONFIG_EXAMPLES_UIP_IPADDR=0xc0a80080
+CONFIG_EXAMPLES_UIP_DRIPADDR=0xc0a80001
+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=0xc0a80080
-CONFIG_EXAMPLE_NETTEST_DRIPADDR=0xc0a80001
-CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00
-CONFIG_EXAMPLE_NETTEST_CLIENTIP=0xc0a8006a
+CONFIG_EXAMPLES_NETTEST_SERVER=n
+CONFIG_EXAMPLES_NETTEST_PERFORMANCE=n
+CONFIG_EXAMPLES_NETTEST_NOMAC=n
+CONFIG_EXAMPLES_NETTEST_IPADDR=0xc0a80080
+CONFIG_EXAMPLES_NETTEST_DRIPADDR=0xc0a80001
+CONFIG_EXAMPLES_NETTEST_NETMASK=0xffffff00
+CONFIG_EXAMPLES_NETTEST_CLIENTIP=0xc0a8006a
#
# Settings for examples/ostest
diff --git a/nuttx/configs/skp16c26/ostest/defconfig b/nuttx/configs/skp16c26/ostest/defconfig
index 91917f8f0..8cb2eb469 100644
--- a/nuttx/configs/skp16c26/ostest/defconfig
+++ b/nuttx/configs/skp16c26/ostest/defconfig
@@ -266,20 +266,20 @@ 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 examples/nsh
diff --git a/nuttx/configs/stm3210e-eval/RIDE/defconfig b/nuttx/configs/stm3210e-eval/RIDE/defconfig
index a5b60fe4e..f4593d5ea 100755
--- a/nuttx/configs/stm3210e-eval/RIDE/defconfig
+++ b/nuttx/configs/stm3210e-eval/RIDE/defconfig
@@ -378,20 +378,20 @@ CONFIG_WATCHDOG=n
#
# 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 examples/ostest
diff --git a/nuttx/configs/stm3210e-eval/buttons/defconfig b/nuttx/configs/stm3210e-eval/buttons/defconfig
index fbfac0dc6..ac3f10887 100644
--- a/nuttx/configs/stm3210e-eval/buttons/defconfig
+++ b/nuttx/configs/stm3210e-eval/buttons/defconfig
@@ -389,36 +389,36 @@ CONFIG_WATCHDOG=n
#
# 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 examples/buttons
#
-CONFIG_EXAMPLE_BUTTONS_MIN=0
-CONFIG_EXAMPLE_BUTTONS_MAX=7
-CONFIG_EXAMPLE_IRQBUTTONS_MIN=2
-CONFIG_EXAMPLE_IRQBUTTONS_MAX=7
-CONFIG_EXAMPLE_BUTTONS_NAME0="WAKEUP"
-CONFIG_EXAMPLE_BUTTONS_NAME1="TAMPER"
-CONFIG_EXAMPLE_BUTTONS_NAME2="KEY"
-CONFIG_EXAMPLE_BUTTONS_NAME3="SELECT"
-CONFIG_EXAMPLE_BUTTONS_NAME4="DOWN"
-CONFIG_EXAMPLE_BUTTONS_NAME5="LEFT"
-CONFIG_EXAMPLE_BUTTONS_NAME6="RIGHT"
-CONFIG_EXAMPLE_BUTTONS_NAME7="UP"
+CONFIG_EXAMPLES_BUTTONS_MIN=0
+CONFIG_EXAMPLES_BUTTONS_MAX=7
+CONFIG_EXAMPLES_IRQBUTTONS_MIN=2
+CONFIG_EXAMPLES_IRQBUTTONS_MAX=7
+CONFIG_EXAMPLES_BUTTONS_NAME0="WAKEUP"
+CONFIG_EXAMPLES_BUTTONS_NAME1="TAMPER"
+CONFIG_EXAMPLES_BUTTONS_NAME2="KEY"
+CONFIG_EXAMPLES_BUTTONS_NAME3="SELECT"
+CONFIG_EXAMPLES_BUTTONS_NAME4="DOWN"
+CONFIG_EXAMPLES_BUTTONS_NAME5="LEFT"
+CONFIG_EXAMPLES_BUTTONS_NAME6="RIGHT"
+CONFIG_EXAMPLES_BUTTONS_NAME7="UP"
#
# Settings for examples/ostest
diff --git a/nuttx/configs/stm3210e-eval/composite/defconfig b/nuttx/configs/stm3210e-eval/composite/defconfig
index 84ed18494..18c2164d3 100755
--- a/nuttx/configs/stm3210e-eval/composite/defconfig
+++ b/nuttx/configs/stm3210e-eval/composite/defconfig
@@ -438,20 +438,20 @@ CONFIG_COMPOSITE_VERSIONNO=0x0101
#
# 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 examples/ostest
diff --git a/nuttx/configs/stm3210e-eval/nsh/defconfig b/nuttx/configs/stm3210e-eval/nsh/defconfig
index 27d26ff73..facfe105a 100755
--- a/nuttx/configs/stm3210e-eval/nsh/defconfig
+++ b/nuttx/configs/stm3210e-eval/nsh/defconfig
@@ -389,20 +389,20 @@ CONFIG_WATCHDOG=n
#
# 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 examples/ostest
diff --git a/nuttx/configs/stm3210e-eval/nsh2/defconfig b/nuttx/configs/stm3210e-eval/nsh2/defconfig
index d4fa891fb..c30691cc9 100644
--- a/nuttx/configs/stm3210e-eval/nsh2/defconfig
+++ b/nuttx/configs/stm3210e-eval/nsh2/defconfig
@@ -538,20 +538,20 @@ CONFIG_LCD_PWM=n
#
# 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 examples/ostest
diff --git a/nuttx/configs/stm3210e-eval/nx/defconfig b/nuttx/configs/stm3210e-eval/nx/defconfig
index cab297583..0833e7a78 100644
--- a/nuttx/configs/stm3210e-eval/nx/defconfig
+++ b/nuttx/configs/stm3210e-eval/nx/defconfig
@@ -462,20 +462,20 @@ CONFIG_LCD_PWM=n
#
# 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 examples/ostest
diff --git a/nuttx/configs/stm3210e-eval/nxconsole/defconfig b/nuttx/configs/stm3210e-eval/nxconsole/defconfig
index 35ba0dcc1..637967efc 100644
--- a/nuttx/configs/stm3210e-eval/nxconsole/defconfig
+++ b/nuttx/configs/stm3210e-eval/nxconsole/defconfig
@@ -463,20 +463,20 @@ CONFIG_LCD_PWM=n
#
# 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 examples/ostest
diff --git a/nuttx/configs/stm3210e-eval/nxlines/defconfig b/nuttx/configs/stm3210e-eval/nxlines/defconfig
index b81f4127c..0a124407a 100644
--- a/nuttx/configs/stm3210e-eval/nxlines/defconfig
+++ b/nuttx/configs/stm3210e-eval/nxlines/defconfig
@@ -461,20 +461,20 @@ CONFIG_LCD_PWM=n
#
# 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 examples/ostest
diff --git a/nuttx/configs/stm3210e-eval/nxtext/defconfig b/nuttx/configs/stm3210e-eval/nxtext/defconfig
index 22dd209a9..14e20946e 100644
--- a/nuttx/configs/stm3210e-eval/nxtext/defconfig
+++ b/nuttx/configs/stm3210e-eval/nxtext/defconfig
@@ -461,20 +461,20 @@ CONFIG_LCD_PWM=n
#
# 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 examples/ostest
diff --git a/nuttx/configs/stm3210e-eval/ostest/defconfig b/nuttx/configs/stm3210e-eval/ostest/defconfig
index 7a2e5b528..8585235ec 100755
--- a/nuttx/configs/stm3210e-eval/ostest/defconfig
+++ b/nuttx/configs/stm3210e-eval/ostest/defconfig
@@ -398,20 +398,20 @@ CONFIG_WATCHDOG=n
#
# 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 examples/ostest
diff --git a/nuttx/configs/stm3210e-eval/pm/defconfig b/nuttx/configs/stm3210e-eval/pm/defconfig
index 6ca7cda87..f7ae420e4 100644
--- a/nuttx/configs/stm3210e-eval/pm/defconfig
+++ b/nuttx/configs/stm3210e-eval/pm/defconfig
@@ -569,34 +569,34 @@ CONFIG_LCD_PWM=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 examples/buttons
#
-CONFIG_EXAMPLE_IRQBUTTONS_MIN=0
-CONFIG_EXAMPLE_IRQBUTTONS_MAX=7
-CONFIG_EXAMPLE_BUTTONS_NAME0="WAKEUP"
-CONFIG_EXAMPLE_BUTTONS_NAME1="TAMPER"
-CONFIG_EXAMPLE_BUTTONS_NAME2="KEY"
-CONFIG_EXAMPLE_BUTTONS_NAME3="SELECT"
-CONFIG_EXAMPLE_BUTTONS_NAME4="DOWN"
-CONFIG_EXAMPLE_BUTTONS_NAME5="LEFT"
-CONFIG_EXAMPLE_BUTTONS_NAME6="RIGHT"
-CONFIG_EXAMPLE_BUTTONS_NAME7="UP"
+CONFIG_EXAMPLES_IRQBUTTONS_MIN=0
+CONFIG_EXAMPLES_IRQBUTTONS_MAX=7
+CONFIG_EXAMPLES_BUTTONS_NAME0="WAKEUP"
+CONFIG_EXAMPLES_BUTTONS_NAME1="TAMPER"
+CONFIG_EXAMPLES_BUTTONS_NAME2="KEY"
+CONFIG_EXAMPLES_BUTTONS_NAME3="SELECT"
+CONFIG_EXAMPLES_BUTTONS_NAME4="DOWN"
+CONFIG_EXAMPLES_BUTTONS_NAME5="LEFT"
+CONFIG_EXAMPLES_BUTTONS_NAME6="RIGHT"
+CONFIG_EXAMPLES_BUTTONS_NAME7="UP"
#
# Settings for examples/ostest
diff --git a/nuttx/configs/stm3210e-eval/usbserial/defconfig b/nuttx/configs/stm3210e-eval/usbserial/defconfig
index 99a5e2572..ac3ff1c9a 100755
--- a/nuttx/configs/stm3210e-eval/usbserial/defconfig
+++ b/nuttx/configs/stm3210e-eval/usbserial/defconfig
@@ -413,20 +413,20 @@ CONFIG_WATCHDOG=n
#
# 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 examples/ostest
diff --git a/nuttx/configs/stm3210e-eval/usbstorage/defconfig b/nuttx/configs/stm3210e-eval/usbstorage/defconfig
index 812226ee6..160d95237 100755
--- a/nuttx/configs/stm3210e-eval/usbstorage/defconfig
+++ b/nuttx/configs/stm3210e-eval/usbstorage/defconfig
@@ -395,20 +395,20 @@ CONFIG_WATCHDOG=n
#
# 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 examples/ostest
diff --git a/nuttx/configs/stm3220g-eval/README.txt b/nuttx/configs/stm3220g-eval/README.txt
index 89c6b9233..22038893e 100644
--- a/nuttx/configs/stm3220g-eval/README.txt
+++ b/nuttx/configs/stm3220g-eval/README.txt
@@ -724,11 +724,11 @@ Where <subdir> is one of the following:
using the STM32's Ethernet controller. It uses apps/examples/nettest to excercise the
TCP/IP network.
- CONFIG_EXAMPLE_NETTEST_SERVER=n : Target is configured as the client
- CONFIG_EXAMPLE_NETTEST_PERFORMANCE=y : Only network performance is verified.
- CONFIG_EXAMPLE_NETTEST_IPADDR=(10<<24|0<<16|0<<8|2) : Target side is IP: 10.0.0.2
- CONFIG_EXAMPLE_NETTEST_DRIPADDR=(10<<24|0<<16|0<<8|1) : Host side is IP: 10.0.0.1
- CONFIG_EXAMPLE_NETTEST_CLIENTIP=(10<<24|0<<16|0<<8|1) : Server address used by which ever is client.
+ CONFIG_EXAMPLES_NETTEST_SERVER=n : Target is configured as the client
+ CONFIG_EXAMPLES_NETTEST_PERFORMANCE=y : Only network performance is verified.
+ CONFIG_EXAMPLES_NETTEST_IPADDR=(10<<24|0<<16|0<<8|2) : Target side is IP: 10.0.0.2
+ CONFIG_EXAMPLES_NETTEST_DRIPADDR=(10<<24|0<<16|0<<8|1) : Host side is IP: 10.0.0.1
+ CONFIG_EXAMPLES_NETTEST_CLIENTIP=(10<<24|0<<16|0<<8|1) : Server address used by which ever is client.
nsh:
---
diff --git a/nuttx/configs/stm3220g-eval/dhcpd/defconfig b/nuttx/configs/stm3220g-eval/dhcpd/defconfig
index d011a3bfb..762607bd0 100644
--- a/nuttx/configs/stm3220g-eval/dhcpd/defconfig
+++ b/nuttx/configs/stm3220g-eval/dhcpd/defconfig
@@ -523,28 +523,28 @@ CONFIG_NX_MXCLIENTMSGS=16
#
# 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/dhcpd
#
-CONFIG_EXAMPLE_DHCPD_NOMAC=y
-CONFIG_EXAMPLE_DHCPD_IPADDR=0x0a000001
-CONFIG_EXAMPLE_DHCPD_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_DHCPD_NETMASK=0xffffff00
+CONFIG_EXAMPLES_DHCPD_NOMAC=y
+CONFIG_EXAMPLES_DHCPD_IPADDR=0x0a000001
+CONFIG_EXAMPLES_DHCPD_DRIPADDR=0x0a000001
+CONFIG_EXAMPLES_DHCPD_NETMASK=0xffffff00
#
# Settings for examples/ostest
diff --git a/nuttx/configs/stm3220g-eval/nettest/defconfig b/nuttx/configs/stm3220g-eval/nettest/defconfig
index 48a7982c2..9262e8c24 100644
--- a/nuttx/configs/stm3220g-eval/nettest/defconfig
+++ b/nuttx/configs/stm3220g-eval/nettest/defconfig
@@ -523,21 +523,21 @@ CONFIG_NX_MXCLIENTMSGS=16
#
# 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=y
-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=y
+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
diff --git a/nuttx/configs/stm3220g-eval/nsh/defconfig b/nuttx/configs/stm3220g-eval/nsh/defconfig
index 1f8cac1f1..ca1d914de 100644
--- a/nuttx/configs/stm3220g-eval/nsh/defconfig
+++ b/nuttx/configs/stm3220g-eval/nsh/defconfig
@@ -639,20 +639,20 @@ CONFIG_STM32_ILI9325_DISABLE=n
#
# 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
diff --git a/nuttx/configs/stm3220g-eval/nsh2/defconfig b/nuttx/configs/stm3220g-eval/nsh2/defconfig
index 8462ef376..324c920d7 100644
--- a/nuttx/configs/stm3220g-eval/nsh2/defconfig
+++ b/nuttx/configs/stm3220g-eval/nsh2/defconfig
@@ -626,20 +626,20 @@ CONFIG_STM32_ILI9325_DISABLE=n
#
# 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
diff --git a/nuttx/configs/stm3220g-eval/nxwm/defconfig b/nuttx/configs/stm3220g-eval/nxwm/defconfig
index 83c2f4841..41f365257 100644
--- a/nuttx/configs/stm3220g-eval/nxwm/defconfig
+++ b/nuttx/configs/stm3220g-eval/nxwm/defconfig
@@ -670,20 +670,20 @@ CONFIG_STM32_ILI9325_DISABLE=n
#
# 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
diff --git a/nuttx/configs/stm3220g-eval/ostest/defconfig b/nuttx/configs/stm3220g-eval/ostest/defconfig
index 5fc04f03c..b8663a72a 100644
--- a/nuttx/configs/stm3220g-eval/ostest/defconfig
+++ b/nuttx/configs/stm3220g-eval/ostest/defconfig
@@ -529,20 +529,20 @@ CONFIG_STM32_ILI9325_DISABLE=n
#
# 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
@@ -661,13 +661,13 @@ CONFIG_EXAMPLES_TOUCHSCREEN_NSAMPLES=25
#
# Settings for examples/buttons
#
-CONFIG_EXAMPLE_BUTTONS_MIN=0
-CONFIG_EXAMPLE_BUTTONS_MAX=2
-CONFIG_EXAMPLE_IRQBUTTONS_MIN=0
-CONFIG_EXAMPLE_IRQBUTTONS_MAX=2
-CONFIG_EXAMPLE_BUTTONS_NAME0="Key/Select"
-CONFIG_EXAMPLE_BUTTONS_NAME1="Left/Right"
-CONFIG_EXAMPLE_BUTTONS_NAME2="Up/Down"
+CONFIG_EXAMPLES_BUTTONS_MIN=0
+CONFIG_EXAMPLES_BUTTONS_MAX=2
+CONFIG_EXAMPLES_IRQBUTTONS_MIN=0
+CONFIG_EXAMPLES_IRQBUTTONS_MAX=2
+CONFIG_EXAMPLES_BUTTONS_NAME0="Key/Select"
+CONFIG_EXAMPLES_BUTTONS_NAME1="Left/Right"
+CONFIG_EXAMPLES_BUTTONS_NAME2="Up/Down"
#
# I2C tool settings
diff --git a/nuttx/configs/stm3220g-eval/telnetd/defconfig b/nuttx/configs/stm3220g-eval/telnetd/defconfig
index e369a522e..28670bb47 100644
--- a/nuttx/configs/stm3220g-eval/telnetd/defconfig
+++ b/nuttx/configs/stm3220g-eval/telnetd/defconfig
@@ -523,21 +523,21 @@ CONFIG_NX_MXCLIENTMSGS=16
#
# 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=y
-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=y
+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/telnetd
@@ -546,10 +546,10 @@ CONFIG_EXAMPLES_TELNETD_DAEMONPRIO=128
CONFIG_EXAMPLES_TELNETD_DAEMONSTACKSIZE=2048
CONFIG_EXAMPLES_TELNETD_CLIENTPRIO=128
CONFIG_EXAMPLES_TELNETD_CLIENTSTACKSIZE=2048
-CONFIG_EXAMPLE_TELNETD_NOMAC=y
-CONFIG_EXAMPLE_TELNETD_IPADDR=0x0a000002
-CONFIG_EXAMPLE_TELNETD_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_TELNETD_NETMASK=0xffffff00
+CONFIG_EXAMPLES_TELNETD_NOMAC=y
+CONFIG_EXAMPLES_TELNETD_IPADDR=0x0a000002
+CONFIG_EXAMPLES_TELNETD_DRIPADDR=0x0a000001
+CONFIG_EXAMPLES_TELNETD_NETMASK=0xffffff00
#
# Settings for examples/ostest
diff --git a/nuttx/configs/stm3240g-eval/README.txt b/nuttx/configs/stm3240g-eval/README.txt
index b536097a8..a1a596bae 100644
--- a/nuttx/configs/stm3240g-eval/README.txt
+++ b/nuttx/configs/stm3240g-eval/README.txt
@@ -893,10 +893,10 @@ Where <subdir> is one of the following:
Configuration settings that you may need to change for your
environment:
- CONFIG_STM32_CODESOURCERYL=y - CodeSourcery for Linux
- CONFIG_EXAMPLE_DISCOVER_DHCPC=y - DHCP Client
- CONFIG_EXAMPLE_DISCOVER_IPADDR - (not defined)
- CONFIG_EXAMPLE_DISCOVER_DRIPADDR - Router IP address
+ CONFIG_STM32_CODESOURCERYL=y - CodeSourcery for Linux
+ CONFIG_EXAMPLES_DISCOVER_DHCPC=y - DHCP Client
+ CONFIG_EXAMPLES_DISCOVER_IPADDR - (not defined)
+ CONFIG_EXAMPLES_DISCOVER_DRIPADDR - Router IP address
NOTE: This configuration uses to the mconf configuration tool to control
the configuration. See the section entitled "NuttX Configuration Tool"
@@ -909,11 +909,11 @@ Where <subdir> is one of the following:
using the STM32's Ethernet controller. It uses apps/examples/nettest to excercise the
TCP/IP network.
- CONFIG_EXAMPLE_NETTEST_SERVER=n : Target is configured as the client
- CONFIG_EXAMPLE_NETTEST_PERFORMANCE=y : Only network performance is verified.
- CONFIG_EXAMPLE_NETTEST_IPADDR=(10<<24|0<<16|0<<8|2) : Target side is IP: 10.0.0.2
- CONFIG_EXAMPLE_NETTEST_DRIPADDR=(10<<24|0<<16|0<<8|1) : Host side is IP: 10.0.0.1
- CONFIG_EXAMPLE_NETTEST_CLIENTIP=(10<<24|0<<16|0<<8|1) : Server address used by which ever is client.
+ CONFIG_EXAMPLES_NETTEST_SERVER=n : Target is configured as the client
+ CONFIG_EXAMPLES_NETTEST_PERFORMANCE=y : Only network performance is verified.
+ CONFIG_EXAMPLES_NETTEST_IPADDR=(10<<24|0<<16|0<<8|2) : Target side is IP: 10.0.0.2
+ CONFIG_EXAMPLES_NETTEST_DRIPADDR=(10<<24|0<<16|0<<8|1) : Host side is IP: 10.0.0.1
+ CONFIG_EXAMPLES_NETTEST_CLIENTIP=(10<<24|0<<16|0<<8|1) : Server address used by which ever is client.
nsh:
---
diff --git a/nuttx/configs/stm3240g-eval/dhcpd/defconfig b/nuttx/configs/stm3240g-eval/dhcpd/defconfig
index 842e0c66b..e33b62f87 100644
--- a/nuttx/configs/stm3240g-eval/dhcpd/defconfig
+++ b/nuttx/configs/stm3240g-eval/dhcpd/defconfig
@@ -536,28 +536,28 @@ CONFIG_NX_MXCLIENTMSGS=16
#
# 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/dhcpd
#
-CONFIG_EXAMPLE_DHCPD_NOMAC=y
-CONFIG_EXAMPLE_DHCPD_IPADDR=0x0a000001
-CONFIG_EXAMPLE_DHCPD_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_DHCPD_NETMASK=0xffffff00
+CONFIG_EXAMPLES_DHCPD_NOMAC=y
+CONFIG_EXAMPLES_DHCPD_IPADDR=0x0a000001
+CONFIG_EXAMPLES_DHCPD_DRIPADDR=0x0a000001
+CONFIG_EXAMPLES_DHCPD_NETMASK=0xffffff00
#
# Settings for examples/ostest
diff --git a/nuttx/configs/stm3240g-eval/discover/defconfig b/nuttx/configs/stm3240g-eval/discover/defconfig
index 12075b891..7c1163b9b 100644
--- a/nuttx/configs/stm3240g-eval/discover/defconfig
+++ b/nuttx/configs/stm3240g-eval/discover/defconfig
@@ -714,11 +714,11 @@ CONFIG_HAVE_CXXINITIALIZE=y
#
# UDP Discovery Daemon Example
#
-CONFIG_EXAMPLE_DISCOVER=y
-CONFIG_EXAMPLE_DISCOVER_DHCPC=y
-CONFIG_EXAMPLE_DISCOVER_NOMAC=y
-CONFIG_EXAMPLE_DISCOVER_DRIPADDR=0xc0a80201
-CONFIG_EXAMPLE_DISCOVER_NETMASK=0xffffff00
+CONFIG_EXAMPLES_DISCOVER=y
+CONFIG_EXAMPLES_DISCOVER_DHCPC=y
+CONFIG_EXAMPLES_DISCOVER_NOMAC=y
+CONFIG_EXAMPLES_DISCOVER_DRIPADDR=0xc0a80201
+CONFIG_EXAMPLES_DISCOVER_NETMASK=0xffffff00
#
# uIP Web Server Example
diff --git a/nuttx/configs/stm3240g-eval/nettest/defconfig b/nuttx/configs/stm3240g-eval/nettest/defconfig
index 55ac14157..813912b84 100644
--- a/nuttx/configs/stm3240g-eval/nettest/defconfig
+++ b/nuttx/configs/stm3240g-eval/nettest/defconfig
@@ -536,21 +536,21 @@ CONFIG_NX_MXCLIENTMSGS=16
#
# 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=y
-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=y
+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
diff --git a/nuttx/configs/stm3240g-eval/nsh/defconfig b/nuttx/configs/stm3240g-eval/nsh/defconfig
index 653538b45..8c7c29078 100644
--- a/nuttx/configs/stm3240g-eval/nsh/defconfig
+++ b/nuttx/configs/stm3240g-eval/nsh/defconfig
@@ -639,20 +639,20 @@ CONFIG_STM32_ILI9325_DISABLE=n
#
# 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
diff --git a/nuttx/configs/stm3240g-eval/nsh2/defconfig b/nuttx/configs/stm3240g-eval/nsh2/defconfig
index 9d2591068..53b0896d8 100644
--- a/nuttx/configs/stm3240g-eval/nsh2/defconfig
+++ b/nuttx/configs/stm3240g-eval/nsh2/defconfig
@@ -586,20 +586,20 @@ CONFIG_NX_MXCLIENTMSGS=16
#
# 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
diff --git a/nuttx/configs/stm3240g-eval/nxconsole/defconfig b/nuttx/configs/stm3240g-eval/nxconsole/defconfig
index e7d27bd2e..f87acc69e 100644
--- a/nuttx/configs/stm3240g-eval/nxconsole/defconfig
+++ b/nuttx/configs/stm3240g-eval/nxconsole/defconfig
@@ -609,20 +609,20 @@ CONFIG_STM32_ILI9325_DISABLE=n
#
# 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
diff --git a/nuttx/configs/stm3240g-eval/nxwm/defconfig b/nuttx/configs/stm3240g-eval/nxwm/defconfig
index c90051b9b..d1fa395dd 100644
--- a/nuttx/configs/stm3240g-eval/nxwm/defconfig
+++ b/nuttx/configs/stm3240g-eval/nxwm/defconfig
@@ -670,20 +670,20 @@ CONFIG_STM32_ILI9325_DISABLE=n
#
# 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
diff --git a/nuttx/configs/stm3240g-eval/ostest/defconfig b/nuttx/configs/stm3240g-eval/ostest/defconfig
index bfc576f5f..cc7a9ac58 100644
--- a/nuttx/configs/stm3240g-eval/ostest/defconfig
+++ b/nuttx/configs/stm3240g-eval/ostest/defconfig
@@ -541,20 +541,20 @@ CONFIG_STM32_ILI9325_DISABLE=n
#
# 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
@@ -673,13 +673,13 @@ CONFIG_EXAMPLES_TOUCHSCREEN_NSAMPLES=25
#
# Settings for examples/buttons
#
-CONFIG_EXAMPLE_BUTTONS_MIN=0
-CONFIG_EXAMPLE_BUTTONS_MAX=2
-CONFIG_EXAMPLE_IRQBUTTONS_MIN=0
-CONFIG_EXAMPLE_IRQBUTTONS_MAX=2
-CONFIG_EXAMPLE_BUTTONS_NAME0="Key/Select"
-CONFIG_EXAMPLE_BUTTONS_NAME1="Left/Right"
-CONFIG_EXAMPLE_BUTTONS_NAME2="Up/Down"
+CONFIG_EXAMPLES_BUTTONS_MIN=0
+CONFIG_EXAMPLES_BUTTONS_MAX=2
+CONFIG_EXAMPLES_IRQBUTTONS_MIN=0
+CONFIG_EXAMPLES_IRQBUTTONS_MAX=2
+CONFIG_EXAMPLES_BUTTONS_NAME0="Key/Select"
+CONFIG_EXAMPLES_BUTTONS_NAME1="Left/Right"
+CONFIG_EXAMPLES_BUTTONS_NAME2="Up/Down"
#
# I2C tool settings
diff --git a/nuttx/configs/stm3240g-eval/telnetd/defconfig b/nuttx/configs/stm3240g-eval/telnetd/defconfig
index f138e5e6f..4ab86aeb9 100644
--- a/nuttx/configs/stm3240g-eval/telnetd/defconfig
+++ b/nuttx/configs/stm3240g-eval/telnetd/defconfig
@@ -536,21 +536,21 @@ CONFIG_NX_MXCLIENTMSGS=16
#
# 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=y
-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=y
+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/telnetd
@@ -559,10 +559,10 @@ CONFIG_EXAMPLES_TELNETD_DAEMONPRIO=128
CONFIG_EXAMPLES_TELNETD_DAEMONSTACKSIZE=2048
CONFIG_EXAMPLES_TELNETD_CLIENTPRIO=128
CONFIG_EXAMPLES_TELNETD_CLIENTSTACKSIZE=2048
-CONFIG_EXAMPLE_TELNETD_NOMAC=y
-CONFIG_EXAMPLE_TELNETD_IPADDR=0x0a000002
-CONFIG_EXAMPLE_TELNETD_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_TELNETD_NETMASK=0xffffff00
+CONFIG_EXAMPLES_TELNETD_NOMAC=y
+CONFIG_EXAMPLES_TELNETD_IPADDR=0x0a000002
+CONFIG_EXAMPLES_TELNETD_DRIPADDR=0x0a000001
+CONFIG_EXAMPLES_TELNETD_NETMASK=0xffffff00
#
# Settings for examples/ostest
diff --git a/nuttx/configs/stm3240g-eval/webserver/defconfig b/nuttx/configs/stm3240g-eval/webserver/defconfig
index 25f1800b6..8921d503c 100644
--- a/nuttx/configs/stm3240g-eval/webserver/defconfig
+++ b/nuttx/configs/stm3240g-eval/webserver/defconfig
@@ -639,21 +639,21 @@ CONFIG_STM32_ILI9325_DISABLE=n
#
# Settings for examples/uip
#
-CONFIG_EXAMPLE_UIP_IPADDR=0xc0a80232
-CONFIG_EXAMPLE_UIP_DRIPADDR=0xc0a80201
-CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00
-CONFIG_EXAMPLE_UIP_NOMAC=y
-CONFIG_EXAMPLE_UIP_DHCPC=n
+CONFIG_EXAMPLES_UIP_IPADDR=0xc0a80232
+CONFIG_EXAMPLES_UIP_DRIPADDR=0xc0a80201
+CONFIG_EXAMPLES_UIP_NETMASK=0xffffff00
+CONFIG_EXAMPLES_UIP_NOMAC=y
+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
diff --git a/nuttx/configs/stm3240g-eval/xmlrpc/defconfig b/nuttx/configs/stm3240g-eval/xmlrpc/defconfig
index c2ba860fa..20639dac4 100644
--- a/nuttx/configs/stm3240g-eval/xmlrpc/defconfig
+++ b/nuttx/configs/stm3240g-eval/xmlrpc/defconfig
@@ -707,7 +707,7 @@ CONFIG_HAVE_CXXINITIALIZE=y
#
# UDP Discovery Daemon Example
#
-# CONFIG_EXAMPLE_DISCOVER is not set
+# CONFIG_EXAMPLES_DISCOVER is not set
#
# uIP Web Server Example
diff --git a/nuttx/configs/stm32f4discovery/nsh/defconfig b/nuttx/configs/stm32f4discovery/nsh/defconfig
index 38a0a1e03..c216c5997 100644
--- a/nuttx/configs/stm32f4discovery/nsh/defconfig
+++ b/nuttx/configs/stm32f4discovery/nsh/defconfig
@@ -579,20 +579,20 @@ CONFIG_NX_MXCLIENTMSGS=16
#
# 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
diff --git a/nuttx/configs/stm32f4discovery/nxlines/defconfig b/nuttx/configs/stm32f4discovery/nxlines/defconfig
index bbdbf0fea..e1e4f2131 100644
--- a/nuttx/configs/stm32f4discovery/nxlines/defconfig
+++ b/nuttx/configs/stm32f4discovery/nxlines/defconfig
@@ -590,21 +590,21 @@ CONFIG_LCD_RPORTRAIT=n
#
# 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
diff --git a/nuttx/configs/stm32f4discovery/ostest/defconfig b/nuttx/configs/stm32f4discovery/ostest/defconfig
index a10efe9ec..dba07f76b 100644
--- a/nuttx/configs/stm32f4discovery/ostest/defconfig
+++ b/nuttx/configs/stm32f4discovery/ostest/defconfig
@@ -546,20 +546,20 @@ CONFIG_STM32_R61580_DISABLE=n
#
# 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
@@ -678,13 +678,13 @@ CONFIG_EXAMPLES_TOUCHSCREEN_NSAMPLES=25
#
# Settings for examples/buttons
#
-CONFIG_EXAMPLE_BUTTONS_MIN=0
-CONFIG_EXAMPLE_BUTTONS_MAX=2
-CONFIG_EXAMPLE_IRQBUTTONS_MIN=0
-CONFIG_EXAMPLE_IRQBUTTONS_MAX=2
-CONFIG_EXAMPLE_BUTTONS_NAME0="Key/Select"
-CONFIG_EXAMPLE_BUTTONS_NAME1="Left/Right"
-CONFIG_EXAMPLE_BUTTONS_NAME2="Up/Down"
+CONFIG_EXAMPLES_BUTTONS_MIN=0
+CONFIG_EXAMPLES_BUTTONS_MAX=2
+CONFIG_EXAMPLES_IRQBUTTONS_MIN=0
+CONFIG_EXAMPLES_IRQBUTTONS_MAX=2
+CONFIG_EXAMPLES_BUTTONS_NAME0="Key/Select"
+CONFIG_EXAMPLES_BUTTONS_NAME1="Left/Right"
+CONFIG_EXAMPLES_BUTTONS_NAME2="Up/Down"
#
# Settings for examples/usbserial
diff --git a/nuttx/configs/stm32f4discovery/pm/defconfig b/nuttx/configs/stm32f4discovery/pm/defconfig
index 8960253f9..07a99c764 100644
--- a/nuttx/configs/stm32f4discovery/pm/defconfig
+++ b/nuttx/configs/stm32f4discovery/pm/defconfig
@@ -598,20 +598,20 @@ CONFIG_NX_MXCLIENTMSGS=16
#
# 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
diff --git a/nuttx/configs/sure-pic32mx/nsh/defconfig b/nuttx/configs/sure-pic32mx/nsh/defconfig
index ffd95e4ac..8025f968c 100644
--- a/nuttx/configs/sure-pic32mx/nsh/defconfig
+++ b/nuttx/configs/sure-pic32mx/nsh/defconfig
@@ -409,21 +409,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
diff --git a/nuttx/configs/sure-pic32mx/ostest/defconfig b/nuttx/configs/sure-pic32mx/ostest/defconfig
index 731529df8..f3c3fee36 100644
--- a/nuttx/configs/sure-pic32mx/ostest/defconfig
+++ b/nuttx/configs/sure-pic32mx/ostest/defconfig
@@ -364,21 +364,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
diff --git a/nuttx/configs/sure-pic32mx/usbnsh/defconfig b/nuttx/configs/sure-pic32mx/usbnsh/defconfig
index 0abcd72b8..cdebb2953 100644
--- a/nuttx/configs/sure-pic32mx/usbnsh/defconfig
+++ b/nuttx/configs/sure-pic32mx/usbnsh/defconfig
@@ -406,21 +406,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
diff --git a/nuttx/configs/teensy/hello/defconfig b/nuttx/configs/teensy/hello/defconfig
index dee8b264e..83176f57e 100644
--- a/nuttx/configs/teensy/hello/defconfig
+++ b/nuttx/configs/teensy/hello/defconfig
@@ -313,21 +313,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
diff --git a/nuttx/configs/teensy/nsh/defconfig b/nuttx/configs/teensy/nsh/defconfig
index 32b7e5a41..0908f0243 100755
--- a/nuttx/configs/teensy/nsh/defconfig
+++ b/nuttx/configs/teensy/nsh/defconfig
@@ -324,21 +324,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
diff --git a/nuttx/configs/teensy/usbstorage/defconfig b/nuttx/configs/teensy/usbstorage/defconfig
index 68d54b870..94cc301db 100755
--- a/nuttx/configs/teensy/usbstorage/defconfig
+++ b/nuttx/configs/teensy/usbstorage/defconfig
@@ -332,21 +332,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
diff --git a/nuttx/configs/twr-k60n512/nsh/defconfig b/nuttx/configs/twr-k60n512/nsh/defconfig
index 47aecfea6..d8ccd6a6d 100644
--- a/nuttx/configs/twr-k60n512/nsh/defconfig
+++ b/nuttx/configs/twr-k60n512/nsh/defconfig
@@ -378,20 +378,20 @@ 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 examples/ostest
diff --git a/nuttx/configs/twr-k60n512/ostest/defconfig b/nuttx/configs/twr-k60n512/ostest/defconfig
index 984ff5cff..8909add13 100644
--- a/nuttx/configs/twr-k60n512/ostest/defconfig
+++ b/nuttx/configs/twr-k60n512/ostest/defconfig
@@ -376,20 +376,20 @@ 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 examples/ostest
diff --git a/nuttx/configs/ubw32/nsh/defconfig b/nuttx/configs/ubw32/nsh/defconfig
index cfc0dad30..afa4e10c8 100644
--- a/nuttx/configs/ubw32/nsh/defconfig
+++ b/nuttx/configs/ubw32/nsh/defconfig
@@ -396,21 +396,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
diff --git a/nuttx/configs/ubw32/ostest/defconfig b/nuttx/configs/ubw32/ostest/defconfig
index 0fc2984bc..0849fe800 100644
--- a/nuttx/configs/ubw32/ostest/defconfig
+++ b/nuttx/configs/ubw32/ostest/defconfig
@@ -395,21 +395,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
diff --git a/nuttx/configs/vsn/nsh/defconfig b/nuttx/configs/vsn/nsh/defconfig
index c55fae0f3..8c59b4298 100755
--- a/nuttx/configs/vsn/nsh/defconfig
+++ b/nuttx/configs/vsn/nsh/defconfig
@@ -426,20 +426,20 @@ 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 examples/ostest