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

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

diff --git a/board/esd/du440/du440.c b/board/esd/du440/du440.c
index ba3c97c1449c524bd123cb874775fe56b07a102d..426321e7bc22f6f4e7cb9249d1a212c9e2ffcdf9 100644 (file)
--- a/board/esd/du440/du440.c
+++ b/board/esd/du440/du440.c
@@ -24,7 +24,7 @@
 #include <asm/bitops.h>
 #include <command.h>
 #include <i2c.h>
-#include <ppc440.h>
+#include <asm/ppc440.h>
 #include "du440.h"
 
 DECLARE_GLOBAL_DATA_PTR;
@@ -265,8 +265,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);
 
        /*
         * release IO-RST#
@@ -350,7 +350,7 @@ int checkboard(void)
 
        puts("Board: DU440");
 
-       if (getenv_r("serial#", serno, sizeof(serno)) > 0) {
+       if (getenv_f("serial#", serno, sizeof(serno)) > 0) {
                puts(", serial# ");
                puts(serno);
        }