configs/stm32f4discovery/pm: Configuration converted to use the kconfig-frontends tools

ChangeLog

@@ -6795,4 +6795,5 @@
 	* configs/teensy/nettest: Configuration converted to use the kconfig-frontends
 	  tools (2014-3-3).
 	* configs/*/dhcpd:  Add missing DHCPD configuratino settings (2014-3-3).
-
+	* configs/stm32f4discovery/pm: Configuration converted to use the
+	  kconfig-frontends tools (2014-3-4)

arch/Kconfig

@@ -170,6 +170,38 @@ config ENDIAN_BIG
 	---help---
 		Select if architecture operates using big-endian byte ordering.
 
+config ARCH_IDLE_CUSTOM
+	bool "Custom IDLE loop"
+	default n
+	---help---
+		Each architecture provides a "default" IDLE loop that exits when the
+		MCU has nothing else to do.  This default IDLE loop can be replaced
+		by a custom, board-specific IDLE loop by setting this option.  Such
+		a custom IDLE loop may do things like a continuous built-in test or
+		perhaps or IDLE low power operations.
+
+		NOTE: As of this writing, this capability is only supported by the
+		STM32.  However, the implementation is trivial:  If CONFIG_ARCH_IDLE_CUSTOM,
+		then the default IDLE loop file is not included in the MCU-specific
+		Make.defs file.
+
+config ARCH_CUSTOM_PMINIT
+	bool "Custom PM initialization"
+	default n
+	depends on PM
+	---help---
+		Each architecture provides default power management (PM)
+		initialization that is called automatically when the system is
+		started. This default PM initialization can be replaced by custom,
+		board-specific PM initialization by setting this option.  Such a
+		custom initialization may do additional PM-related initialization
+		that is unique to the board power management requirements.
+
+		NOTE: As of this writing, this capability is only supported by the
+		STM32.  However, the implementation is trivial:  If CONFIG_ARCH_CUSTOM_PMINIT,
+		then the default PM initialization is not included in the MCU-specific
+		Make.defs file.
+
 config ARCH_HAVE_RAMFUNCS
 	bool
 	default n

arch/arm/src/lpc43xx/Make.defs

@@ -91,7 +91,7 @@ ifeq ($(CONFIG_NUTTX_KERNEL),y)
 CHIP_CSRCS += lpc43_userspace.c lpc43_mpuinit.c
 endif
 
-ifneq ($(CONFIG_IDLE_CUSTOM),y)
+ifneq ($(CONFIG_ARCH_IDLE_CUSTOM),y)
 CHIP_CSRCS += lpc43_idle.c
 endif
 

arch/arm/src/stm32/Make.defs

@@ -132,13 +132,13 @@ CHIP_CSRCS += stm32_otgfshost.c
 endif
 endif
 
-ifneq ($(CONFIG_IDLE_CUSTOM),y)
+ifneq ($(CONFIG_ARCH_IDLE_CUSTOM),y)
 CHIP_CSRCS += stm32_idle.c
 endif
 
 CHIP_CSRCS += stm32_pmstop.c stm32_pmstandby.c stm32_pmsleep.c
 
-ifneq ($(CONFIG_PM_CUSTOMINIT),y)
+ifneq ($(CONFIG_ARCH_CUSTOM_PMINIT),y)
 CHIP_CSRCS += stm32_pminitialize.c
 endif
 

configs/mikroe-stm32f4/src/Makefile

@@ -74,11 +74,11 @@ ifeq ($(CONFIG_NSH_ARCHINIT),y)
 CSRCS += up_nsh.c
 endif
 
-ifeq ($(CONFIG_PM_CUSTOMINIT),y)
+ifeq ($(CONFIG_ARCH_CUSTOM_PMINIT),y)
 CSRCS += up_pm.c
 endif
 
-ifeq ($(CONFIG_IDLE_CUSTOM),y)
+ifeq ($(CONFIG_ARCH_IDLE_CUSTOM),y)
 CSRCS += up_idle.c
 endif
 

configs/mikroe-stm32f4/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();

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).
 

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_ARCH_CUSTOM_PMINIT=y
-CONFIG_IDLE_CUSTOM=y
+CONFIG_ARCH_IDLE_CUSTOM=y
 CONFIG_PM_SLEEP_WAKEUP=n
 
 #

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
 

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
 

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();

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) */

