mirror
/
solo1
kopia lustrzana https://github.com/solokeys/solo1
1
0
Forkuj 0
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

Remove obsolete region for the app static firmware version address

pull/238/head
Szczepan Zalega 2019-08-24 09:03:15 +02:00
rodzic 74181406fe
commit e3ff136196
Nie znaleziono w bazie danych klucza dla tego podpisu
ID klucza GPG: D9BAE35991DE5B22
2 zmienionych plików z 1 dodań i 7 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

4
targets/stm32l432/bootloader/bootloader.c
Wyświetl plik

@ -126,8 +126,6 @@ bool is_firmware_version_newer_or_equal()
new_version->major, new_version->minor, new_version->patch, new_version->reserved
);
dump_hex1(TAG_BOOT, (uint8_t *) last_written_app_address, 8);
dump_hex1(TAG_BOOT, (uint8_t *) NEW_FW_VERSION_ADDR, 8);
dump_hex1(TAG_BOOT, (uint8_t *) NEW_FW_VERSION_ADDR+8, 8);
printf1(TAG_BOOT,"APPLICATION_END_ADDR: %p\r\n", APPLICATION_END_ADDR);
printf1(TAG_BOOT,"BOOT_VERSION_ADDR: %p\r\n", BOOT_VERSION_ADDR);
@ -135,8 +133,6 @@ bool is_firmware_version_newer_or_equal()
flash_memory_st * ptr = 0x08000000;
printf1(TAG_BOOT,"AUTH_WORD_ADDR: %p\r\n", AUTH_WORD_ADDR);
printf1(TAG_BOOT,"NEW_FW_VERSION_ADDR: %p\r\n", NEW_FW_VERSION_ADDR);
printf1(TAG_BOOT,"NEW_FW_VERSION_ADDR: %p\r\n", ptr->app_version );
printf1(TAG_BOOT,"NEW_FW_VERSION_ADDR: %p\r\n", new_version );
printf1(TAG_BOOT,"NEW_FW_VERSION_ADDR last_written_app_address: %p\r\n", last_written_app_address );
printf1(TAG_BOOT,"current firm add: %p\r\n", &current_firmware_version );

4
targets/stm32l432/src/memory_layout.h
Wyświetl plik

@ -44,7 +44,6 @@
#define AUTH_WORD_ADDR (APPLICATION_END_ADDR)
#define LAST_ADDR (APPLICATION_END_ADDR-2048 + 8)
#define NEW_FW_VERSION_ADDR (AUTH_WORD_ADDR-8)
#define BOOT_VERSION_PAGE (APPLICATION_END_PAGE)
#define BOOT_VERSION_ADDR (0x08000000 + BOOT_VERSION_PAGE*FLASH_PAGE_SIZE + 8)
#define LAST_PAGE (APPLICATION_END_PAGE-1)
@ -52,8 +51,7 @@
struct flash_memory_st{
uint8_t bootloader[APPLICATION_START_PAGE*2*1024];
uint8_t application[(APPLICATION_END_PAGE-APPLICATION_START_PAGE)*2*1024-16];
uint8_t app_version[8];
uint8_t application[(APPLICATION_END_PAGE-APPLICATION_START_PAGE)*2*1024-8];
uint8_t auth_word[4];
uint8_t bootloader_disabled[4];
// place for more user data