diff options
author | Simon Glass <sjg@chromium.org> | 2022-10-21 03:22:39 +0300 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2022-10-31 18:01:31 +0300 |
commit | 984639039f4cfe32ec2cc531d6ace05326ac49eb (patch) | |
tree | 472bf7e47978335a73c5d6025d3b83b534f7192b /arch/microblaze | |
parent | 6f38d91158e7e4199753b79e0a25c1a65175aba4 (diff) | |
download | u-boot-984639039f4cfe32ec2cc531d6ace05326ac49eb.tar.xz |
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 'arch/microblaze')
-rw-r--r-- | arch/microblaze/cpu/relocate.c | 6 | ||||
-rw-r--r-- | arch/microblaze/cpu/start.S | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/arch/microblaze/cpu/relocate.c b/arch/microblaze/cpu/relocate.c index b00d02b1df..7a15fb2ec3 100644 --- a/arch/microblaze/cpu/relocate.c +++ b/arch/microblaze/cpu/relocate.c @@ -19,7 +19,7 @@ * @rela_start: rela section start * @rela_end: rela section end * @dyn_start: dynamic section start - * @origin_addr: address where u-boot starts(doesn't need to be CONFIG_SYS_TEXT_BASE) + * @origin_addr: address where u-boot starts(doesn't need to be CONFIG_TEXT_BASE) */ void mb_fix_rela(u32 reloc_addr, u32 verbose, u32 rela_start, u32 rela_end, u32 dyn_start, u32 origin_addr) @@ -29,9 +29,9 @@ void mb_fix_rela(u32 reloc_addr, u32 verbose, u32 rela_start, /* * Return in case u-boot.elf is used directly. * Skip it when u-boot.bin is loaded to different address than - * CONFIG_SYS_TEXT_BASE. In this case relocation is necessary to run. + * CONFIG_TEXT_BASE. In this case relocation is necessary to run. */ - if (reloc_addr == CONFIG_SYS_TEXT_BASE) { + if (reloc_addr == CONFIG_TEXT_BASE) { debug_cond(verbose, "Relocation address is the same - skip relocation\n"); return; diff --git a/arch/microblaze/cpu/start.S b/arch/microblaze/cpu/start.S index a877db305e..7079d9e170 100644 --- a/arch/microblaze/cpu/start.S +++ b/arch/microblaze/cpu/start.S @@ -55,15 +55,15 @@ uboot_sym_start: add r6, r0, r0 lwi r7, r20, ALIGNMENT_ADDR - addi r7, r7, -CONFIG_SYS_TEXT_BASE + addi r7, r7, -CONFIG_TEXT_BASE add r7, r7, r5 lwi r8, r20, ALIGNMENT_ADDR + 0x4 - addi r8, r8, -CONFIG_SYS_TEXT_BASE + addi r8, r8, -CONFIG_TEXT_BASE add r8, r8, r5 lwi r9, r20, ALIGNMENT_ADDR + 0x8 - addi r9, r9, -CONFIG_SYS_TEXT_BASE + addi r9, r9, -CONFIG_TEXT_BASE add r9, r9, r5 - addi r10, r0, CONFIG_SYS_TEXT_BASE + addi r10, r0, CONFIG_TEXT_BASE brlid r15, mb_fix_rela nop |