diff options
| author | Stefan Roese <sr@denx.de> | 2008-07-14 10:45:47 +0200 |
|---|---|---|
| committer | Stefan Roese <sr@denx.de> | 2008-07-14 10:45:47 +0200 |
| commit | 4b326101d6cfaeab8250988bc4c7f51e6c92d719 (patch) | |
| tree | d04632af08591263f5cd6fc8a5c6ba8ac3d6d246 /board/integratorcp/flash.c | |
| parent | 69e2c6d0d13d7c8cf1612ac090bdc4c59ba6858e (diff) | |
| parent | d5996dd555edf52721b7691a4c59de016251ed39 (diff) | |
| download | olio-uboot-2014.01-4b326101d6cfaeab8250988bc4c7f51e6c92d719.tar.xz olio-uboot-2014.01-4b326101d6cfaeab8250988bc4c7f51e6c92d719.zip | |
Merge branch 'master' of /home/stefan/git/u-boot/u-boot into next
Diffstat (limited to 'board/integratorcp/flash.c')
| -rw-r--r-- | board/integratorcp/flash.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/board/integratorcp/flash.c b/board/integratorcp/flash.c index b653c058e..59961cdab 100644 --- a/board/integratorcp/flash.c +++ b/board/integratorcp/flash.c @@ -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 */ |