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

Tom Rini
2 parents 5873d0fbad 617c246f3c
Showing 4 changed files Side-by-side Diff
arch/x86/cpu/coreboot/sdram.c
common/board_f.c
common/board_r.c
include/configs/coreboot.h
@@ -113,7 +113,7 @@
 	return 0;
 }
  
-int dram_init(void)
+int dram_init_banksize(void)
 {
 	int i, j;
  
@@ -131,5 +131,10 @@
 		}
 	}
 	return 0;
+}
+
+int dram_init(void)
+{
+	return dram_init_banksize();
 }
@@ -755,7 +755,7 @@
 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 @@
 #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? */
@@ -722,9 +722,6 @@
 #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,
 	initr_announce,
@@ -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
...	...	@@ -113,7 +113,7 @@
113	113	return 0;
114	114	}
115	115
116		-int dram_init(void)
	116	+int dram_init_banksize(void)
117	117	{
118	118	int i, j;
119	119
...	...	@@ -131,5 +131,10 @@
131	131	}
132	132	}
133	133	return 0;
	134	+}
	135	+
	136	+int dram_init(void)
	137	+{
	138	+ return dram_init_banksize();
134	139	}
...	...	@@ -755,7 +755,7 @@
755	755	static init_fnc_t init_sequence_f[] = {
756	756	#if !defined(CONFIG_CPM2) && !defined(CONFIG_MPC512X) && \
757	757	!defined(CONFIG_MPC83xx) && !defined(CONFIG_MPC85xx) && \
758		- !defined(CONFIG_MPC86xx)
	758	+ !defined(CONFIG_MPC86xx) && !defined(CONFIG_X86)
759	759	zero_global_data,
760	760	#endif
761	761	setup_fdt,
...	...	@@ -856,8 +856,7 @@
856	856	#endif
857	857	#ifdef CONFIG_X86
858	858	dram_init_f, /* configure available RAM banks */
859		- /* x86 would prefer that this happens after relocation */
860		- dram_init,
	859	+ calculate_relocation_address,
861	860	#endif
862	861	announce_dram_init,
863	862	/* TODO: unify all these dram functions? */
...	...	@@ -722,9 +722,6 @@
722	722	#ifdef CONFIG_CLOCKS
723	723	set_cpu_clk_info, /* Setup clock information */
724	724	#endif
725		-#ifdef CONFIG_X86
726		- init_bd_struct_r,
727		-#endif
728	725	initr_reloc_global_data,
729	726	initr_serial,
730	727	initr_announce,
...	...	@@ -41,6 +41,7 @@
41	41	#define CONFIG_INTEL_CORE_ARCH /* Sandy bridge and ivy bridge chipsets. */
42	42	#define CONFIG_ZBOOT_32
43	43	#define CONFIG_PHYSMEM
	44	+#define CONFIG_SYS_EARLY_PCI_INIT
44	45
45	46	#define CONFIG_LMB
46	47	#define CONFIG_OF_LIBFDT