brain-hackers_pepepper-mirror/u-boot-brain
1
0
Fork 0
mirror of https://github.com/brain-hackers/u-boot-brain synced 2024-06-09 23:36:03 +09:00
Code Issues Projects Releases Wiki Activity

board_f: powerpc: Make prt_8260_rsr(), prt_8260_clks() private

Browse Source 
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>
This commit is contained in:
Simon Glass 2017-03-28 10:27:29 -06:00 committed by Tom Rini
parent 689697785e
commit 8749fa6af3
4 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
arch/powerpc/cpu/mpc8260/cpu.c
View File

@ -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) {

2
arch/powerpc/include/asm/processor.h
View File

@ -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*/

4
common/board_f.c
View File

@ -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

7
include/common.h
View File

@ -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);