aboutsummaryrefslogtreecommitdiff
path: root/common/board_r.c
diff options
context:
space:
mode:
authorSimon Glass2023-02-05 15:40:19 -0700
committerTom Rini2023-02-10 07:41:39 -0500
commit00ba40fa3e507fd5bba9cb0fde71f17e3ecbb4c6 (patch)
tree452745fd350a8c20549621d9ac629de7c3d68ca1 /common/board_r.c
parent0ab3609061c90ed06f03171622894e54ff10f575 (diff)
Correct SPL uses of NEEDS_MANUAL_RELOC
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>
Diffstat (limited to 'common/board_r.c')
-rw-r--r--common/board_r.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/common/board_r.c b/common/board_r.c
index 3618acad437..fe803615163 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)