Skip to content

Commit e45fe7f

Browse files
committed
scripts/dtc: Update to upstream version v1.4.5-6-gc1e55a5513e9
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>
1 parent 070ea01 commit e45fe7f

2 files changed

Lines changed: 10 additions & 1 deletion

File tree

scripts/dtc/checks.c

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -988,6 +988,10 @@ static void check_property_phandle_args(struct check *c,
988988
* entries when each index position has a specific definition.
989989
*/
990990
if (phandle == 0 || phandle == -1) {
991+
/* Give up if this is an overlay with external references */
992+
if (dti->dtsflags & DTSF_PLUGIN)
993+
break;
994+
991995
cellsize = 0;
992996
continue;
993997
}
@@ -1176,6 +1180,11 @@ static void check_interrupts_property(struct check *c,
11761180
prop = get_property(parent, "interrupt-parent");
11771181
if (prop) {
11781182
phandle = propval_cell(prop);
1183+
/* Give up if this is an overlay with external references */
1184+
if ((phandle == 0 || phandle == -1) &&
1185+
(dti->dtsflags & DTSF_PLUGIN))
1186+
return;
1187+
11791188
irq_node = get_node_by_phandle(root, phandle);
11801189
if (!irq_node) {
11811190
FAIL(c, dti, "Bad interrupt-parent phandle for %s",

scripts/dtc/version_gen.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
#define DTC_VERSION "DTC 1.4.5-gb1a60033"
1+
#define DTC_VERSION "DTC 1.4.5-gc1e55a55"

0 commit comments

Comments
 (0)