Merge remote-tracking branch 'benma/rembase-bootloader'

Author: benma

.ci/ci

@@ -40,10 +40,6 @@ make -j8 bootloader-btc
 make -j8 bootloader-btc-development
 make -j8 bootloader-btc-production
 
-make -j8 bootloader-bitboxbase
-make -j8 bootloader-bitboxbase-development
-make -j8 bootloader-bitboxbase-production
-
 # Firmware
 make -j8 firmware
 make -j8 firmware-btc

Makefile

@@ -80,12 +80,6 @@ bootloader-btc-development: | build
 	$(MAKE) -C build bootloader-btc-development.elf
 bootloader-btc-production: | build
 	$(MAKE) -C build bootloader-btc-production.elf
-bootloader-bitboxbase: | build
-	$(MAKE) -C build bootloader-bitboxbase.elf
-bootloader-bitboxbase-development: | build
-	$(MAKE) -C build bootloader-bitboxbase-development.elf
-bootloader-bitboxbase-production: | build
-	$(MAKE) -C build bootloader-bitboxbase-production.elf
 factory-setup: | build
 	$(MAKE) -C build factory-setup.elf
 factory-setup-bitboxbase: | build

src/CMakeLists.txt

@@ -495,14 +495,8 @@ set(BOOTLOADERS-BITBOX02
   bootloader-btc-development # Runs signed/unsigned firmware and has bootloader menu
   bootloader-btc-production # Runs signed (btc-only keys) firmware and bootloader is locked
   )
-set(BOOTLOADERS-BITBOXBASE
-  bootloader-bitboxbase # Runs signed (base keys) firmware
-  bootloader-bitboxbase-development # Runs signed/unsigned firmware and has bootloader menu
-  bootloader-bitboxbase-production # Runs signed (base keys) firmware and bootloader is locked
-  )
 set(BOOTLOADERS
   ${BOOTLOADERS-BITBOX02}
-  ${BOOTLOADERS-BITBOXBASE}
   )
 set(BOOTLOADERS ${BOOTLOADERS} PARENT_SCOPE)
 
@@ -619,10 +613,6 @@ if(CMAKE_CROSSCOMPILING)
     target_sources(${bootloader}.elf PRIVATE ${PLATFORM-BITBOX02-SOURCES})
   endforeach(bootloader)
 
-  foreach(bootloader ${BOOTLOADERS-BITBOXBASE})
-    target_sources(${bootloader}.elf PRIVATE ${PLATFORM-BITBOXBASE-SOURCES})
-  endforeach(bootloader)
-
   target_compile_definitions(bootloader.elf PRIVATE PRODUCT_BITBOX_MULTI)
   target_compile_definitions(bootloader-development.elf PRIVATE PRODUCT_BITBOX_MULTI BOOTLOADER_DEVDEVICE)
   target_compile_definitions(bootloader-development-locked.elf PRIVATE PRODUCT_BITBOX_MULTI BOOTLOADER_DEVDEVICE BOOTLOADER_PRODUCTION)
@@ -637,11 +627,6 @@ if(CMAKE_CROSSCOMPILING)
   target_compile_definitions(bootloader-btc-production.elf PRIVATE PRODUCT_BITBOX_BTCONLY BOOTLOADER_PRODUCTION)
   set_property(TARGET bootloader-btc-production.elf PROPERTY EXCLUDE_FROM_ALL ON)
 
-  target_compile_definitions(bootloader-bitboxbase.elf PRIVATE PRODUCT_BITBOX_BASE)
-  target_compile_definitions(bootloader-bitboxbase-development.elf PRIVATE BOOTLOADER_DEVDEVICE PRODUCT_BITBOX_BASE)
-  target_compile_definitions(bootloader-bitboxbase-production.elf PRIVATE BOOTLOADER_PRODUCTION PRODUCT_BITBOX_BASE)
-  set_property(TARGET bootloader-bitboxbase-production.elf PROPERTY EXCLUDE_FROM_ALL ON)
-
   foreach(firmware ${FIRMWARES})
     set(elf ${firmware}.elf)
     add_executable(${elf} ${FIRMWARE-SOURCES})

src/bootloader/bootloader.c

@@ -14,7 +14,6 @@
 
 #include "bootloader.h"
 #include "bootloader_version.h"
-#include "leds.h"
 #include "mpu_regions.h"
 
 #include <driver_init.h>
@@ -31,13 +30,8 @@
 #include <ui/fonts/arial_fonts.h>
 #include <ui/oled/oled.h>
 #include <ui/ugui/ugui.h>
-#if PLATFORM_BITBOXBASE == 1
-#include <usart/usart.h>
-#include <usart/usart_frame.h>
-#elif PLATFORM_BITBOX02 == 1
 #include <usb/usb.h>
 #include <usb/usb_packet.h>
-#endif
 #include <usb/usb_processing.h>
 #include <util.h>
 
@@ -223,27 +217,6 @@ static const uint8_t _root_pubkeys[BOOT_NUM_ROOT_SIGNING_KEYS][BOOT_PUBKEY_LEN]
         0x1b, 0xec, 0x2b, 0x99, 0x40, 0x61, 0x3e, 0xef, 0xe7, 0x9e, 0x6a, 0x2b, 0x10, 0xbe, 0xda, 0xc2,
     },
 };
