Djam/u-boot
1
0
Fork 0
mirror of https://github.com/u-boot/u-boot.git synced 2025-05-08 19:11:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

board_f: powerpc: Move prt_83xx_rsr() to private code

Browse source 
This function is called just before checkcpu() on MPX83xx. Move it to the
code for that arch.

Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Simon Glass 2017-03-28 10:27:27 -06:00 • committed by Tom Rini
parent 727e94a4ac
commit d891ab95c2
5 changed files with 8 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

5
arch/powerpc/cpu/mpc83xx/cpu.c
View file

@ -33,6 +33,7 @@ int checkcpu(void)
u32 pvr = get_pvr(); u32 pvr = get_pvr();
u32 spridr; u32 spridr;
char buf[32]; char buf[32];
int ret;
int i; int i;
const struct cpu_type { const struct cpu_type {
@ -61,6 +62,10 @@ int checkcpu(void)
immr = (immap_t *)CONFIG_SYS_IMMR; immr = (immap_t *)CONFIG_SYS_IMMR;
ret = prt_83xx_rsr();
if (ret)
return ret;
puts("CPU: "); puts("CPU: ");
switch (pvr & 0xffff0000) { switch (pvr & 0xffff0000) {

1
arch/powerpc/cpu/mpc83xx/cpu_init.c
View file

@ -8,6 +8,7 @@
#include <mpc83xx.h> #include <mpc83xx.h>
#include <ioports.h> #include <ioports.h>
#include <asm/io.h> #include <asm/io.h>
#include <asm/processor.h>
#ifdef CONFIG_USB_EHCI_FSL #ifdef CONFIG_USB_EHCI_FSL
#include <usb/ehci-ci.h> #include <usb/ehci-ci.h>
#endif #endif

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

@ -1354,6 +1354,8 @@ void ll_puts(const char *);
/* In misc.c */ /* In misc.c */
void _nmask_and_or_msr(unsigned long nmask, unsigned long or_val); void _nmask_and_or_msr(unsigned long nmask, unsigned long or_val);
int prt_83xx_rsr(void);
#endif /* ndef ASSEMBLY*/ #endif /* ndef ASSEMBLY*/
#ifdef CONFIG_MACH_SPECIFIC #ifdef CONFIG_MACH_SPECIFIC

3
common/board_f.c
View file

@ -849,9 +849,6 @@ static const init_fnc_t init_sequence_f[] = {
prt_8260_rsr, prt_8260_rsr,
prt_8260_clks, prt_8260_clks,
#endif /* CONFIG_MPC8260 */ #endif /* CONFIG_MPC8260 */
#if defined(CONFIG_MPC83xx)
prt_83xx_rsr,
#endif
#if defined(CONFIG_PPC) || defined(CONFIG_M68K) || defined(CONFIG_SH) #if defined(CONFIG_PPC) || defined(CONFIG_M68K) || defined(CONFIG_SH)
checkcpu, checkcpu,
#endif #endif

2
include/common.h
View file

@ -712,8 +712,6 @@ ulong cpu_init_f(void);
int cpu_init_r (void); int cpu_init_r (void);
#if defined(CONFIG_MPC8260) #if defined(CONFIG_MPC8260)
int prt_8260_rsr (void); int prt_8260_rsr (void);
#elif defined(CONFIG_MPC83xx)
int prt_83xx_rsr (void);
#endif #endif
/* $(CPU)/interrupts.c */ /* $(CPU)/interrupts.c */