summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorBin Meng <bmeng.cn@gmail.com>2014-11-20 16:11:00 +0800
committerSimon Glass <sjg@chromium.org>2014-11-25 06:34:02 -0700
commita549f7497b4d719d37e4a20378c81c1b29bf0404 (patch)
tree481da9302ec849aa755a3ffc86010752cc130890 /arch
parent4372a9eca5561ec21277b616b5223cf23ab526ca (diff)
downloadu-boot-imx-a549f7497b4d719d37e4a20378c81c1b29bf0404.zip
u-boot-imx-a549f7497b4d719d37e4a20378c81c1b29bf0404.tar.gz
u-boot-imx-a549f7497b4d719d37e4a20378c81c1b29bf0404.tar.bz2
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>
Diffstat (limited to 'arch')
-rw-r--r--arch/x86/cpu/cpu.c6
-rw-r--r--arch/x86/include/asm/u-boot-x86.h2
2 files changed, 0 insertions, 8 deletions
diff --git a/arch/x86/cpu/cpu.c b/arch/x86/cpu/cpu.c
index ac25392..cf421fa 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 98217dd..36145cb 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);