Merge branch 'master' of git://git.denx.de/u-boot-x86

arch/x86/cpu/coreboot/sdram.c

@@ -113,7 +113,7 @@ int dram_init_f(void)
 	return 0;
 }
 
-int dram_init(void)
+int dram_init_banksize(void)
 {
 	int i, j;
 
@@ -132,3 +132,8 @@ int dram_init(void)
 	}
 	return 0;
 }
+
+int dram_init(void)
+{
+	return dram_init_banksize();
+}

common/board_f.c

@@ -755,7 +755,7 @@ static int mark_bootstage(void)
 static init_fnc_t init_sequence_f[] = {
 #if !defined(CONFIG_CPM2) && !defined(CONFIG_MPC512X) && \
 		!defined(CONFIG_MPC83xx) && !defined(CONFIG_MPC85xx) && \
-		!defined(CONFIG_MPC86xx)
+		!defined(CONFIG_MPC86xx) && !defined(CONFIG_X86)
 	zero_global_data,
 #endif
 	setup_fdt,
@@ -856,8 +856,7 @@ static init_fnc_t init_sequence_f[] = {
 #endif
 #ifdef CONFIG_X86
 	dram_init_f,		/* configure available RAM banks */
-	/* x86 would prefer that this happens after relocation */
-	dram_init,
+	calculate_relocation_address,
 #endif
 	announce_dram_init,
 	/* TODO: unify all these dram functions? */

common/board_r.c

@@ -721,9 +721,6 @@ init_fnc_t init_sequence_r[] = {
 	 */
 #ifdef CONFIG_CLOCKS
 	set_cpu_clk_info, /* Setup clock information */
-#endif
-#ifdef CONFIG_X86
-	init_bd_struct_r,
 #endif
 	initr_reloc_global_data,
 	initr_serial,

include/configs/coreboot.h

@@ -41,6 +41,7 @@
 #define CONFIG_INTEL_CORE_ARCH	/* Sandy bridge and ivy bridge chipsets. */
 #define CONFIG_ZBOOT_32
 #define CONFIG_PHYSMEM
+#define CONFIG_SYS_EARLY_PCI_INIT
 
 #define CONFIG_LMB
 #define CONFIG_OF_LIBFDT