Skip to content

Commit

Permalink
Merge commit 'refs/pull/1169/head' of https://github.com/digitalbitbo…
Browse files Browse the repository at this point in the history
  • Loading branch information
benma committed Feb 5, 2024
2 parents 3c0e9ac + 3bac5c6 commit 520f71f
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 2 deletions.
6 changes: 4 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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:
Expand Down
2 changes: 2 additions & 0 deletions src/platform/platform_init.c
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,15 @@
#if !defined(BOOTLOADER)
#include "sd_mmc/sd_mmc_start.h"
#endif
#include "util.h"

extern void initialise_monitor_handles(void);

void platform_init(void)
{
#if defined(SEMIHOSTING)
initialise_monitor_handles();
traceln("%s", "Semihosting enabled");
#endif
oled_init();
#if !defined(BOOTLOADER)
Expand Down

0 comments on commit 520f71f

Please sign in to comment.