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>

diff --git a/arch/arm/include/asm/system.h b/arch/arm/include/asm/system.h
index ce552944b701dae922e3783047b22728c3932c6a..5fe83699f435892dc274ad5118f64c3a725b1e91 100644 (file)
--- a/arch/arm/include/asm/system.h
+++ b/arch/arm/include/asm/system.h
@@ -628,7 +628,18 @@ void mmu_set_region_dcache_behaviour(phys_addr_t start, size_t size,
                                     enum dcache_option option);
 
 #ifdef CONFIG_SYS_NONCACHED_MEMORY
-void noncached_init(void);
+/**
+ * noncached_init() - Initialize non-cached memory region
+ *
+ * Initialize non-cached memory area. This memory region will be typically
+ * located right below the malloc() area and mapped uncached in the MMU.
+ *
+ * It is called during the generic post-relocation init sequence.
+ *
+ * Return: 0 if OK
+ */
+int noncached_init(void);
+
 phys_addr_t noncached_alloc(size_t size, size_t align);
 #endif /* CONFIG_SYS_NONCACHED_MEMORY */
 

diff --git a/arch/arm/lib/cache.c b/arch/arm/lib/cache.c
index ee7d14b2d31dfd426809073a1a6f0ea9c0cd6681..bdde9cdad5d050b0841e0ce9d1c1420059908631 100644 (file)
--- a/arch/arm/lib/cache.c
+++ b/arch/arm/lib/cache.c
@@ -86,7 +86,7 @@ void noncached_set_region(void)
 #endif
 }
 
-void noncached_init(void)
+int noncached_init(void)
 {
        phys_addr_t start, end;
        size_t size;
@@ -103,6 +103,8 @@ void noncached_init(void)
        noncached_next = start;
 
        noncached_set_region();
+
+       return 0;
 }
 
 phys_addr_t noncached_alloc(size_t size, size_t align)

diff --git a/common/board_r.c b/common/board_r.c
index 414b6272c5ac4d0bac66110806c4db0ed27efebf..48e898b586145306f7b03a91adbded8cc06dfb6c 100644 (file)
--- 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