Skip to content

Commit 3bac5c6

Browse files
committed
Makefile had some bugs from previous way we compiled semihosting binaries
1 parent 1b954a6 commit 3bac5c6

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

Makefile

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,8 @@ flash-dev-firmware:
105105
./py/load_firmware.py build/bin/firmware.bin --debug
106106
jlink-flash-bootloader-development: | build
107107
JLinkExe -if SWD -device ATSAMD51J20 -speed 4000 -autoconnect 1 -CommanderScript ./build/scripts/bootloader-development.jlink
108+
jlink-flash-bootloader-semihosting: | build-semihosting
109+
JLinkExe -if SWD -device ATSAMD51J20 -speed 4000 -autoconnect 1 -CommanderScript ./build-semihosting/scripts/bootloader-development.jlink
108110
jlink-flash-bootloader-development-locked: | build
109111
JLinkExe -if SWD -device ATSAMD51J20 -speed 4000 -autoconnect 1 -CommanderScript ./build/scripts/bootloader-development-locked.jlink
110112
jlink-flash-bootloader: | build
@@ -119,8 +121,8 @@ jlink-flash-firmware-btc: | build
119121
JLinkExe -if SWD -device ATSAMD51J20 -speed 4000 -autoconnect 1 -CommanderScript ./build/scripts/firmware-btc.jlink
120122
jlink-flash-factory-setup: | build
121123
JLinkExe -if SWD -device ATSAMD51J20 -speed 4000 -autoconnect 1 -CommanderScript ./build/scripts/factory-setup.jlink
122-
jlink-flash-firmware-semihosting: | build
123-
JLinkExe -if SWD -device ATSAMD51J20 -speed 4000 -autoconnect 1 -CommanderScript ./build/scripts/firmware-semihosting.jlink
124+
jlink-flash-firmware-semihosting: | build-semihosting
125+
JLinkExe -if SWD -device ATSAMD51J20 -speed 4000 -autoconnect 1 -CommanderScript ./build-semihosting/scripts/firmware.jlink
124126
dockerinit:
125127
./scripts/container.sh build --pull --force-rm --no-cache -t shiftcrypto/firmware_v2 .
126128
dockerdev:

src/platform/platform_init.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,15 @@
1818
#if !defined(BOOTLOADER)
1919
#include "sd_mmc/sd_mmc_start.h"
2020
#endif
21+
#include "util.h"
2122

2223
extern void initialise_monitor_handles(void);
2324

2425
void platform_init(void)
2526
{
2627
#if defined(SEMIHOSTING)
2728
initialise_monitor_handles();
29+
traceln("%s", "Semihosting enabled");
2830
#endif
2931
oled_init();
3032
#if !defined(BOOTLOADER)

0 commit comments

Comments
 (0)