configs/stm32f429i-disco/src/Makefile

@@ -60,7 +60,7 @@ ifeq ($(CONFIG_NSH_LIBRARY),y)
 CSRCS += stm32_nsh.c
 endif
 
-ifeq ($(CONFIG_IDLE_CUSTOM),y)
+ifeq ($(CONFIG_ARCH_IDLE_CUSTOM),y)
 CSRCS += stm32_idle.c
 endif
 

configs/stm32f429i-disco/src/stm32f429i-disco.h

@@ -211,7 +211,7 @@ void stm32_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 stm32_pmbuttons(void);
 #endif
 

configs/stm32f4discovery/README.txt

@@ -1485,46 +1485,63 @@ Where <subdir> is one of the following:
     to test that the board can go into lower and lower states of power usage
     as a result of inactivity.  This configuration is based on the nsh2
     configuration with modifications for testing power management.  This
-    configuration should provide some guideline for power management in your
+    configuration should provide some guidelines for power management in your
     STM32 application.
 
+    NOTES:
+
+    1. This configuration uses the mconf-based configuration tool.  To
+       change this configuration using that tool, you should:
+
+       a. Build and install the kconfig-mconf tool.  See nuttx/README.txt
+          and misc/tools/
+
+       b. Execute 'make menuconfig' in nuttx/ in order to start the
+          reconfiguration process.
+
+    2. Default configuration is Cygwin under windows using the CodeSourcery
+       toolchain:
+
+         CONFIG_HOST_WINDOWS=y         : Windows
+         CONFIG_WINDOWS_CYGWIN=y       : Cygwin
          CONFIG_STM32_CODESOURCERYW=y  : CodeSourcery under Windows
 
-    CONFIG_PM_CUSTOMINIT and CONFIG_IDLE_CUSTOM are necessary parts of the
+    3. CONFIG_ARCH_CUSTOM_PMINIT and CONFIG_ARCH_IDLE_CUSTOM are necessary
-    PM configuration:
+       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
-    to configs/stm3210-eval/src/up_pm.c.  This allows us to support board-
+       arch/arm/src/stm32/stm32_pminitialiaze.c to configs/stm3210-eval/src/stm32_pm.c.
-    specific PM initialization.
+       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
+       The bulk of the PM activities occur in the IDLE loop.  The IDLE loop
-    special because it is what runs when there is no other task running.  Therefore
+       is special because it is what runs when there is no other task running.
-    when the IDLE executes, we can be assure that nothing else is going on; this
+       Therefore when the IDLE executes, we can be assure that nothing else
-    is the ideal condition for doing reduced power management.
+       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
-    IDLE loop (of arch/arm/src/stm32/stm32_idle.c) and replace this with our own
+       normal STM32 IDLE loop (of arch/arm/src/stm32/stm32_idle.c) and replace
-    custom IDLE loop (at configs/stm3210-eval/src/up_idle.c).
+       this with our own custom IDLE loop (at configs/stm3210-eval/src/up_idle.c).
 
-    Here are some additional things to note in the configuration:
+    4. Here are some additional things to note in the configuration:
 
         CONFIG_PM_BUTTONS=y
 
-    CONFIG_PM_BUTTONS enables button support for PM testing.  Buttons can drive
+       CONFIG_PM_BUTTONS enables button support for PM testing.  Buttons can
-    EXTI interrupts and EXTI interrrupts can be used to wakeup for certain reduced
+       drive EXTI interrupts and EXTI interrrupts can be used to wakeup for
-    power modes (STOP mode).  The use of the buttons here is for PM testing purposes
+       certain reduced power modes (STOP mode).  The use of the buttons here
-    only; buttons would normally be part the application code and CONFIG_PM_BUTTONS
+       is for PM testing purposes only; buttons would normally be part the
-    would not be defined.
+       application code and CONFIG_PM_BUTTONS would not be defined.
 
          CONFIG_RTC_ALARM=y
 
        The RTC alarm is used to wake up from STOP mode and to transition to
