Merge remote-tracking branch 'benma/bootloaderbtc'

benma · benma · commit 3c29cd14c39a · 2019-09-02T11:41:29.000+02:00
diff --git a/src/bootloader/bootloader.c b/src/bootloader/bootloader.c
@@ -153,7 +153,7 @@ typedef union {
 static uint8_t _loading_ready = 0;
 static uint8_t _firmware_num_chunks = 0;
 // clang-format off
-#if defined(BOOTLOADER_BTC)
+#if defined(BOOTLOADER_BTC_ONLY)
 static const uint8_t _root_pubkeys[BOOT_NUM_ROOT_SIGNING_KEYS][BOOT_PUBKEY_LEN] = { // order is important
     {
         0xe7, 0x30, 0x92, 0x3f, 0x19, 0x04, 0xd3, 0xe8, 0x3e, 0x0a, 0xb0, 0x7f, 0x05, 0x0d, 0x8e, 0x4e,

Original file line number	Diff line number	Diff line change
`@@ -153,7 +153,7 @@ typedef union {`
`153`	`153`	`static uint8_t _loading_ready = 0;`
`154`	`154`	`static uint8_t _firmware_num_chunks = 0;`
`155`	`155`	`// clang-format off`
`156`		`-#if defined(BOOTLOADER_BTC)`
	`156`	`+#if defined(BOOTLOADER_BTC_ONLY)`
`157`	`157`	`static const uint8_t _root_pubkeys[BOOT_NUM_ROOT_SIGNING_KEYS][BOOT_PUBKEY_LEN] = { // order is important`
`158`	`158`	`{`
`159`	`159`	`0xe7, 0x30, 0x92, 0x3f, 0x19, 0x04, 0xd3, 0xe8, 0x3e, 0x0a, 0xb0, 0x7f, 0x05, 0x0d, 0x8e, 0x4e,`