Merge pull request #1438 from NickeZ/nickez/da14531-squashed

Nickez/da14531 squashed

Author: NickeZ

.ci/ci

@@ -55,6 +55,9 @@ make -j8 bootloader-btc
 make -j8 bootloader-btc-development
 make -j8 bootloader-btc-production
 
+make -j8 bootloader-plus
+make -j8 bootloader-plus-development
+
 # Firmware
 make -j8 firmware
 make -j8 firmware-btc

.gitmodules

@@ -13,3 +13,6 @@
 [submodule "external/optiga-trust-m"]
 	path = external/optiga-trust-m
 	url = https://github.com/BitBoxSwiss/optiga-trust-m.git
+[submodule "external/embedded-swd"]
+	path = external/embedded-swd
+	url = https://github.com/BitBoxSwiss/embedded-swd

CMakeLists.txt

@@ -44,6 +44,10 @@ elseif(CCACHE_PROGRAM)
   set(CMAKE_C_COMPILER_LAUNCHER "${CCACHE_PROGRAM}")
 endif()
 
+# This is ignored on platforms other than darwin. By default rust compiles for
+# 10.7 which doesn't link for us.
+set(CMAKE_OSX_DEPLOYMENT_TARGET "10.15" CACHE STRING "Minimum OS X deployment version")
+
 project(bitbox02 C)
 
 # nosys is set in arm.cmake so that `project(c)` above works. Remove it since it interferes with compile options
@@ -324,7 +328,7 @@ string(APPEND CMAKE_C_FLAGS " -Wno-cast-function-type")
 
 # Enable stack protection on release builds
 if(NOT CMAKE_BUILD_TYPE STREQUAL "DEBUG")
-  string(APPEND CMAKE_C_FLAGS " -fstack-protector-all")
+  string(APPEND CMAKE_C_FLAGS " -fstack-protector-strong")
   if(CMAKE_CROSSCOMPILING)
     # Path to empty dummy libssp and libssp_shared. '-llibssp -llibssp_shared' is automatically added
     # with '-fstack-protector-all', but we don't need them as we have our own custom

Makefile

@@ -64,19 +64,23 @@ firmware-btc: | build
 firmware-debug: | build-debug
 	$(MAKE) -C build-debug firmware.elf
 bootloader: | build
-	$(MAKE) -C build bootloader.elf
+	$(MAKE) -C build bb02-bl-multi.elf
 bootloader-development: | build
-	$(MAKE) -C build bootloader-development.elf
+	$(MAKE) -C build bb02-bl-multi-development.elf
+bootloader-plus: | build
+	$(MAKE) -C build bb02p-bl-multi.elf
+bootloader-plus-development: | build
+	$(MAKE) -C build bb02p-bl-multi-development.elf
 bootloader-development-locked: | build
-	$(MAKE) -C build bootloader-development-locked.elf
+	$(MAKE) -C build bb02-bl-multi-development-locked.elf
 bootloader-production: | build
-	$(MAKE) -C build bootloader-production.elf
+	$(MAKE) -C build bb02-bl-multi-production.elf
 bootloader-btc: | build
-	$(MAKE) -C build bootloader-btc.elf
+	$(MAKE) -C build bb02-bl-btconly.elf
 bootloader-btc-development: | build
-	$(MAKE) -C build bootloader-btc-development.elf
+	$(MAKE) -C build bb02-bl-btconly-development.elf
 bootloader-btc-production: | build
-	$(MAKE) -C build bootloader-btc-production.elf
+	$(MAKE) -C build bb02-bl-btconly-production.elf
 factory-setup: | build
 	$(MAKE) -C build factory-setup.elf
 docs: | build
@@ -106,15 +110,17 @@ run-valgrind-on-unit-tests:
 flash-dev-firmware:
 	./py/load_firmware.py build/bin/firmware.bin --debug
 jlink-flash-bootloader-development: | build
-	JLinkExe -NoGui 1 -if SWD -device ATSAMD51J20 -speed 4000 -autoconnect 1 -CommanderScript ./build/scripts/bootloader-development.jlink
+	JLinkExe -NoGui 1 -if SWD -device ATSAMD51J20 -speed 4000 -autoconnect 1 -CommanderScript ./build/scripts/bb02-bl-multi-development.jlink
+jlink-flash-bootloader-plus-development: | build
+	JLinkExe -NoGui 1 -if SWD -device ATSAMD51J20 -speed 4000 -autoconnect 1 -CommanderScript ./build/scripts/bb02p-bl-multi-development.jlink
 jlink-flash-bootloader-development-locked: | build
-	JLinkExe -NoGui 1 -if SWD -device ATSAMD51J20 -speed 4000 -autoconnect 1 -CommanderScript ./build/scripts/bootloader-development-locked.jlink
+	JLinkExe -NoGui 1 -if SWD -device ATSAMD51J20 -speed 4000 -autoconnect 1 -CommanderScript ./build/scripts/bb02-bl-multi-development-locked.jlink
 jlink-flash-bootloader: | build
-	JLinkExe -NoGui 1 -if SWD -device ATSAMD51J20 -speed 4000 -autoconnect 1 -CommanderScript ./build/scripts/bootloader.jlink
+	JLinkExe -NoGui 1 -if SWD -device ATSAMD51J20 -speed 4000 -autoconnect 1 -CommanderScript ./build/scripts/bb02-bl-multi.jlink
 jlink-flash-bootloader-btc-development: | build
