build: New make target bootloader-debug

A new make target for developing without screen or developing on the
bootloader itself. Always jumps to firmware and has RTT enabled.

Author: NickeZ

CMakeLists.txt

@@ -85,6 +85,8 @@ if(CMAKE_CROSSCOMPILING)
   message(STATUS "size: ${CMAKE_SIZE} ${TOOLCHAIN_PREFIX}size")
 endif()
 
+option(BOOTLOADER_NO_MENU "Build a bootloader that always boots" OFF)
+
 
 #-----------------------------------------------------------------------------
 # Create version header file

Makefile

@@ -28,7 +28,7 @@ build/Makefile:
 
 build-debug/Makefile:
 	mkdir -p build-debug
-	cd build-debug && cmake -DCMAKE_TOOLCHAIN_FILE=arm.cmake -DCMAKE_BUILD_TYPE=DEBUG ..
+	cd build-debug && cmake -DCMAKE_TOOLCHAIN_FILE=arm.cmake -DCMAKE_BUILD_TYPE=DEBUG -DBOOTLOADER_NO_MENU=1 ..
 	$(MAKE) -C py/bitbox02
 
 build-build/Makefile:
@@ -77,6 +77,9 @@ bootloader-btc-development: | build
 	$(MAKE) -C build bootloader-btc-development.elf
 bootloader-btc-production: | build
 	$(MAKE) -C build bootloader-btc-production.elf
+# The debug bootloader doesn't have a menu, and always boots. Use gdb/RTT
+bootloader-debug: | build-debug
+	$(MAKE) -C build-debug bootloader.elf
 factory-setup: | build
 	$(MAKE) -C build factory-setup.elf
 docs: | build
@@ -115,6 +118,8 @@ jlink-flash-bootloader-btc-development: | build
 	JLinkExe -NoGui 1 -if SWD -device ATSAMD51J20 -speed 4000 -autoconnect 1 -CommanderScript ./build/scripts/bootloader-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
+jlink-flash-bootloader-debug: | build-debug
+	JLinkExe -NoGui 1 -if SWD -device ATSAMD51J20 -speed 4000 -autoconnect 1 -CommanderScript ./build-debug/scripts/bootloader.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

src/CMakeLists.txt

@@ -445,6 +445,10 @@ if(CMAKE_CROSSCOMPILING)
     target_link_libraries(${elf} PRIVATE --specs=nano.specs)
     target_compile_options(${elf} PRIVATE --specs=nosys.specs)
     target_link_libraries(${elf} PRIVATE --specs=nosys.specs)
+
+    if(BOOTLOADER_NO_MENU)
+        target_compile_definitions(${elf} PRIVATE BOOTLOADER_NO_MENU)
+    endif()
   endforeach(bootloader)
 
   foreach(bootloader ${DEVDEVICE-BOOTLOADERS})

src/bootloader/bootloader.c

@@ -962,6 +962,12 @@ void bootloader_jump(void)
 
     _check_init(&bootdata);
 
+#if defined(BOOTLOADER_NO_MENU)
+    if (((uint32_t*)FLASH_APP_START)[1] != 0xffffffff) {
+        _binary_exec(); /* no return */
+    }
+#endif
+
 #if PLATFORM_BITBOX02 == 1
     if (shared_data.fields.upside_down) {
         screen_rotate();