diff options
| author | Tom Rini <trini@konsulko.com> | 2016-12-05 17:00:23 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-12-05 17:00:23 -0500 |
| commit | bf50ac918bfbc0042e43b0a5c87cfa9dd4351e0a (patch) | |
| tree | dd4473fe2bfce799aac320280f64c22b3e891a4a /arch/powerpc/cpu/mpc85xx/cpu_init.c | |
| parent | 0bf1bc44070723f032ffac650eeff5157a289206 (diff) | |
| parent | dd2ad2f1318975da1cf64cf95a4a3b3ed44172a5 (diff) | |
Merge git://git.denx.de/u-boot-fsl-qoriq
Diffstat (limited to 'arch/powerpc/cpu/mpc85xx/cpu_init.c')
| -rw-r--r-- | arch/powerpc/cpu/mpc85xx/cpu_init.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/arch/powerpc/cpu/mpc85xx/cpu_init.c b/arch/powerpc/cpu/mpc85xx/cpu_init.c index c2402a8bda2..d1b6699a6a1 100644 --- a/arch/powerpc/cpu/mpc85xx/cpu_init.c +++ b/arch/powerpc/cpu/mpc85xx/cpu_init.c @@ -45,7 +45,9 @@ #include <nand.h> #include <errno.h> #endif - +#ifndef CONFIG_ARCH_QEMU_E500 +#include <fsl_ddr.h> +#endif #include "../../../../drivers/block/fsl_sata.h" #ifdef CONFIG_U_QE #include <fsl_qe.h> @@ -947,6 +949,10 @@ int cpu_init_r(void) #endif /* CONFIG_SYS_FSL_USB_DUAL_PHY_ENABLE */ +#ifdef CONFIG_SYS_FSL_ERRATUM_A009942 + erratum_a009942_check_cpo(); +#endif + #ifdef CONFIG_FMAN_ENET fman_enet_init(); #endif |