Move sram related bdinfo from arch-specific setup_board_part1 to generic
code in setup_bdinfo. Also use "if (IS_ENABLED(CONFIG_SYS_HAS_SRAM))"
instead of "#ifdef CONFIG_SYS_SRAM_BASE".

Signed-off-by: Ovidiu Panait <ovidiu.pan...@windriver.com>
---

 common/board_f.c | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/common/board_f.c b/common/board_f.c
index ac72096e3a..1befab5446 100644
--- a/common/board_f.c
+++ b/common/board_f.c
@@ -618,8 +618,15 @@ __weak int arch_setup_bdinfo(void)
 
 int setup_bdinfo(void)
 {
+       struct bd_info *bd = gd->bd;
+
        board_setup_bdinfo_mem();
 
+       if (IS_ENABLED(CONFIG_SYS_HAS_SRAM)) {
+               bd->bi_sramstart = CONFIG_SYS_SRAM_BASE; /* start of SRAM */
+               bd->bi_sramsize = CONFIG_SYS_SRAM_SIZE;  /* size  of SRAM */
+       }
+
        return arch_setup_bdinfo();
 }
 
@@ -629,11 +636,6 @@ static int setup_board_part1(void)
 {
        struct bd_info *bd = gd->bd;
 
-#ifdef CONFIG_SYS_SRAM_BASE
-       bd->bi_sramstart = CONFIG_SYS_SRAM_BASE;        /* start of SRAM */
-       bd->bi_sramsize = CONFIG_SYS_SRAM_SIZE;         /* size  of SRAM */
-#endif
-
 #if defined(CONFIG_E500) || defined(CONFIG_MPC86xx)
        bd->bi_immr_base = CONFIG_SYS_IMMR;     /* base  of IMMR register     */
 #endif
-- 
2.17.1

Reply via email to