6 files changed, 13 insertions, 13 deletions
diff --git a/nuttx/configs/stm3210e-eval/README.txt b/nuttx/configs/stm3210e-eval/README.txt
index 2c90cf269..c60049555 100644
--- a/nuttx/configs/stm3210e-eval/README.txt
+++ b/nuttx/configs/stm3210e-eval/README.txt
@@ -943,23 +943,23 @@ Where <subdir> is one of the following:
 
       CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYW=y  : CodeSourcery under Windows
 
-    CONFIG_PM_CUSTOMINIT and CONFIG_IDLE_CUSTOM are necessary parts of the
+    CONFIG_ARCH_CUSTOM_PMINIT and CONFIG_ARCH_IDLE_CUSTOM are necessary parts of the
     PM configuration:
 
-      CONFIG_PM_CUSTOMINIT=y
+      CONFIG_ARCH_CUSTOM_PMINIT=y
 
-    CONFIG_PM_CUSTOMINIT moves the PM initialization from arch/arm/src/stm32/stm32_pminitialiaze.c
+    CONFIG_ARCH_CUSTOM_PMINIT moves the PM initialization from arch/arm/src/stm32/stm32_pminitialiaze.c
     to configs/stm3210-eval/src/up_pm.c.  This allows us to support board-
     specific PM initialization.
 
-      CONFIG_IDLE_CUSTOM=y
+      CONFIG_ARCH_IDLE_CUSTOM=y
 
     The bulk of the PM activities occur in the IDLE loop.  The IDLE loop is
     special because it is what runs when there is no other task running.  Therefore
     when the IDLE executes, we can be assure that nothing else is going on; this
     is the ideal condition for doing reduced power management.
 
-    The configuration CONFIG_IDLE_CUSTOM allows us to "steal" the normal STM32
+    The configuration CONFIG_ARCH_IDLE_CUSTOM allows us to "steal" the normal STM32
     IDLE loop (of arch/arm/src/stm32/stm32_idle.c) and replace this with our own
     custom IDLE loop (at configs/stm3210-eval/src/up_idle.c).
 
diff --git a/nuttx/configs/stm3210e-eval/pm/defconfig b/nuttx/configs/stm3210e-eval/pm/defconfig
index 3b4ba0b9b..77053db49 100644
--- a/nuttx/configs/stm3210e-eval/pm/defconfig
+++ b/nuttx/configs/stm3210e-eval/pm/defconfig
@@ -273,8 +273,8 @@ CONFIG_SCHED_ATEXIT=n
 # (see include/nuttx/power/pm.h for many more standard configuration options)
 #
 CONFIG_PM=y
-CONFIG_PM_CUSTOMINIT=y
-CONFIG_IDLE_CUSTOM=y
+CONFIG_ARCH_CUSTOM_PMINIT=y
+CONFIG_ARCH_IDLE_CUSTOM=y
 CONFIG_PM_SLEEP_WAKEUP=n
 
 #
diff --git a/nuttx/configs/stm3210e-eval/src/Makefile b/nuttx/configs/stm3210e-eval/src/Makefile
index d2abed9da..b5de86eec 100644
--- a/nuttx/configs/stm3210e-eval/src/Makefile
+++ b/nuttx/configs/stm3210e-eval/src/Makefile
@@ -76,7 +76,7 @@ ifeq ($(CONFIG_WATCHDOG),y)
 CSRCS		+= up_watchdog.c
 endif
 
-ifeq ($(CONFIG_PM_CUSTOMINIT),y)
+ifeq ($(CONFIG_ARCH_CUSTOM_PMINIT),y)
 CSRCS		+= up_pm.c
 endif
 
@@ -84,7 +84,7 @@ ifeq ($(CONFIG_PM_BUTTONS),y)
 CSRCS		+= up_pmbuttons.c 
 endif
 
-ifeq ($(CONFIG_IDLE_CUSTOM),y)
+ifeq ($(CONFIG_ARCH_IDLE_CUSTOM),y)
 CSRCS		+= up_idle.c
 endif
 
diff --git a/nuttx/configs/stm3210e-eval/src/stm3210e-internal.h b/nuttx/configs/stm3210e-eval/src/stm3210e-internal.h
index 33a8750f9..fb179c00f 100644
--- a/nuttx/configs/stm3210e-eval/src/stm3210e-internal.h
+++ b/nuttx/configs/stm3210e-eval/src/stm3210e-internal.h
@@ -313,7 +313,7 @@ void up_ledpminitialize(void);
  *
  ************************************************************************************/
 
-#if defined(CONFIG_PM) && defined(CONFIG_IDLE_CUSTOM) && defined(CONFIG_PM_BUTTONS)
+#if defined(CONFIG_PM) && defined(CONFIG_ARCH_IDLE_CUSTOM) && defined(CONFIG_PM_BUTTONS)
 void up_pmbuttons(void);
 #endif
 
diff --git a/nuttx/configs/stm3210e-eval/src/up_pm.c b/nuttx/configs/stm3210e-eval/src/up_pm.c
index 29c5f12ff..ab3e526c9 100644
--- a/nuttx/configs/stm3210e-eval/src/up_pm.c
+++ b/nuttx/configs/stm3210e-eval/src/up_pm.c
@@ -93,7 +93,7 @@ void up_pminitialize(void)
 
   pm_initialize();
 
-#if defined(CONFIG_IDLE_CUSTOM) && defined(CONFIG_PM_BUTTONS)
+#if defined(CONFIG_ARCH_IDLE_CUSTOM) && defined(CONFIG_PM_BUTTONS)
   /* Initialize the buttons to wake up the system from low power modes */
 
   up_pmbuttons();
diff --git a/nuttx/configs/stm3210e-eval/src/up_pmbuttons.c b/nuttx/configs/stm3210e-eval/src/up_pmbuttons.c
index 6548a55de..d82edfbb8 100644
--- a/nuttx/configs/stm3210e-eval/src/up_pmbuttons.c
+++ b/nuttx/configs/stm3210e-eval/src/up_pmbuttons.c
@@ -53,7 +53,7 @@
 #include "stm32_pm.h"
 #include "stm3210e-internal.h"
 
-#if defined(CONFIG_PM) && defined(CONFIG_IDLE_CUSTOM) && defined(CONFIG_PM_BUTTONS)
+#if defined(CONFIG_PM) && defined(CONFIG_ARCH_IDLE_CUSTOM) && defined(CONFIG_PM_BUTTONS)
 
 /****************************************************************************
  * Pre-processor Definitions
@@ -316,4 +316,4 @@ void up_pmbuttons(void)
 #endif
 }
 
-#endif /* defined(CONFIG_PM) && defined(CONFIG_IDLE_CUSTOM) && defined(CONFIG_PM_BUTTONS) */
+#endif /* defined(CONFIG_PM) && defined(CONFIG_ARCH_IDLE_CUSTOM) && defined(CONFIG_PM_BUTTONS) */