diff options
| author | Simon Glass <sjg@chromium.org> | 2017-03-28 10:27:29 -0600 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2017-04-05 13:55:08 -0400 |
| commit | 8749fa6af3e94630eeb02bc3a45fe9bdcb8d3087 (patch) | |
| tree | bb62d9299642dbdfa3a53dc430906c0b3e52f85c | |
| parent | 689697785e04aefd08b6efdc4e47a737819da173 (diff) | |
| download | u-boot-8749fa6af3e94630eeb02bc3a45fe9bdcb8d3087.tar.gz | |
board_f: powerpc: Make prt_8260_rsr(), prt_8260_clks() private
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>
Reviewed-by: Stefan Roese <sr@denx.de>
| -rw-r--r-- | arch/powerpc/cpu/mpc8260/cpu.c | 9 | ||||
| -rw-r--r-- | arch/powerpc/include/asm/processor.h | 2 | ||||
| -rw-r--r-- | common/board_f.c | 4 | ||||
| -rw-r--r-- | 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 f1c97fc2a3..91cb2a770d 100644 --- a/common/board_f.c +++ b/common/board_f.c @@ -842,10 +842,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 2e02709c66..35e2b154ae 100644 --- a/include/common.h +++ b/include/common.h @@ -637,9 +637,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 @@ -710,9 +708,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); |