Merge branch 'master' into next

[u-boot] / doc / README.mpc85xxads

diff --git a/doc/README.mpc85xxads b/doc/README.mpc85xxads
index 08d6831fb62abfc9233df043b3d29bfe02276471..ae8202bdd17d4146be4f0196dbb8ee4ab9d1a530 100644 (file)
--- a/doc/README.mpc85xxads
+++ b/doc/README.mpc85xxads
@@ -100,6 +100,9 @@ Updated 13-July-2004 Jon Loeliger
        SW7[1:4]  =    0101 =  5    => 5 x 66    = 330  CCB Sysclk
        SW7[5:6]  =      01         => 5:2 x 330 = 825  Core clock
 
+    In order to use PCI-X (only in the first PCI slot.  The one with
+    the RIO connector), you need to set SW1[4] (config) to 1 (off).
+    Also, configure the board to run PCI at 66 MHz.
 
 2. MEMORY MAP TO WORK WITH LINUX KERNEL
 
@@ -130,7 +133,7 @@ Updated 13-July-2004 Jon Loeliger
        include/configs/MPC8540ADS.h
        include/configs/MPC8560ADS.h
 
-    CONFIG_BOOKE           BOOKE(e.g. Motorola MPC85xx, IBM 440, etc)
+    CONFIG_BOOKE           BOOKE(e.g. Motorola MPC85xx, AMCC 440, etc)
     CONFIG_E500                    BOOKE e500 family(Motorola)
     CONFIG_MPC85xx         MPC8540,MPC8560 and their derivatives
     CONFIG_MPC8540         MPC8540 specific