configs/stm32l476-mdk: Repartition bring-up logic so that it is more like...

configs/stm32l476-mdk:  Repartition bring-up logic so that it is more like other board directories.  Add support for USERLED driver.  Add bring-up initialization logic for the USERLED driver.

configs/stm32l476-mdk/include/board.h

@@ -45,10 +45,8 @@
 # include <stdint.h>
 #endif
 
-#include <stm32l4.h>
-
 /************************************************************************************
- * Definitions
+ * Pre-processor Definitions
  ************************************************************************************/
 
 /* Clocking *************************************************************************/

configs/stm32l476-mdk/nsh/defconfig

@@ -62,4 +62,6 @@ CONFIG_STM32L4_USART3=y
 CONFIG_TASK_NAME_SIZE=0
 CONFIG_USART3_SERIAL_CONSOLE=y
 CONFIG_USER_ENTRYPOINT="nsh_main"
+CONFIG_USERLED_LOWER=y
+CONFIG_USERLED=y
 CONFIG_WDOG_INTRESERVE=1

configs/stm32l476-mdk/src/Makefile

@@ -36,7 +36,7 @@
 -include $(TOPDIR)/Make.defs
 
 ASRCS =
-CSRCS = stm32_boot.c stm32_spi.c stm32_userleds.c
+CSRCS = stm32_boot.c stm32_bringup.c stm32_spi.c stm32_userleds.c
 
 ifeq ($(CONFIG_ARCH_BOARD_STM32L4_CUSTOM_CLOCKCONFIG),y)
 CSRCS += stm32_clockconfig.c

configs/stm32l476-mdk/src/stm32_appinit.c

 /****************************************************************************
  * configs/stm32l476-mdk/src/stm32_appinit.c
  *
- *   Copyright (C) 2016 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2016-2017 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -39,40 +39,11 @@
 
 #include <nuttx/config.h>
 
-#include <sys/types.h>
-#include <sys/mount.h>
-#include <stdio.h>
-#include <syslog.h>
-#include <errno.h>
-#include <debug.h>
-#include <string.h>
-#include <stdlib.h>
-
-#include <nuttx/arch.h>
 #include <nuttx/board.h>
 
-#include <stm32l4.h>
-#include <stm32l4_uid.h>
-
-#include <arch/board/board.h>
-
-#include <nuttx/drivers/drivers.h>
-
 #include "stm32l476-mdk.h"
 
-/* Conditional logic in stm32l476-mdk.h will determine if certain features
- * are supported.  Tests for these features need to be made after including
- * stm32l476-mdk.h.
- */
-
-#ifdef HAVE_RTC_DRIVER
-#  include <nuttx/timers/rtc.h>
-#  include "stm32l4_rtc.h"
-#endif
-
-/****************************************************************************
- * Private Data
- ****************************************************************************/
+#ifdef CONFIG_LIB_BOARDCTL
 
 /****************************************************************************
  * Public Functions
@@ -103,68 +74,17 @@
  *
  ****************************************************************************/
 
-#ifdef CONFIG_LIB_BOARDCTL
 int board_app_initialize(uintptr_t arg)
 {
-#ifdef HAVE_RTC_DRIVER
-  FAR struct rtc_lowerhalf_s *rtclower;
-#endif
-  int ret;
-
-  (void)ret;
-
-#ifdef HAVE_PROC
-  /* mount the proc filesystem */
+#ifdef CONFIG_BOARD_INITIALIZE
+  /* Board initialization already performed by board_initialize() */
 
-  syslog(LOG_INFO, "Mounting procfs to /proc\n");
-
-  ret = mount(NULL, CONFIG_NSH_PROC_MOUNTPOINT, "procfs", 0, NULL);
-  if (ret < 0)
-    {
-      syslog(LOG_ERR,
-             "ERROR: Failed to mount the PROC filesystem: %d (%d)\n",
-             ret, errno);
-      return ret;
-    }
-#endif
-
-#ifdef HAVE_RTC_DRIVER
-  /* Instantiate the STM32 lower-half RTC driver */
-
-  rtclower = stm32l4_rtc_lowerhalf();
-  if (!rtclower)
-    {
-      serr("ERROR: Failed to instantiate the RTC lower-half driver\n");
-      return -ENOMEM;
-    }
-  else
-    {
-      /* Bind the lower half driver and register the combined RTC driver
-       * as /dev/rtc0
-       */
+  return OK;
+#else
+  /* Perform board-specific initialization */
 
-      ret = rtc_initialize(0, rtclower);
-      if (ret < 0)
-        {
-          serr("ERROR: Failed to bind/register the RTC driver: %d\n", ret);
-          return ret;
-        }
-    }
+  return stm32_bringup();
 #endif
-
-  return OK;
 }
