From patchwork Sat May 19 12:13:52 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eugeniu Rosca X-Patchwork-Id: 916829 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="T+I10AbW"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 40p3sH0h0Gz9s4n for ; Sat, 19 May 2018 22:15:31 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id A98BFC21FAE; Sat, 19 May 2018 12:14:43 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.0 required=5.0 tests=FREEMAIL_FROM, RCVD_IN_DNSWL_BLOCKED, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id E1B10C21F4E; Sat, 19 May 2018 12:14:41 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 69EA0C21F94; Sat, 19 May 2018 12:14:28 +0000 (UTC) Received: from mail-wm0-f65.google.com (mail-wm0-f65.google.com [74.125.82.65]) by lists.denx.de (Postfix) with ESMTPS id 0C249C21F21 for ; Sat, 19 May 2018 12:14:25 +0000 (UTC) Received: by mail-wm0-f65.google.com with SMTP id a8-v6so18155549wmg.5 for ; Sat, 19 May 2018 05:14:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=2upqv1J0JRuSkJz3QfPisXUbDs43WzADCUw2eNsYb3U=; b=T+I10AbWxV9fxR0RBPKlpxmN7Lil4ekfEFbaGw1zYBysoHzis+1Xwj+J6bIxM0r1FB DnR+P2MYLB/hmGy80N/RCJcO7+uO/hLVBdyxdfIse6LmPyb7b8hFLc0InCBcFfsBixIR WbO+B92bjDK3AeX3wvUDEdN6Bc40MrCojGzUNy9MWdlsTj/v1VE6xWcQ7V0ttngo46nD GLAzSEPmvFiOjCA4L1Rj5nPT/dWAkSZrpWoMvo+OEvn4AtIWM4KcSwNnKJ4wm61uCT8q p5Z2ofoPDMaNaK1KkXB9G+zvdQ3cmEmSKq6+9JiapbUWPlYJnOGZDKLdBa9mAcS0TO+w u4fg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=2upqv1J0JRuSkJz3QfPisXUbDs43WzADCUw2eNsYb3U=; b=UCfU/+a+40hDu31v0QikFPJtY0TkWhD5BsJC3+KhYi1d569iLxu5RZ7AKoGcnrNnEV +x5NHTi2COGGhcCe+c6OcTZRMjpyJkV1wL9zofxTv4UkywUbMHyMHR3a7qI+kdVYn5Yv 0oDEEjKa0Mc4vaTqfXS+wg1PrmqHAIBgVZL/V4afUFpf679pod8YsRFZu2kmStLgPVlj epF5uC1Bt5bH0XmlukL0AV79SOYoSkl/aft348kv5vmuOb2tFZst/7aRh5J4BdMn6EdQ UFBWmTj7IiqJdK3+uwFtbfUDyzzyqcVfopmBjiJgjWc17AGksSZWs+q/YLnTQcEIblXg uCeg== X-Gm-Message-State: ALKqPwcbvUlwdicC+D6I4xEwvMVgsh0iQq0Cx0CwV25WmouiM56Tu0ri k8Md/HDKvyhRZbjzZenm3s4= X-Google-Smtp-Source: AB8JxZqBIW3Nf+eaDG5DkzFTTbgKx67EjLvh5Vvf4VY9ma+LShtaGsT9Ps0U3zSB0FsGUpvOZCPvfg== X-Received: by 2002:a1c:711c:: with SMTP id m28-v6mr7065791wmc.92.1526732064722; Sat, 19 May 2018 05:14:24 -0700 (PDT) Received: from localhost.localdomain (ipb218f550.dynamic.kabel-deutschland.de. [178.24.245.80]) by smtp.gmail.com with ESMTPSA id y9-v6sm9038934wrh.63.2018.05.19.05.14.23 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 19 May 2018 05:14:24 -0700 (PDT) From: Eugeniu Rosca X-Google-Original-From: Eugeniu Rosca To: Masahiro Yamada , Simon Glass , Petr Vorel , Tom Rini Date: Sat, 19 May 2018 14:13:52 +0200 Message-Id: <20180519121355.18377-3-erosca@de.adit-jv.com> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180519121355.18377-1-erosca@de.adit-jv.com> References: <20180519121355.18377-1-erosca@de.adit-jv.com> Cc: u-boot@lists.denx.de, Eugeniu Rosca Subject: [U-Boot] [PATCH v3 3/6] scripts/dtc: Update to upstream version v1.4.5-6-gc1e55a5513e9 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" From: Rob Herring 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 [ Linux commit: e45fe7f788dd1395befe5639149ad8dacfbd94ab ] Signed-off-by: Eugeniu Rosca Reviewed-by: Simon Glass Reviewed-by: Masahiro Yamada --- v2->v3: * Added: Reviewed-by: Simon Glass * Added: Reviewed-by: Masahiro Yamada v1->v2: * Newly pushed scripts/dtc/checks.c | 9 +++++++++ scripts/dtc/version_gen.h | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/scripts/dtc/checks.c b/scripts/dtc/checks.c index 08a3a29edae3..e66138449886 100644 --- a/scripts/dtc/checks.c +++ b/scripts/dtc/checks.c @@ -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", diff --git a/scripts/dtc/version_gen.h b/scripts/dtc/version_gen.h index d88393cab14a..6a4e84798966 100644 --- a/scripts/dtc/version_gen.h +++ b/scripts/dtc/version_gen.h @@ -1 +1 @@ -#define DTC_VERSION "DTC 1.4.5-gb1a60033" +#define DTC_VERSION "DTC 1.4.5-gc1e55a55"