Merge https://gitlab.denx.de/u-boot/custodians/u-boot-marvell

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

diff --git a/common/boot_fit.c b/common/boot_fit.c
index 51440a6e6f32ae27793904219367ea825a39ccd9..ffa4d740eb3e9923e3a6ec1fb14f3f6d4ad8aa78 100644 (file)
--- a/common/boot_fit.c
+++ b/common/boot_fit.c
@@ -1,19 +1,18 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * (C) Copyright 2017
  * Texas Instruments, <www.ti.com>
  *
  * Franklin S Cooper Jr. <fcooper@ti.com>
- *
- * SPDX-License-Identifier:     GPL-2.0+
  */
 
 #include <boot_fit.h>
 #include <common.h>
 #include <errno.h>
 #include <image.h>
-#include <libfdt.h>
+#include <linux/libfdt.h>
 
-int fdt_offset(void *fit)
+static int fdt_offset(const void *fit)
 {
        int images, node, fdt_len, fdt_node, fdt_offset;
        const char *fdt_name;
@@ -25,7 +24,7 @@ int fdt_offset(void *fit)
        images = fdt_path_offset(fit, FIT_IMAGES_PATH);
        if (images < 0) {
                debug("%s: Cannot find /images node: %d\n", __func__, images);
-               return FDT_ERROR;
+               return -EINVAL;
        }
 
        fdt_name = fdt_getprop(fit, node, FIT_FDT_PROP, &fdt_len);
@@ -55,7 +54,7 @@ int fdt_offset(void *fit)
        return fdt_offset;
 }
 
-void *locate_dtb_in_fit(void *fit)
+void *locate_dtb_in_fit(const void *fit)
 {
        struct image_header *header;
        int size;
@@ -73,7 +72,7 @@ void *locate_dtb_in_fit(void *fit)
 
        ret = fdt_offset(fit);
 
-       if (ret <= 0)
+       if (ret < 0)
                return NULL;
        else
                return (void *)fit+size+ret;