diff options
| author | Tom Rini <trini@ti.com> | 2013-04-16 16:12:33 -0400 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2013-04-16 16:12:33 -0400 |
| commit | 314dd4fecc87175f6e79eb977966fb60b33c543c (patch) | |
| tree | bfe799c8730caab5ca507e50ab8dfe09e8c4abfb | |
| parent | 5873d0fbad2b1a94db7b9c8c8f5d77c10479a9dd (diff) | |
| parent | 617c246f3c123d4a2d4dba9d08a4a2dd324cb407 (diff) | |
| download | u-boot-314dd4fecc87175f6e79eb977966fb60b33c543c.tar.gz u-boot-314dd4fecc87175f6e79eb977966fb60b33c543c.tar.xz u-boot-314dd4fecc87175f6e79eb977966fb60b33c543c.zip | |
Merge branch 'master' of git://git.denx.de/u-boot-x86
| -rw-r--r-- | arch/x86/cpu/coreboot/sdram.c | 7 | ||||
| -rw-r--r-- | common/board_f.c | 5 | ||||
| -rw-r--r-- | common/board_r.c | 3 | ||||
| -rw-r--r-- | include/configs/coreboot.h | 1 |
4 files changed, 9 insertions, 7 deletions
diff --git a/arch/x86/cpu/coreboot/sdram.c b/arch/x86/cpu/coreboot/sdram.c index 786009c746..b4fe6c91cf 100644 --- a/arch/x86/cpu/coreboot/sdram.c +++ b/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(); +} diff --git a/common/board_f.c b/common/board_f.c index 769889123b..00ca81126c 100644 --- a/common/board_f.c +++ b/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? */ diff --git a/common/board_r.c b/common/board_r.c index 9605f80a0c..2b17fa6cfe 100644 --- a/common/board_r.c +++ b/common/board_r.c @@ -722,9 +722,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, initr_announce, diff --git a/include/configs/coreboot.h b/include/configs/coreboot.h index a4aa8f7453..5bacc77bb5 100644 --- a/include/configs/coreboot.h +++ b/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 |