stm32mp1: display board information

[oweals/u-boot.git] / common / fdt_support.c

diff --git a/common/fdt_support.c b/common/fdt_support.c
index 34d2bd59c485905fe2d60817aaf9af8b39d80d96..42583e3ed8c895d5b2b081bccc846be48d17bde4 100644 (file)
--- a/common/fdt_support.c
+++ b/common/fdt_support.c
@@ -7,7 +7,7 @@
  */
 
 #include <common.h>
-#include <inttypes.h>
+#include <mapmem.h>
 #include <stdio_dev.h>
 #include <linux/ctype.h>
 #include <linux/types.h>
@@ -409,7 +409,11 @@ static int fdt_pack_reg(const void *fdt, void *buf, u64 *address, u64 *size,
        return p - (char *)buf;
 }
 
+#if CONFIG_NR_DRAM_BANKS > 4
+#define MEMORY_BANKS_MAX CONFIG_NR_DRAM_BANKS
+#else
 #define MEMORY_BANKS_MAX 4
+#endif
 int fdt_fixup_memory_banks(void *blob, u64 start[], u64 size[], int banks)
 {
        int err, nodeoffset;
@@ -630,7 +634,7 @@ int fdt_shrink_to_minimum(void *blob, uint extrasize)
        fdt_set_totalsize(blob, actualsize);
 
        /* Add the new reservation */
-       ret = fdt_add_mem_rsv(blob, (uintptr_t)blob, actualsize);
+       ret = fdt_add_mem_rsv(blob, map_to_sysmem(blob), actualsize);
        if (ret < 0)
                return ret;
 
@@ -1021,8 +1025,7 @@ static u64 of_bus_default_map(fdt32_t *addr, const fdt32_t *range,
        s  = fdt_read_number(range + na + pna, ns);
        da = fdt_read_number(addr, na);
 
-       debug("OF: default map, cp=%" PRIu64 ", s=%" PRIu64
-             ", da=%" PRIu64 "\n", cp, s, da);
+       debug("OF: default map, cp=%llx, s=%llx, da=%llx\n", cp, s, da);
 
        if (da < cp || da >= (cp + s))
                return OF_BAD_ADDR;
@@ -1077,8 +1080,7 @@ static u64 of_bus_isa_map(fdt32_t *addr, const fdt32_t *range,
        s  = fdt_read_number(range + na + pna, ns);
        da = fdt_read_number(addr + 1, na - 1);
 
-       debug("OF: ISA map, cp=%" PRIu64 ", s=%" PRIu64
-             ", da=%" PRIu64 "\n", cp, s, da);
+       debug("OF: ISA map, cp=%llx, s=%llx, da=%llx\n", cp, s, da);
 
        if (da < cp || da >= (cp + s))
                return OF_BAD_ADDR;
@@ -1184,7 +1186,7 @@ static int of_translate_one(const void *blob, int parent, struct of_bus *bus,
 
  finish:
        of_dump_addr("OF: parent translation for:", addr, pna);
-       debug("OF: with offset: %" PRIu64 "\n", offset);
+       debug("OF: with offset: %llu\n", offset);
 
        /* Translate it into parent bus space */
        return pbus->translate(addr, offset, pna);
@@ -1514,9 +1516,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 %"
-                      PRIx64 ",\n but the device tree has it address %"
-                      PRIx64 ".\n", alias, addr, dt_addr);
+               printf("Warning: U-Boot configured device %s at address %llu,\n"
+                      "but the device tree has it address %llx.\n",
+                      alias, addr, dt_addr);
                return 0;
        }
 
@@ -1664,7 +1666,7 @@ int fdt_setup_simplefb_node(void *fdt, int node, u64 base_address, u32 width,
        if (ret < 0)
                return ret;
 
-       snprintf(name, sizeof(name), "framebuffer@%" PRIx64, base_address);
+       snprintf(name, sizeof(name), "framebuffer@%llx", base_address);
        ret = fdt_set_name(fdt, node, name);
        if (ret < 0)
                return ret;