diff options
| author | Simon Glass <sjg@chromium.org> | 2022-10-20 18:22:39 -0600 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2022-10-31 11:01:31 -0400 |
| commit | 984639039f4cfe32ec2cc531d6ace05326ac49eb (patch) | |
| tree | 472bf7e47978335a73c5d6025d3b83b534f7192b /lib/efi | |
| parent | 6f38d91158e7e4199753b79e0a25c1a65175aba4 (diff) | |
| download | u-boot-984639039f4cfe32ec2cc531d6ace05326ac49eb.tar.gz | |
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>
Diffstat (limited to 'lib/efi')
| -rw-r--r-- | lib/efi/efi_stub.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/efi/efi_stub.c b/lib/efi/efi_stub.c index a35fce1385..c9eb32ec10 100644 --- a/lib/efi/efi_stub.c +++ b/lib/efi/efi_stub.c @@ -126,7 +126,7 @@ static void jump_to_uboot(ulong cs32, ulong addr, ulong info) ((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 @@ static int get_codeseg32(void) 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 @@ efi_status_t EFIAPI efi_main(efi_handle_t image, 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 @@ efi_status_t EFIAPI efi_main(efi_handle_t image, 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; } |