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 ---
common/board_r.c | 4 ++-- common/event.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/common/board_r.c b/common/board_r.c index 552b9899323..cbc140e6d8b 100644 --- a/common/board_r.c +++ b/common/board_r.c @@ -155,7 +155,7 @@ static int initr_reloc_global_data(void) * The fdt_blob needs to be moved to new relocation address * 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;
#ifdef CONFIG_EFI_LOADER @@ -609,7 +609,7 @@ static init_fnc_t init_sequence_r[] = { */ #endif 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, #endif #if defined(CONFIG_SYS_INIT_RAM_LOCK) && defined(CONFIG_E500) diff --git a/common/event.c b/common/event.c index c312556490e..164c95f8f52 100644 --- a/common/event.c +++ b/common/event.c @@ -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) { struct evspy_info *spy, *end;