diff options
author | Tom Rini <trini@ti.com> | 2013-08-13 13:14:02 (GMT) |
---|---|---|
committer | Tom Rini <trini@ti.com> | 2013-08-13 13:14:02 (GMT) |
commit | b98d934128bcd98106e764d2f492ac79c38ae53d (patch) | |
tree | 5e078614fccb51f34fa8f7aa8d92c4f5f518b686 /arch/powerpc/cpu/mpc85xx/cpu_init.c | |
parent | 67cafc0861477bf19a587508ed13f4538c7a281e (diff) | |
parent | 3aab0cd852d7c9565c2559a7983cbb73852bac28 (diff) | |
download | u-boot-b98d934128bcd98106e764d2f492ac79c38ae53d.tar.xz |
Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx
Diffstat (limited to 'arch/powerpc/cpu/mpc85xx/cpu_init.c')
-rw-r--r-- | arch/powerpc/cpu/mpc85xx/cpu_init.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/arch/powerpc/cpu/mpc85xx/cpu_init.c b/arch/powerpc/cpu/mpc85xx/cpu_init.c index 25beda2..48b3826 100644 --- a/arch/powerpc/cpu/mpc85xx/cpu_init.c +++ b/arch/powerpc/cpu/mpc85xx/cpu_init.c @@ -399,6 +399,14 @@ int cpu_init_r(void) sync(); } #endif +#ifdef CONFIG_SYS_FSL_ERRATUM_A005812 + /* + * A-005812 workaround sets bit 32 of SPR 976 for SoCs running + * in write shadow mode. Checking DCWS before setting SPR 976. + */ + if (mfspr(L1CSR2) & L1CSR2_DCWS) + mtspr(SPRN_HDBCR0, (mfspr(SPRN_HDBCR0) | 0x80000000)); +#endif #if defined(CONFIG_PPC_SPINTABLE_COMPATIBLE) && defined(CONFIG_MP) spin = getenv("spin_table_compat"); @@ -532,8 +540,10 @@ skip_l2: enable_cpc(); +#ifndef CONFIG_SYS_FSL_NO_SERDES /* needs to be in ram since code uses global static vars */ fsl_serdes_init(); +#endif #ifdef CONFIG_SYS_FSL_ERRATUM_A005871 if (IS_SVR_REV(svr, 1, 0)) { |