diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2011-01-17 09:43:40 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2011-01-17 09:43:40 +0100 |
| commit | 2f0109b1bb833fe3481b37a6cfa0ae319d248754 (patch) | |
| tree | a7b1d214a66fcc4f5618fc4e4fec6d23237b6b28 /arch/blackfin | |
| parent | 2fed74ef6d446552300cc254de7b3e26140b04fe (diff) | |
| parent | d0e7facd5482c31a5640b31c9a4555e5a4ee215c (diff) | |
| download | barebox-2f0109b1bb833fe3481b37a6cfa0ae319d248754.tar.gz barebox-2f0109b1bb833fe3481b37a6cfa0ae319d248754.tar.xz | |
Merge branch 'master' into next
Diffstat (limited to 'arch/blackfin')
| -rw-r--r-- | arch/blackfin/boards/ipe337/cmd_alternate.c | 4 | ||||
| -rw-r--r-- | arch/blackfin/lib/blackfin_linux.c | 2 | ||||
| -rw-r--r-- | arch/blackfin/lib/traps.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/arch/blackfin/boards/ipe337/cmd_alternate.c b/arch/blackfin/boards/ipe337/cmd_alternate.c index 2883c77d32..116f910ef1 100644 --- a/arch/blackfin/boards/ipe337/cmd_alternate.c +++ b/arch/blackfin/boards/ipe337/cmd_alternate.c @@ -21,7 +21,7 @@ static int do_alternate(struct command *cmdtp, int argc, char *argv[]) ptr = buf; if ((*ptr) != MAGIC) { - printf("Wrong magic! Expected 0x%08x, got 0x%08x.\n", MAGIC, *ptr); + printf("Wrong magic! Expected 0x%08x, got 0x%08lx.\n", MAGIC, *ptr); return 1; } @@ -38,7 +38,7 @@ static int do_alternate(struct command *cmdtp, int argc, char *argv[]) } while (val >>= 1); } - printf("Bitcount : %d\n", bitcount); + printf("Bitcount : %ld\n", bitcount); free(buf); return (bitcount & 1) ? 3 : 2; diff --git a/arch/blackfin/lib/blackfin_linux.c b/arch/blackfin/lib/blackfin_linux.c index eda3f4c011..a20cf55748 100644 --- a/arch/blackfin/lib/blackfin_linux.c +++ b/arch/blackfin/lib/blackfin_linux.c @@ -48,7 +48,7 @@ static int do_bootm_linux(struct image_data *idata) image_header_t *os_header = &os_handle->header; appl = (int (*)(char *))image_get_ep(os_header); - printf("Starting Kernel at 0x%08x\n", appl); + printf("Starting Kernel at 0x%p\n", appl); if (relocate_image(os_handle, (void *)image_get_load(os_header))) return -1; diff --git a/arch/blackfin/lib/traps.c b/arch/blackfin/lib/traps.c index ce479b9d1b..14f1da9ff1 100644 --- a/arch/blackfin/lib/traps.c +++ b/arch/blackfin/lib/traps.c @@ -81,7 +81,7 @@ static const char *trap_to_string(int trapnr) void trap_c (struct pt_regs *regs) { - unsigned long trapnr = (regs->seqstat) & SEQSTAT_EXCAUSE; + uint32_t trapnr = (regs->seqstat) & SEQSTAT_EXCAUSE; const char *str; printf("Exception occured!\n\n"); |