From 25b05a10ec8e1ce25318817587bc77a9cca61418 Mon Sep 17 00:00:00 2001 From: Jamie Smith Date: Thu, 2 Jan 2025 23:59:10 -0800 Subject: [PATCH] Fix using bootloader with MIMXRT (#414) --- .../TARGET_MIMXRT105x/TARGET_EVK/PinNames.h | 3 +++ .../device/TOOLCHAIN_GCC_ARM/MIMXRT1052xxxxx.ld | 4 ++-- targets/upload_method_cfg/MIMXRT1060_EVK.cmake | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/targets/TARGET_NXP/TARGET_MCUXpresso_MCUS/TARGET_MIMXRT105x/TARGET_EVK/PinNames.h b/targets/TARGET_NXP/TARGET_MCUXpresso_MCUS/TARGET_MIMXRT105x/TARGET_EVK/PinNames.h index daa4f25bad..d79bf59d9d 100644 --- a/targets/TARGET_NXP/TARGET_MCUXpresso_MCUS/TARGET_MIMXRT105x/TARGET_EVK/PinNames.h +++ b/targets/TARGET_NXP/TARGET_MCUXpresso_MCUS/TARGET_MIMXRT105x/TARGET_EVK/PinNames.h @@ -209,6 +209,9 @@ typedef enum { // MIMXRT EVKs do not have a usable LED, because the LED shares important pins with the // debugging interface, so trying to use the LED can interrupt flashing and debugging code! +// User button is connected to the WAKEUP pin +#define BUTTON1 WAKEUP + typedef enum { PullNone = 0, PullDown = 1, diff --git a/targets/TARGET_NXP/TARGET_MCUXpresso_MCUS/TARGET_MIMXRT105x/device/TOOLCHAIN_GCC_ARM/MIMXRT1052xxxxx.ld b/targets/TARGET_NXP/TARGET_MCUXpresso_MCUS/TARGET_MIMXRT105x/device/TOOLCHAIN_GCC_ARM/MIMXRT1052xxxxx.ld index 13feec0f62..2811c10f2a 100644 --- a/targets/TARGET_NXP/TARGET_MCUXpresso_MCUS/TARGET_MIMXRT105x/device/TOOLCHAIN_GCC_ARM/MIMXRT1052xxxxx.ld +++ b/targets/TARGET_NXP/TARGET_MCUXpresso_MCUS/TARGET_MIMXRT105x/device/TOOLCHAIN_GCC_ARM/MIMXRT1052xxxxx.ld @@ -126,8 +126,8 @@ SECTIONS *(.boot_hdr.dcd_data) } - /* Interrupts go at the start of flash */ - #define INTERRUPT_TABLE_ADDR MBED_ROM_BANK_EXT_FLASH_START + /* Interrupts go at the start of configured flash area */ + #define INTERRUPT_TABLE_ADDR MBED_CONFIGURED_ROM_BANK_EXT_FLASH_START #endif /* Now we have the ISR vector */ diff --git a/targets/upload_method_cfg/MIMXRT1060_EVK.cmake b/targets/upload_method_cfg/MIMXRT1060_EVK.cmake index 1d2d2a86cf..b2b08dd366 100644 --- a/targets/upload_method_cfg/MIMXRT1060_EVK.cmake +++ b/targets/upload_method_cfg/MIMXRT1060_EVK.cmake @@ -13,7 +13,7 @@ # General config parameters # ------------------------------------------------------------- -set(UPLOAD_METHOD_DEFAULT JLINK) +set(UPLOAD_METHOD_DEFAULT PYOCD) # Config options for JLINK # -------------------------------------------------------------