x86: coreboot: Allow >=4GiB memory bank size

Some platforms may have >=4GiB memory, so we need make U-Boot report
such configuration correctly when booting as the coreboot payload.

Signed-off-by: Bin Meng <bmeng.cn@gmail.com>

diff --git a/arch/x86/cpu/coreboot/sdram.c b/arch/x86/cpu/coreboot/sdram.c
index ae5c893b3c3ee37a10ba7d40b15a87c50828a52e..32f595d537b04d2b508f7b6e9532909027f94d6b 100644 (file)
--- a/arch/x86/cpu/coreboot/sdram.c
+++ b/arch/x86/cpu/coreboot/sdram.c
@@ -94,10 +94,10 @@ int dram_init(void)
                struct memrange *memrange = &lib_sysinfo.memrange[i];
                unsigned long long end = memrange->base + memrange->size;
 
-               if (memrange->type == CB_MEM_RAM && end > ram_size &&
-                   memrange->base < (1ULL << 32))
-                       ram_size = end;
+               if (memrange->type == CB_MEM_RAM && end > ram_size)
+                       ram_size += memrange->size;
        }
+
        gd->ram_size = ram_size;
        if (ram_size == 0)
                return -1;
@@ -113,8 +113,7 @@ void dram_init_banksize(void)
                for (i = 0, j = 0; i < lib_sysinfo.n_memranges; i++) {
                        struct memrange *memrange = &lib_sysinfo.memrange[i];
 
-                       if (memrange->type == CB_MEM_RAM &&
-                           memrange->base < (1ULL << 32)) {
+                       if (memrange->type == CB_MEM_RAM) {
                                gd->bd->bi_dram[j].start = memrange->base;
                                gd->bd->bi_dram[j].size = memrange->size;
                                j++;