diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2016-01-15 15:31:13 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2016-01-15 15:33:59 +0100 |
| commit | e2306ada3ee62a9dcf82c072477d9eeeb8bbede3 (patch) | |
| tree | 638bfbfbda2bf6fa1711c26d6d1566bc8f9888ed /common | |
| parent | 7f2e215fcfce225a3e6e09a0364693e2ada0cdd2 (diff) | |
| download | barebox-e2306ada3ee62a9dcf82c072477d9eeeb8bbede3.tar.gz barebox-e2306ada3ee62a9dcf82c072477d9eeeb8bbede3.tar.xz | |
Convert users of PRINTF_CONVERSION_RESOURCE to %pa
printf now supports printing resource_size_t directly, convert
all users of the previously used PRINTF_CONVERSION_RESOURCE over
to %pa.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'common')
| -rw-r--r-- | common/bootm.c | 12 | ||||
| -rw-r--r-- | common/uimage.c | 7 |
2 files changed, 9 insertions, 10 deletions
diff --git a/common/bootm.c b/common/bootm.c index 08125e7bb0..ec6e899bb3 100644 --- a/common/bootm.c +++ b/common/bootm.c @@ -326,9 +326,9 @@ static int bootm_open_oftree(struct image_data *data) static void bootm_print_info(struct image_data *data) { if (data->os_res) - printf("OS image is at " PRINTF_CONVERSION_RESOURCE "-" PRINTF_CONVERSION_RESOURCE "\n", - data->os_res->start, - data->os_res->end); + printf("OS image is at %pa-%pa\n", + &data->os_res->start, + &data->os_res->end); else printf("OS image not yet relocated\n"); @@ -343,9 +343,9 @@ static void bootm_print_info(struct image_data *data) printf(", multifile image %d", data->initrd_num); printf("\n"); if (data->initrd_res) - printf("initrd is at " PRINTF_CONVERSION_RESOURCE "-" PRINTF_CONVERSION_RESOURCE "\n", - data->initrd_res->start, - data->initrd_res->end); + printf("initrd is at %pa-%pa\n", + &data->initrd_res->start, + &data->initrd_res->end); else printf("initrd image not yet relocated\n"); } diff --git a/common/uimage.c b/common/uimage.c index a7011a7623..59d7b65c90 100644 --- a/common/uimage.c +++ b/common/uimage.c @@ -354,10 +354,9 @@ static int uimage_sdram_flush(void *buf, unsigned int len) uimage_resource = request_sdram_region("uimage", start, size); if (!uimage_resource) { - printf("unable to request SDRAM " - PRINTF_CONVERSION_RESOURCE "-" - PRINTF_CONVERSION_RESOURCE "\n", - start, start + size - 1); + resource_size_t prsize = start + size - 1; + printf("unable to request SDRAM %pa - %pa\n", + &start, &prsize); return -ENOMEM; } } |