Platform: Correct region name
Change "TFM_DATA" to "ER_TFM_DATA" in gcc linker scripts
to align with armclang.
Change-Id: Ic6071204f8b260f75652353cb49b57602a0dcdd9
Signed-off-by: Edison Ai <edison.ai@arm.com>
diff --git a/platform/ext/target/mps2/an519/gcc/mps2_an519_s.ld b/platform/ext/target/mps2/an519/gcc/mps2_an519_s.ld
index 67da77c..13478b0 100644
--- a/platform/ext/target/mps2/an519/gcc/mps2_an519_s.ld
+++ b/platform/ext/target/mps2/an519/gcc/mps2_an519_s.ld
@@ -874,8 +874,8 @@
. = ALIGN(4);
} > RAM AT> FLASH
- Image$$TFM_DATA$$RW$$Base = ADDR(.TFM_DATA);
- Image$$TFM_DATA$$RW$$Limit = ADDR(.TFM_DATA) + SIZEOF(.TFM_DATA);
+ Image$$ER_TFM_DATA$$RW$$Base = ADDR(.TFM_DATA);
+ Image$$ER_TFM_DATA$$RW$$Limit = ADDR(.TFM_DATA) + SIZEOF(.TFM_DATA);
.TFM_BSS : ALIGN(4)
{
@@ -885,8 +885,8 @@
. = ALIGN(4);
__bss_end__ = .;
} > RAM AT> FLASH
- Image$$TFM_DATA$$ZI$$Base = ADDR(.TFM_BSS);
- Image$$TFM_DATA$$ZI$$Limit = ADDR(.TFM_BSS) + SIZEOF(.TFM_BSS);
+ Image$$ER_TFM_DATA$$ZI$$Base = ADDR(.TFM_BSS);
+ Image$$ER_TFM_DATA$$ZI$$Limit = ADDR(.TFM_BSS) + SIZEOF(.TFM_BSS);
Image$$ER_TFM_DATA$$Base = ADDR(.TFM_DATA);
Image$$ER_TFM_DATA$$Limit = ADDR(.TFM_DATA) + SIZEOF(.TFM_DATA) + SIZEOF(.TFM_BSS);
diff --git a/platform/ext/target/mps2/an519/gcc/mps2_an519_s.ld.template b/platform/ext/target/mps2/an519/gcc/mps2_an519_s.ld.template
index 0480810..15e09e0 100644
--- a/platform/ext/target/mps2/an519/gcc/mps2_an519_s.ld.template
+++ b/platform/ext/target/mps2/an519/gcc/mps2_an519_s.ld.template
@@ -410,8 +410,8 @@
. = ALIGN(4);
} > RAM AT> FLASH
- Image$$TFM_DATA$$RW$$Base = ADDR(.TFM_DATA);
- Image$$TFM_DATA$$RW$$Limit = ADDR(.TFM_DATA) + SIZEOF(.TFM_DATA);
+ Image$$ER_TFM_DATA$$RW$$Base = ADDR(.TFM_DATA);
+ Image$$ER_TFM_DATA$$RW$$Limit = ADDR(.TFM_DATA) + SIZEOF(.TFM_DATA);
.TFM_BSS : ALIGN(4)
{
@@ -421,8 +421,8 @@
. = ALIGN(4);
__bss_end__ = .;
} > RAM AT> FLASH
- Image$$TFM_DATA$$ZI$$Base = ADDR(.TFM_BSS);
- Image$$TFM_DATA$$ZI$$Limit = ADDR(.TFM_BSS) + SIZEOF(.TFM_BSS);
+ Image$$ER_TFM_DATA$$ZI$$Base = ADDR(.TFM_BSS);
+ Image$$ER_TFM_DATA$$ZI$$Limit = ADDR(.TFM_BSS) + SIZEOF(.TFM_BSS);
Image$$ER_TFM_DATA$$Base = ADDR(.TFM_DATA);
Image$$ER_TFM_DATA$$Limit = ADDR(.TFM_DATA) + SIZEOF(.TFM_DATA) + SIZEOF(.TFM_BSS);
diff --git a/platform/ext/target/mps2/an521/gcc/mps2_an521_s.ld b/platform/ext/target/mps2/an521/gcc/mps2_an521_s.ld
index f0066d9..5ae4939 100644
--- a/platform/ext/target/mps2/an521/gcc/mps2_an521_s.ld
+++ b/platform/ext/target/mps2/an521/gcc/mps2_an521_s.ld
@@ -874,8 +874,8 @@
. = ALIGN(4);
} > RAM AT> FLASH
- Image$$TFM_DATA$$RW$$Base = ADDR(.TFM_DATA);
- Image$$TFM_DATA$$RW$$Limit = ADDR(.TFM_DATA) + SIZEOF(.TFM_DATA);
+ Image$$ER_TFM_DATA$$RW$$Base = ADDR(.TFM_DATA);
+ Image$$ER_TFM_DATA$$RW$$Limit = ADDR(.TFM_DATA) + SIZEOF(.TFM_DATA);
.TFM_BSS : ALIGN(4)
{
@@ -885,8 +885,8 @@
. = ALIGN(4);
__bss_end__ = .;
} > RAM AT> FLASH
- Image$$TFM_DATA$$ZI$$Base = ADDR(.TFM_BSS);
- Image$$TFM_DATA$$ZI$$Limit = ADDR(.TFM_BSS) + SIZEOF(.TFM_BSS);
+ Image$$ER_TFM_DATA$$ZI$$Base = ADDR(.TFM_BSS);
+ Image$$ER_TFM_DATA$$ZI$$Limit = ADDR(.TFM_BSS) + SIZEOF(.TFM_BSS);
Image$$ER_TFM_DATA$$Base = ADDR(.TFM_DATA);
Image$$ER_TFM_DATA$$Limit = ADDR(.TFM_DATA) + SIZEOF(.TFM_DATA) + SIZEOF(.TFM_BSS);
diff --git a/platform/ext/target/mps2/an521/gcc/mps2_an521_s.ld.template b/platform/ext/target/mps2/an521/gcc/mps2_an521_s.ld.template
index e1f12bb..bb8ba99 100644
--- a/platform/ext/target/mps2/an521/gcc/mps2_an521_s.ld.template
+++ b/platform/ext/target/mps2/an521/gcc/mps2_an521_s.ld.template
@@ -410,8 +410,8 @@
. = ALIGN(4);
} > RAM AT> FLASH
- Image$$TFM_DATA$$RW$$Base = ADDR(.TFM_DATA);
- Image$$TFM_DATA$$RW$$Limit = ADDR(.TFM_DATA) + SIZEOF(.TFM_DATA);
+ Image$$ER_TFM_DATA$$RW$$Base = ADDR(.TFM_DATA);
+ Image$$ER_TFM_DATA$$RW$$Limit = ADDR(.TFM_DATA) + SIZEOF(.TFM_DATA);
.TFM_BSS : ALIGN(4)
{
@@ -421,8 +421,8 @@
. = ALIGN(4);
__bss_end__ = .;
} > RAM AT> FLASH
- Image$$TFM_DATA$$ZI$$Base = ADDR(.TFM_BSS);
- Image$$TFM_DATA$$ZI$$Limit = ADDR(.TFM_BSS) + SIZEOF(.TFM_BSS);
+ Image$$ER_TFM_DATA$$ZI$$Base = ADDR(.TFM_BSS);
+ Image$$ER_TFM_DATA$$ZI$$Limit = ADDR(.TFM_BSS) + SIZEOF(.TFM_BSS);
Image$$ER_TFM_DATA$$Base = ADDR(.TFM_DATA);
Image$$ER_TFM_DATA$$Limit = ADDR(.TFM_DATA) + SIZEOF(.TFM_DATA) + SIZEOF(.TFM_BSS);
diff --git a/platform/ext/target/musca_a/Device/Source/gcc/musca_s.ld b/platform/ext/target/musca_a/Device/Source/gcc/musca_s.ld
index 67da77c..13478b0 100644
--- a/platform/ext/target/musca_a/Device/Source/gcc/musca_s.ld
+++ b/platform/ext/target/musca_a/Device/Source/gcc/musca_s.ld
@@ -874,8 +874,8 @@
. = ALIGN(4);
} > RAM AT> FLASH
- Image$$TFM_DATA$$RW$$Base = ADDR(.TFM_DATA);
- Image$$TFM_DATA$$RW$$Limit = ADDR(.TFM_DATA) + SIZEOF(.TFM_DATA);
+ Image$$ER_TFM_DATA$$RW$$Base = ADDR(.TFM_DATA);
+ Image$$ER_TFM_DATA$$RW$$Limit = ADDR(.TFM_DATA) + SIZEOF(.TFM_DATA);
.TFM_BSS : ALIGN(4)
{
@@ -885,8 +885,8 @@
. = ALIGN(4);
__bss_end__ = .;
} > RAM AT> FLASH
- Image$$TFM_DATA$$ZI$$Base = ADDR(.TFM_BSS);
- Image$$TFM_DATA$$ZI$$Limit = ADDR(.TFM_BSS) + SIZEOF(.TFM_BSS);
+ Image$$ER_TFM_DATA$$ZI$$Base = ADDR(.TFM_BSS);
+ Image$$ER_TFM_DATA$$ZI$$Limit = ADDR(.TFM_BSS) + SIZEOF(.TFM_BSS);
Image$$ER_TFM_DATA$$Base = ADDR(.TFM_DATA);
Image$$ER_TFM_DATA$$Limit = ADDR(.TFM_DATA) + SIZEOF(.TFM_DATA) + SIZEOF(.TFM_BSS);
diff --git a/platform/ext/target/musca_a/Device/Source/gcc/musca_s.ld.template b/platform/ext/target/musca_a/Device/Source/gcc/musca_s.ld.template
index 0480810..15e09e0 100644
--- a/platform/ext/target/musca_a/Device/Source/gcc/musca_s.ld.template
+++ b/platform/ext/target/musca_a/Device/Source/gcc/musca_s.ld.template
@@ -410,8 +410,8 @@
. = ALIGN(4);
} > RAM AT> FLASH
- Image$$TFM_DATA$$RW$$Base = ADDR(.TFM_DATA);
- Image$$TFM_DATA$$RW$$Limit = ADDR(.TFM_DATA) + SIZEOF(.TFM_DATA);
+ Image$$ER_TFM_DATA$$RW$$Base = ADDR(.TFM_DATA);
+ Image$$ER_TFM_DATA$$RW$$Limit = ADDR(.TFM_DATA) + SIZEOF(.TFM_DATA);
.TFM_BSS : ALIGN(4)
{
@@ -421,8 +421,8 @@
. = ALIGN(4);
__bss_end__ = .;
} > RAM AT> FLASH
- Image$$TFM_DATA$$ZI$$Base = ADDR(.TFM_BSS);
- Image$$TFM_DATA$$ZI$$Limit = ADDR(.TFM_BSS) + SIZEOF(.TFM_BSS);
+ Image$$ER_TFM_DATA$$ZI$$Base = ADDR(.TFM_BSS);
+ Image$$ER_TFM_DATA$$ZI$$Limit = ADDR(.TFM_BSS) + SIZEOF(.TFM_BSS);
Image$$ER_TFM_DATA$$Base = ADDR(.TFM_DATA);
Image$$ER_TFM_DATA$$Limit = ADDR(.TFM_DATA) + SIZEOF(.TFM_DATA) + SIZEOF(.TFM_BSS);