Merge tag 'u-boot-atmel-fixes-2021.01-b' of https://gitlab.denx.de/u-boot/custodians...

[platform/kernel/u-boot.git] / lib / binman.c

diff --git a/lib/binman.c b/lib/binman.c
index 9098a1d..f027d1b 100644 (file)
--- a/lib/binman.c
+++ b/lib/binman.c
@@ -11,6 +11,7 @@
 #include <dm.h>
 #include <log.h>
 #include <malloc.h>
+#include <mapmem.h>
 
 /**
  * struct binman_info - Information needed by the binman library
@@ -42,7 +43,7 @@ static int binman_entry_find_internal(ofnode node, const char *name,
 
        ret = ofnode_read_u32(node, "image-pos", &entry->image_pos);
        if (ret)
-               return log_msg_ret("import-pos", ret);
+               return log_msg_ret("image-pos", ret);
        ret = ofnode_read_u32(node, "size", &entry->size);
        if (ret)
                return log_msg_ret("size", ret);
@@ -55,11 +56,38 @@ int binman_entry_find(const char *name, struct binman_entry *entry)
        return binman_entry_find_internal(binman->image, name, entry);
 }
 
+int binman_entry_map(ofnode parent, const char *name, void **bufp, int *sizep)
+{
+       struct binman_entry entry;
+       int ret;
+
+       if (binman->rom_offset == ROM_OFFSET_NONE)
+               return -EPERM;
+       ret = binman_entry_find_internal(parent, name, &entry);
+       if (ret)
+               return log_msg_ret("entry", ret);
+       if (sizep)
+               *sizep = entry.size;
+       *bufp = map_sysmem(entry.image_pos + binman->rom_offset, entry.size);
+
+       return 0;
+}
+
+ofnode binman_section_find_node(const char *name)
+{
+       return ofnode_find_subnode(binman->image, name);
+}
+
 void binman_set_rom_offset(int rom_offset)
 {
        binman->rom_offset = rom_offset;
 }
 
+int binman_get_rom_offset(void)
+{
+       return binman->rom_offset;
+}
+
 int binman_init(void)
 {
        binman = malloc(sizeof(struct binman_info));
@@ -68,7 +96,14 @@ int binman_init(void)
        binman->image = ofnode_path("/binman");
        if (!ofnode_valid(binman->image))
                return log_msg_ret("binman node", -EINVAL);
-       binman->rom_offset = ROM_OFFSET_NONE;
+       if (ofnode_read_bool(binman->image, "multiple-images")) {
+               ofnode node = ofnode_first_subnode(binman->image);
+
+               if (!ofnode_valid(node))
+                       return log_msg_ret("first image", -ENOENT);
+               binman->image = node;
+       }
+       binman_set_rom_offset(ROM_OFFSET_NONE);
 
        return 0;
 }