13 files changed, 165 insertions, 165 deletions
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