[FL-1990] Correct release type in copro manifest and rename boot to bootloader (#787)

* World: rename boot to bootloader.
* Scripts: correct release type in copro bundler.

firmware/targets/f6/furi-hal/furi-hal-bootloader.c

@@ -1,4 +1,4 @@
-#include <furi-hal-boot.h>
+#include <furi-hal-bootloader.h>
 #include <stm32wbxx_ll_rtc.h>
 #include <furi.h>
 
@@ -7,25 +7,25 @@
 #define BOOT_REQUEST_CLEAN 0xDADEDADE
 #define BOOT_REQUEST_DFU 0xDF00B000
 
-void furi_hal_boot_init() {
+void furi_hal_bootloader_init() {
 #ifndef DEBUG
     LL_RTC_BAK_SetRegister(RTC, LL_RTC_BKP_DR0, BOOT_REQUEST_TAINTED);
 #endif
     FURI_LOG_I("FuriHalBoot", "Init OK");
 }
 
-void furi_hal_boot_set_mode(FuriHalBootMode mode) {
-    if (mode == FuriHalBootModeNormal) {
+void furi_hal_bootloader_set_mode(FuriHalBootloaderMode mode) {
+    if (mode == FuriHalBootloaderModeNormal) {
         LL_RTC_BAK_SetRegister(RTC, LL_RTC_BKP_DR0, BOOT_REQUEST_CLEAN);
-    } else if (mode == FuriHalBootModeDFU) {
+    } else if (mode == FuriHalBootloaderModeDFU) {
         LL_RTC_BAK_SetRegister(RTC, LL_RTC_BKP_DR0, BOOT_REQUEST_DFU);
     }
 }
 
-void furi_hal_boot_set_flags(FuriHalBootFlag flags) {
+void furi_hal_bootloader_set_flags(FuriHalBootloaderFlag flags) {
     LL_RTC_BAK_SetRegister(RTC, LL_RTC_BKP_DR2, flags);
 }
 
-FuriHalBootFlag furi_hal_boot_get_flags() {
+FuriHalBootloaderFlag furi_hal_bootloader_get_flags() {
     return LL_RTC_BAK_GetRegister(RTC, LL_RTC_BKP_DR2);
 }

firmware/targets/f6/furi-hal/furi-hal-version.c

@@ -276,7 +276,7 @@ const struct Version* furi_hal_version_get_firmware_version(void) {
     return version_get();
 }
 
-const struct Version* furi_hal_version_get_boot_version(void) {
+const struct Version* furi_hal_version_get_bootloader_version(void) {
 #ifdef NO_BOOTLOADER
     return 0;
 #else

firmware/targets/f6/furi-hal/furi-hal.c

@@ -16,7 +16,7 @@ void furi_hal_init() {
 
     MX_RTC_Init();
     FURI_LOG_I("HAL", "RTC OK");
-    furi_hal_boot_init();
+    furi_hal_bootloader_init();
     furi_hal_version_init();
 
     furi_hal_spi_init();

firmware/targets/f6/target.mk

@@ -153,9 +153,9 @@ C_SOURCES += \
 
 # Linker options
 ifeq ($(NO_BOOTLOADER), 1)
-LDFLAGS += -T$(MXPROJECT_DIR)/stm32wb55xx_flash_cm4_no_boot.ld
+LDFLAGS += -T$(MXPROJECT_DIR)/stm32wb55xx_flash_cm4_no_bootloader.ld
 else
-LDFLAGS += -T$(MXPROJECT_DIR)/stm32wb55xx_flash_cm4_boot.ld
+LDFLAGS += -T$(MXPROJECT_DIR)/stm32wb55xx_flash_cm4_with_bootloader.ld
 endif
 
 SVD_FILE = ../debug/STM32WB55_CM4.svd

firmware/targets/f7/furi-hal/furi-hal-bootloader.c

@@ -1,4 +1,4 @@
-#include <furi-hal-boot.h>
+#include <furi-hal-bootloader.h>
 #include <stm32wbxx_ll_rtc.h>
 #include <furi.h>
 
@@ -7,25 +7,25 @@
 #define BOOT_REQUEST_CLEAN 0xDADEDADE
 #define BOOT_REQUEST_DFU 0xDF00B000
 
-void furi_hal_boot_init() {
+void furi_hal_bootloader_init() {
 #ifndef DEBUG
     LL_RTC_BAK_SetRegister(RTC, LL_RTC_BKP_DR0, BOOT_REQUEST_TAINTED);
 #endif
     FURI_LOG_I("FuriHalBoot", "Init OK");
 }
 
-void furi_hal_boot_set_mode(FuriHalBootMode mode) {
-    if (mode == FuriHalBootModeNormal) {
+void furi_hal_bootloader_set_mode(FuriHalBootloaderMode mode) {
+    if (mode == FuriHalBootloaderModeNormal) {
         LL_RTC_BAK_SetRegister(RTC, LL_RTC_BKP_DR0, BOOT_REQUEST_CLEAN);
-    } else if (mode == FuriHalBootModeDFU) {
+    } else if (mode == FuriHalBootloaderModeDFU) {
         LL_RTC_BAK_SetRegister(RTC, LL_RTC_BKP_DR0, BOOT_REQUEST_DFU);
     }
 }
 
-void furi_hal_boot_set_flags(FuriHalBootFlag flags) {
+void furi_hal_bootloader_set_flags(FuriHalBootloaderFlag flags) {
     LL_RTC_BAK_SetRegister(RTC, LL_RTC_BKP_DR2, flags);
 }
 
-FuriHalBootFlag furi_hal_boot_get_flags() {
+FuriHalBootloaderFlag furi_hal_bootloader_get_flags() {
     return LL_RTC_BAK_GetRegister(RTC, LL_RTC_BKP_DR2);
 }

firmware/targets/f7/furi-hal/furi-hal-version.c

@@ -276,7 +276,7 @@ const struct Version* furi_hal_version_get_firmware_version(void) {
     return version_get();
 }
 
-const struct Version* furi_hal_version_get_boot_version(void) {
+const struct Version* furi_hal_version_get_bootloader_version(void) {
 #ifdef NO_BOOTLOADER
     return 0;
 #else

firmware/targets/f7/furi-hal/furi-hal.c

@@ -16,7 +16,7 @@ void furi_hal_init() {
 
     MX_RTC_Init();
     FURI_LOG_I("HAL", "RTC OK");
-    furi_hal_boot_init();
+    furi_hal_bootloader_init();
     furi_hal_version_init();
 
     furi_hal_spi_init();

firmware/targets/f7/target.mk

@@ -153,9 +153,9 @@ C_SOURCES += \
 
 # Linker options
 ifeq ($(NO_BOOTLOADER), 1)
-LDFLAGS += -T$(MXPROJECT_DIR)/stm32wb55xx_flash_cm4_no_boot.ld
+LDFLAGS += -T$(MXPROJECT_DIR)/stm32wb55xx_flash_cm4_no_bootloader.ld
 else
-LDFLAGS += -T$(MXPROJECT_DIR)/stm32wb55xx_flash_cm4_boot.ld
+LDFLAGS += -T$(MXPROJECT_DIR)/stm32wb55xx_flash_cm4_with_bootloader.ld
 endif
 
 SVD_FILE = ../debug/STM32WB55_CM4.svd

firmware/targets/furi-hal-include/furi-hal-boot.h

@@ -1,50 +0,0 @@
-/**
- * @file furi-hal-boot.h
- * Bootloader HAL API
- */
-
-#pragma once
-
-#include <stdint.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/** Boot modes */
-typedef enum {
-    FuriHalBootModeNormal,
-    FuriHalBootModeDFU
-} FuriHalBootMode;
-
-/** Boot flags */
-typedef enum {
-    FuriHalBootFlagDefault=0,
-    FuriHalBootFlagFactoryReset=1,
-} FuriHalBootFlag;
-
-/** Initialize boot subsystem
- */
-void furi_hal_boot_init();
-
-/** Set boot mode
- *
- * @param[in]  mode  FuriHalBootMode
- */
-void furi_hal_boot_set_mode(FuriHalBootMode mode);
-
-/** Set boot flags
- *
- * @param[in]  flags  FuriHalBootFlag
- */
-void furi_hal_boot_set_flags(FuriHalBootFlag flags);
-
-/** Get boot flag
- *
- * @return     FuriHalBootFlag
- */
-FuriHalBootFlag furi_hal_boot_get_flags();
-
-#ifdef __cplusplus
-}
-#endif

firmware/targets/furi-hal-include/furi-hal-bootloader.h

@@ -0,0 +1,50 @@
+/**
+ * @file furi-hal-bootloader.h
+ * Bootloader HAL API
+ */
+
+#pragma once
+
+#include <stdint.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/** Boot modes */
+typedef enum {
+    FuriHalBootloaderModeNormal,
+    FuriHalBootloaderModeDFU
+} FuriHalBootloaderMode;
+
+/** Boot flags */
+typedef enum {
+    FuriHalBootloaderFlagDefault=0,
+    FuriHalBootloaderFlagFactoryReset=1,
+} FuriHalBootloaderFlag;
+
+/** Initialize boot subsystem
+ */
+void furi_hal_bootloader_init();
+
+/** Set bootloader mode
+ *
+ * @param[in]  mode  FuriHalBootloaderMode
+ */
+void furi_hal_bootloader_set_mode(FuriHalBootloaderMode mode);
+
+/** Set bootloader flags
+ *
+ * @param[in]  flags  FuriHalBootloaderFlag
+ */
+void furi_hal_bootloader_set_flags(FuriHalBootloaderFlag flags);
+
+/** Get boot flag
+ *
+ * @return     FuriHalBootloaderFlag
+ */
+FuriHalBootloaderFlag furi_hal_bootloader_get_flags();
+
+#ifdef __cplusplus
+}
+#endif

firmware/targets/furi-hal-include/furi-hal-version.h

@@ -148,7 +148,7 @@ const uint8_t* furi_hal_version_get_ble_mac();
  *
  * @return     Address of boot version structure.
  */
-const struct Version* furi_hal_version_get_boot_version();
+const struct Version* furi_hal_version_get_bootloader_version();
 
 /** Get address of version structure of firmware.
  *

firmware/targets/furi-hal-include/furi-hal.h

@@ -9,7 +9,7 @@
 template <unsigned int N> struct STOP_EXTERNING_ME {};
 #endif
 
-#include "furi-hal-boot.h"
+#include "furi-hal-bootloader.h"
 #include "furi-hal-clock.h"
 #include "furi-hal-crypto.h"
 #include "furi-hal-console.h"