From patchwork Sun Feb 19 22:02:03 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonas Karlman X-Patchwork-Id: 1744751 X-Patchwork-Delegate: sjg@chromium.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=fail reason="key not found in DNS" header.d=kwiboo.se header.i=@kwiboo.se header.a=rsa-sha256 header.s=s1 header.b=gWc3up/V; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4PKfff4MPdz23yV for ; Mon, 20 Feb 2023 09:02:18 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 3B1438589B; Sun, 19 Feb 2023 23:02:13 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=reject dis=none) header.from=kwiboo.se Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=kwiboo.se header.i=@kwiboo.se header.b="gWc3up/V"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id E2A24855DA; Sun, 19 Feb 2023 23:02:10 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_MSPIKE_H2,SPF_HELO_NONE, SPF_PASS,UNPARSEABLE_RELAY autolearn=ham autolearn_force=no version=3.4.2 Received: from xtrwhxbr.outbound-mail.sendgrid.net (xtrwhxbr.outbound-mail.sendgrid.net [167.89.10.181]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 58AF68584B for ; Sun, 19 Feb 2023 23:02:05 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=reject dis=none) header.from=kwiboo.se Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=bounces+31435339-7456-u-boot=lists.denx.de@em2124.kwiboo.se DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kwiboo.se; h=from:subject:in-reply-to:references:mime-version:to:cc: content-transfer-encoding:content-type:cc:content-type:from:subject:to; s=s1; bh=skiw3wnB+0FqMpxiX7NNfaKR16TLAyVi5mRxQ7QgUeI=; b=gWc3up/VBPNhI7XpxfuYPaLlfLC/72iVoHu7kxPf4kSJwpt5chbQpHGGqrXAWgbV1fX1 Vwag1bZlzCzaGFDAhvK11aPM0hJ6zCXgbO5pe4SNmZcb6WyAkZuTNEmFxGknkHFbiiCLCl dR47DNFtwJxgDkBqY7Im0zx94M+7IFcCc8Q3hdQYiQGuM+vVHzkPOiGqywbdw0U63lhuL5 rV109wHQ06AXRe7zixl37KBs4M//D+D+0wqTYqk3gRlRa2k+SHsCYvUvzGmWY0oRMQCxSW QAu7475l99VfA/HDfVKyrLxRt2ODyU/E5x6qPcCvGoMbn7U6xqeDSPLV2s3PmPiw== Received: by filterdrecv-8dd65bbd4-bvdhz with SMTP id filterdrecv-8dd65bbd4-bvdhz-1-63F29C5A-6F 2023-02-19 22:02:02.838631455 +0000 UTC m=+788682.664755146 Received: from bionic.localdomain (unknown) by geopod-ismtpd-canary-0 (SG) with ESMTP id faz76CzaT5q0tA73RT8CqA Sun, 19 Feb 2023 22:02:02.638 +0000 (UTC) From: Jonas Karlman Subject: [PATCH 1/9] binman: Remove redundant SetAllowFakeBlob from blob-ext entry Date: Sun, 19 Feb 2023 22:02:03 +0000 (UTC) Message-Id: <20230219220158.4160763-2-jonas@kwiboo.se> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230219220158.4160763-1-jonas@kwiboo.se> References: <20230219220158.4160763-1-jonas@kwiboo.se> MIME-Version: 1.0 X-SG-EID: TdbjyGynYnRZWhH+7lKUQJL+ZxmxpowvO2O9SQF5CwCVrYgcwUXgU5DKUU3QxAfZekEeQsTe+RrMu3cja6a0h077lLHCiybD3IWAmySiWTDB2NCgiy26/yAHp85ecyfu+2UC8EQaCu+W/Xwx+nKNO7f/np19By+ft05/Jj7M/bu8meqiXicRC3io/9c4bmLWtZu0bzLoogBykC+/orMs8E2wk5r8aplnrVwRbfto3sa2QAkYyKBll8lAuY9n6z0w To: Simon Glass , Alper Nebi Yasak Cc: Pali =?iso-8859-1?q?Roh=E1r?= , Heinrich Schuchardt , Marek =?iso-8859-1?q?Beh=FAn?= , Quentin Schulz , Stefan Herbrechtsmeier , u-boot@lists.denx.de, Jonas Karlman X-Entity-ID: P7KYpSJvGCELWjBME/J5tg== X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.6 at phobos.denx.de X-Virus-Status: Clean Entry_blob_ext contains an implementation of SetAllowFakeBlob that is identical to the one in the base Entry class, remove it. Signed-off-by: Jonas Karlman Reviewed-by: Simon Glass Reviewed-by: Simon Glass --- tools/binman/etype/blob_ext.py | 8 -------- 1 file changed, 8 deletions(-) diff --git a/tools/binman/etype/blob_ext.py b/tools/binman/etype/blob_ext.py index fba6271de2bb..d6b0ca17c3f3 100644 --- a/tools/binman/etype/blob_ext.py +++ b/tools/binman/etype/blob_ext.py @@ -26,11 +26,3 @@ class Entry_blob_ext(Entry_blob): def __init__(self, section, etype, node): Entry_blob.__init__(self, section, etype, node) self.external = True - - def SetAllowFakeBlob(self, allow_fake): - """Set whether the entry allows to create a fake blob - - Args: - allow_fake_blob: True if allowed, False if not allowed - """ - self.allow_fake = allow_fake From patchwork Sun Feb 19 22:02:03 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonas Karlman X-Patchwork-Id: 1744757 X-Patchwork-Delegate: sjg@chromium.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=kwiboo.se header.i=@kwiboo.se header.a=rsa-sha256 header.s=s1 header.b=fC2zgrAE; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4PKfh62jzQz23yV for ; Mon, 20 Feb 2023 09:03:34 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 0E6E98582C; Sun, 19 Feb 2023 23:02:55 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=reject dis=none) header.from=kwiboo.se Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=kwiboo.se header.i=@kwiboo.se header.b="fC2zgrAE"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 72B388590D; Sun, 19 Feb 2023 23:02:18 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_MSPIKE_H2,SPF_HELO_NONE, SPF_PASS,UNPARSEABLE_RELAY autolearn=ham autolearn_force=no version=3.4.2 Received: from cskrhhvt.outbound-mail.sendgrid.net (cskrhhvt.outbound-mail.sendgrid.net [198.21.0.135]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 787BE85831 for ; Sun, 19 Feb 2023 23:02:06 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=reject dis=none) header.from=kwiboo.se Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=bounces+31435339-7456-u-boot=lists.denx.de@em2124.kwiboo.se DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kwiboo.se; h=from:subject:in-reply-to:references:mime-version:to:cc: content-transfer-encoding:content-type:cc:content-type:from:subject:to; s=s1; bh=q531tJvOLv/hOd8xMrV76KJCWYkAPfjOseMzPbLW600=; b=fC2zgrAEX9GLa0fs4sIaROyLzEUDqiO3ydwOiNXZ4aHpXVJSJhAlIi+Hr08ZcrvacDNm 8wLnIhXgqz0qNleO0ymipNQYTAwvU8yV6fWhlte6CJDBrgHus4Hw0V1MmKmMTPTLh+Htio Gk9h63O/zE7OXvseKl0DgMCr+kb/pRX3G3d7Fwf/mKsytGFz1l9Aex4Ph8Rsr9nkCFOfQQ BczOi7RcCPDPjwo3k/Sdwu9FecLuqxlCnCLxRk3PtDs0Smo5fshWws9l7kCV26lW+vDfIm wpjdNkyGDvYV3B9uFAssBZh+4cA+fP+07hWcXXDDeI70I9+XmT8nQh/hdgTZX1AQ== Received: by filterdrecv-7dfc98557c-gnzb2 with SMTP id filterdrecv-7dfc98557c-gnzb2-1-63F29C5B-30 2023-02-19 22:02:03.465950611 +0000 UTC m=+788698.372797596 Received: from bionic.localdomain (unknown) by geopod-ismtpd-canary-0 (SG) with ESMTP id zC5izqYtTOGBuxSNrwmt3g Sun, 19 Feb 2023 22:02:03.162 +0000 (UTC) From: Jonas Karlman Subject: [PATCH 2/9] binman: Fix spelling of nodes in code comments Date: Sun, 19 Feb 2023 22:02:03 +0000 (UTC) Message-Id: <20230219220158.4160763-3-jonas@kwiboo.se> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230219220158.4160763-1-jonas@kwiboo.se> References: <20230219220158.4160763-1-jonas@kwiboo.se> MIME-Version: 1.0 X-SG-EID: TdbjyGynYnRZWhH+7lKUQJL+ZxmxpowvO2O9SQF5CwCVrYgcwUXgU5DKUU3QxAfZekEeQsTe+RrMu3cja6a0h6bQsaNObzUuAkJlRCDAbfrARIJj2hd3USo0kf5i7EmVNiSYBJjDd/fPZYBomVQJS1bSDsojh+868w9mFY02jluEIQCTaxvCBLsSv+GoWd7atFHV8eS/CS2bGsbldDgtNSy+EWMf6VIOUMuSB49OV62IkpCGjfN8aQBhECi20/Ds To: Simon Glass , Alper Nebi Yasak Cc: Pali =?iso-8859-1?q?Roh=E1r?= , Heinrich Schuchardt , Marek =?iso-8859-1?q?Beh=FAn?= , Quentin Schulz , Stefan Herbrechtsmeier , u-boot@lists.denx.de, Jonas Karlman X-Entity-ID: P7KYpSJvGCELWjBME/J5tg== X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.6 at phobos.denx.de X-Virus-Status: Clean Replace notes with nodes in code comments and docstrings. Signed-off-by: Jonas Karlman Reviewed-by: Simon Glass Reviewed-by: Simon Glass --- tools/binman/etype/fit.py | 2 +- tools/binman/etype/section.py | 2 +- tools/binman/state.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/binman/etype/fit.py b/tools/binman/etype/fit.py index cd2943533ce2..822de7982768 100644 --- a/tools/binman/etype/fit.py +++ b/tools/binman/etype/fit.py @@ -823,7 +823,7 @@ class Entry_fit(Entry_section): self.mkimage = self.AddBintool(btools, 'mkimage') def CheckMissing(self, missing_list): - # We must use our private entry list for this since generator notes + # We must use our private entry list for this since generator nodes # which are removed from self._entries will otherwise not show up as # missing for entry in self._priv_entries.values(): diff --git a/tools/binman/etype/section.py b/tools/binman/etype/section.py index 57b91ff726c0..8bf5aa437d1a 100644 --- a/tools/binman/etype/section.py +++ b/tools/binman/etype/section.py @@ -172,7 +172,7 @@ class Entry_section(Entry): def IsSpecialSubnode(self, node): """Check if a node is a special one used by the section itself - Some notes are used for hashing / signatures and do not add entries to + Some nodes are used for hashing / signatures and do not add entries to the actual section. Returns: diff --git a/tools/binman/state.py b/tools/binman/state.py index 56e5bf8bc10f..33563199840e 100644 --- a/tools/binman/state.py +++ b/tools/binman/state.py @@ -306,7 +306,7 @@ def GetUpdateNodes(node, for_repack=False): """Yield all the nodes that need to be updated in all device trees The property referenced by this node is added to any device trees which - have the given node. Due to removable of unwanted notes, SPL and TPL may + have the given node. Due to removable of unwanted nodes, SPL and TPL may not have this node. Args: From patchwork Sun Feb 19 22:02:04 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonas Karlman X-Patchwork-Id: 1744755 X-Patchwork-Delegate: sjg@chromium.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=kwiboo.se header.i=@kwiboo.se header.a=rsa-sha256 header.s=s1 header.b=PcZd9aht; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4PKfgV1Xyqz23yV for ; Mon, 20 Feb 2023 09:03:02 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 6123C857FC; Sun, 19 Feb 2023 23:02:49 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=reject dis=none) header.from=kwiboo.se Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=kwiboo.se header.i=@kwiboo.se header.b="PcZd9aht"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 0110285841; Sun, 19 Feb 2023 23:02:14 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_MSPIKE_H2,SPF_HELO_NONE, SPF_PASS,UNPARSEABLE_RELAY autolearn=ham autolearn_force=no version=3.4.2 Received: from xtrwkhkk.outbound-mail.sendgrid.net (xtrwkhkk.outbound-mail.sendgrid.net [167.89.16.17]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 87E108583D for ; Sun, 19 Feb 2023 23:02:06 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=reject dis=none) header.from=kwiboo.se Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=bounces+31435339-7456-u-boot=lists.denx.de@em2124.kwiboo.se DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kwiboo.se; h=from:subject:in-reply-to:references:mime-version:to:cc: content-transfer-encoding:content-type:cc:content-type:from:subject:to; s=s1; bh=EB7eGpzJdfk52RjmGhcwGoZT3T2fyfY24n9SXn0AkU0=; b=PcZd9ahtnRmQ7yTxbUgfqIwWaX8leL9DSInoQQLixwjKBThNP0JsxKSttlDp8K3D9v+A LMUJlgj4KBpVwuvMlCIRiQVS1vlpYSdwG/hirIOK3rYClyBT+loPNZVv4HdqOdWEzlmaP0 woaT6qOPoe3qOD4Cn3vzSEf2heS1MSVTgsMa+PLsecBHQl2I428aParTbNlu/hjeb+fOP0 4bO1KZWil6AUXZFaejKVoVJV0+r/sJ1w47rCJGOXJehnMIjSTZhpQpPmO4L0YWodWoLq04 QJkLPsOhjPZnDwgqXhXVMMPJUgX57/Kng72T9hKeb8da8HnPxk7ysAX/ec9gNkew== Received: by filterdrecv-7765ff4f7d-686qh with SMTP id filterdrecv-7765ff4f7d-686qh-1-63F29C5B-67 2023-02-19 22:02:03.984621799 +0000 UTC m=+788678.972612966 Received: from bionic.localdomain (unknown) by geopod-ismtpd-canary-0 (SG) with ESMTP id EK-cdhTWSiSyYQE2yUfgFA Sun, 19 Feb 2023 22:02:03.686 +0000 (UTC) From: Jonas Karlman Subject: [PATCH 3/9] binman: Use correct argument name in docstrings Date: Sun, 19 Feb 2023 22:02:04 +0000 (UTC) Message-Id: <20230219220158.4160763-4-jonas@kwiboo.se> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230219220158.4160763-1-jonas@kwiboo.se> References: <20230219220158.4160763-1-jonas@kwiboo.se> MIME-Version: 1.0 X-SG-EID: TdbjyGynYnRZWhH+7lKUQJL+ZxmxpowvO2O9SQF5CwCVrYgcwUXgU5DKUU3QxAfZekEeQsTe+RrMu3cja6a0h/0c2k8q4YY/wb3l0ZkYhvsWpO9zDzlfCAO2PhnsgVKuX2iz447iQZaMZeupsJ1bCC/2MGVm8W+Crp5U3Dw107vpuo8c5JBK9PFFnevqjAf47AKqBuBDfPM3+q3lOlQxuA3t+eKhlJEBTXCJUfmgOd9csGUCv88WksEZNqpt3rpx To: Simon Glass , Alper Nebi Yasak Cc: Pali =?iso-8859-1?q?Roh=E1r?= , Heinrich Schuchardt , Marek =?iso-8859-1?q?Beh=FAn?= , Quentin Schulz , Stefan Herbrechtsmeier , u-boot@lists.denx.de, Jonas Karlman X-Entity-ID: P7KYpSJvGCELWjBME/J5tg== X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.6 at phobos.denx.de X-Virus-Status: Clean Use correct argument name in docstrings. Signed-off-by: Jonas Karlman Reviewed-by: Simon Glass Reviewed-by: Simon Glass --- tools/binman/entry.py | 2 +- tools/binman/etype/blob.py | 2 +- tools/binman/etype/section.py | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/binman/entry.py b/tools/binman/entry.py index 5eacc5fa6c42..52b5d335f8ba 100644 --- a/tools/binman/entry.py +++ b/tools/binman/entry.py @@ -1104,7 +1104,7 @@ features to produce new behaviours. If there are faked blobs, the entries are added to the list Args: - fake_blobs_list: List of Entry objects to be added to + faked_blobs_list: List of Entry objects to be added to """ # This is meaningless for anything other than blobs pass diff --git a/tools/binman/etype/blob.py b/tools/binman/etype/blob.py index c7ddcedffb82..a80741e36338 100644 --- a/tools/binman/etype/blob.py +++ b/tools/binman/etype/blob.py @@ -102,7 +102,7 @@ class Entry_blob(Entry): If there are faked blobs, the entries are added to the list Args: - fake_blobs_list: List of Entry objects to be added to + faked_blobs_list: List of Entry objects to be added to """ if self.faked: faked_blobs_list.append(self) diff --git a/tools/binman/etype/section.py b/tools/binman/etype/section.py index 8bf5aa437d1a..d3926f791c72 100644 --- a/tools/binman/etype/section.py +++ b/tools/binman/etype/section.py @@ -885,7 +885,7 @@ class Entry_section(Entry): """Set whether a section allows to create a fake blob Args: - allow_fake_blob: True if allowed, False if not allowed + allow_fake: True if allowed, False if not allowed """ super().SetAllowFakeBlob(allow_fake) for entry in self._entries.values(): @@ -909,7 +909,7 @@ class Entry_section(Entry): If there are faked blobs, the entries are added to the list Args: - fake_blobs_list: List of Entry objects to be added to + faked_blobs_list: List of Entry objects to be added to """ for entry in self._entries.values(): entry.CheckFakedBlobs(faked_blobs_list) From patchwork Sun Feb 19 22:02:04 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonas Karlman X-Patchwork-Id: 1744753 X-Patchwork-Delegate: sjg@chromium.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=kwiboo.se header.i=@kwiboo.se header.a=rsa-sha256 header.s=s1 header.b=mL7C35J/; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4PKfg171Glz23yV for ; Mon, 20 Feb 2023 09:02:37 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 0502885831; Sun, 19 Feb 2023 23:02:27 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=reject dis=none) header.from=kwiboo.se Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=kwiboo.se header.i=@kwiboo.se header.b="mL7C35J/"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 6BF8D85890; Sun, 19 Feb 2023 23:02:13 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_MSPIKE_H2,SPF_HELO_NONE, SPF_PASS,UNPARSEABLE_RELAY autolearn=ham autolearn_force=no version=3.4.2 Received: from xtrwkhkk.outbound-mail.sendgrid.net (xtrwkhkk.outbound-mail.sendgrid.net [167.89.16.17]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id E3AA9858D8 for ; Sun, 19 Feb 2023 23:02:06 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=reject dis=none) header.from=kwiboo.se Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=bounces+31435339-7456-u-boot=lists.denx.de@em2124.kwiboo.se DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kwiboo.se; h=from:subject:in-reply-to:references:mime-version:to:cc: content-transfer-encoding:content-type:cc:content-type:from:subject:to; s=s1; bh=hmG0ubfvHtRXAJmnWchmnQiKo3wH5LzZXH6f5wfx25s=; b=mL7C35J/3oDHnIBmdeD2PneeDkhe6Hy4VVw1xYKX/nPSu60fn67U5ruJ/Zmzipqi+6ge H+xl5WHrgXQoQc3tf9bN5kTJjes53VXsIEMPDi4sJgz0mYMu86Jbm4J+l/vrO+1mki9C57 hmvmV+yIgaffLAF1fq4S0eDGIBC4HrTVfIGqt10RXPfRNdpXukeE3WEm1nwejvfIf9xPMI YLB98Z2eN0bQ0BT+8u0mXmuEiGcTDZ7wNv5cUzoebofdVWrIKRI1dnC4vWh6811oD6LJy8 dv3Wr06/maeecNxiFddX/H6oDeku0bJ4I5nmBcAJGMe52QvPrqYpU3hmrFx7Tg3w== Received: by filterdrecv-8dd65bbd4-bvdhz with SMTP id filterdrecv-8dd65bbd4-bvdhz-1-63F29C5C-27 2023-02-19 22:02:04.421682036 +0000 UTC m=+788684.247805713 Received: from bionic.localdomain (unknown) by geopod-ismtpd-canary-0 (SG) with ESMTP id iSAj_CU8RHSdTFWJnfZJPA Sun, 19 Feb 2023 22:02:04.207 +0000 (UTC) From: Jonas Karlman Subject: [PATCH 4/9] binman: Override CheckOptional in fit entry Date: Sun, 19 Feb 2023 22:02:04 +0000 (UTC) Message-Id: <20230219220158.4160763-5-jonas@kwiboo.se> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230219220158.4160763-1-jonas@kwiboo.se> References: <20230219220158.4160763-1-jonas@kwiboo.se> MIME-Version: 1.0 X-SG-EID: TdbjyGynYnRZWhH+7lKUQJL+ZxmxpowvO2O9SQF5CwCVrYgcwUXgU5DKUU3QxAfZekEeQsTe+RrMu3cja6a0h/8BKH77YEdlBHysr2q7x7EEsN5tjL/ny3Jg0ChNt1Os15AVEMvTzezr268nt6g0Y3BI8L2FgXpU+94Qv3E/JiwWbNRKRgCkrvt3Q0UAcyqUk1sW89pc6TvopkPDs9r0xptps5t7I35/T2FYcbmrAzoII0xMkOBPeI9/NVzQe+SA To: Simon Glass , Alper Nebi Yasak Cc: Pali =?iso-8859-1?q?Roh=E1r?= , Heinrich Schuchardt , Marek =?iso-8859-1?q?Beh=FAn?= , Quentin Schulz , Stefan Herbrechtsmeier , u-boot@lists.denx.de, Jonas Karlman X-Entity-ID: P7KYpSJvGCELWjBME/J5tg== X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.6 at phobos.denx.de X-Virus-Status: Clean Missing optional blobs was not reported for generated entries, e.g. tee-os on rockchip targets. Implement a CheckOptional to fix this. After this the following can be shown: Image 'simple-bin' is missing external blobs but is still functional: tee-os /binman/simple-bin/fit/images/@tee-SEQ/tee-os (tee-os): See the documentation for your board. You may need to build Open Portable Trusted Execution Environment (OP-TEE) with TEE=/path/to/tee.bin Signed-off-by: Jonas Karlman Reviewed-by: Simon Glass --- tools/binman/etype/fit.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/tools/binman/etype/fit.py b/tools/binman/etype/fit.py index 822de7982768..314e03b4a964 100644 --- a/tools/binman/etype/fit.py +++ b/tools/binman/etype/fit.py @@ -828,3 +828,10 @@ class Entry_fit(Entry_section): # missing for entry in self._priv_entries.values(): entry.CheckMissing(missing_list) + + def CheckOptional(self, optional_list): + # We must use our private entry list for this since generator nodes + # which are removed from self._entries will otherwise not show up as + # optional + for entry in self._priv_entries.values(): + entry.CheckOptional(optional_list) From patchwork Sun Feb 19 22:02:05 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonas Karlman X-Patchwork-Id: 1744759 X-Patchwork-Delegate: sjg@chromium.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=kwiboo.se header.i=@kwiboo.se header.a=rsa-sha256 header.s=s1 header.b=M/L0bTlU; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4PKfhY0gDqz23yV for ; Mon, 20 Feb 2023 09:03:57 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 75CF9858A8; Sun, 19 Feb 2023 23:03:03 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=reject dis=none) header.from=kwiboo.se Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=kwiboo.se header.i=@kwiboo.se header.b="M/L0bTlU"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 066FA857FC; Sun, 19 Feb 2023 23:02:23 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_MSPIKE_H2,SPF_HELO_NONE, SPF_PASS,UNPARSEABLE_RELAY autolearn=ham autolearn_force=no version=3.4.2 Received: from xvfrpbcd.outbound-mail.sendgrid.net (xvfrpbcd.outbound-mail.sendgrid.net [168.245.59.205]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 695DE8585F for ; Sun, 19 Feb 2023 23:02:07 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=reject dis=none) header.from=kwiboo.se Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=bounces+31435339-7456-u-boot=lists.denx.de@em2124.kwiboo.se DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kwiboo.se; h=from:subject:in-reply-to:references:mime-version:to:cc: content-transfer-encoding:content-type:cc:content-type:from:subject:to; s=s1; bh=KlTDXw9MJtbhgEokgwaewhAjA0iZxN6Q92Mb909nFbk=; b=M/L0bTlU65dP1ciV4cWS0WWqV3Xl22WA3AeHebQuFWKt2wF2mf1Bo8hHpjcRzVKL9p1u hBB3Do+F+McIucIz5sQIRi1bSUt/TrDtuWW4p9NgSAQFloMyJ883pJmAU88300zza1ldg0 g/GT9NtLuKan+OBnjdQcuvcsFBIfvGLlA2h+63mRHyC85827h2bWZI1iBP+T7Q93RbkIi5 IzB7Cu6e6WRycQzWe1g9BYC7hteAFl7cbdiZ2aGrDfY+acAFd6dF2wDqXouRhSXkIDSoHd zGRCcICyeWIqEm5Nbo4HXOfMbMP9IlX76dEefdHxrxDKBv0d9rfdIDIfI6C+BR3w== Received: by filterdrecv-695cbfbb87-q9b6q with SMTP id filterdrecv-695cbfbb87-q9b6q-1-63F29C5C-D1 2023-02-19 22:02:04.961642161 +0000 UTC m=+788715.771555608 Received: from bionic.localdomain (unknown) by geopod-ismtpd-canary-0 (SG) with ESMTP id 3FevGqnFTeWLZl__uvW_OQ Sun, 19 Feb 2023 22:02:04.732 +0000 (UTC) From: Jonas Karlman Subject: [PATCH 5/9] binman: Implement missing check functions in mkimage entry Date: Sun, 19 Feb 2023 22:02:05 +0000 (UTC) Message-Id: <20230219220158.4160763-6-jonas@kwiboo.se> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230219220158.4160763-1-jonas@kwiboo.se> References: <20230219220158.4160763-1-jonas@kwiboo.se> MIME-Version: 1.0 X-SG-EID: TdbjyGynYnRZWhH+7lKUQJL+ZxmxpowvO2O9SQF5CwCVrYgcwUXgU5DKUU3QxAfZekEeQsTe+RrMu3cja6a0h62kXiO4uXNR0Oi35YeOYknTJetU+l+swvftx8T4cfUGQUBy+DkpkWUqw2H4yUVVEhMMCJpyeJIiIqCbQB7liT4brS6v232cQWp08FBn+ug9s1steGC3qvkMCHGipRr3aOw5CIbi1EW1FtAdGnopKCrQNbZNu1x1VVQvar8rzlY3 To: Simon Glass , Alper Nebi Yasak Cc: Pali =?iso-8859-1?q?Roh=E1r?= , Heinrich Schuchardt , Marek =?iso-8859-1?q?Beh=FAn?= , Quentin Schulz , Stefan Herbrechtsmeier , u-boot@lists.denx.de, Jonas Karlman X-Entity-ID: P7KYpSJvGCELWjBME/J5tg== X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.6 at phobos.denx.de X-Virus-Status: Clean The mkimage entry is working like a section entry but inherits from Entry not Entry_section. Copy implementations of missing Check-functions from Entry_section and adopt to Entry_mkimage. Signed-off-by: Jonas Karlman --- tools/binman/etype/mkimage.py | 44 ++++++++++++++++++++++++++++++++++- 1 file changed, 43 insertions(+), 1 deletion(-) diff --git a/tools/binman/etype/mkimage.py b/tools/binman/etype/mkimage.py index cb264c3cad0b..49d3462a154c 100644 --- a/tools/binman/etype/mkimage.py +++ b/tools/binman/etype/mkimage.py @@ -206,16 +206,31 @@ class Entry_mkimage(Entry): self._imagename.SetAllowMissing(allow_missing) def SetAllowFakeBlob(self, allow_fake): - """Set whether the sub nodes allows to create a fake blob + """Set whether a section allows to create a fake blob Args: allow_fake: True if allowed, False if not allowed """ + super().SetAllowFakeBlob(allow_fake) for entry in self._mkimage_entries.values(): entry.SetAllowFakeBlob(allow_fake) if self._imagename: self._imagename.SetAllowFakeBlob(allow_fake) + def CheckMissing(self, missing_list): + """Check if any entries in this section have missing external blobs + + If there are missing (non-optional) blobs, the entries are added to the + list + + Args: + missing_list: List of Entry objects to be added to + """ + for entry in self._mkimage_entries.values(): + entry.CheckMissing(missing_list) + if self._imagename: + self._imagename.CheckMissing(missing_list) + def CheckFakedBlobs(self, faked_blobs_list): """Check if any entries in this section have faked external blobs @@ -229,6 +244,33 @@ class Entry_mkimage(Entry): if self._imagename: self._imagename.CheckFakedBlobs(faked_blobs_list) + def CheckOptional(self, optional_list): + """Check the section for missing but optional external blobs + + If there are missing (optional) blobs, the entries are added to the list + + Args: + optional_list (list): List of Entry objects to be added to + """ + for entry in self._mkimage_entries.values(): + entry.CheckOptional(optional_list) + if self._imagename: + self._imagename.CheckOptional(optional_list) + + def check_missing_bintools(self, missing_list): + """Check if any entries in this section have missing bintools + + If there are missing bintools, these are added to the list + + Args: + missing_list: List of Bintool objects to be added to + """ + super().check_missing_bintools(missing_list) + for entry in self._mkimage_entries.values(): + entry.check_missing_bintools(missing_list) + if self._imagename: + self._imagename.check_missing_bintools(missing_list) + def AddBintools(self, btools): super().AddBintools(btools) self.mkimage = self.AddBintool(btools, 'mkimage') From patchwork Sun Feb 19 22:02:05 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonas Karlman X-Patchwork-Id: 1744754 X-Patchwork-Delegate: sjg@chromium.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=kwiboo.se header.i=@kwiboo.se header.a=rsa-sha256 header.s=s1 header.b=nB6eFJ52; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4PKfgD6Blgz23yV for ; Mon, 20 Feb 2023 09:02:48 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id F302A85925; Sun, 19 Feb 2023 23:02:33 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=reject dis=none) header.from=kwiboo.se Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=kwiboo.se header.i=@kwiboo.se header.b="nB6eFJ52"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id C609285851; Sun, 19 Feb 2023 23:02:16 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_MSPIKE_H2,SPF_HELO_NONE, SPF_PASS,UNPARSEABLE_RELAY autolearn=ham autolearn_force=no version=3.4.2 Received: from xtrwkhkk.outbound-mail.sendgrid.net (xtrwkhkk.outbound-mail.sendgrid.net [167.89.16.17]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 0CF3585778 for ; Sun, 19 Feb 2023 23:02:07 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=reject dis=none) header.from=kwiboo.se Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=bounces+31435339-7456-u-boot=lists.denx.de@em2124.kwiboo.se DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kwiboo.se; h=from:subject:in-reply-to:references:mime-version:to:cc: content-transfer-encoding:content-type:cc:content-type:from:subject:to; s=s1; bh=+tzUTRnv2LqsUt8RxL+zG5lE02FxM3f6PiPrnyJk9fk=; b=nB6eFJ52eoF7qBl1D5Vk4gafTiDJh/aFNM0DMg87T7YAHtA5iuYYcCUfUj4Q51OsSvFo RoHlNbhJ7F2Ipsh3DGejesxsRva5az6fEyz5r0DgEOOdQ1ahqB5P6DgileTjVut++KmSuq gq7Ln0zJc01BYH0Iv58sUu7COP2pl3mRh/NP/EOl2EzXnD4wWjJzbHD4RK5VtFFCycg58W PyGhdpGLqSQ5hqWuJJoukwQ+c+lUvByRMjskqVjuqKDyxLxYTz6E8ycINVoYXDRkOcHaXj 5S6nNClRAYjfFY+n66oOw+LDlXtm0YsY5O+yRVWcGiR1iFo1kk6FmNE+yEc1cYkA== Received: by filterdrecv-7dfc98557c-gsmlv with SMTP id filterdrecv-7dfc98557c-gsmlv-1-63F29C5D-39 2023-02-19 22:02:05.567218824 +0000 UTC m=+788702.375983714 Received: from bionic.localdomain (unknown) by geopod-ismtpd-canary-0 (SG) with ESMTP id XNjaKT1WTmipANR5LTKCyQ Sun, 19 Feb 2023 22:02:05.256 +0000 (UTC) From: Jonas Karlman Subject: [PATCH 6/9] binman: Mark mkimage entry missing when its subnodes is missing Date: Sun, 19 Feb 2023 22:02:05 +0000 (UTC) Message-Id: <20230219220158.4160763-7-jonas@kwiboo.se> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230219220158.4160763-1-jonas@kwiboo.se> References: <20230219220158.4160763-1-jonas@kwiboo.se> MIME-Version: 1.0 X-SG-EID: TdbjyGynYnRZWhH+7lKUQJL+ZxmxpowvO2O9SQF5CwCVrYgcwUXgU5DKUU3QxAfZekEeQsTe+RrMu3cja6a0hzpOj7WQ7plkp2yQgSEkSZHcIvBEE7N82UWb7fjpohPIjnhXSgGkz8JHkWh7I0ABe2pSySRrS0Y3PYuwW67bBj8sG1amIlBTIc1J3Q9ZdHHfa7PuSQjc/ztWH3KlZXSJdxzTGRZ6C7KW36H8JdfQDNTYhncOs4edXeGvnpUJhumu To: Simon Glass , Alper Nebi Yasak Cc: Pali =?iso-8859-1?q?Roh=E1r?= , Heinrich Schuchardt , Marek =?iso-8859-1?q?Beh=FAn?= , Quentin Schulz , Stefan Herbrechtsmeier , u-boot@lists.denx.de, Jonas Karlman X-Entity-ID: P7KYpSJvGCELWjBME/J5tg== X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.6 at phobos.denx.de X-Virus-Status: Clean Using the mkimage entry with the multiple-data-files prop and having a missing external blob result in an unexpected ValueError exception using the --allow-missing flag. ValueError: Filename 'missing.bin' not found in input path (...) Fix this by using _pathname that is resolved by ObtainContents for blob entries, ObtainContents also handles allow missing for external blobs. Mark mkimage entry as missing and return without running mkimage when missing entries is reported by CheckMissing. Signed-off-by: Jonas Karlman Reviewed-by: Simon Glass --- tools/binman/etype/mkimage.py | 10 +++++++++- tools/binman/ftest.py | 9 +++++++++ .../test/278_mkimage_missing_multiple.dts | 19 +++++++++++++++++++ 3 files changed, 37 insertions(+), 1 deletion(-) create mode 100644 tools/binman/test/278_mkimage_missing_multiple.dts diff --git a/tools/binman/etype/mkimage.py b/tools/binman/etype/mkimage.py index 49d3462a154c..2673a8607f37 100644 --- a/tools/binman/etype/mkimage.py +++ b/tools/binman/etype/mkimage.py @@ -156,7 +156,8 @@ class Entry_mkimage(Entry): for entry in self._mkimage_entries.values(): if not entry.ObtainContents(fake_size=fake_size): return False - fnames.append(tools.get_input_filename(entry.GetDefaultFilename())) + if entry._pathname: + fnames.append(entry._pathname) input_fname = ":".join(fnames) else: data, input_fname, uniq = self.collect_contents_to_file( @@ -171,6 +172,13 @@ class Entry_mkimage(Entry): outfile = self._filename if self._filename else 'mkimage-out.%s' % uniq output_fname = tools.get_output_filename(outfile) + missing_list = [] + self.CheckMissing(missing_list) + self.missing = bool(missing_list) + if self.missing: + self.SetContents(b'') + return self.allow_missing + args = ['-d', input_fname] if self._data_to_imagename: args += ['-n', input_fname] diff --git a/tools/binman/ftest.py b/tools/binman/ftest.py index 48ac1540bfd8..803b8c5accf4 100644 --- a/tools/binman/ftest.py +++ b/tools/binman/ftest.py @@ -6393,6 +6393,15 @@ fdt fdtmap Extract the devicetree blob from the fdtmap data = self._DoReadFile('277_rockchip_tpl.dts') self.assertEqual(ROCKCHIP_TPL_DATA, data[:len(ROCKCHIP_TPL_DATA)]) + def testMkimageMissingBlobMultiple(self): + """Test using mkimage to build an image""" + with test_util.capture_sys_output() as (stdout, stderr): + self._DoTestFile('278_mkimage_missing_multiple.dts', allow_missing=True) + err = stderr.getvalue() + self.assertRegex( + err, + "Image '.*' is missing external blobs and is non-functional: .*") + if __name__ == "__main__": unittest.main() diff --git a/tools/binman/test/278_mkimage_missing_multiple.dts b/tools/binman/test/278_mkimage_missing_multiple.dts new file mode 100644 index 000000000000..f84aea49ead9 --- /dev/null +++ b/tools/binman/test/278_mkimage_missing_multiple.dts @@ -0,0 +1,19 @@ +// SPDX-License-Identifier: GPL-2.0+ + +/dts-v1/; + +/ { + #address-cells = <1>; + #size-cells = <1>; + + binman { + mkimage { + args = "-n test -T script"; + multiple-data-files; + + blob-ext { + filename = "missing.bin"; + }; + }; + }; +}; From patchwork Sun Feb 19 22:02:06 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonas Karlman X-Patchwork-Id: 1744758 X-Patchwork-Delegate: sjg@chromium.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=kwiboo.se header.i=@kwiboo.se header.a=rsa-sha256 header.s=s1 header.b=Tc0VDUEF; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4PKfhK6nGBz23yV for ; Mon, 20 Feb 2023 09:03:45 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 61BF58584D; Sun, 19 Feb 2023 23:02:58 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=reject dis=none) header.from=kwiboo.se Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=kwiboo.se header.i=@kwiboo.se header.b="Tc0VDUEF"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 296D185778; Sun, 19 Feb 2023 23:02:22 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_MSPIKE_H2,SPF_HELO_NONE, SPF_PASS,UNPARSEABLE_RELAY autolearn=ham autolearn_force=no version=3.4.2 Received: from xtrwkhkk.outbound-mail.sendgrid.net (xtrwkhkk.outbound-mail.sendgrid.net [167.89.16.17]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 2589285860 for ; Sun, 19 Feb 2023 23:02:07 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=reject dis=none) header.from=kwiboo.se Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=bounces+31435339-7456-u-boot=lists.denx.de@em2124.kwiboo.se DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kwiboo.se; h=from:subject:in-reply-to:references:mime-version:to:cc: content-transfer-encoding:content-type:cc:content-type:from:subject:to; s=s1; bh=JH9bnYYPyT0qa64I0NW+CoXQyO3qflaWjwOEU1j3hAY=; b=Tc0VDUEFQiIh70qynr+WWrrdAWSna93z+IAoJQqdnFCBX0WSqfUAQbWC+nyoIj3r/Mnr x5aeJi97qIarxYrOG1qcgHRAvcU/8ZnZYtgNZrNHffQd/Gd6t+JuzJ5h50sh4T2EAFMZdn U7SA0SdJAxwR90Rz49wDDD5DhZuGnrEGlBFejmtGtAnYZK8UqXnBDsOcDl8FSIJpSiicny vM75EWZjOS8Nu0tvyJiYOMNYqkEz3XtL7O29r05wuaO5fLQwk/7/2CKI+w5VZDx73HLuHK x3FDQ6Fzq5q3mW5K2yX0zfhy/1X3Id+5vGabd2tGdo+jssEb3nSCtdd1QkBsUqMQ== Received: by filterdrecv-7765ff4f7d-qqvbf with SMTP id filterdrecv-7765ff4f7d-qqvbf-1-63F29C5D-7B 2023-02-19 22:02:06.081643786 +0000 UTC m=+788479.030351542 Received: from bionic.localdomain (unknown) by geopod-ismtpd-canary-0 (SG) with ESMTP id u-BeDL94TWWforpq4XKpVQ Sun, 19 Feb 2023 22:02:05.779 +0000 (UTC) From: Jonas Karlman Subject: [PATCH 7/9] binman: Fix blank line usage for invalid images warning text Date: Sun, 19 Feb 2023 22:02:06 +0000 (UTC) Message-Id: <20230219220158.4160763-8-jonas@kwiboo.se> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230219220158.4160763-1-jonas@kwiboo.se> References: <20230219220158.4160763-1-jonas@kwiboo.se> MIME-Version: 1.0 X-SG-EID: TdbjyGynYnRZWhH+7lKUQJL+ZxmxpowvO2O9SQF5CwCVrYgcwUXgU5DKUU3QxAfZekEeQsTe+RrMu3cja6a0hxvFyypeXhx47Qk7VhpcH+dgKtc8Ow+6FRv/oKjWRGf4MMYbhDFXiz4hvj3UEAk+z+yU+fDjua95VTaoSq7a4iqAOoKWQkh5iUqkS326vzQMFsS9TZ705VMeSlrTDUtvID5Q6e08RmEZJNzEgsBLmuWbc35hkc3/a/1TZJ7RXOcA To: Simon Glass , Alper Nebi Yasak Cc: Pali =?iso-8859-1?q?Roh=E1r?= , Heinrich Schuchardt , Marek =?iso-8859-1?q?Beh=FAn?= , Quentin Schulz , Stefan Herbrechtsmeier , u-boot@lists.denx.de, Jonas Karlman X-Entity-ID: P7KYpSJvGCELWjBME/J5tg== X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.6 at phobos.denx.de X-Virus-Status: Clean There is no blank line between last missing blob help message and the header line for optional blob help messages. Image 'simple-bin' is missing external blobs and is non-functional: atf-bl31 /binman/simple-bin/fit/images/@atf-SEQ/atf-bl31: See the documentation for your board. You may need to build ARM Trusted Firmware and build with BL31=/path/to/bl31.bin Image 'simple-bin' is missing external blobs but is still functional: tee-os /binman/simple-bin/fit/images/@tee-SEQ/tee-os: See the documentation for your board. You may need to build Open Portable Trusted Execution Environment (OP-TEE) with TEE=/path/to/tee.bin Some images are invalid With this a blank line is inserted to make the text more readable. Signed-off-by: Jonas Karlman Reviewed-by: Simon Glass --- tools/binman/control.py | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/tools/binman/control.py b/tools/binman/control.py index e64740094f60..b5ede60c1cde 100644 --- a/tools/binman/control.py +++ b/tools/binman/control.py @@ -106,9 +106,10 @@ def _ReadMissingBlobHelp(): return result def _ShowBlobHelp(path, text): - tout.warning('\n%s:' % path) + tout.warning('%s:' % path) for line in text.splitlines(): tout.warning(' %s' % line) + tout.warning('') def _ShowHelpForMissingBlobs(missing_list): """Show help for each missing blob to help the user take action @@ -598,7 +599,7 @@ def ProcessImage(image, update_fdt, write_map, get_contents=True, missing_list = [] image.CheckMissing(missing_list) if missing_list: - tout.warning("Image '%s' is missing external blobs and is non-functional: %s" % + tout.warning("Image '%s' is missing external blobs and is non-functional: %s\n" % (image.name, ' '.join([e.name for e in missing_list]))) _ShowHelpForMissingBlobs(missing_list) @@ -606,7 +607,7 @@ def ProcessImage(image, update_fdt, write_map, get_contents=True, image.CheckFakedBlobs(faked_list) if faked_list: tout.warning( - "Image '%s' has faked external blobs and is non-functional: %s" % + "Image '%s' has faked external blobs and is non-functional: %s\n" % (image.name, ' '.join([os.path.basename(e.GetDefaultFilename()) for e in faked_list]))) @@ -614,7 +615,7 @@ def ProcessImage(image, update_fdt, write_map, get_contents=True, image.CheckOptional(optional_list) if optional_list: tout.warning( - "Image '%s' is missing external blobs but is still functional: %s" % + "Image '%s' is missing external blobs but is still functional: %s\n" % (image.name, ' '.join([e.name for e in optional_list]))) _ShowHelpForMissingBlobs(optional_list) @@ -622,7 +623,7 @@ def ProcessImage(image, update_fdt, write_map, get_contents=True, image.check_missing_bintools(missing_bintool_list) if missing_bintool_list: tout.warning( - "Image '%s' has missing bintools and is non-functional: %s" % + "Image '%s' has missing bintools and is non-functional: %s\n" % (image.name, ' '.join([os.path.basename(bintool.name) for bintool in missing_bintool_list]))) return any([missing_list, faked_list, missing_bintool_list]) @@ -756,7 +757,7 @@ def Binman(args): # This can only be True if -M is provided, since otherwise binman # would have raised an error already if invalid: - msg = '\nSome images are invalid' + msg = 'Some images are invalid' if args.ignore_missing: tout.warning(msg) else: From patchwork Sun Feb 19 22:02:06 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonas Karlman X-Patchwork-Id: 1744756 X-Patchwork-Delegate: sjg@chromium.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=kwiboo.se header.i=@kwiboo.se header.a=rsa-sha256 header.s=s1 header.b=VkhcnFC8; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4PKfgt4C4Mz23yV for ; Mon, 20 Feb 2023 09:03:22 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 072FF85843; Sun, 19 Feb 2023 23:02:52 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=reject dis=none) header.from=kwiboo.se Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=kwiboo.se header.i=@kwiboo.se header.b="VkhcnFC8"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 9E0E585778; Sun, 19 Feb 2023 23:02:18 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_MSPIKE_H2,SPF_HELO_NONE, SPF_PASS,UNPARSEABLE_RELAY autolearn=ham autolearn_force=no version=3.4.2 Received: from xtrwhxbr.outbound-mail.sendgrid.net (xtrwhxbr.outbound-mail.sendgrid.net [167.89.10.181]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id C1CEE85867 for ; Sun, 19 Feb 2023 23:02:08 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=reject dis=none) header.from=kwiboo.se Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=bounces+31435339-7456-u-boot=lists.denx.de@em2124.kwiboo.se DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kwiboo.se; h=from:subject:in-reply-to:references:mime-version:to:cc: content-transfer-encoding:content-type:cc:content-type:from:subject:to; s=s1; bh=Elc0lsO1e2h/Porm6o7cZPM9V/GsnyK7pdFiz8v0yKg=; b=VkhcnFC8VUgUclrG6QedHkJ9FzKr3JRsFvIN2TUVN0KTlR6MMVk1m2vwPxcZtWahM8zU MfHlXzO/u9AuuNKcSkTGAR+3kqzMVg2hiavELEHis184HzSZA8Q96lhrPqClqn4suuOwz5 lMMnsVJE+UUe/e4JMkY0p8uOTLOFB9zYqiA+i/kerTJI5xznoghquuH5FvwrXX7gZ1Yein oj/bCk/kSZpI5W3d6S+gz0FfrCG9y2Pf/WEjqDf2jYkWYN4VPWzcuhUV8iLnSMHnEyIRMZ LNCax2GQ/DyXZUwnq8UnbuNlY6CwyV1LAnmYaakHBVuJQUgvibST9bDwFUfJ03Yg== Received: by filterdrecv-8dd65bbd4-9vgxf with SMTP id filterdrecv-8dd65bbd4-9vgxf-1-63F29C5E-4C 2023-02-19 22:02:06.503658592 +0000 UTC m=+788704.717523344 Received: from bionic.localdomain (unknown) by geopod-ismtpd-canary-0 (SG) with ESMTP id eRsjQj9OQYS5AGTIsnN2Aw Sun, 19 Feb 2023 22:02:06.298 +0000 (UTC) From: Jonas Karlman Subject: [PATCH 8/9] binman: Show filename in missing blob help message Date: Sun, 19 Feb 2023 22:02:06 +0000 (UTC) Message-Id: <20230219220158.4160763-9-jonas@kwiboo.se> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230219220158.4160763-1-jonas@kwiboo.se> References: <20230219220158.4160763-1-jonas@kwiboo.se> MIME-Version: 1.0 X-SG-EID: TdbjyGynYnRZWhH+7lKUQJL+ZxmxpowvO2O9SQF5CwCVrYgcwUXgU5DKUU3QxAfZekEeQsTe+RrMu3cja6a0h4cPkSfys0bSYtpqAWRaQ01JnImM+APt4y2M8Hs/2GjNE9NUgucallXRlHqLv5H8O1tYla8XlqEuf0btarrTtVHcfKCo8zkXZep7EEasJtqgJHgxr6L+zAdjs6TZBtLoyiFy+gZrnGqIqIWyrqpDFlMJJxpK4wjjaEhqMrxchq2L To: Simon Glass , Alper Nebi Yasak Cc: Pali =?iso-8859-1?q?Roh=E1r?= , Heinrich Schuchardt , Marek =?iso-8859-1?q?Beh=FAn?= , Quentin Schulz , Stefan Herbrechtsmeier , u-boot@lists.denx.de, Jonas Karlman X-Entity-ID: P7KYpSJvGCELWjBME/J5tg== X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.6 at phobos.denx.de X-Virus-Status: Clean Show the filename next to the node path in missing blob help messages, also show a generic missing blob message when there was no help message for the help tag. Signed-off-by: Jonas Karlman Reviewed-by: Simon Glass --- tools/binman/control.py | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/tools/binman/control.py b/tools/binman/control.py index b5ede60c1cde..a5ff1cb56245 100644 --- a/tools/binman/control.py +++ b/tools/binman/control.py @@ -105,8 +105,8 @@ def _ReadMissingBlobHelp(): _FinishTag(tag, msg, result) return result -def _ShowBlobHelp(path, text): - tout.warning('%s:' % path) +def _ShowBlobHelp(path, text, fname): + tout.warning('%s (%s):' % (path, fname)) for line in text.splitlines(): tout.warning(' %s' % line) tout.warning('') @@ -126,10 +126,17 @@ def _ShowHelpForMissingBlobs(missing_list): tags = entry.GetHelpTags() # Show the first match help message + shown_help = False for tag in tags: if tag in missing_blob_help: - _ShowBlobHelp(entry._node.path, missing_blob_help[tag]) + _ShowBlobHelp(entry._node.path, missing_blob_help[tag], + entry.GetDefaultFilename()) + shown_help = True break + # Or a generic help message + if not shown_help: + _ShowBlobHelp(entry._node.path, "Missing blob", + entry.GetDefaultFilename()) def GetEntryModules(include_testing=True): """Get a set of entry class implementations From patchwork Sun Feb 19 22:02:07 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonas Karlman X-Patchwork-Id: 1744760 X-Patchwork-Delegate: sjg@chromium.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=kwiboo.se header.i=@kwiboo.se header.a=rsa-sha256 header.s=s1 header.b=GjA36F5I; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4PKfhm2M2Fz23yV for ; Mon, 20 Feb 2023 09:04:08 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id EA4DA85928; Sun, 19 Feb 2023 23:03:23 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=reject dis=none) header.from=kwiboo.se Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=kwiboo.se header.i=@kwiboo.se header.b="GjA36F5I"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id A720E8580F; Sun, 19 Feb 2023 23:02:23 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_MSPIKE_H2,SPF_HELO_NONE, SPF_PASS,UNPARSEABLE_RELAY autolearn=ham autolearn_force=no version=3.4.2 Received: from xtrwhxbr.outbound-mail.sendgrid.net (xtrwhxbr.outbound-mail.sendgrid.net [167.89.10.181]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 476B9858E1 for ; Sun, 19 Feb 2023 23:02:09 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=reject dis=none) header.from=kwiboo.se Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=bounces+31435339-7456-u-boot=lists.denx.de@em2124.kwiboo.se DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kwiboo.se; h=from:subject:in-reply-to:references:mime-version:to:cc: content-transfer-encoding:content-type:cc:content-type:from:subject:to; s=s1; bh=galmiRvSae3e3Wak2xJIMiT0ZavdpR/lmbR5XvYEZnc=; b=GjA36F5IkXW9C2DcqkQYK/88b75Badz77d6A+NmsxafGNlRGMcuHzieibk0V9Mh7wn3T mnDSodwGGYtyCgF+s7na2v6ImWiYR/FY/SYGsOXJx0XCp0I2GwvGSH0x2SdUj75lnBOPbV VdMfOlZc4ATl3VdCccBDYwJGB8B3J0o6f9XGETRXSdkYiCrgMxLhMCD2U5/ur3IHocxqyc Pf9lby+EP37sM/gD0D6jFwdiD+yCi2ViXU6PCRJ0jbP8r5C6lgpCAlfImd1BiAyX17/Xry 62NAOzCW2zl4AHsNPGo1VFoZpz8kBPLLNTQBKHKkTnYwYWSnOstMXrBTSEivQu+A== Received: by filterdrecv-695cbfbb87-4gblt with SMTP id filterdrecv-695cbfbb87-4gblt-1-63F29C5E-85 2023-02-19 22:02:07.028142292 +0000 UTC m=+788671.100324055 Received: from bionic.localdomain (unknown) by geopod-ismtpd-canary-0 (SG) with ESMTP id Nb9RRp4xQWmMde1GWu8RTQ Sun, 19 Feb 2023 22:02:06.822 +0000 (UTC) From: Jonas Karlman Subject: [PATCH 9/9] Makefile: Show binman missing blob message Date: Sun, 19 Feb 2023 22:02:07 +0000 (UTC) Message-Id: <20230219220158.4160763-10-jonas@kwiboo.se> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230219220158.4160763-1-jonas@kwiboo.se> References: <20230219220158.4160763-1-jonas@kwiboo.se> MIME-Version: 1.0 X-SG-EID: TdbjyGynYnRZWhH+7lKUQJL+ZxmxpowvO2O9SQF5CwCVrYgcwUXgU5DKUU3QxAfZekEeQsTe+RrMu3cja6a0h//jDTHQXcOZTJgCKBvGmF5l24zgElnh5pc8BLRMWfa7OgqwF/Ar+dlwaAJjWcRvul+FOdFLZ8WUJcV7VjpyPYGcwQ2AGQnK8BIrRiY/SrpFGS7F5mzsL33dSJO9EjwI9lOXaFT7Ivzj46vO0ICiiKvuxecLzc88RlT0pE/xr6Cq To: Simon Glass , Alper Nebi Yasak Cc: Pali =?iso-8859-1?q?Roh=E1r?= , Heinrich Schuchardt , Marek =?iso-8859-1?q?Beh=FAn?= , Quentin Schulz , Stefan Herbrechtsmeier , u-boot@lists.denx.de, Jonas Karlman X-Entity-ID: P7KYpSJvGCELWjBME/J5tg== X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.6 at phobos.denx.de X-Virus-Status: Clean When binman is invoked during a build of U-Boot and an external blob is missing, the user is usually presented with a generic file not found in input path message. Invoke binman with --allow-missing so that binman can show relevant missing blob help messages. Build continue to fail with missing blobs unless BINMAN_ALLOW_MISSING=1 is used. This changes the following error message: binman: Filename 'atf-bl31' not found in input path (...) to the following: Image 'itb' is missing external blobs and is non-functional: atf-blob /binman/itb/fit/images/atf/atf-blob (bl31.bin): See the documentation for your board. You may need to build ARM Trusted Firmware and build with BL31=/path/to/bl31.bin Signed-off-by: Jonas Karlman Reviewed-by: Simon Glass --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 58f8c7a35335..c2860824f6f2 100644 --- a/Makefile +++ b/Makefile @@ -1326,7 +1326,7 @@ cmd_binman = $(srctree)/tools/binman/binman $(if $(BINMAN_DEBUG),-D) \ --toolpath $(objtree)/tools \ $(if $(BINMAN_VERBOSE),-v$(BINMAN_VERBOSE)) \ build -u -d u-boot.dtb -O . -m \ - $(if $(BINMAN_ALLOW_MISSING),--allow-missing --ignore-missing) \ + --allow-missing $(if $(BINMAN_ALLOW_MISSING),--ignore-missing) \ -I . -I $(srctree) -I $(srctree)/board/$(BOARDDIR) \ -I arch/$(ARCH)/dts -a of-list=$(CONFIG_OF_LIST) \ $(foreach f,$(BINMAN_INDIRS),-I $(f)) \