Merge branch 'master' of git://git.denx.de/u-boot-video

[oweals/u-boot.git] / lib / fdtdec.c

diff --git a/lib/fdtdec.c b/lib/fdtdec.c
index a208589c48aea777fcb7e57e6924d21009626f3d..d28f2cbb1cf6a9aad1492bb294a3f84a02619826 100644 (file)
--- a/lib/fdtdec.c
+++ b/lib/fdtdec.c
@@ -11,7 +11,6 @@
 #include <errno.h>
 #include <fdtdec.h>
 #include <fdt_support.h>
-#include <inttypes.h>
 #include <linux/libfdt.h>
 #include <serial.h>
 #include <asm/sections.h>
@@ -922,28 +921,6 @@ char *fdtdec_get_config_string(const void *blob, const char *prop_name)
        return (char *)nodep;
 }
 
-int fdtdec_decode_region(const void *blob, int node, const char *prop_name,
-                        fdt_addr_t *basep, fdt_size_t *sizep)
-{
-       const fdt_addr_t *cell;
-       int len;
-
-       debug("%s: %s: %s\n", __func__, fdt_get_name(blob, node, NULL),
-             prop_name);
-       cell = fdt_getprop(blob, node, prop_name, &len);
-       if (!cell || (len < sizeof(fdt_addr_t) * 2)) {
-               debug("cell=%p, len=%d\n", cell, len);
-               return -1;
-       }
-
-       *basep = fdt_addr_to_cpu(*cell);
-       *sizep = fdt_size_to_cpu(cell[1]);
-       debug("%s: base=%08lx, size=%lx\n", __func__, (ulong)*basep,
-             (ulong)*sizep);
-
-       return 0;
-}
-
 u64 fdtdec_get_number(const fdt32_t *ptr, unsigned int cells)
 {
        u64 number = 0;
@@ -1002,67 +979,6 @@ int fdt_get_named_resource(const void *fdt, int node, const char *property,
        return fdt_get_resource(fdt, node, property, index, res);
 }
 
-int fdtdec_decode_memory_region(const void *blob, int config_node,
-                               const char *mem_type, const char *suffix,
-                               fdt_addr_t *basep, fdt_size_t *sizep)
-{
-       char prop_name[50];
-       const char *mem;
-       fdt_size_t size, offset_size;
-       fdt_addr_t base, offset;
-       int node;
-
-       if (config_node == -1) {
-               config_node = fdt_path_offset(blob, "/config");
-               if (config_node < 0) {
-                       debug("%s: Cannot find /config node\n", __func__);
-                       return -ENOENT;
-               }
-       }
-       if (!suffix)
-               suffix = "";
-
-       snprintf(prop_name, sizeof(prop_name), "%s-memory%s", mem_type,
-                suffix);
-       mem = fdt_getprop(blob, config_node, prop_name, NULL);
-       if (!mem) {
-               debug("%s: No memory type for '%s', using /memory\n", __func__,
-                     prop_name);
-               mem = "/memory";
-       }
-
-       node = fdt_path_offset(blob, mem);
-       if (node < 0) {
-               debug("%s: Failed to find node '%s': %s\n", __func__, mem,
-                     fdt_strerror(node));
-               return -ENOENT;
-       }
-
-       /*
-        * Not strictly correct - the memory may have multiple banks. We just
-        * use the first
-        */
-       if (fdtdec_decode_region(blob, node, "reg", &base, &size)) {
-               debug("%s: Failed to decode memory region %s\n", __func__,
-                     mem);
-               return -EINVAL;
-       }
-
-       snprintf(prop_name, sizeof(prop_name), "%s-offset%s", mem_type,
-                suffix);
-       if (fdtdec_decode_region(blob, config_node, prop_name, &offset,
-                                &offset_size)) {
-               debug("%s: Failed to decode memory region '%s'\n", __func__,
-                     prop_name);
-               return -EINVAL;
-       }
-
-       *basep = base + offset;
-       *sizep = offset_size;
-
-       return 0;
-}
-
 static int decode_timing_property(const void *blob, int node, const char *name,
                                  struct timing_entry *result)
 {
@@ -1182,10 +1098,8 @@ int fdtdec_setup_mem_size_base(void)
 
 #if defined(CONFIG_NR_DRAM_BANKS)
 
-static int get_next_memory_node(const void *blob, int startoffset)
+static int get_next_memory_node(const void *blob, int mem)
 {
-       int mem = -1;
-
        do {
                mem = fdt_node_offset_by_prop_value(gd->fdt_blob, mem,
                                                    "device_type", "memory", 7);
@@ -1284,7 +1198,8 @@ static int uncompress_blob(const void *src, ulong sz_src, void **dstp)
 # else
 static int uncompress_blob(const void *src, ulong sz_src, void **dstp)
 {
-       return -ENOTSUPP;
+       *dstp = (void *)src;
+       return 0;
 }
 # endif
 #endif
@@ -1450,13 +1365,12 @@ int fdtdec_decode_ram_size(const void *blob, const char *area, int board_id,
                if (auto_size) {
                        u64 new_size;
 
-                       debug("Auto-sizing %" PRIx64 ", size %" PRIx64 ": ",
-                             addr, size);
+                       debug("Auto-sizing %llx, size %llx: ", addr, size);
                        new_size = get_ram_size((long *)(uintptr_t)addr, size);
                        if (new_size == size) {
                                debug("OK\n");
                        } else {
-                               debug("sized to %" PRIx64 "\n", new_size);
+                               debug("sized to %llx\n", new_size);
                                size = new_size;
                        }
                }
@@ -1466,7 +1380,7 @@ int fdtdec_decode_ram_size(const void *blob, const char *area, int board_id,
                total_size += size;
        }
 
-       debug("Memory size %" PRIu64 "\n", total_size);
+       debug("Memory size %llu\n", total_size);
        if (sizep)
                *sizep = (phys_size_t)total_size;