forked from mirrors/nixpkgs
106 lines
3.2 KiB
Diff
106 lines
3.2 KiB
Diff
|
From fbee2adffd39b03e10262b09779faef94c4d5a9d Mon Sep 17 00:00:00 2001
|
||
|
|
From: Ben Wolsieffer <benwolsieffer@gmail.com>
|
||
|
|
Date: Thu, 18 Apr 2019 15:50:24 -0400
|
||
|
|
Subject: [PATCH] fdt: make compatible with dtc >=1.4.6
|
||
|
|
|
||
|
|
Signed-off-by: Ben Wolsieffer <benwolsieffer@gmail.com>
|
||
|
|
---
|
||
|
|
include/libfdt_env.h | 6 +++---
|
||
|
|
lib/libfdt/fdt.h | 6 +++---
|
||
|
|
lib/libfdt/libfdt.h | 6 +++---
|
||
|
|
lib/libfdt/libfdt_internal.h | 6 +++---
|
||
|
|
tools/dtoc/fdt.py | 2 +-
|
||
|
|
5 files changed, 13 insertions(+), 13 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/include/libfdt_env.h b/include/libfdt_env.h
|
||
|
|
index 6c6845f76c..1fbcd0ef83 100644
|
||
|
|
--- a/include/libfdt_env.h
|
||
|
|
+++ b/include/libfdt_env.h
|
||
|
|
@@ -6,8 +6,8 @@
|
||
|
|
* SPDX-License-Identifier: LGPL-2.1+
|
||
|
|
*/
|
||
|
|
|
||
|
|
-#ifndef _LIBFDT_ENV_H
|
||
|
|
-#define _LIBFDT_ENV_H
|
||
|
|
+#ifndef LIBFDT_ENV_H
|
||
|
|
+#define LIBFDT_ENV_H
|
||
|
|
|
||
|
|
#include "compiler.h"
|
||
|
|
#include "linux/types.h"
|
||
|
|
@@ -32,4 +32,4 @@ typedef __be64 fdt64_t;
|
||
|
|
/* adding a ramdisk needs 0x44 bytes in version 2008.10 */
|
||
|
|
#define FDT_RAMDISK_OVERHEAD 0x80
|
||
|
|
|
||
|
|
-#endif /* _LIBFDT_ENV_H */
|
||
|
|
+#endif /* LIBFDT_ENV_H */
|
||
|
|
diff --git a/lib/libfdt/fdt.h b/lib/libfdt/fdt.h
|
||
|
|
index 3134d78332..38cc182739 100644
|
||
|
|
--- a/lib/libfdt/fdt.h
|
||
|
|
+++ b/lib/libfdt/fdt.h
|
||
|
|
@@ -1,5 +1,5 @@
|
||
|
|
-#ifndef _FDT_H
|
||
|
|
-#define _FDT_H
|
||
|
|
+#ifndef FDT_H
|
||
|
|
+#define FDT_H
|
||
|
|
/*
|
||
|
|
* libfdt - Flat Device Tree manipulation
|
||
|
|
* Copyright (C) 2006 David Gibson, IBM Corporation.
|
||
|
|
@@ -64,4 +64,4 @@ struct fdt_property {
|
||
|
|
#define FDT_V16_SIZE FDT_V3_SIZE
|
||
|
|
#define FDT_V17_SIZE (FDT_V16_SIZE + sizeof(fdt32_t))
|
||
|
|
|
||
|
|
-#endif /* _FDT_H */
|
||
|
|
+#endif /* FDT_H */
|
||
|
|
diff --git a/lib/libfdt/libfdt.h b/lib/libfdt/libfdt.h
|
||
|
|
index cb533f4275..9345a59f05 100644
|
||
|
|
--- a/lib/libfdt/libfdt.h
|
||
|
|
+++ b/lib/libfdt/libfdt.h
|
||
|
|
@@ -1,5 +1,5 @@
|
||
|
|
-#ifndef _LIBFDT_H
|
||
|
|
-#define _LIBFDT_H
|
||
|
|
+#ifndef LIBFDT_H
|
||
|
|
+#define LIBFDT_H
|
||
|
|
/*
|
||
|
|
* libfdt - Flat Device Tree manipulation
|
||
|
|
* Copyright (C) 2006 David Gibson, IBM Corporation.
|
||
|
|
@@ -2189,4 +2189,4 @@ int fdt_device_is_available(const void *blob, int node);
|
||
|
|
int fdt_node_offset_by_phandle_node(const void *fdt, int node, uint32_t phandle);
|
||
|
|
#endif /* SWIG */
|
||
|
|
|
||
|
|
-#endif /* _LIBFDT_H */
|
||
|
|
+#endif /* LIBFDT_H */
|
||
|
|
diff --git a/lib/libfdt/libfdt_internal.h b/lib/libfdt/libfdt_internal.h
|
||
|
|
index 9a79fe85dd..8fdda7ee79 100644
|
||
|
|
--- a/lib/libfdt/libfdt_internal.h
|
||
|
|
+++ b/lib/libfdt/libfdt_internal.h
|
||
|
|
@@ -1,5 +1,5 @@
|
||
|
|
-#ifndef _LIBFDT_INTERNAL_H
|
||
|
|
-#define _LIBFDT_INTERNAL_H
|
||
|
|
+#ifndef LIBFDT_INTERNAL_H
|
||
|
|
+#define LIBFDT_INTERNAL_H
|
||
|
|
/*
|
||
|
|
* libfdt - Flat Device Tree manipulation
|
||
|
|
* Copyright (C) 2006 David Gibson, IBM Corporation.
|
||
|
|
@@ -47,4 +47,4 @@ static inline struct fdt_reserve_entry *_fdt_mem_rsv_w(void *fdt, int n)
|
||
|
|
|
||
|
|
#define FDT_SW_MAGIC (~FDT_MAGIC)
|
||
|
|
|
||
|
|
-#endif /* _LIBFDT_INTERNAL_H */
|
||
|
|
+#endif /* LIBFDT_INTERNAL_H */
|
||
|
|
diff --git a/tools/dtoc/fdt.py b/tools/dtoc/fdt.py
|
||
|
|
index dbc338653b..ac2191fb37 100644
|
||
|
|
--- a/tools/dtoc/fdt.py
|
||
|
|
+++ b/tools/dtoc/fdt.py
|
||
|
|
@@ -360,7 +360,7 @@ class Fdt:
|
||
|
|
poffset = libfdt.fdt_first_property_offset(self._fdt, node._offset)
|
||
|
|
while poffset >= 0:
|
||
|
|
p = self._fdt_obj.get_property_by_offset(poffset)
|
||
|
|
- prop = Prop(node, poffset, p.name, p.value)
|
||
|
|
+ prop = Prop(node, poffset, p.name, p)
|
||
|
|
props_dict[prop.name] = prop
|
||
|
|
|
||
|
|
poffset = libfdt.fdt_next_property_offset(self._fdt, poffset)
|
||
|
|
--
|
||
|
|
2.21.0
|
||
|
|
|