x86: coreboot: Convert to use DM coreboot video driver

[u-boot] / arch / x86 / cpu / coreboot / sdram.c

diff --git a/arch/x86/cpu/coreboot/sdram.c b/arch/x86/cpu/coreboot/sdram.c
index e98a2302e79d83c51ff63a43a74e206d507b861a..7115e7a151f331276af7290b9692771e90ab9d2b 100644 (file)
--- a/arch/x86/cpu/coreboot/sdram.c
+++ b/arch/x86/cpu/coreboot/sdram.c
@@ -7,24 +7,17 @@
  */
 
 #include <common.h>
-#include <malloc.h>
 #include <asm/e820.h>
-#include <asm/u-boot-x86.h>
-#include <asm/global_data.h>
-#include <asm/init_helpers.h>
-#include <asm/processor.h>
-#include <asm/sections.h>
-#include <asm/zimage.h>
 #include <asm/arch/sysinfo.h>
-#include <asm/arch/tables.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
 unsigned install_e820_map(unsigned max_entries, struct e820entry *entries)
 {
+       unsigned num_entries;
        int i;
 
-       unsigned num_entries = min((unsigned)lib_sysinfo.n_memranges, max_entries);
+       num_entries = min((unsigned)lib_sysinfo.n_memranges, max_entries);
        if (num_entries < lib_sysinfo.n_memranges) {
                printf("Warning: Limiting e820 map to %d entries.\n",
                        num_entries);
@@ -34,8 +27,18 @@ unsigned install_e820_map(unsigned max_entries, struct e820entry *entries)
 
                entries[i].addr = memrange->base;
                entries[i].size = memrange->size;
-               entries[i].type = memrange->type;
+
+               /*
+                * coreboot has some extensions (type 6 & 16) to the E820 types.
+                * When we detect this, mark it as E820_RESERVED.
+                */
+               if (memrange->type == CB_MEM_VENDOR_RSVD ||
+                   memrange->type == CB_MEM_TABLE)
+                       entries[i].type = E820_RESERVED;
+               else
+                       entries[i].type = memrange->type;
        }
+
        return num_entries;
 }
 
@@ -91,13 +94,14 @@ int dram_init(void)
                unsigned long long end = memrange->base + memrange->size;
 
                if (memrange->type == CB_MEM_RAM && end > ram_size)
-                       ram_size = end;
+                       ram_size += memrange->size;
        }
+
        gd->ram_size = ram_size;
        if (ram_size == 0)
                return -1;
 
-       return calculate_relocation_address();
+       return 0;
 }
 
 void dram_init_banksize(void)