X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=arch%2Fx86%2Fcpu%2Fcoreboot%2Fsdram.c;h=7115e7a151f331276af7290b9692771e90ab9d2b;hb=2d3c573ee6373f4521491f1a38e81245c3a6be57;hp=27228861de56908bf615cc582f8a3192a9ee58ab;hpb=52b778603b7017885d67428c9cca9807bc6e2f7d;p=u-boot

diff --git a/arch/x86/cpu/coreboot/sdram.c b/arch/x86/cpu/coreboot/sdram.c
index 27228861de..7115e7a151 100644
--- a/arch/x86/cpu/coreboot/sdram.c
+++ b/arch/x86/cpu/coreboot/sdram.c
@@ -7,16 +7,8 @@
  */
 
 #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;
 
@@ -101,15 +93,15 @@ 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;
 
-	return calculate_relocation_address();
+	return 0;
 }
 
 void dram_init_banksize(void)
@@ -120,8 +112,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++;