-#endif /* CONFIG_LIB_BOARDCTL */
-
-#if defined(CONFIG_BOARDCTL_UNIQUEID)
-int board_uniqueid(uint8_t *uniqueid)
-{
-  if (uniqueid == 0)
-    {
-      return -EINVAL;
-    }
 
-  stm32l4_get_uniqueid(uniqueid);
-  return OK;
-}
-#endif
+#endif /* CONFIG_LIB_BOARDCTL */

configs/stm32l476-mdk/src/stm32_boot.c

@@ -98,13 +98,8 @@ void stm32l4_board_initialize(void)
 #ifdef CONFIG_BOARD_INITIALIZE
 void board_initialize(void)
 {
-  /* Perform NSH initialization here instead of from the NSH.  This
-   * alternative NSH initialization is necessary when NSH is ran in user-space
-   * but the initialization function must run in kernel space.
-   */
+  /* Perform board-specific initialization */
 
-#if defined(CONFIG_NSH_LIBRARY) && !defined(CONFIG_NSH_ARCHINIT)
-  board_app_initialize(0);
-#endif
+  (void)stm32_bringup();
 }
 #endif

configs/stm32l476-mdk/src/stm32_bringup.c

+/****************************************************************************
+ * configs/stm32l476-mdk/src/stm32_bringup.c
+ *
+ *   Copyright (C) 2016-2017 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.
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <nuttx/config.h>
+
+#include <sys/types.h>
+#include <sys/mount.h>
+#include <stdio.h>
+#include <syslog.h>
+#include <errno.h>
+#include <debug.h>
+#include <string.h>
+#include <stdlib.h>
+
+#include <nuttx/arch.h>
+#include <nuttx/board.h>
+#include <nuttx/drivers/drivers.h>
+
+#include <arch/board/board.h>
+
+#include "stm32l4.h"
+#include "stm32l4_uid.h"
+#include "stm32l476-mdk.h"
+
+/* Conditional logic in stm32l476-mdk.h will determine if certain features
+ * are supported.  Tests for these features need to be made after including
+ * stm32l476-mdk.h.
+ */
+
+#ifdef HAVE_RTC_DRIVER
+#  include <nuttx/timers/rtc.h>
+#  include "stm32l4_rtc.h"
+#endif
+
+#ifdef HAVE_USERLED_DRIVER
+#  include <nuttx/leds/userled.h>
+#endif
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: board_app_initialize
+ *
+ * Description:
+ *   Perform application specific initialization.  This function is never
+ *   called directly from application code, but only indirectly via the
+ *   (non-standard) boardctl() interface using the command BOARDIOC_INIT.
+ *
+ * Input Parameters:
+ *   arg - The boardctl() argument is passed to the board_app_initialize()
+ *         implementation without modification.  The argument has no
+ *         meaning to NuttX; the meaning of the argument is a contract
+ *         between the board-specific initalization logic and the
+ *         matching application logic.  The value cold be such things as a
+ *         mode enumeration value, a set of DIP switch switch settings, a
+ *         pointer to configuration data read from a file or serial FLASH,
+ *         or whatever you would like to do with it.  Every implementation
+ *         should accept zero/NULL as a default configuration.
+ *
+ * Returned Value:
+ *   Zero (OK) is returned on success; a negated errno value is returned on
+ *   any failure to indicate the nature of the failure.
+ *
+ ****************************************************************************/
+
+#ifdef CONFIG_LIB_BOARDCTL
+int board_app_initialize(uintptr_t arg)
+{
+#ifdef HAVE_RTC_DRIVER
+  FAR struct rtc_lowerhalf_s *rtclower;
+#endif
+  int ret;
+
+#ifdef HAVE_PROC
+  /* mount the proc filesystem */
+
+  syslog(LOG_INFO, "Mounting procfs to /proc\n");
+
+  ret = mount(NULL, CONFIG_NSH_PROC_MOUNTPOINT, "procfs", 0, NULL);
+  if (ret < 0)
+    {
+      syslog(LOG_ERR,
+             "ERROR: Failed to mount the PROC filesystem: %d (%d)\n",
+             ret, errno);
+      return ret;
+    }
+#endif
+
+#ifdef HAVE_RTC_DRIVER
+  /* Instantiate the STM32 lower-half RTC driver */
+
+  rtclower = stm32l4_rtc_lowerhalf();
+  if (!rtclower)
+    {
+      syslog(LOG_ERR,
+             "ERROR: Failed to instantiate the RTC lower-half driver\n");
+      return -ENOMEM;
+    }
+  else
+    {
+      /* Bind the lower half driver and register the combined RTC driver
+       * as /dev/rtc0
+       */
+
+      ret = rtc_initialize(0, rtclower);
+      if (ret < 0)
+        {
+          syslog(LOG_ERR,
+                 "ERROR: Failed to bind/register the RTC driver: %d\n",
+                 ret);
+          return ret;
+        }
+    }
+#endif
+
+#ifdef HAVE_USERLED_DRIVER
+  /* Register the LED driver */
+
+  ret = userled_lower_initialize("/dev/userleds");
+  if (ret != OK)
+    {
+      syslog(LOG_ERR, "ERROR: userled_lower_initialize() failed: %d\n",
+             ret);
+      return ret;
+    }
+#endif
+
+  UNUSED(ret);
+  return OK;
+}
+#endif /* CONFIG_LIB_BOARDCTL */
+
+#if defined(CONFIG_BOARDCTL_UNIQUEID)
+int board_uniqueid(uint8_t *uniqueid)
+{
+  if (uniqueid == 0)
+    {
+      return -EINVAL;
+    }
+
+  stm32l4_get_uniqueid(uniqueid);
+  return OK;
+}
+#endif

