Merge branch '2021-09-24-arm64-optimized-str-funcs' into next

[platform/kernel/u-boot.git] / common / boot_fit.c

diff --git a/common/boot_fit.c b/common/boot_fit.c
index ce42931..dfc2a31 100644 (file)
--- a/common/boot_fit.c
+++ b/common/boot_fit.c
@@ -1,17 +1,17 @@
+// 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 <log.h>
+#include <linux/libfdt.h>
 
 static int fdt_offset(const void *fit)
 {
@@ -73,7 +73,7 @@ void *locate_dtb_in_fit(const void *fit)
 
        ret = fdt_offset(fit);
 
-       if (ret <= 0)
+       if (ret < 0)
                return NULL;
        else
                return (void *)fit+size+ret;