dany/u-boot-megous
1
0
Fork 0
mirror of https://xff.cz/git/u-boot/ synced 2025-09-29 06:21:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

x86: Remove cpu_init_r() for x86

Browse Source 
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>
This commit is contained in:
Bin Meng
2014-11-20 16:11:00 +08:00
committed by Simon Glass
parent 4372a9eca5
commit a549f7497b
3 changed files with 1 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
arch/x86/cpu/cpu.c
View File

@@ -320,12 +320,6 @@ int x86_cpu_init_f(void)
return 0; 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) void x86_enable_caches(void)
{ {
unsigned long cr0; unsigned long cr0;

2
arch/x86/include/asm/u-boot-x86.h
View File

@@ -10,8 +10,6 @@
/* cpu/.../cpu.c */ /* cpu/.../cpu.c */
int arch_cpu_init(void); int arch_cpu_init(void);
int x86_cpu_init_r(void);
int cpu_init_r(void);
int x86_cpu_init_f(void); int x86_cpu_init_f(void);
int cpu_init_f(void); int cpu_init_f(void);
void init_gd(gd_t *id, u64 *gdt_addr); void init_gd(gd_t *id, u64 *gdt_addr);

2
common/board_r.c
View File

@@ -775,7 +775,7 @@ init_fnc_t init_sequence_r[] = {
initr_flash, initr_flash,
#endif #endif
INIT_FUNC_WATCHDOG_RESET 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 */ /* initialize higher level parts of CPU like time base and timers */
cpu_init_r, cpu_init_r,
#endif #endif