From: Wolfgang Denk <wd@denx.de>
Date: Fri, 9 May 2008 22:18:22 +0000 (+0200)
Subject: Merge branch 'master' of git://www.denx.de/git/u-boot-mpc85xx
X-Git-Tag: v2008.10-rc1~332
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f3f31757464bd91af4de17de386cb763fa0b6ba0;hp=1b5605ca57fbb364f4d78eeee28b974ed875e888;p=platform%2Fkernel%2Fu-boot.git

Merge branch 'master' of git://denx.de/git/u-boot-mpc85xx
---

diff --git a/board/freescale/mpc8548cds/mpc8548cds.c b/board/freescale/mpc8548cds/mpc8548cds.c
index dc39fbe..efe2a3a 100644
--- a/board/freescale/mpc8548cds/mpc8548cds.c
+++ b/board/freescale/mpc8548cds/mpc8548cds.c
@@ -59,6 +59,7 @@ int checkboard (void)
 	uint pci_slot = get_pci_slot ();
 
 	uint cpu_board_rev = get_cpu_board_revision ();
+	uint svr;
 
 	printf ("Board: CDS Version 0x%02x, PCI Slot %d\n",
 		get_board_version (), pci_slot);
@@ -71,12 +72,16 @@ int checkboard (void)
 	 */
 	local_bus_init ();
 
+	svr = get_svr();
+
 	/*
 	 * Fix CPU2 errata: A core hang possible while executing a
 	 * msync instruction and a snoopable transaction from an I/O
 	 * master tagged to make quick forward progress is present.
+	 * Fixed in Silicon Rev.2.1
 	 */
-	ecm->eebpcr |= (1 << 16);
+	if (!(SVR_MAJ(svr) >= 2 && SVR_MIN(svr) >= 1))
+		ecm->eebpcr |= (1 << 16);
 
 	/*
 	 * Hack TSEC 3 and 4 IO voltages.