efi_loader: add missing EFI_RESET_PLATFORM_SPECIFIC

[u-boot] / common / fdt_support.c

diff --git a/common/fdt_support.c b/common/fdt_support.c
index 17623a1728f6982887148d82716d2cf4f8ab4258..66a313e2ae978a7a199a21605a23990f9258099a 100644 (file)
--- a/common/fdt_support.c
+++ b/common/fdt_support.c
@@ -13,7 +13,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>
@@ -418,7 +418,7 @@ static int fdt_pack_reg(const void *fdt, void *buf, u64 *address, u64 *size,
 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) {
@@ -447,9 +447,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);