fixup! fixup! chore(core): refactor boot_args

trezor · Nov 7, 2023 · d26260b · d26260b
1 parent e8c4b3e
commit d26260b
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/core/embed/boardloader/memory_stm32u5a.ld b/core/embed/boardloader/memory_stm32u5a.ld
@@ -97,7 +97,7 @@ SECTIONS {
     *(.fb2*);
     . = ALIGN(4);
   } >SRAM5
-  
+
   .boot_args : ALIGN(8) {
     *(.boot_command*);
     . = ALIGN(8);

diff --git a/core/embed/trezorhal/stm32f4/boot_args.c b/core/embed/trezorhal/stm32f4/boot_args.c
@@ -5,7 +5,7 @@
 
 // The 'g_boot_command_shadow' shadows a real boot command passed
 // to the bootloader.
-// 1. In the bootloader, it's value is set in the startup code.
+// 1. In the bootloader, its value is set in the startup code.
 // 2. In the firmware it holds command for the next boot and it is used
 //    when svc_reboot_to_bootloader() is called
 boot_command_t g_boot_command_shadow;

diff --git a/core/embed/trezorhal/unix/boot_args.c b/core/embed/trezorhal/unix/boot_args.c
@@ -3,7 +3,7 @@
 #include <common.h>
 #include <string.h>
 
-// The 'g_boot_command' variable stores the 'command' for the next
+// The 'g_boot_command_shadow' variable stores the 'command' for the next
 // reboot/jumping to the bootloadeer. It may be one of the
 // 'BOOT_COMMAND_xxx' values defined in the enumeration, or it could
 // be any other value that should be treated as a non-special action,

diff --git a/core/src/apps/management/reboot_to_bootloader.py b/core/src/apps/management/reboot_to_bootloader.py
@@ -21,7 +21,7 @@ async def reboot_to_bootloader(msg: RebootToBootloader) -> NoReturn:
     # For convenience, we block unofficial firmwares from jumping to bootloader
     # this way, so that the user doesn't get mysterious "install failed" errors.
     # (It would be somewhat nicer if this was a compile-time flag, but oh well.)
-    is_official = True  # utils.firmware_vendor() != "UNSAFE, DO NOT USE!"
+    is_official = utils.firmware_vendor() != "UNSAFE, DO NOT USE!"
     if (
         msg.boot_command == BootCommand.INSTALL_UPGRADE
         and msg.firmware_header is not None