| Message ID | 1416471060-16135-1-git-send-email-bmeng.cn@gmail.com |
|---|---|
| State | Accepted |
| Delegated to: | Simon Glass |
| Headers | show |
On 20 November 2014 at 01:11, Bin Meng <bmeng.cn@gmail.com> wrote: > 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> > --- > 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(-) Acked-by: Simon Glass <sjg@chromium.org> Tested on chromebook_link: Tested-by: Simon Glass <sjg@chromium.org>
On 24 November 2014 at 20:06, Simon Glass <sjg@chromium.org> wrote: > On 20 November 2014 at 01:11, Bin Meng <bmeng.cn@gmail.com> wrote: >> 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> >> --- >> 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(-) > > Acked-by: Simon Glass <sjg@chromium.org> > > Tested on chromebook_link: > Tested-by: Simon Glass <sjg@chromium.org> Applied to u-boot-x86, thanks!
diff --git a/arch/x86/cpu/cpu.c b/arch/x86/cpu/cpu.c index cf0606e..1a6f679 100644 --- a/arch/x86/cpu/cpu.c +++ b/arch/x86/cpu/cpu.c @@ -319,12 +319,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 0399417..f454b83 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 7c33900..b5ea030 100644 --- a/common/board_r.c +++ b/common/board_r.c @@ -774,7 +774,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
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> --- 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(-)