summaryrefslogtreecommitdiff
path: root/common/board_r.c
diff options
context:
space:
mode:
authorOvidiu Panait <ovidiu.panait@windriver.com>2020-07-24 14:12:24 +0300
committerTom Rini <trini@konsulko.com>2020-08-07 01:08:22 +0300
commit365af27f0dec5013c9749ee397e9274ff32e06c4 (patch)
treef30390f63ca36da46132ecdb7eff5fc64b25d0bc /common/board_r.c
parentbf2fb81ad363e63b4695104a2cf554de9e4f141a (diff)
downloadu-boot-365af27f0dec5013c9749ee397e9274ff32e06c4.tar.xz
blkcache: Extend blkcache_init to cover CONFIG_NEEDS_MANUAL_RELOC
Extend manual relocation of block_cache list pointers to all platforms that enable CONFIG_NEEDS_MANUAL_RELOC. Remove m68k-specific checks and provide a single implementation that adds gd->reloc_off to the pre-relocation pointers. Acked-by: Angelo Dureghello <angelo.dureghello@timesys.com> Tested-by: Angelo Dureghello <angelo.dureghello@timesys.com> Reviewed-by: Simon Glass <sjg@chromium.org> Reviewed-by: Eric Nelson <eric@nelint.com> Signed-off-by: Ovidiu Panait <ovidiu.panait@windriver.com> [trini: Add guard around DECLARE_GLOBAL_DATA_PTR to avoid size growth] Signed-off-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'common/board_r.c')
-rw-r--r--common/board_r.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/common/board_r.c b/common/board_r.c
index 3b2c6e092b..53792e9a31 100644
--- a/common/board_r.c
+++ b/common/board_r.c
@@ -848,7 +848,7 @@ static init_fnc_t init_sequence_r[] = {
#if defined(CONFIG_PRAM)
initr_mem,
#endif
-#if defined(CONFIG_M68K) && defined(CONFIG_BLOCK_CACHE)
+#if defined(CONFIG_NEEDS_MANUAL_RELOC) && defined(CONFIG_BLOCK_CACHE)
blkcache_init,
#endif
run_main_loop,