]> git.ipfire.org Git - thirdparty/u-boot.git/commitdiff
Merge branch 'remove-config-nr-dram-banks-v9-2020-08-26' of https://gitlab.denx.de...
authorTom Rini <trini@konsulko.com>
Mon, 7 Sep 2020 18:31:00 +0000 (14:31 -0400)
committerTom Rini <trini@konsulko.com>
Mon, 7 Sep 2020 18:31:00 +0000 (14:31 -0400)
1  2 
common/image.c

diff --cc common/image.c
index da8bccd400dd6c17904bf0c9ab8d4ef721a7cd3a,6f68b13fced2c6833e5f13a2e29fd2f3f1dea8dc..645bfef16906601b6f46aa11e558edda389edef8
@@@ -685,18 -685,9 +685,12 @@@ phys_size_t env_get_bootm_size(void
                return tmp;
        }
  
- #if (defined(CONFIG_ARM) || defined(CONFIG_MICROBLAZE)) && \
-      defined(CONFIG_NR_DRAM_BANKS)
-       start = gd->bd->bi_dram[0].start;
-       size = gd->bd->bi_dram[0].size;
- #else
-       start = gd->bd->bi_memstart;
-       size = gd->bd->bi_memsize;
- #endif
+       start = gd->ram_base;
+       size = gd->ram_size;
  
 +      if (start + size > gd->ram_top)
 +              size = gd->ram_top - start;
 +
        s = env_get("bootm_low");
        if (s)
                tmp = (phys_size_t)simple_strtoull(s, NULL, 16);