diff options
author | Yilun Lin <yllin@google.com> | 2019-01-23 17:02:42 +0800 |
---|---|---|
committer | chrome-bot <chrome-bot@chromium.org> | 2019-01-28 07:22:50 -0800 |
commit | b8189096e5be33848372dca449d045c2ba25e812 (patch) | |
tree | 3dda00597282917177b588c54252d2733aeca809 /core | |
parent | 818bbeda2631a2121647630ebd73cef660347277 (diff) | |
download | chrome-ec-b8189096e5be33848372dca449d045c2ba25e812.tar.gz |
link_defs.h: Renames __ro_end to __data_lma_start.
The name of __ro_end is confusing. The variable is
actually used as a label tagging that it is the starting
address of .data LMA. Renames to __data_lma_start to
be more decriptive.
BRANCH=None
TEST=make buildall -j
BUG=b:122084384
Change-Id: I8990a2a1f3d0719739a8e649b881cb277fe5a9b8
Signed-off-by: Yilun Lin <yllin@google.com>
Reviewed-on: https://chromium-review.googlesource.com/1433160
Commit-Ready: Yilun Lin <yllin@chromium.org>
Tested-by: Yilun Lin <yllin@chromium.org>
Reviewed-by: Nicolas Boichat <drinkcat@chromium.org>
Diffstat (limited to 'core')
-rw-r--r-- | core/cortex-m/ec.lds.S | 2 | ||||
-rw-r--r-- | core/cortex-m/init.S | 6 | ||||
-rw-r--r-- | core/cortex-m0/ec.lds.S | 2 | ||||
-rw-r--r-- | core/cortex-m0/init.S | 6 | ||||
-rw-r--r-- | core/nds32/ec.lds.S | 2 | ||||
-rw-r--r-- | core/nds32/init.S | 6 |
6 files changed, 12 insertions, 12 deletions
diff --git a/core/cortex-m/ec.lds.S b/core/cortex-m/ec.lds.S index 8bd5bfa21a..ef0a2a2dc9 100644 --- a/core/cortex-m/ec.lds.S +++ b/core/cortex-m/ec.lds.S @@ -271,7 +271,7 @@ SECTIONS #else } > FLASH #endif - __ro_end = . ; + __data_lma_start = . ; .bss : { /* diff --git a/core/cortex-m/init.S b/core/cortex-m/init.S index de869c61e7..a68bbf38b7 100644 --- a/core/cortex-m/init.S +++ b/core/cortex-m/init.S @@ -42,7 +42,7 @@ bss_loop: blt bss_loop /* Copy initialized data to Internal RAM */ - ldr r0,_ro_end + ldr r0,_data_lma_start ldr r1,_data_start ldr r2,_data_end data_loop: @@ -100,8 +100,8 @@ _data_start: .long __data_start _data_end: .long __data_end -_ro_end: -.long __ro_end +_data_lma_start: +.long __data_lma_start /* Dummy functions to avoid linker complaints */ .global __aeabi_unwind_cpp_pr0 diff --git a/core/cortex-m0/ec.lds.S b/core/cortex-m0/ec.lds.S index d7830be852..da6444dd14 100644 --- a/core/cortex-m0/ec.lds.S +++ b/core/cortex-m0/ec.lds.S @@ -186,7 +186,7 @@ SECTIONS #endif . = ALIGN(4); } > FLASH - __ro_end = . ; + __data_lma_start = . ; .bss : { /* diff --git a/core/cortex-m0/init.S b/core/cortex-m0/init.S index 0aa587f128..d8ab0587d6 100644 --- a/core/cortex-m0/init.S +++ b/core/cortex-m0/init.S @@ -68,7 +68,7 @@ vtable_loop: #endif /* Copy initialized data to Internal RAM */ - ldr r0,_ro_end + ldr r0,_data_lma_start ldr r1,_data_start ldr r2,_data_end data_loop: @@ -108,8 +108,8 @@ _data_start: .long __data_start _data_end: .long __data_end -_ro_end: -.long __ro_end +_data_lma_start: +.long __data_lma_start /* Dummy functions to avoid linker complaints */ .global __aeabi_unwind_cpp_pr0 diff --git a/core/nds32/ec.lds.S b/core/nds32/ec.lds.S index 926be4f788..659270c5b4 100644 --- a/core/nds32/ec.lds.S +++ b/core/nds32/ec.lds.S @@ -173,7 +173,7 @@ SECTIONS #endif . = ALIGN(4); } >FLASH - __ro_end = . ; + __data_lma_start = . ; .data : { . = ALIGN(4); diff --git a/core/nds32/init.S b/core/nds32/init.S index b96ed44bb8..db75c4f312 100644 --- a/core/nds32/init.S +++ b/core/nds32/init.S @@ -167,7 +167,7 @@ bss_loop: lwi $r1, [$r0] la $r0, _data_end lwi $r2, [$r0] - la $r0, _ro_end + la $r0, _data_lma_start lwi $r0, [$r0] data_loop: lwi.bi $r3, [$r0], 4 @@ -251,8 +251,8 @@ _data_start: .long __data_start _data_end: .long __data_end -_ro_end: -.long __ro_end +_data_lma_start: +.long __data_lma_start /* Reserve space for system stack */ .section .bss.system_stack |