[rtems commit] bsp/mpc55xx: Errata e4396 for e200z7

[Sebastian Huber]

Module:    rtems
Branch:    master
Commit:    c6d35ad46b423e12c80b2616b5898357dcd0b835
Changeset: http://git.rtems.org/rtems/commit/?id=c6d35ad46b423e12c80b2616b5898357dcd0b835

Author:    Sebastian Huber <sebastian.huber at embedded-brains.de>
Date:      Wed Nov 21 09:46:58 2012 +0100

bsp/mpc55xx:  Errata e4396 for e200z7

---

 .../lib/libbsp/powerpc/mpc55xxevb/startup/start.S  |   12 ++++++++++--
 1 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/c/src/lib/libbsp/powerpc/mpc55xxevb/startup/start.S b/c/src/lib/libbsp/powerpc/mpc55xxevb/startup/start.S
index 77c9d84..e8ae3c0 100644
--- a/c/src/lib/libbsp/powerpc/mpc55xxevb/startup/start.S
+++ b/c/src/lib/libbsp/powerpc/mpc55xxevb/startup/start.S
@@ -170,9 +170,17 @@ _start:
 	ori	r3, r3, 0x4000
 	mtspr	HID0, r3
 
-	/* Enable branch prediction */
-	LWI	r3, FSL_EIS_BUCSR_BBFI | FSL_EIS_BUCSR_BPEN
+	/*
+	 * Enable branch prediction.
+	 *
+	 * Errata e4396: e200z7: Erroneous Address Fetch
+	 *
+	 * The propose workaround does not work.
+	 */
+#if MPC55XX_CHIP_FAMILY != 567
+	LWI	r3, FSL_EIS_BUCSR_BBFI | FSL_EIS_BUCSR_BALLOC_ALL | FSL_EIS_BUCSR_BPRED_NOT_TAKEN | FSL_EIS_BUCSR_BPEN
 	mtspr	FSL_EIS_BUCSR, r3
+#endif
 
 #endif /* MPC55XX_NEEDS_LOW_LEVEL_INIT */