]> git.dujemihanovic.xyz Git - u-boot.git/commitdiff
board_f: Add default values for bi_dram[] in dram_init_banksize()
authorStefan Roese <sr@denx.de>
Wed, 12 Aug 2020 11:02:39 +0000 (13:02 +0200)
committerStefan Roese <sr@denx.de>
Wed, 26 Aug 2020 07:19:28 +0000 (09:19 +0200)
Remove the bi_memstart / bi_memsize assignment in setup_bdinfo() and
make sure, that bd_dram[] is always configured in the weak default
implementation of dram_init_banksize(), when CONFIG_SYS_SDRAM_BASE is
not set.

Signed-off-by: Stefan Roese <sr@denx.de>
Reviewed-by: Ovidiu Panait <ovidiu.panait@windriver.com>
common/board_f.c

index ed37e3acaaf98987bfa5e39adbf54d6a3f46906f..62473abf793cab55ca4626caf72791cf2ebdf8a9 100644 (file)
@@ -237,10 +237,8 @@ static int show_dram_config(void)
 
 __weak int dram_init_banksize(void)
 {
-#if defined(CONFIG_SYS_SDRAM_BASE)
-       gd->bd->bi_dram[0].start = CONFIG_SYS_SDRAM_BASE;
+       gd->bd->bi_dram[0].start = gd->ram_base;
        gd->bd->bi_dram[0].size = get_effective_memsize();
-#endif
 
        return 0;
 }
@@ -598,9 +596,6 @@ int setup_bdinfo(void)
 {
        struct bd_info *bd = gd->bd;
 
-       bd->bi_memstart = gd->ram_base;  /* start of memory */
-       bd->bi_memsize = gd->ram_size;   /* size in bytes */
-
        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 */