Merge pull request #13100 from vmedcy/pr/fix-13058

Fix BOOT_HEADER_SIZE allocation in ARM scatter files (#13058)
pull/12899/head
Martin Kojtal 2020-06-16 13:45:06 +02:00 committed by GitHub
commit e901ea9845
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 10 additions and 25 deletions

View File

@ -148,14 +148,9 @@
; Cortex-M0+ application flash area
LR_IROM1 FLASH_START (FLASH_SIZE - 0x8000)
LR_IROM1 (FLASH_START + BOOT_HEADER_SIZE) (FLASH_SIZE - BOOT_HEADER_SIZE - 0x8000)
{
.cy_app_header +0
{
* (.cy_app_header)
}
ER_FLASH_VECTORS +BOOT_HEADER_SIZE
ER_FLASH_VECTORS +0
{
* (RESET, +FIRST)
}

View File

@ -148,14 +148,9 @@
; Cortex-M0+ application flash area
LR_IROM1 FLASH_START (FLASH_SIZE - 0x8000)
LR_IROM1 (FLASH_START + BOOT_HEADER_SIZE) (FLASH_SIZE - BOOT_HEADER_SIZE - 0x8000)
{
.cy_app_header +0
{
* (.cy_app_header)
}
ER_FLASH_VECTORS +BOOT_HEADER_SIZE
ER_FLASH_VECTORS +0
{
* (RESET, +FIRST)
}

View File

@ -134,9 +134,9 @@
; Cortex-M4 application flash area
LR_IROM1 FLASH_START FLASH_SIZE
LR_IROM1 (FLASH_START + BOOT_HEADER_SIZE) (FLASH_SIZE - BOOT_HEADER_SIZE)
{
ER_FLASH_VECTORS +BOOT_HEADER_SIZE
ER_FLASH_VECTORS +0
{
* (RESET, +FIRST)
}

View File

@ -148,14 +148,9 @@
; Cortex-M0+ application flash area
LR_IROM1 FLASH_START (FLASH_SIZE - 0x8000)
LR_IROM1 (FLASH_START + BOOT_HEADER_SIZE) (FLASH_SIZE - BOOT_HEADER_SIZE - 0x8000)
{
.cy_app_header +0
{
* (.cy_app_header)
}
ER_FLASH_VECTORS +BOOT_HEADER_SIZE
ER_FLASH_VECTORS +0
{
* (RESET, +FIRST)
}

View File

@ -134,9 +134,9 @@
; Cortex-M4 application flash area
LR_IROM1 FLASH_START FLASH_SIZE
LR_IROM1 (FLASH_START + BOOT_HEADER_SIZE) (FLASH_SIZE - BOOT_HEADER_SIZE)
{
ER_FLASH_VECTORS +BOOT_HEADER_SIZE
ER_FLASH_VECTORS +0
{
* (RESET, +FIRST)
}