]> git.sur5r.net Git - u-boot/commitdiff
scripts/dtc: Update to upstream version v1.4.5-6-gc1e55a5513e9
authorRob Herring <robh@kernel.org>
Sat, 19 May 2018 12:13:52 +0000 (14:13 +0200)
committerTom Rini <trini@konsulko.com>
Thu, 31 May 2018 12:53:11 +0000 (08:53 -0400)
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>
[ Linux commit: e45fe7f788dd1395befe5639149ad8dacfbd94ab ]
Signed-off-by: Eugeniu Rosca <erosca@de.adit-jv.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Masahiro Yamada <yamada.masahiro@socionext.com>
scripts/dtc/checks.c
scripts/dtc/version_gen.h

index 08a3a29edae348f4b2189375ed327626c9352330..e661384498865d80b2e4715b7fcebeffdfa869cb 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 d88393cab14a74949e770272afe432c7abd7f3cf..6a4e84798966216683485e37217e09a35f40af42 100644 (file)
@@ -1 +1 @@
-#define DTC_VERSION "DTC 1.4.5-gb1a60033"
+#define DTC_VERSION "DTC 1.4.5-gc1e55a55"