Merge branch 'master' of /home/wd/git/u-boot/custodians

[oweals/u-boot.git] / board / mp2usb / flash.c

diff --git a/board/mp2usb/flash.c b/board/mp2usb/flash.c
index 89ced163bb7aaf056f6aba012f2532576664329d..527e74ef13cef97d5a2bf14cea76d09992624399 100644 (file)
--- a/board/mp2usb/flash.c
+++ b/board/mp2usb/flash.c
@@ -98,8 +98,8 @@ unsigned long flash_init (void)
                        &flash_info[0] );
 
        flash_protect ( FLAG_PROTECT_SET,
-                       CFG_ENV_ADDR,
-                       CFG_ENV_ADDR + CFG_ENV_SIZE - 1, &flash_info[0] );
+                       CONFIG_ENV_ADDR,
+                       CONFIG_ENV_ADDR + CONFIG_ENV_SIZE - 1, &flash_info[0] );
 
        return size;
 }
@@ -426,7 +426,7 @@ static int write_data (flash_info_t *info, ulong dest, FPW data)
 
        /* Check if Flash is (sufficiently) erased */
        if ((*addr & data) != data) {
-               printf ("not erased at %08lx (%lx)\n", (ulong) addr, *addr);
+               printf ("not erased at %08lx (%lx)\n", (ulong) addr, (ulong) *addr);
                return (2);
        }
        /*