From: Andrew Jones <drjones@xxxxxxxxxx>
Rename etext to the more popular _etext allowing different linker
scripts to more easily be used.
Signed-off-by: Andrew Jones <drjones@xxxxxxxxxx>
Signed-off-by: Nikos Nikoleris <nikos.nikoleris@xxxxxxx>
Reviewed-by: Ricardo Koller <ricarkol@xxxxxxxxxx>
---
lib/arm/setup.c | 4 ++--
arm/flat.lds | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/lib/arm/setup.c b/lib/arm/setup.c
index 59b0aedd..03a4098e 100644
--- a/lib/arm/setup.c
+++ b/lib/arm/setup.c
@@ -33,7 +33,7 @@
#define NR_EXTRA_MEM_REGIONS 16
#define NR_INITIAL_MEM_REGIONS (MAX_DT_MEM_REGIONS + NR_EXTRA_MEM_REGIONS)
-extern unsigned long etext;
+extern unsigned long _etext;
char *initrd;
u32 initrd_size;
@@ -157,7 +157,7 @@ unsigned int mem_region_get_flags(phys_addr_t paddr)
static void mem_regions_add_assumed(void)
{
- phys_addr_t code_end = (phys_addr_t)(unsigned long)&etext;
+ phys_addr_t code_end = (phys_addr_t)(unsigned long)&_etext;
struct mem_region *r;
r = mem_region_find(code_end - 1);
diff --git a/arm/flat.lds b/arm/flat.lds
index 47fcb649..9016ac9f 100644
--- a/arm/flat.lds
+++ b/arm/flat.lds
@@ -27,7 +27,7 @@ SECTIONS
PROVIDE(_text = .);
.text : { *(.init) *(.text) *(.text.*) }
. = ALIGN(64K);
- PROVIDE(etext = .);
+ PROVIDE(_etext = .);
PROVIDE(reloc_start = .);
.rela.dyn : { *(.rela.dyn) }
--
2.25.1
