diff options
author | Wolfgang Denk <wd@denx.de> | 2008-07-31 09:02:41 +0200 |
---|---|---|
committer | Wolfgang Denk <wd@denx.de> | 2008-07-31 09:02:41 +0200 |
commit | 695a29b768d549b8c2df7461bb28b2f271325ad3 (patch) | |
tree | b8f0a5a0490aaa3b1c73a7737989927e7783fdfb /board/atmel | |
parent | 09d318a8bb1444ec92e31cafcdba877eb9409e58 (diff) | |
parent | 861931c30bdb0cfbecf6c4f944bd221be572f010 (diff) | |
download | u-boot-imx-695a29b768d549b8c2df7461bb28b2f271325ad3.zip u-boot-imx-695a29b768d549b8c2df7461bb28b2f271325ad3.tar.gz u-boot-imx-695a29b768d549b8c2df7461bb28b2f271325ad3.tar.bz2 |
Merge branch 'master' of /home/wd/git/u-boot/custodians
Diffstat (limited to 'board/atmel')
-rw-r--r-- | board/atmel/atngw100/atngw100.c | 2 | ||||
-rw-r--r-- | board/atmel/atstk1000/atstk1000.c | 2 | ||||
-rw-r--r-- | board/atmel/atstk1000/flash.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/board/atmel/atngw100/atngw100.c b/board/atmel/atngw100/atngw100.c index f2c3e79..4ead533 100644 --- a/board/atmel/atngw100/atngw100.c +++ b/board/atmel/atngw100/atngw100.c @@ -81,7 +81,7 @@ phys_size_t initdram(int board_type) unmap_physmem(sdram_base, EBI_SDRAM_SIZE); if (expected_size != actual_size) - printf("Warning: Only %u of %u MiB SDRAM is working\n", + printf("Warning: Only %lu of %lu MiB SDRAM is working\n", actual_size >> 20, expected_size >> 20); return actual_size; diff --git a/board/atmel/atstk1000/atstk1000.c b/board/atmel/atstk1000/atstk1000.c index 6371e2d..d284fc1 100644 --- a/board/atmel/atstk1000/atstk1000.c +++ b/board/atmel/atstk1000/atstk1000.c @@ -104,7 +104,7 @@ phys_size_t initdram(int board_type) unmap_physmem(sdram_base, EBI_SDRAM_SIZE); if (expected_size != actual_size) - printf("Warning: Only %u of %u MiB SDRAM is working\n", + printf("Warning: Only %lu of %lu MiB SDRAM is working\n", actual_size >> 20, expected_size >> 20); return actual_size; diff --git a/board/atmel/atstk1000/flash.c b/board/atmel/atstk1000/flash.c index 12537f3..e2bfd4a 100644 --- a/board/atmel/atstk1000/flash.c +++ b/board/atmel/atstk1000/flash.c @@ -70,7 +70,7 @@ unsigned long flash_init(void) void flash_print_info(flash_info_t *info) { - printf("Flash: Vendor ID: 0x%02x, Product ID: 0x%02x\n", + printf("Flash: Vendor ID: 0x%02lx, Product ID: 0x%02lx\n", info->flash_id >> 16, info->flash_id & 0xffff); printf("Size: %ld MB in %d sectors\n", info->size >> 10, info->sector_count); |