rusefi
/
wideband
mirror of https://github.com/rusefi/wideband.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

make the compiler happy

This commit is contained in:
Matthew Kennedy 2021-02-25 23:12:22 -08:00
parent 66a1100340
commit ab8c24564f
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
firmware/boards/f0_module/bootloader/bootloader.cpp
View File

@ -6,16 +6,17 @@
#include <cstring> #include <cstring>
// These are defined in the linker script // These are defined in the linker script
extern uint32_t __appflash_start__; extern uint32_t __appflash_start__[64];
extern uint32_t __appflash_size__; extern uint32_t __appflash_size__;
extern uint32_t __ram_vectors_start__; extern uint32_t __ram_vectors_start__[64];
extern uint32_t __ram_vectors_size__; extern uint32_t __ram_vectors_size__;
#define SWAP_UINT32(x) ((((x) >> 24) & 0xff) | (((x) << 8) & 0xff0000) | (((x) >> 8) & 0xff00) | (((x) << 24) & 0xff000000)) #define SWAP_UINT32(x) ((((x) >> 24) & 0xff) | (((x) << 8) & 0xff0000) | (((x) >> 8) & 0xff00) | (((x) << 24) & 0xff000000))
uint32_t crc32(const uint8_t *buf, uint32_t size); uint32_t crc32(const uint8_t *buf, uint32_t size);
bool isAppValid() { bool isAppValid() {
const uint32_t* appFlash = &__appflash_start__; const uint32_t* appFlash =
__appflash_start__;
int appSize = 25600; int appSize = 25600;
@ -33,7 +34,7 @@ void boot_app() {
// Reset peripherals we might have used // Reset peripherals we might have used
rccDisableCAN1(); rccDisableCAN1();
const uint32_t* appFlash = &__appflash_start__; const uint32_t* appFlash = __appflash_start__;
// copy vector table to sram // copy vector table to sram
// TODO: use __ram_vectors_size__ // TODO: use __ram_vectors_size__
@ -55,7 +56,7 @@ void boot_app() {
while(1); while(1);
} }
uint32_t appFlashAddr = (uint32_t)&__appflash_start__; uintptr_t appFlashAddr = (uintptr_t)__appflash_start__;
void EraseAppPages() void EraseAppPages()
{ {