OSDN Git Service

scripts/dtc: Update to upstream version v1.4.5-6-gc1e55a5513e9
authorRob Herring <robh@kernel.org>
Wed, 25 Oct 2017 15:59:13 +0000 (10:59 -0500)
committerRob Herring <robh@kernel.org>
Wed, 25 Oct 2017 15:59:13 +0000 (10:59 -0500)
Pickup the fix for handling unresolved phandles in overlays.

This adds the following commits from upstream:

c1e55a5513e9 checks: fix handling of unresolved phandles for dts plugins
f8872e29ce06 tests: Avoid 64-bit arithmetic in assembler
48c91c08bcfa libfdt: add stringlist functions to linker script

Signed-off-by: Rob Herring <robh@kernel.org>
scripts/dtc/checks.c
scripts/dtc/version_gen.h

index 08a3a29..e661384 100644 (file)
@@ -988,6 +988,10 @@ static void check_property_phandle_args(struct check *c,
                 * entries when each index position has a specific definition.
                 */
                if (phandle == 0 || phandle == -1) {
+                       /* Give up if this is an overlay with external references */
+                       if (dti->dtsflags & DTSF_PLUGIN)
+                               break;
+
                        cellsize = 0;
                        continue;
                }
@@ -1176,6 +1180,11 @@ static void check_interrupts_property(struct check *c,
                prop = get_property(parent, "interrupt-parent");
                if (prop) {
                        phandle = propval_cell(prop);
+                       /* Give up if this is an overlay with external references */
+                       if ((phandle == 0 || phandle == -1) &&
+                           (dti->dtsflags & DTSF_PLUGIN))
+                                       return;
+
                        irq_node = get_node_by_phandle(root, phandle);
                        if (!irq_node) {
                                FAIL(c, dti, "Bad interrupt-parent phandle for %s",
index d88393c..6a4e847 100644 (file)
@@ -1 +1 @@
-#define DTC_VERSION "DTC 1.4.5-gb1a60033"
+#define DTC_VERSION "DTC 1.4.5-gc1e55a55"