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

This commit is contained in:
Wolfgang Denk 2008-05-10 00:18:22 +02:00
commit f3f3175746

View File

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