diff --git a/mk4-bootloader/.settings/stm32cubeide.project.prefs b/mk4-bootloader/.settings/stm32cubeide.project.prefs index df5f766..54766bc 100644 --- a/mk4-bootloader/.settings/stm32cubeide.project.prefs +++ b/mk4-bootloader/.settings/stm32cubeide.project.prefs @@ -1,4 +1,4 @@ -2F62501ED4689FB349E356AB974DBE57=C3A67CCDF9999A128803FAFA45D27CB3 -8DF89ED150041C4CBC7CB9A9CAA90856=C3A67CCDF9999A128803FAFA45D27CB3 -DC22A860405A8BF2F2C095E5B6529F12=8040A010A8A98FBBA7D72D23313D48E3 +2F62501ED4689FB349E356AB974DBE57=A4B1A91E4596F4EC3A121CB648631791 +8DF89ED150041C4CBC7CB9A9CAA90856=A4B1A91E4596F4EC3A121CB648631791 +DC22A860405A8BF2F2C095E5B6529F12=460787E75B2D603D0ACA93B88832D04C eclipse.preferences.version=1 diff --git a/mk4-bootloader/Core/Src/main.c b/mk4-bootloader/Core/Src/main.c index d9071a0..e328115 100644 --- a/mk4-bootloader/Core/Src/main.c +++ b/mk4-bootloader/Core/Src/main.c @@ -25,6 +25,7 @@ /* Private includes ----------------------------------------------------------*/ /* USER CODE BEGIN Includes */ +#include "../../../version.h" #include "qspi_drv.h" /* USER CODE END Includes */ diff --git a/mk4-bootloader/STM32L476RCTX_FLASH.ld b/mk4-bootloader/STM32L476RCTX_FLASH.ld index 84ecfa2..2a7aad7 100644 --- a/mk4-bootloader/STM32L476RCTX_FLASH.ld +++ b/mk4-bootloader/STM32L476RCTX_FLASH.ld @@ -34,12 +34,15 @@ _estack = ORIGIN(RAM) + LENGTH(RAM); /* end of "RAM" Ram type memory */ _Min_Heap_Size = 0x200 ; /* required amount of heap */ _Min_Stack_Size = 0x400 ; /* required amount of stack */ +_pad_length = 64; + /* Memories definition */ MEMORY { RAM (xrw) : ORIGIN = 0x20000000, LENGTH = 96K RAM2 (xrw) : ORIGIN = 0x10000000, LENGTH = 32K FLASH (rx) : ORIGIN = 0x8000000, LENGTH = 64K + PAD (rx) : ORIGIN = 0x8000000+64K-_pad_length, LENGTH = _pad_length } _boot_size = LENGTH(FLASH); @@ -142,6 +145,8 @@ SECTIONS } >RAM AT> FLASH + .pad : { KEEP(*(.pad)) } > PAD + /* Uninitialized data section into "RAM" Ram type memory */ . = ALIGN(4); .bss : diff --git a/mk4-date/.settings/stm32cubeide.project.prefs b/mk4-date/.settings/stm32cubeide.project.prefs index 1c33287..227d96d 100644 --- a/mk4-date/.settings/stm32cubeide.project.prefs +++ b/mk4-date/.settings/stm32cubeide.project.prefs @@ -1,4 +1,4 @@ -2F62501ED4689FB349E356AB974DBE57=0741E2E7544FCB3133CF403C381330D8 -8DF89ED150041C4CBC7CB9A9CAA90856=0741E2E7544FCB3133CF403C381330D8 +2F62501ED4689FB349E356AB974DBE57=6AEDD0954CFD93428D9AD2B9276A934E +8DF89ED150041C4CBC7CB9A9CAA90856=6AEDD0954CFD93428D9AD2B9276A934E DC22A860405A8BF2F2C095E5B6529F12=F227A79A95EECD4F031B466428DF1209 eclipse.preferences.version=1 diff --git a/mk4-date/STM32L010C6TX_FLASH.ld b/mk4-date/STM32L010C6TX_FLASH.ld index d0eae09..0b2dca2 100644 --- a/mk4-date/STM32L010C6TX_FLASH.ld +++ b/mk4-date/STM32L010C6TX_FLASH.ld @@ -40,7 +40,7 @@ MEMORY { RAM (xrw) : ORIGIN = 0x20000000, LENGTH = 8K FLASH (rx) : ORIGIN = 0x8000000, LENGTH = 32K-_pad_length - PAD (rx) : ORIGIN = 0x8007fff-_pad_length, LENGTH = _pad_length + PAD (rx) : ORIGIN = 0x8008000-_pad_length, LENGTH = _pad_length } /* Sections */ diff --git a/mk4-time/.settings/stm32cubeide.project.prefs b/mk4-time/.settings/stm32cubeide.project.prefs index ef1b73d..d2d34c5 100644 --- a/mk4-time/.settings/stm32cubeide.project.prefs +++ b/mk4-time/.settings/stm32cubeide.project.prefs @@ -1,4 +1,4 @@ -2F62501ED4689FB349E356AB974DBE57=AF5E4FFD4D550637C526A4C3814EDE86 -8DF89ED150041C4CBC7CB9A9CAA90856=AF5E4FFD4D550637C526A4C3814EDE86 +2F62501ED4689FB349E356AB974DBE57=567EE81E60C8A1A45682D5C5317E6662 +8DF89ED150041C4CBC7CB9A9CAA90856=567EE81E60C8A1A45682D5C5317E6662 DC22A860405A8BF2F2C095E5B6529F12=AA705B8CAFB58EBE5E4C71DC01DEB86F eclipse.preferences.version=1 diff --git a/mk4-time/STM32L476RGTX_FLASH.ld b/mk4-time/STM32L476RGTX_FLASH.ld index c32259d..2ec19be 100644 --- a/mk4-time/STM32L476RGTX_FLASH.ld +++ b/mk4-time/STM32L476RGTX_FLASH.ld @@ -43,7 +43,7 @@ MEMORY RAM (xrw) : ORIGIN = 0x20000188, LENGTH = 96K - 392 RAM2 (xrw) : ORIGIN = 0x10000000, LENGTH = 32K FLASH (rx) : ORIGIN = 0x8010000, LENGTH = 192K - _pad_length - PAD (rx) : ORIGIN = 0x803ffff-_pad_length, LENGTH = _pad_length + PAD (rx) : ORIGIN = 0x8040000-_pad_length, LENGTH = _pad_length } /* bootloader = 64k = 0x10000 */