Difuse/u-boot
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Correct SPL uses of NEEDS_MANUAL_RELOC

Browse source 
This converts 3 usages of this option to the non-SPL form, since there is
no SPL_NEEDS_MANUAL_RELOC defined in Kconfig

Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Simon Glass 2023-02-05 15:40:19 -07:00 committed by Tom Rini
parent 0ab3609061
commit 00ba40fa3e
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
common/board_r.c
View file

@ -155,7 +155,7 @@ static int initr_reloc_global_data(void)
* The fdt_blob needs to be moved to new relocation address * The fdt_blob needs to be moved to new relocation address
* incase of FDT blob is embedded with in image * incase of FDT blob is embedded with in image
*/ */
if (CONFIG_IS_ENABLED(OF_EMBED) && CONFIG_IS_ENABLED(NEEDS_MANUAL_RELOC)) if (CONFIG_IS_ENABLED(OF_EMBED) && IS_ENABLED(CONFIG_NEEDS_MANUAL_RELOC))
gd->fdt_blob += gd->reloc_off; gd->fdt_blob += gd->reloc_off;
#ifdef CONFIG_EFI_LOADER #ifdef CONFIG_EFI_LOADER
@ -609,7 +609,7 @@ static init_fnc_t init_sequence_r[] = {
*/ */
#endif #endif
initr_reloc_global_data, initr_reloc_global_data,
#if CONFIG_IS_ENABLED(NEEDS_MANUAL_RELOC) && CONFIG_IS_ENABLED(EVENT) #if IS_ENABLED(CONFIG_NEEDS_MANUAL_RELOC) && CONFIG_IS_ENABLED(EVENT)
event_manual_reloc, event_manual_reloc,
#endif #endif
#if defined(CONFIG_SYS_INIT_RAM_LOCK) && defined(CONFIG_E500) #if defined(CONFIG_SYS_INIT_RAM_LOCK) && defined(CONFIG_E500)

2
common/event.c
View file

@ -155,7 +155,7 @@ void event_show_spy_list(void)
} }
} }
#if CONFIG_IS_ENABLED(NEEDS_MANUAL_RELOC) #if IS_ENABLED(CONFIG_NEEDS_MANUAL_RELOC)
int event_manual_reloc(void) int event_manual_reloc(void)
{ {
struct evspy_info *spy, *end; struct evspy_info *spy, *end;