From 56f6c4f0840f6171747ddb975e392a0c0cf8dc94 Mon Sep 17 00:00:00 2001 From: Kaspar Schleiser Date: Thu, 10 Jan 2019 12:15:08 +0100 Subject: [PATCH 1/2] cpu: lpc2387: turn printf -> LOG_ERROR --- cpu/arm7_common/bootloader.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/cpu/arm7_common/bootloader.c b/cpu/arm7_common/bootloader.c index 5582034625..2f9487338a 100644 --- a/cpu/arm7_common/bootloader.c +++ b/cpu/arm7_common/bootloader.c @@ -28,34 +28,36 @@ #include #include "thread.h" +#include "log.h" + void FIQ_Routine(void) __attribute__((interrupt("FIQ"))); //void SWI_Routine (void) __attribute__((interrupt("SWI"))); void UNDEF_Routine(void) __attribute__((interrupt("UNDEF"))); void IRQ_Routine(void) { - printf("Kernel Panic,\nEarly IRQ call\n"); + LOG_ERROR("Kernel Panic,\nEarly IRQ call\n"); while (1) {}; } /*-----------------------------------------------------------------------------------*/ void FIQ_Routine(void) { - printf("Kernel Panic,\nEarly FIQ call\n"); + LOG_ERROR("Kernel Panic,\nEarly FIQ call\n"); while (1) {}; } /*-----------------------------------------------------------------------------------*/ void SWI_Routine(void) { - printf("Kernel Panic,\nEarly SWI call\n"); + LOG_ERROR("Kernel Panic,\nEarly SWI call\n"); while (1) {}; } /*-----------------------------------------------------------------------------------*/ void DEBUG_Routine(void) { - printf("DEBUG hit."); + LOG_ERROR("DEBUG hit."); while (1) {}; } @@ -75,7 +77,7 @@ void abtorigin(const char *vector, unsigned long *lnk_ptr1) __asm__ __volatile__("mov %0, sp" : "=r"(sp)); // copy sp __asm__ __volatile__("msr cpsr_c, %0" :: "r"(cpsr)); // switch back to abt mode - printf("#!%s abort at %p (0x%08lX) originating from %p (0x%08lX) in mode 0x%X\n", + LOG_ERROR("#!%s abort at %p (0x%08lX) originating from %p (0x%08lX) in mode 0x%X\n", vector, (void *)lnk_ptr1, *(lnk_ptr1), (void *)lnk_ptr2, *(lnk_ptr2), spsr ); From b19dcd3a651824919d96cd86f7cb7d4cd097415d Mon Sep 17 00:00:00 2001 From: Kaspar Schleiser Date: Thu, 10 Jan 2019 12:15:44 +0100 Subject: [PATCH 2/2] cpu: lpc2387: use while(1){} instead of exit This removes the dependency on newlib. --- cpu/arm7_common/bootloader.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/cpu/arm7_common/bootloader.c b/cpu/arm7_common/bootloader.c index 2f9487338a..85598e792e 100644 --- a/cpu/arm7_common/bootloader.c +++ b/cpu/arm7_common/bootloader.c @@ -81,7 +81,7 @@ void abtorigin(const char *vector, unsigned long *lnk_ptr1) vector, (void *)lnk_ptr1, *(lnk_ptr1), (void *)lnk_ptr2, *(lnk_ptr2), spsr ); - exit(1); + while (1) {}; } /*-----------------------------------------------------------------------------------*/ void UNDEF_Routine(void) @@ -96,7 +96,7 @@ void UNDEF_Routine(void) abtorigin("undef", lnk_ptr); } - exit(1); + while (1) {}; } /*-----------------------------------------------------------------------------------*/ void PABT_Routine(void) @@ -111,7 +111,7 @@ void PABT_Routine(void) abtorigin("pabt", lnk_ptr); } - exit(1); + while (1) {}; } /*-----------------------------------------------------------------------------------*/ void DABT_Routine(void) @@ -126,7 +126,7 @@ void DABT_Routine(void) abtorigin("data", lnk_ptr); } - exit(1); + while (1) {}; } /*-----------------------------------------------------------------------------------*/ static inline void