Move these two function calls into checkcpu(), which is called on this arch immediately after these two.
Signed-off-by: Simon Glass sjg@chromium.org ---
arch/powerpc/cpu/mpc8260/cpu.c | 9 ++++++++- arch/powerpc/include/asm/processor.h | 2 ++ common/board_f.c | 4 ---- include/common.h | 7 +------ 4 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/arch/powerpc/cpu/mpc8260/cpu.c b/arch/powerpc/cpu/mpc8260/cpu.c index 9f2be3cb22..58d1c0261c 100644 --- a/arch/powerpc/cpu/mpc8260/cpu.c +++ b/arch/powerpc/cpu/mpc8260/cpu.c @@ -50,7 +50,14 @@ int checkcpu (void) uint pvr = get_pvr (); uint immr, rev, m, k; char buf[32]; - + int ret; + + ret = prt_8260_rsr(); + if (ret) + return ret; + ret = prt_8260_clks(); + if (ret) + return ret; puts ("CPU: ");
switch (pvr) { diff --git a/arch/powerpc/include/asm/processor.h b/arch/powerpc/include/asm/processor.h index c032726df1..fd38da9fe5 100644 --- a/arch/powerpc/include/asm/processor.h +++ b/arch/powerpc/include/asm/processor.h @@ -1355,6 +1355,8 @@ void ll_puts(const char *); void _nmask_and_or_msr(unsigned long nmask, unsigned long or_val);
int prt_83xx_rsr(void); +int prt_8260_rsr(void); +int prt_8260_clks(void);
#endif /* ndef ASSEMBLY*/
diff --git a/common/board_f.c b/common/board_f.c index 9d17ae0100..8f37662a57 100644 --- a/common/board_f.c +++ b/common/board_f.c @@ -857,10 +857,6 @@ static const init_fnc_t init_sequence_f[] = { console_init_f, /* stage 1 init of console */ display_options, /* say that we are here */ display_text_info, /* show debugging info if required */ -#if defined(CONFIG_MPC8260) - prt_8260_rsr, - prt_8260_clks, -#endif /* CONFIG_MPC8260 */ #if defined(CONFIG_PPC) || defined(CONFIG_M68K) || defined(CONFIG_SH) checkcpu, #endif diff --git a/include/common.h b/include/common.h index 6f08110b74..bc486489a2 100644 --- a/include/common.h +++ b/include/common.h @@ -640,9 +640,7 @@ int serial_stub_tstc(struct stdio_dev *sdev);
/* $(CPU)/speed.c */ int get_clocks (void); -#if defined(CONFIG_MPC8260) -int prt_8260_clks (void); -#elif defined(CONFIG_MPC5xxx) +#if defined(CONFIG_MPC5xxx) int prt_mpc5xxx_clks (void); #endif #ifdef CONFIG_4xx @@ -713,9 +711,6 @@ ulong cpu_init_f(void); #endif
int cpu_init_r (void); -#if defined(CONFIG_MPC8260) -int prt_8260_rsr (void); -#endif
/* $(CPU)/interrupts.c */ int interrupt_init (void);