diff options
| author | Markus Klotzbuecher <mk@denx.de> | 2008-07-21 12:37:56 +0200 |
|---|---|---|
| committer | Markus Klotzbuecher <mk@denx.de> | 2008-07-21 12:37:56 +0200 |
| commit | ab06bddb04ed4be50a8f9ad5f94fa23953a734e3 (patch) | |
| tree | 5df2528b42f073dd5bbb34b14f288a1811073729 /board/integratorcp | |
| parent | 262423955895ba4599fa11d7c49dcffb65af0afd (diff) | |
| parent | 1953d128fd07f07d1c3810a28c0863ea64dae1b6 (diff) | |
| download | u-boot-imx-ab06bddb04ed4be50a8f9ad5f94fa23953a734e3.zip u-boot-imx-ab06bddb04ed4be50a8f9ad5f94fa23953a734e3.tar.gz u-boot-imx-ab06bddb04ed4be50a8f9ad5f94fa23953a734e3.tar.bz2 | |
Merge branch 'master' of git://www.denx.de/git/u-boot
Diffstat (limited to 'board/integratorcp')
| -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 b653c05..59961cd 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 */ |