From patchwork Fri Aug 19 14:00:19 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Herbrechtsmeier X-Patchwork-Id: 1668120 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 (1024-bit key; unprotected) header.d=weidmueller.onmicrosoft.com header.i=@weidmueller.onmicrosoft.com header.a=rsa-sha256 header.s=selector1-weidmueller-onmicrosoft-com header.b=SNTYXpPN; 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 4M8Njp2Yfnz1ygd for ; Sat, 20 Aug 2022 00:02:22 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 9739184B5D; Fri, 19 Aug 2022 16:01:27 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=fail (p=none dis=none) header.from=weidmueller.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=weidmueller.onmicrosoft.com header.i=@weidmueller.onmicrosoft.com header.b="SNTYXpPN"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 8B9FB84B42; Fri, 19 Aug 2022 16:01:09 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.2 Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-eopbgr70071.outbound.protection.outlook.com [40.107.7.71]) (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 947A684B27 for ; Fri, 19 Aug 2022 16:00:57 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=weidmueller.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=stefan.herbrechtsmeier-oss@weidmueller.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=aPWpHXD7MtkSiCpBFdCu7rvYQOwsKgCkZ5N8JEmlsuIIofiXNNhuDHrkL0Ec2fZqh745Y7vVA5ucNDHlCfEQ2xc9iUfxwaMAj2fc9PInSBnjlPU3B6/gJnkgVKko6lHGCHODl8Pe1OYsCDoqcmKuGm6+/LLx2Q5besbATfLvY8PQBasiiRlK9uC+qZJzbLuKlTu3tgb2aXIZ7HcYj2UgG52vDtQJCBN4WQQyTlk5oQNTWmIPhj8KZbPxWSmbqYW7piEVKIel3hizNk6y0qcdMGRjKRgvDx3Yc4/OccVgpWvYClXofiKgKhhan0pq+RnSRHJ7Okn9XGFnH3QudOiIlA== 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=/CMhbj8fL3g8r/ee4SHDK0Pmca5wV/L/7QPbqW6F5eI=; b=e+mBVivHX3ryKkheVFJfA4OD5ufnHyK7DGQuY3sPhO+l9bKgkVv9+Ci3rSAD5ftwJZc1UyESig+O4iiTQDl9OZ+LEZ5cFt29T2MhGHdpUjAVXIMsl4H9Fw2kTew7Y8e1jqINSaQ1bijYTSAEN92eWCYFVLYskfCPwSqWnSszSdbtIimXqtGPcQhA78ndA3lGDQrtQ4YSZ8lz34iUnk+b+GIr4bomOlocVJaOfhPDpKEm5x/cEcdChbGR/5hoO/Qdx/g8F9yGmqn/qOfnSMHR3pmpyxuOuxTGFahPH4YHBqrYx5CV/inrd976zwafuAHaXVTd74wxsJDxinCiDJQdpA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=weidmueller.com; dmarc=pass action=none header.from=weidmueller.com; dkim=pass header.d=weidmueller.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=weidmueller.onmicrosoft.com; s=selector1-weidmueller-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=/CMhbj8fL3g8r/ee4SHDK0Pmca5wV/L/7QPbqW6F5eI=; b=SNTYXpPNjN+dhpK6AFR+4lmSJ/qy+M2jrISHaYZzSBm9ruxGn89k+AOr81+mnnM6BNE/oDQHwgSywU6gvHMo3bZd8Hzpy1MDtzCq7UVFwwF8dY4zBfTQZ0tZfzYNKH9htSRrl30AaXqdxnA6oSVbDCl6ezNJw8DoRvw3ONvoI40= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=weidmueller.com; Received: from PAXPR08MB6969.eurprd08.prod.outlook.com (2603:10a6:102:1d8::23) by VI1PR0802MB2302.eurprd08.prod.outlook.com (2603:10a6:800:9e::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5546.16; Fri, 19 Aug 2022 14:00:56 +0000 Received: from PAXPR08MB6969.eurprd08.prod.outlook.com ([fe80::f95b:2e64:9ee6:4d44]) by PAXPR08MB6969.eurprd08.prod.outlook.com ([fe80::f95b:2e64:9ee6:4d44%3]) with mapi id 15.20.5546.018; Fri, 19 Aug 2022 14:00:56 +0000 From: Stefan Herbrechtsmeier To: u-boot@lists.denx.de Cc: Stefan Herbrechtsmeier , Alper Nebi Yasak , Simon Glass Subject: [PATCH v5 05/21] binman: Collect bintools before usage Date: Fri, 19 Aug 2022 16:00:19 +0200 Message-Id: <20220819140035.32760-6-stefan.herbrechtsmeier-oss@weidmueller.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220819140035.32760-1-stefan.herbrechtsmeier-oss@weidmueller.com> References: <20220819140035.32760-1-stefan.herbrechtsmeier-oss@weidmueller.com> X-ClientProxiedBy: AS4P251CA0011.EURP251.PROD.OUTLOOK.COM (2603:10a6:20b:5d2::7) To PAXPR08MB6969.eurprd08.prod.outlook.com (2603:10a6:102:1d8::23) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 89ae394b-40c0-4af4-4be1-08da81eb3c89 X-MS-TrafficTypeDiagnostic: VI1PR0802MB2302:EE_ X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ETgxUTzN+uEAfKJyirQnKX1O/xlRVY3pv0LXinKmc2tqfmhhwik1TTNL6BoQsH2ER56hyTtgxgb1eAsQWLMNZCtOPlnvdCt9rGDaIxU+O6qYUvU5KtBcu8MSFLT0DspSF4JfssipxBi7U2nec868uak9ykAUu0jeLUMO/c4hvKPeQzbbcCcRi8sAah8e5I7N60rshw2FD7s3+QjBbf9ZICbWmGWMtWbxOKnWvb/ergG8J5VidxVQk3Ije3GLrsKOupUiy7hO9UtlXXVMKWve5CKhwUwgwZC+fT5AYbjAAO2C8lnT9610u2RdjlIHdYFdyminm6HX+et1Z6uGqv1rEQeUbnyPo/Q1hAW1fjG4rSUaWsp7zABU2Y97n64foMSeX0L7laX0zGFzK03McDAE2h8Jaq+2ugN0SxUZSMUP2wQkRXPK44/t8M3ArCyoGMovmG1lJYNPd5A0BswDXlGwOtySY+0g5Uz/2Hbk3nXHyNvEavgkyJukbM97Rg93CVeoYHdzHA10RMDrad0Fp6DSuNug27by5I+A84h3cG6VqqHa5lr0YKk8gNx+ddLLUO+uMCOVmfwnGteHaEjk45CnTDMo3etAS2QYHVLlfnb2Xe+0IuGqgR2nmYffM+qwG1HV+yhFrOSK0sRjNR0q4NsyF8K1HYQlTTyRCGpRQlBLX6ru72IG8PHPMvx+G9KjGgrWG8h+4GHz5jIA0i8sVM/T2KhsCITj67Kb9g2cd6tHplHY23T4Fo27afvwxtExD+RbUbVTj4C+fSX72c9SUMNunw== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:PAXPR08MB6969.eurprd08.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230016)(4636009)(346002)(39860400002)(376002)(396003)(136003)(366004)(6486002)(6666004)(2616005)(478600001)(316002)(2906002)(54906003)(6916009)(36756003)(41300700001)(86362001)(1076003)(186003)(38350700002)(83380400001)(38100700002)(26005)(52116002)(6512007)(6506007)(4326008)(5660300002)(66946007)(66476007)(8676002)(8936002)(66556008); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: nntheBwDSsUP+6NbipJk671+KaWGG6xruqX7D2B4AldiAF+6SckPPxYOxSRqmGbJU1QjIyw8U34S1ac1rooWiTmkjvzXjtySf5YEienGUlF/Pbw4FjyUzelPsZeUr4XkajNhi89M75TmmndB3fMjnrwrmKU0XQWcdjv66llGO3jMX/QrzwhRPVObQFdwgDjwKj9TQ1pl7xdd8T2ywLNlc1bAHooeJSssbKjQu0IR9el8QWyrmlPywhpjJybrmjGpv8CK6TM3B+0QK4GMOkHdngzW5Hyh/Lc69IipjKk6AUG8/K11/XFSoCjdr7N4+ZJ2s9l7Rl8KjE+N7usD7Qw/zGfuJLUIskwgp5TLyXj7FB9+b2tbOSAYiOcxFUHaXQa74cAEsgGQ6K5qEdbOdsViMEKld3EbFGEhYTy8MwIpzwrrKeKB6iPG1tjpROFgT/2b3azUWLv528X/NvIV/cEwJm4qOrPxU7EB+AFWcvpRuzy+wwlp2GnJXCCnM7eCiIT3uqJiJe7GSij8LpeQDfwNZGkOTQNNwgL6Nah7nblSXzoC0MChJuAwu9tY5P5KHCA/g9+Ky5uT6cg+ysSCdGiO96FvbYdjUnwU0GeiSTSSTFVFuU+bRp61gf/mIPUEoOkDeLucsW1kko2ppCmBtam2Yao2TPXvH2SLofHLBu2Ur8K65iYN5hWgjE1cWahgN8MX2Ns7kwAeZp77juv59mqNP/yqxyP+hjtiA+CBigniMBoEyRnids88ddjx6NblKeGMFPRU8o+pAOscBFFTjv9VdquvMxE2aqR7kOHsAoAAAyddrhOKqNuQ1RZGFWk2Lq5DINUNKDZdq6TyG/A/gBPB4o1GVoIdWNMtEu3BG28WUndZ2bqy/wn2+3Dq/rKto1AWu28yotUtFTYfIDd9WismNSlJKPG36jSPd7BaxgsOqQOqeklK2wpcaGL2CpH1i5nf1yB7oZnlN3L1dKePP3QO929OCNfLrsPTXSYbqGbM/OhEj28HFu9118+RKn5jB1Ae+IEATZYAjgAF7C2VNgIe0Lr0m+vQXMqWuVZ70QLm9qWz/H1BlTcqeqNr3+UUnV7wVmNGFItZXIfxiNXXpHcaodHdHjhWKrUEA79xl9cpA2poH8aC5k77WCpu5Kob0qmhKY5zB/ZLYbWqpzGG+/V80lXjVmSnZWkwYcIBrPM0GtGacbMiE9x6ycbaBRt/yS3d1N7R/m1zfbZmeUx3IEbo5sRTgekLq1iRerwWV4n5uy70xEXi0NrrCJqXtKH55YDQzNSpT0Jar3Me1IkqYtHTQUlebhJLDkQpci05Gp27SAbV8bRjh7P3TP5y27HNso5to83JpyrKRWN8CAIb3VhmQt4DOgjObZrfAXhTFx6mehFFIQijiDcMEs5y8LS1M18AAMGy/fSw8vTgr5yHgaBYsEkrq9+1/rCcvoB2xgLeeyAhSCrE0T0+YD4IdptMSzVS7zjkfZ1IkmHwVKZgAihV8NeZKvY2A0S0q63pYODr1QAT/eFXvECDfwRPXDZ69T9PUr1nsDX/x0HJbctohJ22mGTy73JEmHPv1Xyb9/YIpt+0a4UWxkbMMUcYWTXnGzsS0EJOEk7GaDmXVMqygHbUVg== X-OriginatorOrg: weidmueller.com X-MS-Exchange-CrossTenant-Network-Message-Id: 89ae394b-40c0-4af4-4be1-08da81eb3c89 X-MS-Exchange-CrossTenant-AuthSource: PAXPR08MB6969.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Aug 2022 14:00:56.0680 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: e4289438-1c5f-4c95-a51a-ee553b8b18ec X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: gGxtvbsrisEVkytYknshe+xPTWBpBepGJvVF87DknPqkrlLHD/sY8GRwZhLMDDHEZh5O7OUclm9OOKtAHDzN9w== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR0802MB2302 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 From: Stefan Herbrechtsmeier Collect and thereby initialize bintools before any usage but after generation of entries. This is needed to handle bintools for compress and decompress like other bintools. Signed-off-by: Stefan Herbrechtsmeier --- Changes in v5: - Add commit to collect bintools before usage tools/binman/control.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tools/binman/control.py b/tools/binman/control.py index ce57dc7efc..f8b1733b14 100644 --- a/tools/binman/control.py +++ b/tools/binman/control.py @@ -215,6 +215,7 @@ def ReadEntry(image_fname, entry_path, decomp=True): from binman.image import Image image = Image.FromFile(image_fname) + image.CollectBintools() entry = image.FindEntryPath(entry_path) return entry.ReadData(decomp) @@ -251,6 +252,7 @@ def ExtractEntries(image_fname, output_fname, outdir, entry_paths, List of EntryInfo records that were written """ image = Image.FromFile(image_fname) + image.CollectBintools() if alt_format == 'list': ShowAltFormats(image) @@ -370,6 +372,7 @@ def WriteEntry(image_fname, entry_path, data, do_compress=True, """ tout.info("Write entry '%s', file '%s'" % (entry_path, image_fname)) image = Image.FromFile(image_fname) + image.CollectBintools() entry = image.FindEntryPath(entry_path) WriteEntryToImage(image, entry, data, do_compress=do_compress, allow_resize=allow_resize, write_map=write_map) @@ -507,8 +510,8 @@ def PrepareImagesAndDtbs(dtb_fname, select_images, update_fdt, use_expanded): # without changing the device-tree size, thus ensuring that our # entry offsets remain the same. for image in images.values(): - image.CollectBintools() image.gen_entries() + image.CollectBintools() if update_fdt: image.AddMissingProperties(True) image.ProcessFdt(dtb)