summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGregory Nutt <gnutt@nuttx.org>2014-11-24 12:33:24 -0600
committerGregory Nutt <gnutt@nuttx.org>2014-11-24 12:33:24 -0600
commitb6f5f4b545ef51b85524241e0f10adb5c21351a4 (patch)
treef602cdf8742026f971414d3535a37b84aa54f1cc
parenta80121096e6c86072be64ed5d37f342f0330aaf1 (diff)
downloadnuttx-b6f5f4b545ef51b85524241e0f10adb5c21351a4.tar.gz
nuttx-b6f5f4b545ef51b85524241e0f10adb5c21351a4.tar.bz2
nuttx-b6f5f4b545ef51b85524241e0f10adb5c21351a4.zip
Nucleo F4x1RE: Stangeness in initialization noted by Sébastien Lorquet
-rw-r--r--nuttx/configs/nucleo-f4x1re/src/stm32_boot.c5
-rw-r--r--nuttx/configs/spark/src/up_boot.c9
2 files changed, 11 insertions, 3 deletions
diff --git a/nuttx/configs/nucleo-f4x1re/src/stm32_boot.c b/nuttx/configs/nucleo-f4x1re/src/stm32_boot.c
index 92f17e489..d9962a8ee 100644
--- a/nuttx/configs/nucleo-f4x1re/src/stm32_boot.c
+++ b/nuttx/configs/nucleo-f4x1re/src/stm32_boot.c
@@ -121,6 +121,11 @@ void board_initialize(void)
#if defined(CONFIG_NSH_LIBRARY) && !defined(CONFIG_NSH_ARCHINIT)
nsh_archinitialize();
+#endif
+
+ /* CC3000 wireless initialization */
+
+#ifdef CONFIG_WL_CC3000
wireless_archinitialize(0);
#endif
}
diff --git a/nuttx/configs/spark/src/up_boot.c b/nuttx/configs/spark/src/up_boot.c
index f0199a6fc..939b8cee9 100644
--- a/nuttx/configs/spark/src/up_boot.c
+++ b/nuttx/configs/spark/src/up_boot.c
@@ -124,11 +124,14 @@ void board_initialize(void)
*/
#if defined(CONFIG_NSH_LIBRARY) && !defined(CONFIG_NSH_ARCHINIT)
- nsh_archinitialize();
- wireless_archinitialize(0);
-
+ nsh_archinitialize();
#endif
+ /* CC3000 wireless initialization */
+
+#ifdef CONFIG_WL_CC3000
+ wireless_archinitialize(0);
+#endif
}
#endif