configs/stm32l476-mdk/src/stm32_buttons.c

@@ -46,17 +46,15 @@
 #include <nuttx/board.h>
 #include <arch/board/board.h>
 
+#include "stm32l4_gpio.h"
 #include "stm32l476-mdk.h"
 
 #ifdef CONFIG_ARCH_BUTTONS
 
-/****************************************************************************
- * Pre-processor Definitions
- ****************************************************************************/
-
 /****************************************************************************
  * Private Data
  ****************************************************************************/
+
 /* Pin configuration for each button.  This array is indexed by
  * the BUTTON_* definitions in board.h
  */
@@ -66,10 +64,6 @@ static const uint32_t g_buttons[NUM_BUTTONS] =
   GPIO_BTN_POWER
 };
 
-/****************************************************************************
- * Private Functions
- ****************************************************************************/
-
 /****************************************************************************
  * Public Functions
  ****************************************************************************/

configs/stm32l476-mdk/src/stm32l476-mdk.h

@@ -55,6 +55,7 @@
 
 #define HAVE_PROC             1
 #define HAVE_RTC_DRIVER       1
+#define HAVE_USERLED_DRIVER   1
 
 #if !defined(CONFIG_FS_PROCFS)
 #  undef HAVE_PROC
@@ -71,6 +72,12 @@
 #  undef HAVE_RTC_DRIVER
 #endif
 
+/* Check if we have the LED driver */
+
+#if !defined(CONFIG_USERLED) || !defined(CONFIG_USERLED_LOWER)
+#  undef HAVE_USERLED_DRIVER
+#endif
+
 /* LEDs.
  * The Reference Moto Mod contains three LEDs.  Two LEDs, are by convention,
  * used to indicate the Reference Moto Mod battery state of charge, and the
@@ -137,6 +144,22 @@ extern struct spi_dev_s *g_spi2;
  * Public Functions
  ************************************************************************************/
 
+/****************************************************************************
+ * Name: stm32_bringup
+ *
+ * Description:
+ *   Perform architecture-specific initialization
+ *
+ *   CONFIG_BOARD_INITIALIZE=y :
+ *     Called from board_initialize().
+ *
+ *   CONFIG_BOARD_INITIALIZE=y && CONFIG_LIB_BOARDCTL=y :
+ *     Called from the NSH library
+ *
+ ****************************************************************************/
+
+int stm32_bringup(void);
+
 /************************************************************************************
  * Name: stm32_spiinitialize
  *