Merge branch 'rembase-factorysetup'

Author: benma

Makefile

@@ -82,8 +82,6 @@ bootloader-btc-production: | build
 	$(MAKE) -C build bootloader-btc-production.elf
 factory-setup: | build
 	$(MAKE) -C build factory-setup.elf
-factory-setup-bitboxbase: | build
-	$(MAKE) -C build factory-setup-bitboxbase.elf
 docs: | build
 	$(MAKE) -C build doc
 rust-docs: | build

src/CMakeLists.txt

@@ -505,7 +505,6 @@ set(FIRMWARES
   firmware-btc # Firmware BTC-ONLY
   firmware-bitboxbase # Firmware BASE
   factory-setup # Factory-setup
-  factory-setup-bitboxbase # Factory-setup
   )
 set(FIRMWARES ${FIRMWARES} PARENT_SCOPE)
 
@@ -522,7 +521,6 @@ endif()
 #  *  firmware-btc_rust_c
 #  *  firmware-bitboxbase_rust_c
 #  *  factory-setup_rust_c
-#  *  factory-setup-bitboxbase_rust_c
 foreach(type ${RUST_LIBS})
   set(lib ${RUST_BINARY_DIR}/feature-${type}/${RUST_TARGET_ARCH_DIR}/${RUST_PROFILE}/libbitbox02_rust_c.a)
   # The dummy output is to always trigger rebuild (cargo is clever enough to
@@ -692,10 +690,6 @@ if(CMAKE_CROSSCOMPILING)
   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})
 
-  target_sources(factory-setup-bitboxbase.elf PRIVATE factorysetup.c)
-  target_compile_definitions(factory-setup-bitboxbase.elf PRIVATE PRODUCT_BITBOXBASE_FACTORYSETUP "APP_BTC=0" "APP_LTC=0" "APP_ETH=0" "APP_U2F=0")
-  target_sources(factory-setup-bitboxbase.elf PRIVATE ${PLATFORM-BITBOXBASE-SOURCES})
-
   foreach(name ${BOOTLOADERS} ${FIRMWARES})
     add_custom_command(
       TARGET ${name}.elf POST_BUILD

src/factorysetup.c

@@ -20,7 +20,6 @@
 #include "platform_init.h"
 #include "screen.h"
 #include "securechip/securechip.h"
-#include "usart/usart.h"
 #include "usb/usb.h"
 #include "usb/usb_packet.h"
 #include "usb/usb_processing.h"
@@ -261,17 +260,9 @@ int main(void)
             // Not much we can do here.
         }
     }
-#if PLATFORM_BITBOX02 == 1
     usb_start(_api_setup);
-#elif PLATFORM_BITBOXBASE == 1
-    usart_start();
-    _api_setup();
-#endif
 
     while (1) {
-#if PLATFORM_BITBOXBASE == 1
-        usart_receive();
-#endif
         usb_processing_process(usb_processing_hww());
     }
 }

src/hww.c

@@ -90,7 +90,7 @@ static size_t _api_info(uint8_t* buf)
     *current = 0x00;
     current++;
     *current = 0x01;
-#elif PRODUCT_BITBOX_BASE == 1 || PRODUCT_BITBOXBASE_FACTORYSETUP == 1
+#elif PRODUCT_BITBOX_BASE == 1
     *current = 0x01;
     current++;
     *current = 0x00;

src/platform/platform_config.h

@@ -41,12 +41,6 @@
 #error "invald product value"
 #endif
 
-#if !defined(PRODUCT_BITBOXBASE_FACTORYSETUP)
-#define PRODUCT_BITBOXBASE_FACTORYSETUP 0
-#elif PRODUCT_BITBOXBASE_FACTORYSETUP != 1
-#error "invald product value"
-#endif
-
 // Derive other useful definitions from the product.
 
 #if PRODUCT_BITBOX_MULTI == 1
@@ -77,10 +71,4 @@
 #define FACTORYSETUP 1
 #endif
 
-#if PRODUCT_BITBOXBASE_FACTORYSETUP == 1
-#define PLATFORM_BITBOX02 0
-#define PLATFORM_BITBOXBASE 1
-#define FACTORYSETUP 1
-#endif
-
 #endif

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

@@ -44,7 +44,6 @@ target-firmware = ["firmware", "platform-bitbox02", "app-bitcoin", "app-litecoin
 target-firmware-btc = ["firmware", "platform-bitbox02", "app-bitcoin"]
 target-firmware-bitboxbase = ["firmware", "platform-bitboxbase"]
 target-factory-setup = ["firmware", "platform-bitbox02"]
-target-factory-setup-bitboxbase = ["firmware", "platform-bitboxbase"]
 # add Rust features which are called in the C unit tests (currently there is only one target for C tests).
 target-c-unit-tests = ["app-ethereum", "firmware"]
 

src/ui/components/ui_images.h

@@ -43,7 +43,7 @@ static const uint8_t IMAGE_BB2_LOGO[] = {
     0xce, 0x92, 0x64, 0x80, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
     0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00};
 
-#elif PRODUCT_BITBOX_BASE == 1 || PRODUCT_BITBOXBASE_FACTORYSETUP == 1
+#elif PRODUCT_BITBOX_BASE == 1
 
 #define IMAGE_BB2_LOGO_W 96
 #define IMAGE_BB2_LOGO_H 13

src/version.h.in

@@ -4,7 +4,7 @@
 #include <platform/platform_config.h>
 
 // TOOD(nc): Create versions for factorysetup
-#if (PRODUCT_BITBOX_MULTI == 1) || (PRODUCT_BITBOX02_FACTORYSETUP == 1) || (PRODUCT_BITBOXBASE_FACTORYSETUP == 1)
+#if (PRODUCT_BITBOX_MULTI == 1) || (PRODUCT_BITBOX02_FACTORYSETUP == 1)
 /* Standard firmware */
 #define DIGITAL_BITBOX_VERSION "@FIRMWARE_VERSION_FULL@"
 #define DIGITAL_BITBOX_VERSION_SHORT "@FIRMWARE_VERSION@"