From patchwork Fri Feb 18 14:10:23 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 1594791 X-Patchwork-Delegate: sjg@chromium.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=siemens.com header.i=@siemens.com header.a=rsa-sha256 header.s=selector2 header.b=rIM+jhK0; dkim-atps=neutral Authentication-Results: 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=) 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 RSA-PSS (4096 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4K0YWJ735sz9sFr for ; Sat, 19 Feb 2022 01:10:36 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 639CA83A92; Fri, 18 Feb 2022 15:10:31 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=siemens.com 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=siemens.com header.i=@siemens.com header.b="rIM+jhK0"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id ECE2283900; Fri, 18 Feb 2022 15:10:29 +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,SPF_HELO_PASS,SPF_PASS, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.2 Received: from EUR02-AM5-obe.outbound.protection.outlook.com (mail-am5eur02on0621.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe07::621]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 6272883B79 for ; Fri, 18 Feb 2022 15:10:26 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=siemens.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=jan.kiszka@siemens.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Q57lCrjIxtV/3i46xbhIN7PQkwnReAEi7cMQO85kssWUHcSkJu9GNk6SdbCYPEX6Mjguj62VJSqYJJIdiH/IPgpC0/fwgF0vGOUZeA8q2vLSUhhOqr9DkRSfLiDLSpEILzMKqR1H4DZkleZGxTsawqwx+PwtUmzOdoptw6F2OXGoeArqqdcuAJNCBSVgtYtgmRu34uyZuS58BvAIgqz8Ya4inE2cQToFxKUGQaTXnahbGXZITD5nM/AaTUq591tD2sxYjGV+y4RN/ZUtD98/2YDLyj13RCg7JeXXsrjwJVKOcpvA2+JN0HaB0YiffEMjXqBajcJutphPwGnH+zZABw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=akcn12cNhHYLdRiN54ZtIFkpVFLdb1ASjii6vroRuLw=; b=EB4ATDlf4xfcLNnFcOBwcq7if+G3cBKvMjeyimBdyIVQLRs3CEdCTQcl0FeNN//zsPdf4bsUkfliZ7FEMtpC0c2hG5Y+Rk6bHFnn8TJ86tRo6HeC4jOHIpdNWcKyT5yu69tgZu2+fkD0eE4LB7HdWbCphWs7EAHFIlyEnFQlYqXe69rGmfcORaXyPNB0aUwRNpzlyzkNpmNPClM7vJeunobcWFH7hZL/nIu6WZRGxNmB51y20KU7e3nQBvhz8EDkkpnXzSnzb/uKmAa9C/uqrteCv7zegJqo/b5dDdWxL+jW7gGzjli7p3qLC2PQBScYu/2EhXb82Q9nlusauJJrHA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 194.138.21.71) smtp.rcpttodomain=chromium.org smtp.mailfrom=siemens.com; dmarc=pass (p=none sp=none pct=100) action=none header.from=siemens.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=siemens.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=akcn12cNhHYLdRiN54ZtIFkpVFLdb1ASjii6vroRuLw=; b=rIM+jhK0HneK5tDUC7sxKCcg0N0XhsFNRNJmO3m98RCHAhKXCHxp0L+/z2z+bLwSJgFOnOtc+tn/GcOpyp6wJ1+wLI6Xpjnv0X7AaL/A6C+XUMdateRWl17BLMxiGe+mxf3yPMo0S7IM4AT5vOXav23rnk6Jx1VDGR4OoCVBS5QpsuwQT73kv4L3hn5pgJUkPmGD+iuBRkx3QaMhIiHQx/5o7Gydoxph1ZhEWo6Pl84dw1FhEFpfXuFAFy7k7w0Mj9SJBwl5znjGiBrlEVIoqCkzewCryXJ79Cq78x1SGGhzzb9Tfstj4vru3r7eLtg3bRoYwBb1FHxiW4cer7e5Sg== Received: from AS8P250CA0010.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:330::15) by DB8PR10MB3483.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:10:142::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4995.16; Fri, 18 Feb 2022 14:10:25 +0000 Received: from VE1EUR01FT030.eop-EUR01.prod.protection.outlook.com (2603:10a6:20b:330:cafe::b8) by AS8P250CA0010.outlook.office365.com (2603:10a6:20b:330::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4995.21 via Frontend Transport; Fri, 18 Feb 2022 14:10:25 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 194.138.21.71) smtp.mailfrom=siemens.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=siemens.com; Received-SPF: Pass (protection.outlook.com: domain of siemens.com designates 194.138.21.71 as permitted sender) receiver=protection.outlook.com; client-ip=194.138.21.71; helo=hybrid.siemens.com; Received: from hybrid.siemens.com (194.138.21.71) by VE1EUR01FT030.mail.protection.outlook.com (10.152.2.228) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.4995.15 via Frontend Transport; Fri, 18 Feb 2022 14:10:24 +0000 Received: from DEMCHDC8A0A.ad011.siemens.net (139.25.226.106) by DEMCHDC9SKA.ad011.siemens.net (194.138.21.71) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.18; Fri, 18 Feb 2022 15:10:24 +0100 Received: from [167.87.0.165] (167.87.0.165) by DEMCHDC8A0A.ad011.siemens.net (139.25.226.106) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.18; Fri, 18 Feb 2022 15:10:24 +0100 Message-ID: Date: Fri, 18 Feb 2022 15:10:23 +0100 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.5.0 From: Jan Kiszka Subject: [PATCH v2] binman: Include also subnodes in generator nodes Content-Language: en-US To: Simon Glass , U-Boot Mailing List X-Originating-IP: [167.87.0.165] X-ClientProxiedBy: DEMCHDC89XA.ad011.siemens.net (139.25.226.103) To DEMCHDC8A0A.ad011.siemens.net (139.25.226.106) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 4b91ebd5-600b-49e0-8be7-08d9f2e8688d X-MS-TrafficTypeDiagnostic: DB8PR10MB3483:EE_ X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:7219; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 6Y30tDGRy8xwKko4ykRB2bypinhbjG/CD1FJDu/Vs489KxvPKHOQhDbNPOHAGaR4UtAn28Oqt8ZLjIdd2a4caHVwqOvOeW+xLmplrnER3NLeYGvKi9whowGCGS6h+XHdNTXymik+DRAN4tR0fXy/V8BWLMbGpUQGaIbATKPOI10aR/iiRg8CvxgqSCZCnvUUJ9uV9w/ZmsPJ+Frl8ZMsgvp3QMWdZmoQ7VyAzakztrbnvqhkYwqr56c2WdR1SYnkP8q4ZVIzBWPZlz05ncsaDDfYKvNqDGEfbPZ5HOv0Ta7vVP+LB01UonWOsqFfXoI5fs2E95oo46zUuSS8al7rzZNoFVWl8KC8XSGCJ6vQZ0sbe0vWj3bq+PcgsA9Agul/C4Yjq9nzS/uZSF+PSVm8NjMKygDQjXc/LqG0NqjdImF6Plw+9Haj0USt30zc5ZJLNjz8NeFqeDunVsE6QClD8B79lqtdDj7ktt+vR0NdUUoevTU4YP6o/bogA/KuwDiWqHPxmiF+J5C1GGxl1D/hFnfisxCSmNBiE25tAdytau0nBHBoZEyVvfuFS96LtbeSlcjvkpmtNQT5mpQFb/iy7gfF+WBPArMTWdg6poM8q2Finh7aVik0KPKhUQMeQR4NmElbNUe0wcSLyXS8y2l+JG/xf8A+wwJH7FyLnisgITC7XBqDkh4ZkJU190LnPuguQKIe4hy1Eat57h4isMhq9s/GWsziP4dvgqxnceWX+kymYyS4+0Q7Ci+aTsWzsVZh/JBSzPij1WAU1yl9BO3FNw== X-Forefront-Antispam-Report: CIP:194.138.21.71; CTRY:DE; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:hybrid.siemens.com; PTR:InfoDomainNonexistent; CAT:NONE; SFS:(13230001)(4636009)(36840700001)(40470700004)(46966006)(44832011)(70206006)(82960400001)(356005)(5660300002)(2906002)(82310400004)(36860700001)(81166007)(86362001)(40460700003)(8676002)(31696002)(508600001)(110136005)(6706004)(16576012)(8936002)(70586007)(316002)(2616005)(16526019)(26005)(186003)(31686004)(47076005)(336012)(956004)(36756003)(3940600001)(43740500002)(36900700001); DIR:OUT; SFP:1101; X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Feb 2022 14:10:24.9553 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 4b91ebd5-600b-49e0-8be7-08d9f2e8688d X-MS-Exchange-CrossTenant-Id: 38ae3bcd-9579-4fd4-adda-b42e1495d55a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=38ae3bcd-9579-4fd4-adda-b42e1495d55a; Ip=[194.138.21.71]; Helo=[hybrid.siemens.com] X-MS-Exchange-CrossTenant-AuthSource: VE1EUR01FT030.eop-EUR01.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB8PR10MB3483 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.5 at phobos.denx.de X-Virus-Status: Clean From: Jan Kiszka This allows to prefill fdt and config nodes with hash and signature subnodes. It's just important to place the child nodes last so that hashes do not come before the data - would be disliked by mkimage. Signed-off-by: Jan Kiszka --- Changes in v2: - local var renamed - added test case tools/binman/etype/fit.py | 4 ++++ tools/binman/ftest.py | 1 + tools/binman/test/170_fit_fdt.dts | 3 +++ 3 files changed, 8 insertions(+) diff --git a/tools/binman/etype/fit.py b/tools/binman/etype/fit.py index a56b0564f9a..981fac7f086 100644 --- a/tools/binman/etype/fit.py +++ b/tools/binman/etype/fit.py @@ -214,6 +214,10 @@ class Entry_fit(Entry_section): if depth == 1 and in_images: fsw.property('data', tools.read_file(fname)) + + for subsubnode in subnode.subnodes: + with fsw.add_node(subsubnode.name): + _AddNode(subnode, depth + 1, subsubnode) else: if self._fdts is None: if self._fit_list_prop: diff --git a/tools/binman/ftest.py b/tools/binman/ftest.py index 59b6d52fbe4..9de78272463 100644 --- a/tools/binman/ftest.py +++ b/tools/binman/ftest.py @@ -3915,6 +3915,7 @@ class TestFunctional(unittest.TestCase): self.assertEqual(expected_data, fnode.props['data'].bytes) self.assertEqual('fdt-test-fdt%d.dtb' % seq, fnode.props['description'].value) + self.assertEqual(fnode.subnodes[0].name, 'hash') def _CheckConfig(seq, expected_data): """Check the configuration nodes diff --git a/tools/binman/test/170_fit_fdt.dts b/tools/binman/test/170_fit_fdt.dts index 99d710c57e9..0197ffd1597 100644 --- a/tools/binman/test/170_fit_fdt.dts +++ b/tools/binman/test/170_fit_fdt.dts @@ -36,6 +36,9 @@ description = "fdt-NAME.dtb"; type = "flat_dt"; compression = "none"; + hash { + algo = "sha256"; + }; }; };