From patchwork Fri Aug 19 14:25:22 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Herbrechtsmeier X-Patchwork-Id: 1668159 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 (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=s4qrNi2E; 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 4M8PFf5xsgz1yg7 for ; Sat, 20 Aug 2022 00:26:30 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 5845684B86; Fri, 19 Aug 2022 16:26:11 +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="s4qrNi2E"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 364CD84BA3; Fri, 19 Aug 2022 16:26:06 +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 EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05on2043.outbound.protection.outlook.com [40.107.20.43]) (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 5EC0384B69 for ; Fri, 19 Aug 2022 16:26:00 +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=j1Ar1g5CJG+hWFCY03dWK+ac341OgidtrIL6ETPTaXmxFysVq/7N62rP/jdXSxA5tT8VgudgmZXbrHnfTiNAe2DLk2n4PZ8t/omX/5xrFKx/oWH81HbsbXaocaeyVGbWWpEBSSuxDauXHWiUVnc/zSgNKCR+wxZJglEfNN9GWo5F4TQdO0ijT4iW0Vq7bCybtKq1oaHcUyyny4fDLJL43rMAT+U0KduN32Rlv7kZdu4yqXUtUb8iRd+4KHAjRt1sgGTl9JPygr0mAqdAhS+ircEirT2xer9G2vU0uxNyiNv+Tbmqhkg1WUjzl+82sggyKn6JMChA7rz2qZgDZunDvA== 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=eb2caJLfC93pfZOkyhf3ovlqg1kIHNY9EMN839q5iQo=; b=MH9WQ3PdO7JG8dd9xTHKVcnk3Mg03+t/ZQrv6WmeYnuZd4q2FiMu8QcoVaNWDu39xSL2AKjnrODYUCT6pzcdNGuI0BIu0Qyy/zprLucCnDWX+5KgzNJJwO8qvgvfQcFGDKSJ90MpYbFJvS5hOC33hEfdymIWjSZqbaNHSepfjDSt5CeFvPGaME9llxR8+etDF927K2XDSz/ePAiyxdofH6hJNA90JUQC+VVG+6xpftAyOd2I+ybkX3y9cEmseKaWrOKg/Hcnv1qeCF2BD/SEQPMOaQji5sx2Fvj+6svPNcM+RSo9ClIex7VxvIP3orCx4pBdxFJKD44jM3L9F2Su+w== 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=eb2caJLfC93pfZOkyhf3ovlqg1kIHNY9EMN839q5iQo=; b=s4qrNi2EDc4TK6+tGtAJ6LzqTYPLjntm3zGs/IBKM157ks13CjR/FZd2a6D/g5/on0ok+eU2Jb3MDOAQewFOpDmNR+OSFkpvd7nKIJxIQqy1S8jCVlW6x/otwfAbR6RXAuj04y2mkfOB2vxwQUI9gM6hjtUYmD/shKUyQi6tzfI= 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 AM0PR08MB4241.eurprd08.prod.outlook.com (2603:10a6:208:140::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5546.18; Fri, 19 Aug 2022 14:25:59 +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:25:59 +0000 From: Stefan Herbrechtsmeier To: u-boot@lists.denx.de Cc: Stefan Herbrechtsmeier , Alper Nebi Yasak , Simon Glass Subject: [PATCH v6 05/21] binman: Collect bintools before usage Date: Fri, 19 Aug 2022 16:25:22 +0200 Message-Id: <20220819142538.24847-6-stefan.herbrechtsmeier-oss@weidmueller.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220819142538.24847-1-stefan.herbrechtsmeier-oss@weidmueller.com> References: <20220819142538.24847-1-stefan.herbrechtsmeier-oss@weidmueller.com> X-ClientProxiedBy: AS4PR10CA0015.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:5dc::11) 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: 75be377b-61ed-4241-eb6f-08da81eebca4 X-MS-TrafficTypeDiagnostic: AM0PR08MB4241:EE_ X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: RMQPc+DsbWkI3esm8SWy3fpb8PN8mqzFwit0hTS4N9piunzHgDGqpvuWeyBADOvcLa0Op9kRJY8uWTMfxjOG7eebYOBdcDM5zEgZEjnZxv5wNEmB/jYDIGsn33jvHo7hwV7Sre6ov8b1u3mEqN0aW8YUHZPABSevOEt508ygH4048NcRd2u4SMUdFxJaDtQYxffOYnn8Blg6WJ1fJ9fTmansDwy/pwY9LE/9Se4izpIfXouYwq3k8eBwmNlckNofHd5/k3WkTgRteHIKZlFxPziqoxLlme9tXDxyJoHfxfCfbtiRU0dch+UBLlpVcOrjUZSY4qb3y5BIwYf7FipUAIbnplp7Is8NLx4VTR6oE94ACyqLs3/c+8sAnK/HIJgLMf4m4yShsXOdbO2RtDw0Bn8UjkJ3Kv/bMe/hbR1WxZM2bAKvqEMeU7NrivEk0FnZOKn98guGznA3sBcEKU53oMBKEmg2MuabLj+m6P2KF6ksewMEIcaVWPnIcDet4NK164jsz/OdK9OQNndmQw4sh5a9pDIJzSVkanyS38upeSsJXXldJgIp3dCPgWa5FsaXjDr8dTLWxT+eus2/HbultDH/voxGjIP8WdjgE9eqDrLBo57RRkLcETznPX/cbqWmVO3Kin4sfY7n4QExzbzuioiWIX1zxuhErTEoRAD7jldJWsq/jvu3vzzxfdWiR5OMlD3jSv/dAi+byx/UvSllZ42C+ZCuSgLe6FTdJGoh1q0QeOW1ydzP0ZpSYe/lKkjWY/k2OWTQhkQCqo0TqTGxZg== 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)(39860400002)(376002)(136003)(366004)(396003)(346002)(38100700002)(2616005)(1076003)(186003)(38350700002)(8676002)(5660300002)(4326008)(66946007)(8936002)(66476007)(66556008)(36756003)(316002)(54906003)(6916009)(2906002)(478600001)(6486002)(52116002)(26005)(6512007)(86362001)(83380400001)(6506007)(6666004)(41300700001); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: bsLA0VyiR0r29ExbyP7JibQay1mTYGsHR4b3042Bh9aYCcuoYrMJ7C/T8frEmy8jR2vKk4uBaCDLJgcyfrPYKzcYBDgWVRUp9aMe9Dtx5vkZ06SGFEcf3ZltrjK1NcD6ocKaB2p7BU9vPWoMCOIBKlGrSBeWhFN5gxuR3rv9XwGUchb8G5XHDXcqDSDc/vnaRh2VdCgckOwmkbygirvfD6Tt8oONjKstdBjt/c7JpYDWVqb1zvPP9877BTZ4sE4hFZuZfhmXv0nkcPa11FjONoQ5tgp9f1Y2KcRox7AoOvBreanyizxTU2FC/JP13nYU/A7F0WksDJX9L6urcpYK1gnl8vDPqeB14UiHGYRpYQh8GIWwTkjanV/PVaEVBVQmncoKc5qSCYgfzUAKfFtYgvhni2f8zcG2RxW5R345WZj522g1AR2khJPldXXvtNxVp/YluXjAXYktoO+/X1Dx9fxDlqfnHMIUecOKlzx22eCN0KJqDpCsUj0BlV6SAVjj5gWUXRNXBImfuSLhlC/rxCsR3xuH+cFDLyGBKfQBpBLckEitq9ROA5CSCh3/uV9HMqEMxXGgN4tdyDXmMgQM2yy6sR/0B2xCMkuxilgK0d30ZfTQRjOdwhWRj1JG6yX1B8FzX8+/ECVEegTa+kdRi1IxIiUGymVsOQvErzYYdifJ5SvmecbFHBU9DExM5j/Sh4338sBhQRobztIVpVtmK1l941VboeS9mckZgmKW4X6nFI0+vwUGgb1Q4f3CcNd6W8cYgtgY7jcKlf0B5553b2KTo/Yb4Wft7JOGaJRt0ntXdcNXIk+cKVz2fUKecE7KsgEAWsa9jttqawseYP6ORUDNiJ0XSOB19VZYPRHnL0v2P4eFzZ8TTyo6kOGNu5xTSzsHRi2kDKvI9EOVTiXI1161ay/8doAFz/unIjPHlETT0/z6z7dWKgTrZceijtZOu+U4EDMcB24jN2R+3hJFXFZVSSGX2gRsHcbB+x6XuVjk4d2KasqUR4+iWTt9ps8tHD32j6+v0hQUPeBbXXTzbAw0u1dQY8hWVmKO4YBgUndQSpNYroSqgP3Kk8KnW8iNTIy6lcyDZ3qo/Y6yM1B1M+jSI1wISiWJsihMumfI0myxbNQayIS9ZzfdjBGlmuEVGVAKZNS48DaO+9ZDk99i151vIsv3I2xb6hJROR6AzWChtcCn9kn/1YZywTTefxLRkyuj3WI3sID3Q3ZoTK/xTm+tMxa/neNTMlJxd8b8sz1W/iQlaJB25u5UqPFCFclVW66/pOERh8TkSScJ6+sMvUTrE/PnSYZhZSjqnSlscYY7xNOfem68Yo5+yfM+UnJNHV58bXbogNCS1RGz4LPPYTYAftm572pfW60doglI//8IvZt5I2x/FzLmpDAWbbx5Vj0WRWo3yNx+a/Q+Hgnm1KjpTA6uIpgpwNZyD1xpO+OXmlfIY1xKZRlzBcyekIMR8zDBwTgLJSSW8myGBYKrqCwdY1Y0NuPPfIqDArp2NJ5qPUFV1qh9++V6O+796t3wJ9IsjWFvMm+MTIcNgsFobHkeJiVGmmVIdCX/e+MBKyQZGSdWEInfE7b+dIUA3ZBp96IEQCH2I4ve1iIPe4kYUA== X-OriginatorOrg: weidmueller.com X-MS-Exchange-CrossTenant-Network-Message-Id: 75be377b-61ed-4241-eb6f-08da81eebca4 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:25:59.4251 (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: S+BW5nHFOQw/5bzKik6oFmfUBYazG9On3NGr7zCA2dHFggJLcjYIThaUSaeUj6nrZJS45WAXWkzZhD+KD75cpg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR08MB4241 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 Reviewed-by: Simon Glass Reviewed-by: Simon Glass --- (no changes since v5) 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)