From 3bac5c6daf6680aaae24490c35895dab01f2cd8e Mon Sep 17 00:00:00 2001 From: Niklas Dusenlund Date: Mon, 5 Feb 2024 11:44:11 +0100 Subject: [PATCH] Makefile had some bugs from previous way we compiled semihosting binaries --- Makefile | 6 ++++-- src/platform/platform_init.c | 2 ++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index bc2d94c7b..f67e864f9 100644 --- a/Makefile +++ b/Makefile @@ -105,6 +105,8 @@ flash-dev-firmware: ./py/load_firmware.py build/bin/firmware.bin --debug jlink-flash-bootloader-development: | build JLinkExe -if SWD -device ATSAMD51J20 -speed 4000 -autoconnect 1 -CommanderScript ./build/scripts/bootloader-development.jlink +jlink-flash-bootloader-semihosting: | build-semihosting + JLinkExe -if SWD -device ATSAMD51J20 -speed 4000 -autoconnect 1 -CommanderScript ./build-semihosting/scripts/bootloader-development.jlink jlink-flash-bootloader-development-locked: | build JLinkExe -if SWD -device ATSAMD51J20 -speed 4000 -autoconnect 1 -CommanderScript ./build/scripts/bootloader-development-locked.jlink jlink-flash-bootloader: | build @@ -119,8 +121,8 @@ jlink-flash-firmware-btc: | build JLinkExe -if SWD -device ATSAMD51J20 -speed 4000 -autoconnect 1 -CommanderScript ./build/scripts/firmware-btc.jlink jlink-flash-factory-setup: | build JLinkExe -if SWD -device ATSAMD51J20 -speed 4000 -autoconnect 1 -CommanderScript ./build/scripts/factory-setup.jlink -jlink-flash-firmware-semihosting: | build - JLinkExe -if SWD -device ATSAMD51J20 -speed 4000 -autoconnect 1 -CommanderScript ./build/scripts/firmware-semihosting.jlink +jlink-flash-firmware-semihosting: | build-semihosting + JLinkExe -if SWD -device ATSAMD51J20 -speed 4000 -autoconnect 1 -CommanderScript ./build-semihosting/scripts/firmware.jlink dockerinit: ./scripts/container.sh build --pull --force-rm --no-cache -t shiftcrypto/firmware_v2 . dockerdev: diff --git a/src/platform/platform_init.c b/src/platform/platform_init.c index 361956b3f..b10b25432 100644 --- a/src/platform/platform_init.c +++ b/src/platform/platform_init.c @@ -18,6 +18,7 @@ #if !defined(BOOTLOADER) #include "sd_mmc/sd_mmc_start.h" #endif +#include "util.h" extern void initialise_monitor_handles(void); @@ -25,6 +26,7 @@ void platform_init(void) { #if defined(SEMIHOSTING) initialise_monitor_handles(); + traceln("%s", "Semihosting enabled"); #endif oled_init(); #if !defined(BOOTLOADER)