Merge branch 'rembase-firmware'

Author: benma

.ci/ci

@@ -43,7 +43,6 @@ make -j8 bootloader-btc-production
 # Firmware
 make -j8 firmware
 make -j8 firmware-btc
-make -j8 firmware-bitboxbase
 make -j8 factory-setup
 
 # Semihosting

CMakeLists.txt

@@ -91,7 +91,6 @@ endif()
 # Example 'v1.0.0'. They MUST not contain a pre-release label such as '-beta'.
 set(FIRMWARE_VERSION "v9.7.0")
 set(FIRMWARE_BTC_ONLY_VERSION "v9.7.0")
-set(FIRMWARE_BITBOXBASE_VERSION "v9.7.0")
 set(BOOTLOADER_VERSION "v1.0.4")
 
 find_package(PythonInterp 3.6 REQUIRED)
@@ -119,16 +118,6 @@ if(GIT_FOUND AND PYTHONINTERP_FOUND)
   if(NOT exit_code EQUAL "0")
     set(GIT_FIRMWARE_BTC_ONLY_VERSION_STRING "v0.0.0")
   endif()
-  execute_process(
-    COMMAND ${PYTHON_EXECUTABLE} ./scripts/get_version firmware-bitboxbase --check-semver --check-gpg
-    RESULT_VARIABLE exit_code
-    OUTPUT_VARIABLE GIT_FIRMWARE_BITBOXBASE_VERSION_STRING
-    WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
-    OUTPUT_STRIP_TRAILING_WHITESPACE
-  )
-  if(NOT exit_code EQUAL "0")
-    set(GIT_FIRMWARE_BITBOXBASE_VERSION_STRING "v0.0.0")
-  endif()
   execute_process(
     COMMAND ${PYTHON_EXECUTABLE} ./scripts/get_version bootloader --check-semver --check-gpg
     RESULT_VARIABLE exit_code
@@ -208,26 +197,6 @@ set(FIRMWARE_BTC_ONLY_VERSION_MAJOR ${MAJOR_BTC_ONLY})
 set(FIRMWARE_BTC_ONLY_VERSION_MINOR ${MINOR_BTC_ONLY})
 set(FIRMWARE_BTC_ONLY_VERSION_PATCH ${PATCH_BTC_ONLY})
 
-# BITBOXBASE
-
-# If the current HEAD is not on the matching tag append '-pre' for "pre-release"
-set(FIRMWARE_BITBOXBASE_VERSION_FULL ${FIRMWARE_BITBOXBASE_VERSION})
-if(NOT FIRMWARE_BITBOXBASE_VERSION STREQUAL GIT_FIRMWARE_BITBOXBASE_VERSION_STRING)
-  string(APPEND FIRMWARE_BITBOXBASE_VERSION_FULL "-pre+${GIT_COMMIT_HASH_SHORT}")
-endif()
-
-string(REPLACE "." ";" VERSION_LIST ${FIRMWARE_BITBOXBASE_VERSION})
-list(GET VERSION_LIST 0 vMAJOR)
-list(GET VERSION_LIST 1 MINOR_BITBOXBASE)
-list(GET VERSION_LIST 2 PATCH_BITBOXBASE)
-string(REPLACE "v" "" MAJOR_BITBOXBASE ${vMAJOR})
-
-string(LENGTH ${FIRMWARE_BITBOXBASE_VERSION_FULL} FIRMWARE_BITBOXBASE_VERSION_FULL_LEN)
-string(REGEX REPLACE "(.)" "'\\1', 0, " FIRMWARE_BITBOXBASE_VERSION_FULL_W16 ${FIRMWARE_BITBOXBASE_VERSION_FULL})
-set(FIRMWARE_BITBOXBASE_VERSION_MAJOR ${MAJOR_BITBOXBASE})
-set(FIRMWARE_BITBOXBASE_VERSION_MINOR ${MINOR_BITBOXBASE})
-set(FIRMWARE_BITBOXBASE_VERSION_PATCH ${PATCH_BITBOXBASE})
-
 # BOOTLOADER
 
 set(BOOTLOADER_VERSION_FULL ${BOOTLOADER_VERSION})
@@ -281,8 +250,6 @@ message(STATUS "Firmware version:       ${FIRMWARE_VERSION_FULL}")
 message(STATUS "Firmware v. (git):      ${GIT_FIRMWARE_VERSION_STRING}")
 message(STATUS "Firmware-btc version:   ${FIRMWARE_BTC_ONLY_VERSION_FULL}")
 message(STATUS "Firmware-btc v. (git):  ${GIT_FIRMWARE_BTC_ONLY_VERSION_STRING}")
-message(STATUS "Firmware-bbb version:   ${FIRMWARE_BITBOXBASE_VERSION_FULL}")
-message(STATUS "Firmware-bbb v. (git):  ${GIT_FIRMWARE_BITBOXBASE_VERSION_STRING}")
 message(STATUS "Bootloader version:     ${BOOTLOADER_VERSION_FULL}")
 message(STATUS "Bootloader v. (git):    ${GIT_BOOTLOADER_VERSION_STRING}")
 message(STATUS "CMake version:          ${CMAKE_VERSION}")

Makefile

@@ -62,8 +62,6 @@ firmware-semihosting: | build-semihosting
 	$(MAKE) -C build-semihosting firmware.elf
 firmware-btc: | build
 	$(MAKE) -C build firmware-btc.elf
-firmware-bitboxbase: | build
-	$(MAKE) -C build firmware-bitboxbase.elf
 bootloader: | build
 	$(MAKE) -C build bootloader.elf
 bootloader-semihosting: | build-semihosting
@@ -116,8 +114,6 @@ run-valgrind-on-unit-tests:
 #		valgrind --leak-check=yes --track-origins=yes ./build/bin/test_ui_component_gestures;'
 flash-dev-firmware:
 	./py/load_firmware.py build/bin/firmware.bin --debug
-flash-dev-firmware-bitboxbase:
-	./py/load_firmware.py build/bin/firmware-bitboxbase.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: | build
@@ -132,8 +128,6 @@ jlink-flash-firmware-btc: | build
 	JLinkExe -if SWD -device ATSAMD51J20 -speed 4000 -autoconnect 1 -CommanderScript ./build/scripts/firmware-btc.jlink
 jlink-flash-firmware-semihosting: | build
 	JLinkExe -if SWD -device ATSAMD51J20 -speed 4000 -autoconnect 1 -CommanderScript ./build/scripts/firmware-semihosting.jlink
-jlink-flash-firmware-bitboxbase: | build
-	JLinkExe -if SWD -device ATSAMD51J20 -speed 4000 -autoconnect 1 -CommanderScript ./build/scripts/firmware-bitboxbase.jlink
 dockerinit:
 	docker build --pull --force-rm --no-cache -t shiftcrypto/firmware_v2 .
 dockerdev:

scripts/graphics/BitBoxBase_W96_H13_x16_y25.png

@@ -1,4 +1,4 @@
-SOURCES=bb02_logo.png bb02_btc_logo.png bb02_multi_logo.png BitBoxBase_W96_H13_x16_y25.png
+SOURCES=bb02_logo.png bb02_btc_logo.png bb02_multi_logo.png
 
 %.pbm: %.png
 	convert -compress none -depth 1 $< $@

scripts/graphics/Makefile

@@ -73,11 +73,6 @@ set(DBB-FIRMWARE-USB-SOURCES
 )
 set(DBB-FIRMWARE-USB-SOURCES ${DBB-FIRMWARE-USB-SOURCES} PARENT_SCOPE)
 
-set(DBB-FIRMWARE-USART-SOURCES
-  ${CMAKE_SOURCE_DIR}/src/usart/usart_frame.c
-)
-set(DBB-FIRMWARE-USART-SOURCES ${DBB-FIRMWARE-USART-SOURCES} PARENT_SCOPE)
-
 set(DBB-FIRMWARE-UI-SOURCES
     ${CMAKE_SOURCE_DIR}/src/screen.c
     ${CMAKE_SOURCE_DIR}/src/ui/graphics/graphics.c
@@ -163,22 +158,6 @@ set(PLATFORM-BITBOX02-SOURCES
 )
 set(PLATFORM-BITBOX02-SOURCES ${PLATFORM-BITBOX02-SOURCES} PARENT_SCOPE)
 
-set(PLATFORM-BITBOXBASE-SOURCES
-  ${CMAKE_SOURCE_DIR}/src/platform/bitboxbase/leds.c
-  ${CMAKE_SOURCE_DIR}/src/usart/usart.c
-  ${CMAKE_SOURCE_DIR}/src/usart/usart_hww.c
-  ${DBB-FIRMWARE-USART-SOURCES}
-)
-set(PLATFORM-BITBOXBASE-SOURCES ${PLATFORM-BITBOXBASE-SOURCES} PARENT_SCOPE)
-
-set(BITBOXBASE-FIRMWARE-SOURCES
-  ${CMAKE_SOURCE_DIR}/src/bitboxbase/bitboxbase_background.c
-  ${CMAKE_SOURCE_DIR}/src/bitboxbase/bitboxbase_watchdog.c
-  ${CMAKE_SOURCE_DIR}/src/bitboxbase/bitboxbase_screensaver.c
-  ${CMAKE_SOURCE_DIR}/src/bitboxbase/bitboxbase_status.c
-)
-set(BITBOXBASE-FIRMWARE-SOURCES ${BITBOXBASE-FIRMWARE-SOURCES} PARENT_SCOPE)
-
 set(CRYPTOAUTHLIB-SOURCES
   ${CMAKE_SOURCE_DIR}/src/securechip/securechip.c
 )
@@ -207,7 +186,6 @@ set(FIRMWARE-U2F-SOURCES ${FIRMWARE-U2F-SOURCES} PARENT_SCOPE)
 set(INCLUDES
   ${CMAKE_SOURCE_DIR}/src
   ${CMAKE_SOURCE_DIR}/src/platform
-  ${CMAKE_SOURCE_DIR}/src/platform/bitboxbase
   ${CMAKE_SOURCE_DIR}/src/qtouch
   ${CMAKE_SOURCE_DIR}/src/usb/class
   ${CMAKE_SOURCE_DIR}/src/usb/class/hid
@@ -388,10 +366,6 @@ add_custom_target(rust-bindgen
     --whitelist-function menu_create
     --whitelist-function trinary_choice_create
     --rustified-enum trinary_choice_t
-    --whitelist-function bitboxbase_watchdog_reset
-    --whitelist-function bitboxbase_screensaver_reset
-    --whitelist-function leds_turn_small_led
-    --whitelist-function leds_turn_big_led
     --whitelist-function wally_sha256
     --whitelist-function random_32_bytes_mcu
     --whitelist-type component_t
@@ -401,7 +375,6 @@ add_custom_target(rust-bindgen
     --whitelist-function commander
     --whitelist-function commander_states_can_call
     --whitelist-function commander_states_clear_force_next
-    --whitelist-type BitBoxBaseRequest
     --whitelist-var ".*_tag"
     --whitelist-var MAX_LABEL_SIZE
     --whitelist-var font_font_a_9X9
@@ -502,7 +475,6 @@ set(BOOTLOADERS ${BOOTLOADERS} PARENT_SCOPE)
 set(FIRMWARES
   firmware # Firmware MULTI
   firmware-btc # Firmware BTC-ONLY
-  firmware-bitboxbase # Firmware BASE
   factory-setup # Factory-setup
   )
 set(FIRMWARES ${FIRMWARES} PARENT_SCOPE)
@@ -518,7 +490,6 @@ endif()
 #  or
 #  *  firmware_rust_c
 #  *  firmware-btc_rust_c
-#  *  firmware-bitboxbase_rust_c
 #  *  factory-setup_rust_c
 foreach(type ${RUST_LIBS})
   set(lib ${RUST_BINARY_DIR}/feature-${type}/${RUST_TARGET_ARCH_DIR}/${RUST_PROFILE}/libbitbox02_rust_c.a)
@@ -681,10 +652,6 @@ if(CMAKE_CROSSCOMPILING)
   target_compile_definitions(firmware-btc.elf PRIVATE PRODUCT_BITBOX_BTCONLY "APP_BTC=1" "APP_LTC=0" "APP_ETH=0" "APP_U2F=0")
   target_sources(firmware-btc.elf PRIVATE ${PLATFORM-BITBOX02-SOURCES})
 
-  target_sources(firmware-bitboxbase.elf PRIVATE bitboxbase/bitboxbase.c)
-  target_compile_definitions(firmware-bitboxbase.elf PRIVATE PRODUCT_BITBOX_BASE "APP_BTC=0" "APP_LTC=0" "APP_ETH=0" "APP_U2F=0")
-  target_sources(firmware-bitboxbase.elf PRIVATE ${PLATFORM-BITBOXBASE-SOURCES} ${BITBOXBASE-FIRMWARE-SOURCES})
-
   target_sources(factory-setup.elf PRIVATE factorysetup.c)
   target_compile_definitions(factory-setup.elf PRIVATE PRODUCT_BITBOX02_FACTORYSETUP "APP_BTC=0" "APP_LTC=0" "APP_ETH=0" "APP_U2F=0")
   target_sources(factory-setup.elf PRIVATE ${PLATFORM-BITBOX02-SOURCES})