diff options
Diffstat (limited to 'common')
| -rw-r--r-- | common/board_f.c | 5 | ||||
| -rw-r--r-- | common/board_r.c | 3 |
2 files changed, 2 insertions, 6 deletions
diff --git a/common/board_f.c b/common/board_f.c index 769889123..00ca81126 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 9605f80a0..2b17fa6cf 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, |