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

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

diff --git a/board/integratorcp/flash.c b/board/integratorcp/flash.c
index b653c05..7effea6 100644 (file)
--- a/board/integratorcp/flash.c
+++ b/board/integratorcp/flash.c
@@ -125,11 +125,11 @@ unsigned long flash_init (void)
                       CFG_MONITOR_BASE + monitor_flash_len - 1, &flash_info[0]);
 #endif
 
-#ifdef CFG_ENV_IS_IN_FLASH
+#ifdef CONFIG_ENV_IS_IN_FLASH
        /* ENV protection ON */
        flash_protect(FLAG_PROTECT_SET,
-                     CFG_ENV_ADDR,
-                     CFG_ENV_ADDR + CFG_ENV_SECT_SIZE - 1,
+                     CONFIG_ENV_ADDR,
+                     CONFIG_ENV_ADDR + CONFIG_ENV_SECT_SIZE - 1,
                      &flash_info[0]);
 #endif
 
@@ -393,7 +393,7 @@ int flash_erase (flash_info_t * info, int s_first, int s_last)
                                                *addr = (FPW) 0x00D000D0;
                                        } else {
 #ifdef DEBUG
-                                               printf ("Timeout,0x%08x\n", status);
+                                               printf ("Timeout,0x%08lx\n", status);
 #else
                                                printf("Timeout\n");
 #endif
@@ -515,7 +515,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 (%x)\n", (ulong) addr, *addr);
+               printf ("not erased at %08lx (%lx)\n", (ulong) addr, *addr);
                return (2);
        }
 
@@ -542,7 +542,7 @@ static int write_data (flash_info_t * info, ulong dest, FPW data)
 #ifdef DEBUG
                        *addr = (FPW) 0x00700070;
                        status = *addr;
-                       printf("## status=0x%08x, addr=0x%08x\n", status, addr);
+                       printf("## status=0x%08lx, addr=0x%p\n", status, addr);
 #endif
                        *addr = (FPW) 0x00500050; /* clear status register cmd */
                        *addr = (FPW) 0x00FF00FF; /* restore read mode */