Skip to content

Commit 5a87133

Browse files
committed
Merge remote-tracking branch 'remove-rtt-c-impl'
2 parents 83688db + dff5254 commit 5a87133

25 files changed

+116
-5070
lines changed

Makefile

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,8 @@ bootloader-btc-plus-production: | build
9393
$(MAKE) -C build bb02p-bl-btconly-production.elf
9494
factory-setup: | build
9595
$(MAKE) -C build factory-setup.elf
96+
factory-setup-debug: | build-debug
97+
$(MAKE) -C build-debug factory-setup.elf
9698
docs: | build
9799
$(MAKE) -C build doc
98100
rust-docs: | build
@@ -161,6 +163,8 @@ run-debug:
161163
arm-none-eabi-gdb -x scripts/jlink.gdb build-debug/bin/firmware.elf
162164
run-bootloader:
163165
arm-none-eabi-gdb -x scripts/jlink-bootloader.gdb build/bin/bb02p-bl-multi-development.elf
166+
run-factory-setup-debug:
167+
arm-none-eabi-gdb -x scripts/jlink.gdb build-debug/bin/factory-setup.elf
164168
dockerinit:
165169
./scripts/container.sh build --pull --force-rm --no-cache -t shiftcrypto/firmware_v2:$(shell cat .containerversion) .
166170
dockerpull:

external/CMakeLists.txt

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -273,17 +273,6 @@ set_property(TARGET fatfs PROPERTY INTERFACE_LINK_LIBRARIES "")
273273
target_include_directories(fatfs SYSTEM PUBLIC fatfs/source)
274274
target_compile_options(fatfs PRIVATE -Wno-switch-default)
275275

276-
add_library(rtt
277-
SEGGER_RTT_V796b/RTT/SEGGER_RTT.c
278-
)
279-
target_compile_options(rtt PRIVATE "-Wno-cast-qual")
280-
# Define RTT config vars. The default DOWN buffer size (buffer for reading from host) is 64, which
281-
# is too small for our need. The default UP buffer size (buffer for writing to host) is 1024, but
282-
# we define it anyway here in case the default changes.
283-
target_compile_definitions(rtt PUBLIC "BUFFER_SIZE_DOWN=(1024)" "BUFFER_SIZE_UP=(1024)")
284-
target_include_directories(rtt SYSTEM PUBLIC SEGGER_RTT_V796b/RTT SEGGER_RTT_V796b/Config)
285-
286-
287276
# optiga-trust-m
288277
# The below build instructions are loosely based on optiga-trust-m/tests/linux_i2c.cmake
289278
aux_source_directory(optiga-trust-m/src/cmd SRC_CMD_FILES)

external/SEGGER_RTT_V796b/Config/SEGGER_RTT_Conf.h

Lines changed: 0 additions & 425 deletions
This file was deleted.

external/SEGGER_RTT_V796b/Examples/Main_RTT_InputEchoApp.c

Lines changed: 0 additions & 43 deletions
This file was deleted.

external/SEGGER_RTT_V796b/Examples/Main_RTT_MenuApp.c

Lines changed: 0 additions & 70 deletions
This file was deleted.

external/SEGGER_RTT_V796b/Examples/Main_RTT_PrintfTest.c

Lines changed: 0 additions & 118 deletions
This file was deleted.

external/SEGGER_RTT_V796b/Examples/Main_RTT_SpeedTestApp.c

Lines changed: 0 additions & 69 deletions
This file was deleted.

external/SEGGER_RTT_V796b/LICENSE.md

Lines changed: 0 additions & 36 deletions
This file was deleted.

0 commit comments

Comments
 (0)