Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-11-14 00:47:26 +00:00
Code Issues Projects Releases Packages Wiki Activity

common: board_r: Remove unused NEEDS_MANUAL_RELOC code bits

Browse source 
The last user of the NEEDS_MANUAL_RELOC has been removed in commit
26af162ac8 ("arch: m68k: Implement relocation")
Remove now unused NEEDS_MANUAL_RELOC code.

Signed-off-by: Marek Vasut <marek.vasut+renesas@mailbox.org>
This commit is contained in:
Marek Vasut 2023-09-06 23:29:44 +02:00 committed by Tom Rini
parent 99970b557b
commit 49c59dd5ca
3 changed files with 1 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
common/board_r.c
View file

@ -151,13 +151,6 @@ static int initr_reloc_global_data(void)
*/ */
gd->env_addr += gd->reloc_off; gd->env_addr += gd->reloc_off;
#endif #endif
/*
* The fdt_blob needs to be moved to new relocation address
* incase of FDT blob is embedded with in image
*/
if (IS_ENABLED(CONFIG_OF_EMBED) && IS_ENABLED(CONFIG_NEEDS_MANUAL_RELOC))
gd->fdt_blob += gd->reloc_off;
#ifdef CONFIG_EFI_LOADER #ifdef CONFIG_EFI_LOADER
/* /*
* On the ARM architecture gd is mapped to a fixed register (r9 or x18). * On the ARM architecture gd is mapped to a fixed register (r9 or x18).
@ -295,15 +288,6 @@ static int initr_announce(void)
return 0; return 0;
} }
#ifdef CONFIG_NEEDS_MANUAL_RELOC
static int initr_manual_reloc_cmdtable(void)
{
fixup_cmdtable(ll_entry_start(struct cmd_tbl, cmd),
ll_entry_count(struct cmd_tbl, cmd));
return 0;
}
#endif
static int initr_binman(void) static int initr_binman(void)
{ {
int ret; int ret;
@ -657,9 +641,6 @@ static init_fnc_t init_sequence_r[] = {
initr_watchdog, initr_watchdog,
#endif #endif
INIT_FUNC_WATCHDOG_RESET INIT_FUNC_WATCHDOG_RESET
#ifdef CONFIG_NEEDS_MANUAL_RELOC
initr_manual_reloc_cmdtable,
#endif
arch_initr_trap, arch_initr_trap,
#if defined(CONFIG_BOARD_EARLY_INIT_R) #if defined(CONFIG_BOARD_EARLY_INIT_R)
board_early_init_r, board_early_init_r,
@ -803,9 +784,6 @@ void board_init_r(gd_t *new_gd, ulong dest_addr)
#endif #endif
gd->flags &= ~GD_FLG_LOG_READY; gd->flags &= ~GD_FLG_LOG_READY;
if (IS_ENABLED(CONFIG_NEEDS_MANUAL_RELOC))
initcall_manual_reloc(init_sequence_r);
if (initcall_run_list(init_sequence_r)) if (initcall_run_list(init_sequence_r))
hang(); hang();

12
include/relocate.h
View file

@ -50,17 +50,7 @@ int do_elf_reloc_fixups(void);
*/ */
static inline void *manual_reloc(void *ptr) static inline void *manual_reloc(void *ptr)
{ {
#ifndef USE_HOSTCC return ptr;
if (IS_ENABLED(CONFIG_NEEDS_MANUAL_RELOC))
return ptr + gd->reloc_off;
#endif
return ptr;
} }
#if !defined(USE_HOSTCC) && defined(CONFIG_NEEDS_MANUAL_RELOC)
#define MANUAL_RELOC(ptr) (ptr) = manual_reloc(ptr)
#else
#define MANUAL_RELOC(ptr) (void)(ptr)
#endif
#endif /* _RELOCATE_H_ */ #endif /* _RELOCATE_H_ */

10
lib/initcall.c
View file

@ -97,13 +97,3 @@ int initcall_run_list(const init_fnc_t init_sequence[])
return 0; return 0;
} }
void initcall_manual_reloc(init_fnc_t init_sequence[])
{
init_fnc_t *ptr;
for (ptr = init_sequence; *ptr; ptr++) {
if (!initcall_is_event(*ptr))
MANUAL_RELOC(*ptr);
}
}