From 93f1c13b62d38fe5fdf74467472e1983c2284c2c Mon Sep 17 00:00:00 2001
From: ligd <liguiding@pinecone.net>
Date: Tue, 28 Aug 2018 15:44:03 -0600
Subject: [PATCH] apps/: Call BOARDIOC_FINALINIT after start-up script (or
 immediately after BOARIOC_INIT is there is no start-up script).

---
 examples/lvgldemo/lvgldemo.c      | 6 ++++++
 examples/powerled/powerled_main.c | 6 ++++++
 examples/smps/smps_main.c         | 6 ++++++
 nshlib/nsh_consolemain.c          | 8 ++++++++
 nshlib/nsh_usbconsole.c           | 6 ++++++
 nshlib/nsh_usbkeyboard.c          | 6 ++++++
 6 files changed, 38 insertions(+)

diff --git a/examples/lvgldemo/lvgldemo.c b/examples/lvgldemo/lvgldemo.c
index 54474dbc1..50c929b4a 100644
--- a/examples/lvgldemo/lvgldemo.c
+++ b/examples/lvgldemo/lvgldemo.c
@@ -154,6 +154,12 @@ int lvgldemo_main(int argc, char *argv[])
   /* Perform board-specific driver initialization */
 
   (void)boardctl(BOARDIOC_INIT, 0);
+
+#ifdef CONFIG_BOARDCTL_FINALINIT
+  /* Perform architecture-specific final-initialization (if configured) */
+
+  (void)boardctl(BOARDIOC_FINALINIT, 0);
+#endif
 #endif
 
   /* LittlevGL initialization */
diff --git a/examples/powerled/powerled_main.c b/examples/powerled/powerled_main.c
index d967de12b..c2c739658 100644
--- a/examples/powerled/powerled_main.c
+++ b/examples/powerled/powerled_main.c
@@ -482,6 +482,12 @@ int powerled_main(int argc, char *argv[])
   /* Perform architecture-specific initialization (if configured) */
 
   (void)boardctl(BOARDIOC_INIT, 0);
+
+#ifdef CONFIG_BOARDCTL_FINALINIT
+  /* Perform architecture-specific final-initialization (if configured) */
+
+  (void)boardctl(BOARDIOC_FINALINIT, 0);
+#endif
 #endif
 
   /* Set LED current limit */
diff --git a/examples/smps/smps_main.c b/examples/smps/smps_main.c
index 73a20810d..d78b1aa8b 100644
--- a/examples/smps/smps_main.c
+++ b/examples/smps/smps_main.c
@@ -509,6 +509,12 @@ int smps_main(int argc, char *argv[])
   /* Perform architecture-specific initialization (if configured) */
 
   (void)boardctl(BOARDIOC_INIT, 0);
+
+#ifdef CONFIG_BOARDCTL_FINALINIT
+  /* Perform architecture-specific final-initialization (if configured) */
+
+  (void)boardctl(BOARDIOC_FINALINIT, 0);
+#endif
 #endif
 
   /* Set SMPS mode */
diff --git a/nshlib/nsh_consolemain.c b/nshlib/nsh_consolemain.c
index b61cf15af..86f1214a5 100644
--- a/nshlib/nsh_consolemain.c
+++ b/nshlib/nsh_consolemain.c
@@ -42,6 +42,8 @@
 #include <stdio.h>
 #include <assert.h>
 
+#include <sys/boardctl.h>
+
 #include "nsh.h"
 #include "nsh_console.h"
 
@@ -99,6 +101,12 @@ int nsh_consolemain(int argc, char *argv[])
   usbtrace_enable(TRACE_BITSET);
 #endif
 
+#ifdef CONFIG_BOARDCTL_FINALINIT
+  /* Perform architecture-specific final-initialization (if configured) */
+
+  (void)boardctl(BOARDIOC_FINALINIT, 0);
+#endif
+
   /* Execute the session */
 
   ret = nsh_session(pstate);
diff --git a/nshlib/nsh_usbconsole.c b/nshlib/nsh_usbconsole.c
index 84f04f039..be8dbc1e0 100644
--- a/nshlib/nsh_usbconsole.c
+++ b/nshlib/nsh_usbconsole.c
@@ -317,6 +317,12 @@ int nsh_consolemain(int argc, char *argv[])
   (void)nsh_initscript(&pstate->cn_vtbl);
 #endif
 
+#ifdef CONFIG_BOARDCTL_FINALINIT
+  /* Perform architecture-specific final-initialization (if configured) */
+
+  (void)boardctl(BOARDIOC_FINALINIT, 0);
+#endif
+
   /* Now loop, executing creating a session for each USB connection */
 
   for (;;)
diff --git a/nshlib/nsh_usbkeyboard.c b/nshlib/nsh_usbkeyboard.c
index 97f2f206a..7d0f69bb6 100644
--- a/nshlib/nsh_usbkeyboard.c
+++ b/nshlib/nsh_usbkeyboard.c
@@ -210,6 +210,12 @@ int nsh_consolemain(int argc, char *argv[])
   (void)nsh_initscript(&pstate->cn_vtbl);
 #endif
 
+#ifdef CONFIG_BOARDCTL_FINALINIT
+  /* Perform architecture-specific final-initialization (if configured) */
+
+  (void)boardctl(BOARDIOC_FINALINIT, 0);
+#endif
+
   /* Now loop, executing creating a session for each USB connection */
 
   msg = "Waiting for a keyboard...\n";