From: Bin Meng <bmeng.cn@gmail.com>
Date: Thu, 20 Nov 2014 08:11:00 +0000 (+0800)
Subject: x86: Remove cpu_init_r() for x86
X-Git-Url: http://git.dujemihanovic.xyz/?a=commitdiff_plain;h=a549f7497b4d719d37e4a20378c81c1b29bf0404;p=u-boot.git

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 <bmeng.cn@gmail.com>
Acked-by: Simon Glass <sjg@chromium.org>
Tested-by: Simon Glass <sjg@chromium.org>
---

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