This is an automated email from the ASF dual-hosted git repository.

jerzy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mynewt-core.git

commit 405ef3e959e85dfe24f0f4731a60e4c3dd305010
Author: Jerzy Kasenberg <[email protected]>
AuthorDate: Fri Oct 4 12:41:12 2024 +0200

    hw/mcu/lpc55xx: Remove duplicate call to NVIC_Relocate
    
    NVIC_Relocate call was in two places
    Now it is only in hal_system_init function that
    is way it's done in mynewt
    
    Signed-off-by: Jerzy Kasenberg <[email protected]>
---
 hw/mcu/nxp/lpc55xx/src/hal_system.c      | 1 -
 hw/mcu/nxp/lpc55xx/src/hal_system_init.c | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/hw/mcu/nxp/lpc55xx/src/hal_system.c 
b/hw/mcu/nxp/lpc55xx/src/hal_system.c
index 3a96c28ea..59c311dd9 100644
--- a/hw/mcu/nxp/lpc55xx/src/hal_system.c
+++ b/hw/mcu/nxp/lpc55xx/src/hal_system.c
@@ -43,7 +43,6 @@ void hal_system_reset(void)
 void
 SystemInitHook(void)
 {
-    NVIC_Relocate();
     if (MYNEWT_VAL_CHOICE(LPC55XX_BOOT_CLOCK, FRO12M)) {
         BOARD_BootClockFRO12M();
     } else if (MYNEWT_VAL_CHOICE(LPC55XX_BOOT_CLOCK, FROHF96M)) {
diff --git a/hw/mcu/nxp/lpc55xx/src/hal_system_init.c 
b/hw/mcu/nxp/lpc55xx/src/hal_system_init.c
index 4d7622d74..64bd9e922 100644
--- a/hw/mcu/nxp/lpc55xx/src/hal_system_init.c
+++ b/hw/mcu/nxp/lpc55xx/src/hal_system_init.c
@@ -20,6 +20,7 @@
 #include "os/mynewt.h"
 #include <hal/hal_system.h>
 #include <mpu_armv8.h>
+#include <mynewt_cm.h>
 
 static int
 mpu_add_region(uint32_t rnr, uint32_t start, size_t size, uint8_t attr_ix, 
uint8_t ro, uint8_t xn)

Reply via email to