-    STANDBY mode.  This used of the RTC alarm could conflict with other uses of
+       STANDBY mode.  This used of the RTC alarm could conflict with other
-    the RTC alarm in your application.
+       uses of the RTC alarm in your application.
 
   posix_spawn:
   ------------

configs/stm32f4discovery/pm/appconfig

@@ -1,67 +0,0 @@
-############################################################################
-# configs/stm32f4discovery/pm/appconfig
-#
-#   Copyright (C) 2012 Gregory Nutt. All rights reserved.
-#   Author: Gregory Nutt <gnutt@nuttx.org>
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in
-#    the documentation and/or other materials provided with the
-#    distribution.
-# 3. Neither the name NuttX nor the names of its contributors may be
-#    used to endorse or promote products derived from this software
-#    without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
-# OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
-# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-#
-############################################################################
-
-# Path to example in apps/examples containing the user_start entry point
-
-CONFIGURED_APPS += examples/nsh
-
-# The NSH application library
-
-CONFIGURED_APPS += system/readline
-CONFIGURED_APPS += nshlib
-
-# Applications configured as an NX built-in commands
-
-ifeq ($(CONFIG_ADC),y)
-CONFIGURED_APPS += examples/adc
-endif
-
-ifeq ($(CONFIG_PWM),y)
-CONFIGURED_APPS += examples/pwm
-endif
-
-ifeq ($(CONFIG_QENCODER),y)
-CONFIGURED_APPS += examples/qencoder
-endif
-
-ifeq ($(CONFIG_USBDEV),y)
-ifeq ($(CONFIG_CDCACM),y)
-CONFIGURED_APPS += system/cdcacm
-endif
-endif
-
-ifeq ($(CONFIG_WATCHDOG),y)
-CONFIGURED_APPS += examples/watchdog
-endif

configs/stm32f4discovery/src/Makefile

@@ -76,7 +76,7 @@ ifeq ($(CONFIG_NSH_LIBRARY),y)
 CSRCS += stm32_nsh.c
 endif
 
-ifeq ($(CONFIG_PM_CUSTOMINIT),y)
+ifeq ($(CONFIG_ARCH_CUSTOM_PMINIT),y)
 CSRCS += stm32_pm.c
 endif
 
@@ -84,7 +84,7 @@ ifeq ($(CONFIG_PM_BUTTONS),y)
 CSRCS += stm32_pm_buttons.c 
 endif
 
-ifeq ($(CONFIG_IDLE_CUSTOM),y)
+ifeq ($(CONFIG_ARCH_IDLE_CUSTOM),y)
 CSRCS += stm32_idle.c
 endif
 

configs/stm32f4discovery/src/stm32_pm.c

@@ -86,13 +86,13 @@
  *
  ****************************************************************************/
 
-void stm32_pminitialize(void)
+void up_pminitialize(void)
 {
   /* Then initialize the NuttX power management subsystem proper */
 
   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 */
 
   stm32_pm_buttons();

configs/stm32f4discovery/src/stm32_pmbuttons.c

@@ -52,7 +52,7 @@
 #include "stm32_pm.h"
 #include "stm32f4discovery.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
@@ -145,4 +145,4 @@ void stm32_pm_buttons(void)
 #endif
 }
 
-#endif /* CONFIG_PM && CONFIG_IDLE_CUSTOM && CONFIG_PM_BUTTONS)*/
+#endif /* CONFIG_PM && CONFIG_ARCH_IDLE_CUSTOM && CONFIG_PM_BUTTONS)*/

configs/stm32f4discovery/src/stm32f4discovery.h

@@ -275,7 +275,7 @@ void stm32_led_pminitialize(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 stm32_pm_buttons(void);
 #endif
 

include/nuttx/wqueue.h

@@ -417,8 +417,8 @@ int work_usrstart(void);
  *   work   - The work structure to queue
  *   worker - The worker callback to be invoked.  The callback will invoked
  *            on the worker thread of execution.
- *   arg    - The argument that will be passed to the workder callback when
+ *   arg    - The argument that will be passed to the worker callback when
- *            int is invoked.
+ *            it is invoked.
  *   delay  - Delay (in clock ticks) from the time queue until the worker
  *            is invoked. Zero means to perform the work immediately.
  *