Merge branch 'next' of /home/wd/git/u-boot/next

[u-boot] / board / esd / pmc440 / pmc440.c

diff --git a/board/esd/pmc440/pmc440.c b/board/esd/pmc440/pmc440.c
index bd43a9aef0d6ccf6a23ed58a61f81c9b66a83865..5236f44468f9d494ad6edd9dada2c9dadbd79102 100644 (file)
--- a/board/esd/pmc440/pmc440.c
+++ b/board/esd/pmc440/pmc440.c
@@ -29,7 +29,7 @@
 #include <common.h>
 #include <libfdt.h>
 #include <fdt_support.h>
-#include <ppc440.h>
+#include <asm/ppc440.h>
 #include <asm/processor.h>
 #include <asm/io.h>
 #include <asm/bitops.h>
@@ -68,7 +68,7 @@ struct serial_device *default_serial_console(void)
         */
        mfsdr(SDR0_PINSTP, val);
        if (((val & 0xf0000000) >> 29) != 7)
-               return &serial1_device;
+               return &eserial2_device;
 
        ulong scratchreg = in_be32((void*)GPIO0_ISR3L);
        if (!(scratchreg & 0x80)) {
@@ -90,9 +90,9 @@ struct serial_device *default_serial_console(void)
        }
 
        if (scratchreg & 0x01)
-               return &serial1_device;
+               return &eserial2_device;
        else
-               return &serial0_device;
+               return &eserial1_device;
 }
 
 int board_early_init_f(void)
@@ -426,8 +426,8 @@ int misc_init_r(void)
         * This fix will make the MAL burst disabling patch for the Linux
         * EMAC driver obsolete.
         */
-       reg = mfdcr(PLB4_ACR) & ~PLB4_ACR_WRP;
-       mtdcr(PLB4_ACR, reg);
+       reg = mfdcr(PLB4A0_ACR) & ~PLB4Ax_ACR_WRP_MASK;
+       mtdcr(PLB4A0_ACR, reg);
 
 #ifdef CONFIG_FPGA
        pmc440_init_fpga();