diff options
| author | Tom Rini <trini@konsulko.com> | 2018-09-18 20:42:37 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2018-09-18 20:42:37 -0400 |
| commit | 4e710ebb4463c8e031eb269c012fbadb2479608b (patch) | |
| tree | f334518436bc0262b483308026fbba413a45493e /arch/powerpc/cpu/mpc83xx/cpu_init.c | |
| parent | b57f1895b669e3fbdca486e7c40dfea00f22bb93 (diff) | |
| parent | 75629a25087cd9897305375421abe2248bc40e72 (diff) | |
Merge git://git.denx.de/u-boot-dm
- MPC83xx device tree additions (CPU and RAM)
- Fix sandbox build error
- Sync bitrev with Linux
- Various ofnode/DT improvements
Diffstat (limited to 'arch/powerpc/cpu/mpc83xx/cpu_init.c')
| -rw-r--r-- | arch/powerpc/cpu/mpc83xx/cpu_init.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/powerpc/cpu/mpc83xx/cpu_init.c b/arch/powerpc/cpu/mpc83xx/cpu_init.c index fcac9f63a81..1555205e069 100644 --- a/arch/powerpc/cpu/mpc83xx/cpu_init.c +++ b/arch/powerpc/cpu/mpc83xx/cpu_init.c @@ -464,6 +464,7 @@ static int print_83xx_arb_event(int force) } #endif /* CONFIG_DISPLAY_AER_xxxx */ +#ifndef CONFIG_CPU_MPC83XX /* * Figure out the cause of the reset */ @@ -505,3 +506,4 @@ int prt_83xx_rsr(void) return 0; } +#endif |