[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.
This commit is contained in:
あく
2021-10-26 15:24:14 +03:00
committed by GitHub
parent d9d33a0213
commit ae016ce464
28 changed files with 146 additions and 146 deletions

View File

@@ -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);
}

View File

@@ -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

View File

@@ -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();

View File

@@ -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