From 1a453508ccc3768fa6d2cf529525372ed27f8cf3 Mon Sep 17 00:00:00 2001 From: Jerzy Kasenberg Date: Fri, 4 Oct 2024 12:41:12 +0200 Subject: [PATCH] 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 --- 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 3a96c28ea2..59c311dd9d 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 4d7622d74f..64bd9e9223 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 #include +#include static int mpu_add_region(uint32_t rnr, uint32_t start, size_t size, uint8_t attr_ix, uint8_t ro, uint8_t xn)