dany/u-boot-megous
1
0
Fork 0
mirror of https://xff.cz/git/u-boot/ synced 2025-10-01 15:31:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

board_r: use IS_ENABLED(CONFIG_NEEDS_MANUAL_RELOC) in board_init_r()

Browse Source 
Drop CONFIG_NEEDS_MANUAL_RELOC ifdefs in board_init_r() and use
IS_ENABLED() instead. Also, use the MANUAL_RELOC() macro to update the
initcall pointers.

Signed-off-by: Ovidiu Panait <ovidiu.panait@windriver.com>
This commit is contained in:
Ovidiu Panait
2022-05-02 18:34:56 +03:00
committed by Tom Rini
parent 54a54a6313
commit 13ae36cc8d
1 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
common/board_r.c
View File

@@ -61,6 +61,7 @@
#include <wdt.h> #include <wdt.h>
#include <asm-generic/gpio.h> #include <asm-generic/gpio.h>
#include <efi_loader.h> #include <efi_loader.h>
#include <relocate.h>
DECLARE_GLOBAL_DATA_PTR; DECLARE_GLOBAL_DATA_PTR;
@@ -810,19 +811,15 @@ void board_init_r(gd_t *new_gd, ulong dest_addr)
if (CONFIG_IS_ENABLED(X86_64) && !IS_ENABLED(CONFIG_EFI_APP)) if (CONFIG_IS_ENABLED(X86_64) && !IS_ENABLED(CONFIG_EFI_APP))
arch_setup_gd(new_gd); arch_setup_gd(new_gd);
#ifdef CONFIG_NEEDS_MANUAL_RELOC
int i;
#endif
#if !defined(CONFIG_X86) && !defined(CONFIG_ARM) && !defined(CONFIG_ARM64) #if !defined(CONFIG_X86) && !defined(CONFIG_ARM) && !defined(CONFIG_ARM64)
gd = new_gd; gd = new_gd;
#endif #endif
gd->flags &= ~GD_FLG_LOG_READY; gd->flags &= ~GD_FLG_LOG_READY;
#ifdef CONFIG_NEEDS_MANUAL_RELOC if (IS_ENABLED(CONFIG_NEEDS_MANUAL_RELOC)) {
for (i = 0; i < ARRAY_SIZE(init_sequence_r); i++) for (int i = 0; i < ARRAY_SIZE(init_sequence_r); i++)
init_sequence_r[i] += gd->reloc_off; MANUAL_RELOC(init_sequence_r[i]);
#endif }
if (initcall_run_list(init_sequence_r)) if (initcall_run_list(init_sequence_r))
hang(); hang();