diff options
| author | Shiji Yang <yangshiji66@outlook.com> | 2023-08-03 09:47:17 +0800 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2023-08-09 09:21:42 -0400 |
| commit | ccea96f443e2d35cf5ecc341bb14569029eb93b8 (patch) | |
| tree | d5940392747a93bf244739ddc337fdec9ce98a34 /arch/x86/lib/relocate.c | |
| parent | 506df9dc5881b74ca6463b89e9edcd14732a7da5 (diff) | |
| download | u-boot-ccea96f443e2d35cf5ecc341bb14569029eb93b8.zip u-boot-ccea96f443e2d35cf5ecc341bb14569029eb93b8.tar.gz u-boot-ccea96f443e2d35cf5ecc341bb14569029eb93b8.tar.bz2 | |
treewide: unify the linker symbol reference format
Now all linker symbols are declared as type char[]. Though we can
reference the address via both the array name 'var' and its address
'&var'. It's better to unify them to avoid confusing developers.
This patch converts all '&var' linker symbol refrences to the most
commonly used format 'var'.
Signed-off-by: Shiji Yang <yangshiji66@outlook.com>
Reviewed-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'arch/x86/lib/relocate.c')
| -rw-r--r-- | arch/x86/lib/relocate.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/arch/x86/lib/relocate.c b/arch/x86/lib/relocate.c index 5b1b420..da819b9 100644 --- a/arch/x86/lib/relocate.c +++ b/arch/x86/lib/relocate.c @@ -26,11 +26,11 @@ DECLARE_GLOBAL_DATA_PTR; int copy_uboot_to_ram(void) { - size_t len = (uintptr_t)&__data_end - (uintptr_t)&__text_start; + size_t len = (uintptr_t)__data_end - (uintptr_t)__text_start; if (gd->flags & GD_FLG_SKIP_RELOC) return 0; - memcpy((void *)gd->relocaddr, (void *)&__text_start, len); + memcpy((void *)gd->relocaddr, (void *)__text_start, len); return 0; } @@ -38,8 +38,8 @@ int copy_uboot_to_ram(void) #ifndef CONFIG_EFI_APP int clear_bss(void) { - ulong dst_addr = (ulong)&__bss_start + gd->reloc_off; - size_t len = (uintptr_t)&__bss_end - (uintptr_t)&__bss_start; + ulong dst_addr = (ulong)__bss_start + gd->reloc_off; + size_t len = (uintptr_t)__bss_end - (uintptr_t)__bss_start; if (gd->flags & GD_FLG_SKIP_RELOC) return 0; @@ -150,12 +150,12 @@ static void do_elf_reloc_fixups32(unsigned int text_base, uintptr_t size, */ int do_elf_reloc_fixups(void) { - void *re_src = (void *)(&__rel_dyn_start); - void *re_end = (void *)(&__rel_dyn_end); + void *re_src = (void *)__rel_dyn_start; + void *re_end = (void *)__rel_dyn_end; uint text_base; /* The size of the region of u-boot that runs out of RAM. */ - uintptr_t size = (uintptr_t)&__bss_end - (uintptr_t)&__text_start; + uintptr_t size = (uintptr_t)__bss_end - (uintptr_t)__text_start; if (gd->flags & GD_FLG_SKIP_RELOC) return 0; |