From 07387d1769c7cc29ff2402117148477263c4c5ce Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Thu, 6 Nov 2014 13:20:05 -0700 Subject: x86: Use the standard dram_init() function Instead of having an x86-specific DRAM init function, adjust things so we can use the normal one. Signed-off-by: Simon Glass Reviewed-by: Bin Meng --- common/board_f.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'common') diff --git a/common/board_f.c b/common/board_f.c index b5bebc9..1d81ed7 100644 --- a/common/board_f.c +++ b/common/board_f.c @@ -903,13 +903,9 @@ static init_fnc_t init_sequence_f[] = { #if defined(CONFIG_HARD_SPI) init_func_spi, #endif -#ifdef CONFIG_X86 - dram_init_f, /* configure available RAM banks */ - calculate_relocation_address, -#endif announce_dram_init, /* TODO: unify all these dram functions? */ -#ifdef CONFIG_ARM +#if defined(CONFIG_ARM) || defined(CONFIG_X86) dram_init, /* configure available RAM banks */ #endif #if defined(CONFIG_MIPS) || defined(CONFIG_PPC) -- cgit v1.1 From 8b37c7694f1eace82626d00fbfb85311ebf0d220 Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Thu, 6 Nov 2014 13:20:06 -0700 Subject: x86: Use the standard arch_cpu_init() function Instead of an x86-specific cpu_init_f() function, use the normal U-Boot one for this purpose. Also remove a useless/misleading comment. Signed-off-by: Simon Glass Reviewed-by: Bin Meng --- common/board_f.c | 1 - 1 file changed, 1 deletion(-) (limited to 'common') diff --git a/common/board_f.c b/common/board_f.c index 1d81ed7..23d8f64 100644 --- a/common/board_f.c +++ b/common/board_f.c @@ -818,7 +818,6 @@ static init_fnc_t init_sequence_f[] = { #endif arch_cpu_init, /* basic arch cpu dependent setup */ #ifdef CONFIG_X86 - cpu_init_f, /* TODO(sjg@chromium.org): remove */ # ifdef CONFIG_OF_CONTROL find_fdt, /* TODO(sjg@chromium.org): remove */ # endif -- cgit v1.1 From 768e0f52f2d1a9d19842c8d1ded22a96b080a266 Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Mon, 10 Nov 2014 18:00:18 -0700 Subject: Move early malloc() to before arch_cpu_init() For some CPUs, having malloc() available very early is useful. There is no reason to delay this since early malloc is allocated before board_init_f() is called. Move early malloc() init nearer to the start of the init sequence. Signed-off-by: Simon Glass --- common/board_f.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'common') diff --git a/common/board_f.c b/common/board_f.c index 23d8f64..f81f70d 100644 --- a/common/board_f.c +++ b/common/board_f.c @@ -812,6 +812,7 @@ static init_fnc_t init_sequence_f[] = { setup_mon_len, setup_fdt, trace_early_init, + initf_malloc, #if defined(CONFIG_MPC85xx) || defined(CONFIG_MPC86xx) /* TODO: can this go into arch_cpu_init()? */ probecpu, @@ -826,7 +827,6 @@ static init_fnc_t init_sequence_f[] = { #ifdef CONFIG_OF_CONTROL fdtdec_check_fdt, #endif - initf_malloc, initf_dm, #if defined(CONFIG_BOARD_EARLY_INIT_F) board_early_init_f, -- cgit v1.1 From 003504b6fe2296f581191b77fd2f1e98c4f4720c Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Mon, 10 Nov 2014 18:00:25 -0700 Subject: x86: Remove unnecessary find_fdt(), prepare_fdt() functions These are no-longer needed so drop them. Signed-off-by: Simon Glass Reviewed-by: Bin Meng --- common/board_f.c | 5 ----- 1 file changed, 5 deletions(-) (limited to 'common') diff --git a/common/board_f.c b/common/board_f.c index f81f70d..6e6a1a2 100644 --- a/common/board_f.c +++ b/common/board_f.c @@ -818,11 +818,6 @@ static init_fnc_t init_sequence_f[] = { probecpu, #endif arch_cpu_init, /* basic arch cpu dependent setup */ -#ifdef CONFIG_X86 -# ifdef CONFIG_OF_CONTROL - find_fdt, /* TODO(sjg@chromium.org): remove */ -# endif -#endif mark_bootstage, #ifdef CONFIG_OF_CONTROL fdtdec_check_fdt, -- cgit v1.1