Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix issue #70 #515

Merged
merged 1 commit into from Sep 22, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions targets/CMSIS-OS/ChibiOS/MBN_QUAIL/nanoBooter/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
#include <cmsis_os.h>

#include <usbcfg.h>
#include <swo.h>
#include <targetHAL.h>
#include <WireProtocol_ReceiverThread.h>
#include <LaunchCLR.h>
Expand Down Expand Up @@ -47,11 +46,6 @@ int main(void) {
// and performs the board-specific initializations.
halInit();

// init SWO as soon as possible to make it available to output ASAP
#if (SWO_OUTPUT == TRUE)
SwoInit();
#endif

// check for valid CLR image at address contiguous to nanoBooter
if(CheckValidCLRImage((uint32_t)&__nanoImage_end__))
{
Expand Down
6 changes: 0 additions & 6 deletions targets/CMSIS-OS/ChibiOS/NETDUINO3_WIFI/nanoBooter/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
#include <cmsis_os.h>

#include <usbcfg.h>
#include <swo.h>
#include <targetHAL.h>
#include <WireProtocol_ReceiverThread.h>
#include <LaunchCLR.h>
Expand Down Expand Up @@ -56,11 +55,6 @@ int main(void) {
// and performs the board-specific initializations.
halInit();

// init SWO as soon as possible to make it available to output ASAP
#if (SWO_OUTPUT == TRUE)
SwoInit();
#endif

// check for valid CLR image at address contiguous to nanoBooter
if(CheckValidCLRImage((uint32_t)&__nanoImage_end__))
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,11 @@ int main(void) {
SwoInit();
#endif

// The kernel is initialized but not started yet, this means that
// main() is executing with absolute priority but interrupts are already enabled.
osKernelInitialize();
osDelay(20); // Let init stabilize

// the following IF is not mandatory, it's just providing a way for a user to 'force'
// the board to remain in nanoBooter and not launching nanoCLR

Expand All @@ -63,10 +68,6 @@ int main(void) {
}
}

// The kernel is initialized but not started yet, this means that
// main() is executing with absolute priority but interrupts are already enabled.
osKernelInitialize();

// Initializes a serial-over-USB CDC driver.
sduObjectInit(&SDU1);
sduStart(&SDU1, &serusbcfg);
Expand Down
9 changes: 5 additions & 4 deletions targets/CMSIS-OS/ChibiOS/ST_NUCLEO64_F091RC/nanoBooter/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,11 @@ int main(void) {
SwoInit();
#endif

// The kernel is initialized but not started yet, this means that
// main() is executing with absolute priority but interrupts are already enabled.
osKernelInitialize();
osDelay(20); // Let init stabilize

// the following IF is not mandatory, it's just providing a way for a user to 'force'
// the board to remain in nanoBooter and not launching nanoCLR

Expand All @@ -60,10 +65,6 @@ int main(void) {
}
}

// The kernel is initialized but not started yet, this means that
// main() is executing with absolute priority but interrupts are already enabled.
osKernelInitialize();

// Prepares the serial driver 2 using UART2
sdStart(&SD2, NULL);
palSetPadMode(GPIOA, 2, PAL_MODE_ALTERNATE(1)); // USART2 TX
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,11 @@ int main(void) {
SwoInit();
#endif

// The kernel is initialized but not started yet, this means that
// main() is executing with absolute priority but interrupts are already enabled.
osKernelInitialize();
osDelay(20); // Let init stabilize

// the following IF is not mandatory, it's just providing a way for a user to 'force'
// the board to remain in nanoBooter and not launching nanoCLR

Expand All @@ -63,10 +68,6 @@ int main(void) {
}
}

// The kernel is initialized but not started yet, this means that
// main() is executing with absolute priority but interrupts are already enabled.
osKernelInitialize();

// Initializes a serial-over-USB CDC driver.
sduObjectInit(&SDU1);
sduStart(&SDU1, &serusbcfg);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,11 @@ int main(void) {
SwoInit();
#endif

// The kernel is initialized but not started yet, this means that
// main() is executing with absolute priority but interrupts are already enabled.
osKernelInitialize();
osDelay(20); // Let init stabilize

// the following IF is not mandatory, it's just providing a way for a user to 'force'
// the board to remain in nanoBooter and not launching nanoCLR

Expand All @@ -64,10 +69,6 @@ int main(void) {
}
}

// The kernel is initialized but not started yet, this means that
// main() is executing with absolute priority but interrupts are already enabled.
osKernelInitialize();

// Initializes a serial-over-USB CDC driver.
sduObjectInit(&SDU1);
sduStart(&SDU1, &serusbcfg);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,11 @@ int main(void) {
SwoInit();
#endif

// The kernel is initialized but not started yet, this means that
// main() is executing with absolute priority but interrupts are already enabled.
osKernelInitialize();
osDelay(20); // Let init stabilize

// the following IF is not mandatory, it's just providing a way for a user to 'force'
// the board to remain in nanoBooter and not launching nanoCLR

Expand All @@ -63,10 +68,6 @@ int main(void) {
}
}

// The kernel is initialized but not started yet, this means that
// main() is executing with absolute priority but interrupts are already enabled.
osKernelInitialize();

// Initializes a serial-over-USB CDC driver.
sduObjectInit(&SDU1);
sduStart(&SDU1, &serusbcfg);
Expand Down