diff options
| author | Tom Rini <trini@ti.com> | 2014-12-04 09:24:05 -0500 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2014-12-04 09:24:05 -0500 |
| commit | 97cdf64026c7d749dd7a5c0dbaba7a60a7292ac9 (patch) | |
| tree | 2bd7522657fef09538d52b4dd6cef71a9031d273 /common/fdt_support.c | |
| parent | f0c6e1c31b94f193047619b6adf67c2d792b659e (diff) | |
| parent | 1d8104fe8897c5fec3e03b4165bc67c57eeeaa72 (diff) | |
| download | talos-obmc-uboot-97cdf64026c7d749dd7a5c0dbaba7a60a7292ac9.tar.gz talos-obmc-uboot-97cdf64026c7d749dd7a5c0dbaba7a60a7292ac9.zip | |
Merge branch 'sandbox' of git://git.denx.de/u-boot-x86
Diffstat (limited to 'common/fdt_support.c')
| -rw-r--r-- | common/fdt_support.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/common/fdt_support.c b/common/fdt_support.c index 6254e342fd..8266bca7d6 100644 --- a/common/fdt_support.c +++ b/common/fdt_support.c @@ -8,6 +8,7 @@ */ #include <common.h> +#include <inttypes.h> #include <stdio_dev.h> #include <linux/ctype.h> #include <linux/types.h> @@ -914,8 +915,6 @@ void fdt_del_node_and_alias(void *blob, const char *alias) fdt_delprop(blob, off, alias); } -#define PRu64 "%llx" - /* Max address size we deal with */ #define OF_MAX_ADDR_CELLS 4 #define OF_BAD_ADDR ((u64)-1) @@ -973,8 +972,8 @@ static u64 of_bus_default_map(fdt32_t *addr, const fdt32_t *range, s = of_read_number(range + na + pna, ns); da = of_read_number(addr, na); - debug("OF: default map, cp="PRu64", s="PRu64", da="PRu64"\n", - cp, s, da); + debug("OF: default map, cp=%" PRIu64 ", s=%" PRIu64 + ", da=%" PRIu64 "\n", cp, s, da); if (da < cp || da >= (cp + s)) return OF_BAD_ADDR; @@ -1052,7 +1051,7 @@ static int of_translate_one(void * blob, int parent, struct of_bus *bus, finish: of_dump_addr("OF: parent translation for:", addr, pna); - debug("OF: with offset: "PRu64"\n", offset); + debug("OF: with offset: %" PRIu64 "\n", offset); /* Translate it into parent bus space */ return pbus->translate(addr, offset, pna); @@ -1381,9 +1380,9 @@ int fdt_verify_alias_address(void *fdt, int anode, const char *alias, u64 addr) dt_addr = fdt_translate_address(fdt, node, reg); if (addr != dt_addr) { - printf("Warning: U-Boot configured device %s at address %llx,\n" - " but the device tree has it address %llx.\n", - alias, addr, dt_addr); + printf("Warning: U-Boot configured device %s at address %" + PRIx64 ",\n but the device tree has it address %" + PRIx64 ".\n", alias, addr, dt_addr); return 0; } |
