sf: add Gigadevice gd25q16c entry

[u-boot] / common / fdt_support.c

diff --git a/common/fdt_support.c b/common/fdt_support.c
index 724452d754523a39f4a57fce208a80ae49cea2bd..812eca8173ba91c2f14cc698600ba1d069a07cf1 100644 (file)
--- a/common/fdt_support.c
+++ b/common/fdt_support.c
@@ -1,10 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * (C) Copyright 2007
  * Gerald Van Baren, Custom IDEAS, vanbaren@cideas.com
  *
  * Copyright 2010-2011 Freescale Semiconductor, Inc.
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #include <common.h>
@@ -13,7 +12,7 @@
 #include <linux/ctype.h>
 #include <linux/types.h>
 #include <asm/global_data.h>
-#include <libfdt.h>
+#include <linux/libfdt.h>
 #include <fdt_support.h>
 #include <exports.h>
 #include <fdtdec.h>
@@ -410,45 +409,6 @@ static int fdt_pack_reg(const void *fdt, void *buf, u64 *address, u64 *size,
        return p - (char *)buf;
 }
 
-int fdt_record_loadable(void *blob, u32 index, const char *name,
-                       uintptr_t load_addr, u32 size, uintptr_t entry_point,
-                       const char *type, const char *os)
-{
-       int err, node;
-
-       err = fdt_check_header(blob);
-       if (err < 0) {
-               printf("%s: %s\n", __func__, fdt_strerror(err));
-               return err;
-       }
-
-       /* find or create "/fit-images" node */
-       node = fdt_find_or_add_subnode(blob, 0, "fit-images");
-       if (node < 0)
-                       return node;
-
-       /* find or create "/fit-images/<name>" node */
-       node = fdt_find_or_add_subnode(blob, node, name);
-       if (node < 0)
-               return node;
-
-       /*
-        * We record these as 32bit entities, possibly truncating addresses.
-        * However, spl_fit.c is not 64bit safe either: i.e. we should not
-        * have an issue here.
-        */
-       fdt_setprop_u32(blob, node, "load-addr", load_addr);
-       if (entry_point != -1)
-               fdt_setprop_u32(blob, node, "entry-point", entry_point);
-       fdt_setprop_u32(blob, node, "size", size);
-       if (type)
-               fdt_setprop_string(blob, node, "type", type);
-       if (os)
-               fdt_setprop_string(blob, node, "os", os);
-
-       return node;
-}
-
 #ifdef CONFIG_NR_DRAM_BANKS
 #define MEMORY_BANKS_MAX CONFIG_NR_DRAM_BANKS
 #else
@@ -457,7 +417,7 @@ int fdt_record_loadable(void *blob, u32 index, const char *name,
 int fdt_fixup_memory_banks(void *blob, u64 start[], u64 size[], int banks)
 {
        int err, nodeoffset;
-       int len;
+       int len, i;
        u8 tmp[MEMORY_BANKS_MAX * 16]; /* Up to 64-bit address + 64-bit size */
 
        if (banks > MEMORY_BANKS_MAX) {
@@ -486,9 +446,22 @@ int fdt_fixup_memory_banks(void *blob, u64 start[], u64 size[], int banks)
                return err;
        }
 
+       for (i = 0; i < banks; i++) {
+               if (start[i] == 0 && size[i] == 0)
+                       break;
+       }
+
+       banks = i;
+
        if (!banks)
                return 0;
 
+       for (i = 0; i < banks; i++)
+               if (start[i] == 0 && size[i] == 0)
+                       break;
+
+       banks = i;
+
        len = fdt_pack_reg(blob, tmp, start, size, banks);
 
        err = fdt_setprop(blob, nodeoffset, "reg", tmp, len);
@@ -584,6 +557,45 @@ void fdt_fixup_ethernet(void *fdt)
        }
 }
 
+int fdt_record_loadable(void *blob, u32 index, const char *name,
+                       uintptr_t load_addr, u32 size, uintptr_t entry_point,
+                       const char *type, const char *os)
+{
+       int err, node;
+
+       err = fdt_check_header(blob);
+       if (err < 0) {
+               printf("%s: %s\n", __func__, fdt_strerror(err));
+               return err;
+       }
+
+       /* find or create "/fit-images" node */
+       node = fdt_find_or_add_subnode(blob, 0, "fit-images");
+       if (node < 0)
+               return node;
+
+       /* find or create "/fit-images/<name>" node */
+       node = fdt_find_or_add_subnode(blob, node, name);
+       if (node < 0)
+               return node;
+
+       /*
+        * We record these as 32bit entities, possibly truncating addresses.
+        * However, spl_fit.c is not 64bit safe either: i.e. we should not
+        * have an issue here.
+        */
+       fdt_setprop_u32(blob, node, "load-addr", load_addr);
+       if (entry_point != -1)
+               fdt_setprop_u32(blob, node, "entry-point", entry_point);
+       fdt_setprop_u32(blob, node, "size", size);
+       if (type)
+               fdt_setprop_string(blob, node, "type", type);
+       if (os)
+               fdt_setprop_string(blob, node, "os", os);
+
+       return node;
+}
+
 /* Resize the fdt to its actual size + a bit of padding */
 int fdt_shrink_to_minimum(void *blob, uint extrasize)
 {