-#elif PRODUCT_BITBOX_BASE == 1
-static const uint8_t _root_pubkeys[BOOT_NUM_ROOT_SIGNING_KEYS][BOOT_PUBKEY_LEN] = { // order is important
-    {
-        0x89, 0x61, 0xff, 0xaa, 0x89, 0x9b, 0x9d, 0x2d, 0x71, 0xee, 0x31, 0x62, 0xe2, 0x01, 0x20, 0xbe,
-        0x63, 0x0a, 0xfb, 0x5d, 0xf3, 0x5c, 0x99, 0xbf, 0x10, 0xa9, 0x15, 0xbf, 0x48, 0xd2, 0xc6, 0xf6,
-        0xa0, 0x83, 0xbe, 0x8b, 0xb5, 0x35, 0xf7, 0x69, 0x67, 0xc8, 0x2a, 0xa5, 0xdd, 0x5a, 0xe8, 0x7e,
-        0x3e, 0xe6, 0xa0, 0x4d, 0x87, 0x9c, 0xba, 0x08, 0x3a, 0x46, 0x63, 0x62, 0xb7, 0xc1, 0x86, 0x35,
-    },
-    {
-        0x3a, 0xb8, 0x77, 0x41, 0x6e, 0x4e, 0x1d, 0xfc, 0xcb, 0x5c, 0xec, 0xdd, 0xf5, 0xfb, 0x42, 0x18,
-        0x51, 0x1b, 0xe3, 0x5e, 0x23, 0x06, 0x9e, 0x86, 0x20, 0x0c, 0x79, 0x7e, 0xc7, 0xc5, 0xd7, 0xe3,
-        0x04, 0x1e, 0xc7, 0x23, 0xec, 0x1e, 0xae, 0xbe, 0xf2, 0x22, 0xad, 0x60, 0xda, 0x93, 0xea, 0xe7,
-        0xf0, 0x60, 0x48, 0xd1, 0x66, 0x34, 0xf9, 0xf0, 0xcb, 0xa9, 0x7a, 0x26, 0x50, 0x2a, 0x01, 0xd1,
-    },
-    {
-        0x03, 0xc9, 0xb2, 0xd1, 0xea, 0x13, 0x6a, 0x0c, 0x5f, 0xe5, 0x01, 0x91, 0x32, 0xe6, 0x57, 0xf4,
-        0x2d, 0xfa, 0x75, 0x8f, 0x74, 0xb0, 0xb3, 0xe3, 0x74, 0x0e, 0x51, 0xdc, 0x5f, 0x7f, 0xd6, 0x0d,
-        0xdb, 0x00, 0x94, 0x7a, 0xa3, 0x2a, 0xff, 0x05, 0x20, 0xa9, 0x66, 0xfc, 0xe7, 0xdd, 0x2a, 0x81,
-        0x8e, 0x6c, 0xd1, 0x48, 0xc3, 0x54, 0x8a, 0x9d, 0xfb, 0x6b, 0xdf, 0x61, 0xd6, 0xc4, 0xf3, 0xee,
-    },
-};
 #else
 #error "unknown product"
 #endif
@@ -831,16 +804,12 @@ static void _api_reboot(void)
 
 static size_t _api_screen_rotate(uint8_t* output)
 {
-#if PLATFORM_BITBOX02 == 1
     if (_loading_ready) {
         return _report_status(OP_STATUS_ERR_LOAD_FLAG, output);
     }
     screen_rotate();
     _render_default_screen();
     return _report_status(OP_STATUS_OK, output);
-#elif PLATFORM_BITBOXBASE == 1
-    return _report_status(OP_STATUS_ERR_INVALID_CMD, output);
-#endif
 }
 
 static size_t _api_command(const uint8_t* input, uint8_t* output, const size_t max_out_len)
@@ -1026,15 +995,10 @@ void bootloader_jump(void)
 
     if (shared_data.fields.auto_enter != sectrue_u8) {
 #ifdef BOOTLOADER_DEVDEVICE
-#if PLATFORM_BITBOXBASE == 1
-        // We don't have touch on base dev bootloader yet
-        _binary_exec();
-#elif PLATFORM_BITBOX02 == 1
         if (!_devdevice_enter(_firmware_verified_jump(&bootdata, secfalse_u32))) {
             _binary_exec();
             /* no return */
         }
-#endif
 #else
         _firmware_verified_jump(&bootdata, sectrue_u32); // no return if firmware is valid
         _render_message("Firmware\ninvalid\n \nEntering bootloader", 3000);
@@ -1044,12 +1008,7 @@ void bootloader_jump(void)
     // App not entered. Start USB API to receive boot commands
     _compute_is_app_flash_empty();
     _render_default_screen();
-#if PLATFORM_BITBOX02 == 1
     if (usb_start(_api_setup) != ERR_NONE) {
         _render_message("Failed to initialize USB", 0);
     }
-#elif PLATFORM_BITBOXBASE == 1
-    usart_start();
-    _api_setup();
-#endif
 }

src/rust/bitbox02-rust-c/Cargo.toml

@@ -40,9 +40,6 @@ target-bootloader-production = ["bootloader", "platform-bitbox02"]
 target-bootloader-btc = ["bootloader", "platform-bitbox02"]
 target-bootloader-btc-development = ["bootloader", "platform-bitbox02"]
 target-bootloader-btc-production = ["bootloader", "platform-bitbox02"]
-target-bootloader-bitboxbase = ["bootloader", "platform-bitboxbase"]
-target-bootloader-bitboxbase-development = ["bootloader", "platform-bitboxbase"]
-target-bootloader-bitboxbase-production = ["bootloader", "platform-bitboxbase"]
 target-firmware = ["firmware", "platform-bitbox02", "app-bitcoin", "app-litecoin", "app-ethereum", "app-u2f"]
 target-firmware-btc = ["firmware", "platform-bitbox02", "app-bitcoin"]
 target-firmware-bitboxbase = ["firmware", "platform-bitboxbase"]