leandrof/u-boot
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

x86: Use the standard arch_cpu_init() function

Browse Source 
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 <sjg@chromium.org>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
This commit is contained in:
Simon Glass 2014-11-06 13:20:06 -07:00
parent 07387d1769
commit 8b37c7694f
4 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
arch/x86/cpu/coreboot/coreboot.c
View File

@ -20,18 +20,17 @@
DECLARE_GLOBAL_DATA_PTR; DECLARE_GLOBAL_DATA_PTR;
/* int arch_cpu_init(void)
* Miscellaneous platform dependent initializations
*/
int cpu_init_f(void)
{ {
int ret = get_coreboot_info(&lib_sysinfo); int ret = get_coreboot_info(&lib_sysinfo);
if (ret != 0) if (ret != 0) {
printf("Failed to parse coreboot tables.\n"); printf("Failed to parse coreboot tables.\n");
return ret;
}
timestamp_init(); timestamp_init();
return ret; return x86_cpu_init_f();
} }
int board_early_init_f(void) int board_early_init_f(void)

1
arch/x86/cpu/cpu.c
View File

@ -130,7 +130,6 @@ int x86_cpu_init_f(void)
return 0; return 0;
} }
int cpu_init_f(void) __attribute__((weak, alias("x86_cpu_init_f")));
int x86_cpu_init_r(void) int x86_cpu_init_r(void)
{ {

1
arch/x86/include/asm/u-boot-x86.h
View File

@ -9,6 +9,7 @@
#define _U_BOOT_I386_H_ 1 #define _U_BOOT_I386_H_ 1
/* cpu/.../cpu.c */ /* cpu/.../cpu.c */
int arch_cpu_init(void);
int x86_cpu_init_r(void); int x86_cpu_init_r(void);
int cpu_init_r(void); int cpu_init_r(void);
int x86_cpu_init_f(void); int x86_cpu_init_f(void);

1
common/board_f.c
View File

@ -818,7 +818,6 @@ static init_fnc_t init_sequence_f[] = {
#endif #endif
arch_cpu_init, /* basic arch cpu dependent setup */ arch_cpu_init, /* basic arch cpu dependent setup */
#ifdef CONFIG_X86 #ifdef CONFIG_X86
cpu_init_f, /* TODO(sjg@chromium.org): remove */
# ifdef CONFIG_OF_CONTROL # ifdef CONFIG_OF_CONTROL
find_fdt, /* TODO(sjg@chromium.org): remove */ find_fdt, /* TODO(sjg@chromium.org): remove */
# endif # endif