From 1a71dcd0c50bda592d5c3c92cc6fb307b162c249 Mon Sep 17 00:00:00 2001
From: Pavol Rusnak <pavol@rusnak.io>
Date: Fri, 12 Feb 2021 00:26:59 +0100
Subject: [PATCH] chore(legacy): unify {go,return}_to_bootloader =>
 stay_in_bootloader

---
 legacy/bootloader/bootloader.c | 6 +++---
 legacy/memory.ld               | 2 +-
 legacy/memory_app_1.0.0.ld     | 2 +-
 legacy/memory_app_1.8.0.ld     | 2 +-
 legacy/startup.S               | 2 +-
 legacy/supervise.c             | 2 +-
 legacy/supervise.h             | 4 ++--
 7 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/legacy/bootloader/bootloader.c b/legacy/bootloader/bootloader.c
index 5594f40d3..e46c260cd 100644
--- a/legacy/bootloader/bootloader.c
+++ b/legacy/bootloader/bootloader.c
@@ -112,9 +112,9 @@ static void bootloader_loop(void) {
 }
 
 int main(void) {
-  // grab go to bootloader flag as soon as possible
+  // grab "stay in bootloader" flag as soon as possible
   register uint32_t r11 __asm__("r11");
-  volatile uint32_t go_to_bootloader_flag = r11;
+  volatile uint32_t stay_in_bootloader_flag = r11;
 
 #ifndef APPVER
   setup();
@@ -128,7 +128,7 @@ int main(void) {
 
   mpu_config_bootloader();
 
-  if (go_to_bootloader_flag == RETURN_TO_BOOTLOADER_FLAG) {
+  if (stay_in_bootloader_flag == STAY_IN_BOOTLOADER_FLAG) {
     goto bootloader_loop_start;
   }
 
diff --git a/legacy/memory.ld b/legacy/memory.ld
index d6b2684ee..ab9b498c5 100644
--- a/legacy/memory.ld
+++ b/legacy/memory.ld
@@ -18,7 +18,7 @@ INCLUDE cortex-m-generic.ld
 
 _ram_start = ORIGIN(ram);
 _ram_end = ORIGIN(ram) + LENGTH(ram);
-_go_to_bootloader_flag_addr = ABSOLUTE(0x20010000);
+_stay_in_bootloader_flag_addr = ABSOLUTE(0x20010000);
 _stack = _ram_end - 8;
 __stack_chk_guard = _ram_end - 8;
 system_millis = _ram_end - 4;
diff --git a/legacy/memory_app_1.0.0.ld b/legacy/memory_app_1.0.0.ld
index 8304fa264..eb1ac29c2 100644
--- a/legacy/memory_app_1.0.0.ld
+++ b/legacy/memory_app_1.0.0.ld
@@ -18,7 +18,7 @@ INCLUDE cortex-m-generic.ld
 
 _ram_start = ORIGIN(ram);
 _ram_end = ORIGIN(ram) + LENGTH(ram);
-_go_to_bootloader_flag_addr = ABSOLUTE(0x20010000);
+_stay_in_bootloader_flag_addr = ABSOLUTE(0x20010000);
 _stack = _ram_end - 8;
 __stack_chk_guard = _ram_end - 8;
 system_millis = _ram_end - 4;
diff --git a/legacy/memory_app_1.8.0.ld b/legacy/memory_app_1.8.0.ld
index 63cb38d14..e9a63f5ac 100644
--- a/legacy/memory_app_1.8.0.ld
+++ b/legacy/memory_app_1.8.0.ld
@@ -24,7 +24,7 @@ _codelen = SIZEOF(.text) + SIZEOF(.data) + SIZEOF(.ARM.exidx);
 
 _ram_start = ORIGIN(ram);
 _ram_end = ORIGIN(ram) + LENGTH(ram);
-_go_to_bootloader_flag_addr = ABSOLUTE(0x20010000);
+_stay_in_bootloader_flag_addr = ABSOLUTE(0x20010000);
 _stack = _ram_end - 8;
 __stack_chk_guard = _ram_end - 8;
 system_millis = _ram_end - 4;
diff --git a/legacy/startup.S b/legacy/startup.S
index 17435f806..25c239c92 100644
--- a/legacy/startup.S
+++ b/legacy/startup.S
@@ -32,7 +32,7 @@ reset_handler:
   isb
 #endif
 
-  ldr r0, =_go_to_bootloader_flag_addr  // r0 - address of storage for "go to bootloader" flag
+  ldr r0, =_stay_in_bootloader_flag_addr  // r0 - address of storage for "stay in bootloader" flag
   ldr r11, [r0]        // r11 - keep in register and hope it gets to main
 
   ldr r0, =_ram_start // r0 - point to beginning of SRAM
diff --git a/legacy/supervise.c b/legacy/supervise.c
index c717853c0..85f07b7b7 100644
--- a/legacy/supervise.c
+++ b/legacy/supervise.c
@@ -66,7 +66,7 @@ static uint32_t svhandler_flash_lock(void) {
 }
 
 static void __attribute__((noreturn)) svhandler_reboot_to_bootloader(void) {
-  *RETURN_TO_BOOTLOADER_FLAG_ADDR = RETURN_TO_BOOTLOADER_FLAG;
+  *STAY_IN_BOOTLOADER_FLAG_ADDR = STAY_IN_BOOTLOADER_FLAG;
   scb_reset_system();
 }
 
diff --git a/legacy/supervise.h b/legacy/supervise.h
index ac3f28c4f..c6a1401dd 100644
--- a/legacy/supervise.h
+++ b/legacy/supervise.h
@@ -31,8 +31,8 @@
 #define SVC_TIMER_MS 4
 #define SVC_REBOOT_TO_BOOTLOADER 5
 
-#define RETURN_TO_BOOTLOADER_FLAG_ADDR ((uint32_t *)0x20010000)
-#define RETURN_TO_BOOTLOADER_FLAG 0x11
+#define STAY_IN_BOOTLOADER_FLAG_ADDR ((uint32_t *)0x20010000)
+#define STAY_IN_BOOTLOADER_FLAG 0x11
 
 /* Unlocks flash.  This function needs to be called before programming
  * or erasing. Multiple calls of flash_program and flash_erase can