mirror of https://github.com/ARMmbed/mbed-os.git
Merge pull request #13100 from vmedcy/pr/fix-13058
Fix BOOT_HEADER_SIZE allocation in ARM scatter files (#13058)pull/12899/head
commit
e901ea9845
|
|
@ -148,14 +148,9 @@
|
||||||
|
|
||||||
|
|
||||||
; Cortex-M0+ application flash area
|
; 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
|
ER_FLASH_VECTORS +0
|
||||||
{
|
|
||||||
* (.cy_app_header)
|
|
||||||
}
|
|
||||||
|
|
||||||
ER_FLASH_VECTORS +BOOT_HEADER_SIZE
|
|
||||||
{
|
{
|
||||||
* (RESET, +FIRST)
|
* (RESET, +FIRST)
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -148,14 +148,9 @@
|
||||||
|
|
||||||
|
|
||||||
; Cortex-M0+ application flash area
|
; 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
|
ER_FLASH_VECTORS +0
|
||||||
{
|
|
||||||
* (.cy_app_header)
|
|
||||||
}
|
|
||||||
|
|
||||||
ER_FLASH_VECTORS +BOOT_HEADER_SIZE
|
|
||||||
{
|
{
|
||||||
* (RESET, +FIRST)
|
* (RESET, +FIRST)
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -134,9 +134,9 @@
|
||||||
|
|
||||||
|
|
||||||
; Cortex-M4 application flash area
|
; 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)
|
* (RESET, +FIRST)
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -148,14 +148,9 @@
|
||||||
|
|
||||||
|
|
||||||
; Cortex-M0+ application flash area
|
; 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
|
ER_FLASH_VECTORS +0
|
||||||
{
|
|
||||||
* (.cy_app_header)
|
|
||||||
}
|
|
||||||
|
|
||||||
ER_FLASH_VECTORS +BOOT_HEADER_SIZE
|
|
||||||
{
|
{
|
||||||
* (RESET, +FIRST)
|
* (RESET, +FIRST)
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -134,9 +134,9 @@
|
||||||
|
|
||||||
|
|
||||||
; Cortex-M4 application flash area
|
; 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)
|
* (RESET, +FIRST)
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue