Rename CONFIG_SYS_TEXT_BASE to CONFIG_TEXT_BASE
The current name is inconsistent with SPL which uses CONFIG_SPL_TEXT_BASE
and this makes it imposible to use CONFIG_VAL().
Rename it to resolve this problem.
Signed-off-by: Simon Glass <sjg@chromium.org>
diff --git a/lib/efi/efi_stub.c b/lib/efi/efi_stub.c
index a35fce1..c9eb32e 100644
--- a/lib/efi/efi_stub.c
+++ b/lib/efi/efi_stub.c
@@ -126,7 +126,7 @@
((func_t)addr)(0, 0, info);
#else
- cpu_call32(cs32, CONFIG_SYS_TEXT_BASE, info);
+ cpu_call32(cs32, CONFIG_TEXT_BASE, info);
#endif
}
@@ -184,8 +184,8 @@
if ((desc & GDT_PRESENT) && (desc & GDT_NOTSYS) &&
!(desc & GDT_LONG) && (desc & GDT_4KB) &&
(desc & GDT_32BIT) && (desc & GDT_CODE) &&
- CONFIG_SYS_TEXT_BASE > base &&
- CONFIG_SYS_TEXT_BASE + CONFIG_SYS_MONITOR_LEN < limit
+ CONFIG_TEXT_BASE > base &&
+ CONFIG_TEXT_BASE + CONFIG_SYS_MONITOR_LEN < limit
) {
cs32 = i;
break;
@@ -360,7 +360,7 @@
priv->memmap_desc, priv->memmap_size);
add_entry_addr(priv, EFIET_END, NULL, 0, 0, 0);
- memcpy((void *)CONFIG_SYS_TEXT_BASE, _binary_u_boot_bin_start,
+ memcpy((void *)CONFIG_TEXT_BASE, _binary_u_boot_bin_start,
(ulong)_binary_u_boot_bin_end -
(ulong)_binary_u_boot_bin_start);
@@ -371,7 +371,7 @@
printhex8(priv->info->total_size);
#endif
putc('\n');
- jump_to_uboot(cs32, CONFIG_SYS_TEXT_BASE, (ulong)priv->info);
+ jump_to_uboot(cs32, CONFIG_TEXT_BASE, (ulong)priv->info);
return EFI_LOAD_ERROR;
}
diff --git a/lib/efi_loader/efi_runtime.c b/lib/efi_loader/efi_runtime.c
index 93a695f..ad2ab82 100644
--- a/lib/efi_loader/efi_runtime.c
+++ b/lib/efi_loader/efi_runtime.c
@@ -672,12 +672,12 @@
struct elf_rela *rel = (void*)&__efi_runtime_rel_start;
#else
struct elf_rel *rel = (void*)&__efi_runtime_rel_start;
- static ulong lastoff = CONFIG_SYS_TEXT_BASE;
+ static ulong lastoff = CONFIG_TEXT_BASE;
#endif
debug("%s: Relocating to offset=%lx\n", __func__, offset);
for (; (ulong)rel < (ulong)&__efi_runtime_rel_stop; rel++) {
- ulong base = CONFIG_SYS_TEXT_BASE;
+ ulong base = CONFIG_TEXT_BASE;
ulong *p;
ulong newaddr;
@@ -696,7 +696,7 @@
switch (rel->info & R_MASK) {
case R_RELATIVE:
#ifdef IS_RELA
- newaddr = rel->addend + offset - CONFIG_SYS_TEXT_BASE;
+ newaddr = rel->addend + offset - CONFIG_TEXT_BASE;
#else
newaddr = *p - lastoff + offset;
#endif
@@ -707,7 +707,7 @@
extern struct dyn_sym __dyn_sym_start[];
newaddr = __dyn_sym_start[symidx].addr + offset;
#ifdef IS_RELA
- newaddr -= CONFIG_SYS_TEXT_BASE;
+ newaddr -= CONFIG_TEXT_BASE;
#endif
break;
}
diff --git a/lib/trace.c b/lib/trace.c
index 505a318..54f0bf2 100644
--- a/lib/trace.c
+++ b/lib/trace.c
@@ -53,7 +53,7 @@
if (gd->flags & GD_FLG_RELOC)
offset -= gd->relocaddr;
else
- offset -= CONFIG_SYS_TEXT_BASE;
+ offset -= CONFIG_TEXT_BASE;
#endif
return offset / FUNC_SITE_SIZE;
}
@@ -123,7 +123,7 @@
if (hdr->ftrace_count < hdr->ftrace_size) {
struct trace_call *rec = &hdr->ftrace[hdr->ftrace_count];
- rec->func = CONFIG_SYS_TEXT_BASE;
+ rec->func = CONFIG_TEXT_BASE;
rec->caller = 0;
rec->flags = FUNCF_TEXTBASE;
}