diff --git a/targets/stm32l432/bootloader/bootloader.c b/targets/stm32l432/bootloader/bootloader.c index b535dd4..73739a8 100644 --- a/targets/stm32l432/bootloader/bootloader.c +++ b/targets/stm32l432/bootloader/bootloader.c @@ -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", ¤t_firmware_version ); diff --git a/targets/stm32l432/src/memory_layout.h b/targets/stm32l432/src/memory_layout.h index 79bd891..8a66a71 100644 --- a/targets/stm32l432/src/memory_layout.h +++ b/targets/stm32l432/src/memory_layout.h @@ -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