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 <sjg@chromium.org>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>

diff --git a/arch/x86/cpu/coreboot/coreboot.c b/arch/x86/cpu/coreboot/coreboot.c
index e24f13afaf1efcb8f7579c3763fce4145958583e..4e1349f9508f9e09956818144cbba23ff3264fb9 100644 (file)
--- a/arch/x86/cpu/coreboot/coreboot.c
+++ b/arch/x86/cpu/coreboot/coreboot.c
@@ -20,18 +20,17 @@
 
 DECLARE_GLOBAL_DATA_PTR;
 
-/*
- * Miscellaneous platform dependent initializations
- */
-int cpu_init_f(void)
+int arch_cpu_init(void)
 {
        int ret = get_coreboot_info(&lib_sysinfo);
-       if (ret != 0)
+       if (ret != 0) {
                printf("Failed to parse coreboot tables.\n");
+               return ret;
+       }
 
        timestamp_init();
 
-       return ret;
+       return x86_cpu_init_f();
 }
 
 int board_early_init_f(void)

diff --git a/arch/x86/cpu/cpu.c b/arch/x86/cpu/cpu.c
index 2e252532d61363b4501c76f327193e8f877aeb6f..d6ba246b6fda19678da4e0866bc2e29b0aa79e87 100644 (file)
--- a/arch/x86/cpu/cpu.c
+++ b/arch/x86/cpu/cpu.c
@@ -130,7 +130,6 @@ int x86_cpu_init_f(void)
 
        return 0;
 }
-int cpu_init_f(void) __attribute__((weak, alias("x86_cpu_init_f")));
 
 int x86_cpu_init_r(void)
 {

diff --git a/arch/x86/include/asm/u-boot-x86.h b/arch/x86/include/asm/u-boot-x86.h
index 89618c7f6440b0460b6680f00bc2661ef47bd0c8..fdb8a6c9a3bfd9a1eb0642cea85171d75704cdc8 100644 (file)
--- a/arch/x86/include/asm/u-boot-x86.h
+++ b/arch/x86/include/asm/u-boot-x86.h
@@ -9,6 +9,7 @@
 #define _U_BOOT_I386_H_        1
 
 /* cpu/.../cpu.c */
+int arch_cpu_init(void);
 int x86_cpu_init_r(void);
 int cpu_init_r(void);
 int x86_cpu_init_f(void);

diff --git a/common/board_f.c b/common/board_f.c
index 1d81ed7c6a12c440f026fc096d0a42a119f10e9b..23d8f6461a528647b5cb261519843ac1b11aaa8b 100644 (file)
--- 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