rename CFG_ENV macros to CONFIG_ENV

[platform/kernel/u-boot.git] / board / gcplus / flash.c

diff --git a/board/gcplus/flash.c b/board/gcplus/flash.c
index 5455656..48f33b2 100644 (file)
--- a/board/gcplus/flash.c
+++ b/board/gcplus/flash.c
@@ -87,8 +87,8 @@ flash_init(void)
                      CFG_FLASH_BASE + monitor_flash_len - 1, &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;
 }
@@ -404,7 +404,7 @@ 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 (%x)\n", (ulong) addr, *addr);
+               printf("not erased at %08lX (%lX)\n", (ulong) addr, *addr);
                return (2);
        }
        /* Disable interrupts which might cause a timeout here */