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

12 files changed, 130 insertions, 130 deletions

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