From a549f7497b4d719d37e4a20378c81c1b29bf0404 Mon Sep 17 00:00:00 2001 From: Bin Meng Date: Thu, 20 Nov 2014 16:11:00 +0800 Subject: [PATCH] x86: Remove cpu_init_r() for x86 Since cpu_init_interrupts() was moved out of cpu_init_r(), it is useless to keep cpu_init_r() for x86, thus remove it. Signed-off-by: Bin Meng Acked-by: Simon Glass Tested-by: Simon Glass --- arch/x86/cpu/cpu.c | 6 ------ arch/x86/include/asm/u-boot-x86.h | 2 -- common/board_r.c | 2 +- 3 files changed, 1 insertion(+), 9 deletions(-) diff --git a/arch/x86/cpu/cpu.c b/arch/x86/cpu/cpu.c index ac253922ae..cf421faf66 100644 --- a/arch/x86/cpu/cpu.c +++ b/arch/x86/cpu/cpu.c @@ -320,12 +320,6 @@ int x86_cpu_init_f(void) return 0; } -int x86_cpu_init_r(void) -{ - return 0; -} -int cpu_init_r(void) __attribute__((weak, alias("x86_cpu_init_r"))); - void x86_enable_caches(void) { unsigned long cr0; diff --git a/arch/x86/include/asm/u-boot-x86.h b/arch/x86/include/asm/u-boot-x86.h index 98217dd615..36145cb0a8 100644 --- a/arch/x86/include/asm/u-boot-x86.h +++ b/arch/x86/include/asm/u-boot-x86.h @@ -10,8 +10,6 @@ /* 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); int cpu_init_f(void); void init_gd(gd_t *id, u64 *gdt_addr); diff --git a/common/board_r.c b/common/board_r.c index bfa74c7399..9f085b1382 100644 --- a/common/board_r.c +++ b/common/board_r.c @@ -775,7 +775,7 @@ init_fnc_t init_sequence_r[] = { initr_flash, #endif INIT_FUNC_WATCHDOG_RESET -#if defined(CONFIG_PPC) || defined(CONFIG_X86) +#if defined(CONFIG_PPC) /* initialize higher level parts of CPU like time base and timers */ cpu_init_r, #endif -- 2.25.1