x86: Remove board_early_init_r()

This function is not needed. Remove it to improve the generic init sequence
slightly.

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 2df72884f9232cb8203fb1f308f56829d58b1168..cfacc05875496f1243555f3671299089bc48d1e2 100644 (file)
--- a/arch/x86/cpu/coreboot/coreboot.c
+++ b/arch/x86/cpu/coreboot/coreboot.c
@@ -39,17 +39,6 @@ int board_early_init_f(void)
        return 0;
 }
 
-int board_early_init_r(void)
-{
-       /* CPU Speed to 100MHz */
-       gd->cpu_clk = 100000000;
-
-       /* Crystal is 33.000MHz */
-       gd->bus_clk = 33000000;
-
-       return 0;
-}
-
 int print_cpuinfo(void)
 {
        return default_print_cpuinfo();

diff --git a/board/google/chromebook_link/link.c b/board/google/chromebook_link/link.c
index 88cee052415116a8ad05c7a94881a436259d32f0..0a1ae6180f40ac115716ba9985d4f0a105a8365e 100644 (file)
--- a/board/google/chromebook_link/link.c
+++ b/board/google/chromebook_link/link.c
@@ -12,11 +12,6 @@ int arch_early_init_r(void)
        return 0;
 }
 
-int board_early_init_r(void)
-{
-       return 0;
-}
-
 static const struct pch_gpio_set1 pch_gpio_set1_mode = {
        .gpio0 = GPIO_MODE_GPIO,  /* NMI_DBG# */
        .gpio3 = GPIO_MODE_GPIO,  /* ALS_INT# */

diff --git a/common/board_r.c b/common/board_r.c
index 19c64271ab9d151be1d7e289af50973c62427875..bfa74c7399e086aa139963fa0bc70c9eebcdf913 100644 (file)
--- a/common/board_r.c
+++ b/common/board_r.c
@@ -837,9 +837,6 @@ init_fnc_t init_sequence_r[] = {
        INIT_FUNC_WATCHDOG_RESET
 #ifdef CONFIG_CMD_KGDB
        initr_kgdb,
-#endif
-#ifdef CONFIG_X86
-       board_early_init_r,
 #endif
        interrupt_init,
 #if defined(CONFIG_ARM) || defined(CONFIG_x86)

diff --git a/include/configs/chromebook_link.h b/include/configs/chromebook_link.h
index 8caeca64307c233bcb509bd12d3a78859140b28a..cd4a8a0543f5eb30f03149ad7e4cda74e6051825 100644 (file)
--- a/include/configs/chromebook_link.h
+++ b/include/configs/chromebook_link.h
@@ -21,7 +21,6 @@
 #define CONFIG_DCACHE_RAM_MRC_VAR_SIZE         0x4000
 #define CONFIG_SYS_X86_START16                 0xfffff800
 #define CONFIG_BOARD_EARLY_INIT_F
-#define CONFIG_BOARD_EARLY_INIT_R
 #define CONFIG_DISPLAY_CPUINFO
 
 #define CONFIG_X86_RESET_VECTOR