-	JLinkExe -NoGui 1 -if SWD -device ATSAMD51J20 -speed 4000 -autoconnect 1 -CommanderScript ./build/scripts/bootloader-btc-development.jlink
+	JLinkExe -NoGui 1 -if SWD -device ATSAMD51J20 -speed 4000 -autoconnect 1 -CommanderScript ./build/scripts/bb02-bl-btc-development.jlink
 jlink-flash-bootloader-btc: | build
-	JLinkExe -NoGui 1 -if SWD -device ATSAMD51J20 -speed 4000 -autoconnect 1 -CommanderScript ./build/scripts/bootloader-btc.jlink
+	JLinkExe -NoGui 1 -if SWD -device ATSAMD51J20 -speed 4000 -autoconnect 1 -CommanderScript ./build/scripts/bb02-bl-btc.jlink
 jlink-flash-firmware: | build
 	JLinkExe -NoGui 1 -if SWD -device ATSAMD51J20 -speed 4000 -autoconnect 1 -CommanderScript ./build/scripts/firmware.jlink
 jlink-flash-firmware-btc: | build
@@ -133,12 +139,16 @@ jlink-flash-set-securechip-optiga:
 	JLinkExe -NoGui 1 -if SWD -device ATSAMD51J20 -speed 4000 -autoconnect 1 -CommanderScript ./scripts/set-securechip-optiga.jlink
 jlink-flash-set-bb02plus:
 	JLinkExe -NoGui 1 -if SWD -device ATSAMD51J20 -speed 4000 -autoconnect 1 -CommanderScript ./scripts/set-bb02plus.jlink
+jlink-erase-firmware-quick:
+	JLinkExe -NoGui 1 -if SWD -device ATSAMD51J20 -speed 4000 -autoconnect 1 -CommanderScript ./scripts/erase-firmware-quick.jlink
 jlink-gdb-server:
 	JLinkGDBServer -nogui -if SWD -device ATSAMD51J20 -speed 4000
 rtt-client:
 	telnet localhost 19021
 run-debug:
 	arm-none-eabi-gdb -x scripts/jlink.gdb build-debug/bin/firmware.elf
+run-bootloader:
+	arm-none-eabi-gdb -x scripts/jlink-bootloader.gdb build/bin/bb02p-bl-multi-development.elf
 dockerinit:
 	./scripts/container.sh build --pull --force-rm --no-cache -t shiftcrypto/firmware_v2:$(shell cat .containerversion) .
 dockerpull:

bitbox-da14531-firmware.o

@@ -32,6 +32,9 @@ set(LIBWALLY_CFLAGS  "\
   -D_DEFAULT_SOURCE \
   -fno-strict-aliasing \
 ")
+if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
+  string(APPEND LIBWALLY_CFLAGS " -mmacosx-version-min=${CMAKE_OSX_DEPLOYMENT_TARGET}")
+endif()
 
 # Hide some warnings
 set(LIBWALLY_CFLAGS "${LIBWALLY_CFLAGS} -Wno-cast-qual -Wno-cast-align \
@@ -113,6 +116,8 @@ if(CMAKE_CROSSCOMPILING)
     asf4-drivers/hal/src/hal_io.c
     asf4-drivers/hal/src/hal_sha_sync.c
     asf4-drivers/hpl/systick/hpl_systick.c
+    asf4-drivers/hal/src/hal_usart_async.c
+    asf4-drivers/hal/utils/src/utils_ringbuffer.c
     asf4-drivers/hpl/gclk/hpl_gclk.c
     asf4-drivers/hpl/oscctrl/hpl_oscctrl.c
     asf4-drivers/hpl/mclk/hpl_mclk.c
@@ -139,6 +144,8 @@ if(CMAKE_CROSSCOMPILING)
 
   target_link_libraries(asf4-drivers-min samd51a-ds)
   set_property(TARGET asf4-drivers-min PROPERTY INTERFACE_LINK_LIBRARIES "")
+  target_compile_options(asf4-drivers-min PRIVATE -Wno-cast-qual
+      -Wno-unused-parameter -Wno-missing-prototypes -Wno-missing-declarations)
 
   target_include_directories(asf4-drivers-min SYSTEM
     PUBLIC
@@ -237,6 +244,22 @@ set_property(TARGET asf4-drivers PROPERTY INTERFACE_LINK_LIBRARIES "")
     -Wno-pedantic -Wno-incompatible-pointer-types -Wno-unused-parameter -Wno-unused-variable -Wno-cast-qual
     -Wno-switch-default -Wno-format-nonliteral -Wno-missing-prototypes -Wno-missing-declarations
   )
+  add_library(embedded-swd
+    embedded-swd/dap.c
+    embedded-swd/dap_target.c
+  )
+  target_include_directories(embedded-swd SYSTEM PUBLIC
+    embedded-swd
+  )
+  target_link_libraries(embedded-swd
+    PRIVATE
+      CMSIS
+  )
+  target_link_libraries(embedded-swd
+    PUBLIC
+      samd51a-ds
+  )
+
 endif() # CMAKE_CROSSCOMPILING
 
 # fatfs must to be linked together with a diskio middleware: