summaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
authorOvidiu Panait <ovidiu.panait@windriver.com>2020-11-28 10:43:13 +0200
committerTom Rini <trini@konsulko.com>2021-01-15 14:36:12 -0500
commit42d0d4223f991062f10d8b09e9268ed4cbcf271e (patch)
tree7ffb67a31bd0d93872bfd8610fd2ae6618fa2df6 /common
parentb9f6d0f7db9ef57f77ec3bd23a50a160534efbd8 (diff)
downloadu-boot-42d0d4223f991062f10d8b09e9268ed4cbcf271e.tar.gz
u-boot-42d0d4223f991062f10d8b09e9268ed4cbcf271e.tar.bz2
u-boot-42d0d4223f991062f10d8b09e9268ed4cbcf271e.zip
common: board_r: Drop initr_noncached wrapper
Add a return value to noncached_init and use it directly in the post-relocation init sequence, rather than using a wrapper stub. Signed-off-by: Ovidiu Panait <ovidiu.panait@windriver.com> Reviewed-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'common')
-rw-r--r--common/board_r.c10
1 files changed, 1 insertions, 9 deletions
diff --git a/common/board_r.c b/common/board_r.c
index 414b6272c5..48e898b586 100644
--- a/common/board_r.c
+++ b/common/board_r.c
@@ -242,14 +242,6 @@ static int initr_malloc(void)
return 0;
}
-#ifdef CONFIG_SYS_NONCACHED_MEMORY
-static int initr_noncached(void)
-{
- noncached_init();
- return 0;
-}
-#endif
-
static int initr_of_live(void)
{
if (CONFIG_IS_ENABLED(OF_LIVE)) {
@@ -668,7 +660,7 @@ static init_fnc_t init_sequence_r[] = {
console_record_init,
#endif
#ifdef CONFIG_SYS_NONCACHED_MEMORY
- initr_noncached,
+ noncached_init,
#endif
initr_of_live,
#ifdef CONFIG_DM