From patchwork Tue Aug 16 08:42:01 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Herbrechtsmeier X-Patchwork-Id: 1666733 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 (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=ATk15gRc; 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 4M6PnN2DNLz1yft for ; Tue, 16 Aug 2022 18:43:36 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id C29B984405; Tue, 16 Aug 2022 10:42:53 +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="ATk15gRc"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id C95E8849A5; Tue, 16 Aug 2022 10:42:42 +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-eopbgr70049.outbound.protection.outlook.com [40.107.7.49]) (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 ACD27848E1 for ; Tue, 16 Aug 2022 10:42:35 +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=jJBmVuojEm5dxWnwjKnnXZFyZ5WO0owA+nEBNMzxYwjZHVjLlzdp33CeZ4CK0rYBah8/WdosNR1GH2lmQ/JsGurR440jJ++ZrEllKPkIfh21ZqYBUOVAEdweVymnTG1uO5sakDR0cBRrGsq3SU8Dw+Lf1K/TVTLjM0pE++FKZv7RWx5x+kufcW6H4FM5oTKVQ/hHcqLVnPSs8SBLj4Ai5IOjL6anvDIRTKs+dEEX9QvkbGoaIUCynYBbzlkg2bsAbNcB1DIMbUw0Bxk8+u4K5YufhHWx4Vq6X75iRJAc6KutHBLpz40q8Uj8odaFQrN2hu1Gx+frHsoRIhdgFJG3LA== 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=FFgEfnyHh3SB3YL2JjtOnHAQMA/3XxpaWh7KqJezUvU=; b=RfrtUNE3TcnJ29pIYUzg34TmX+O42wzv+LwQ/IxYg8PsrXUuisxrK/5XmN0hkH4oQJqI5bh+aL5BuLYbiG01r6ayPeSVC540APwtFPa8WXfu70/9VdnjdfWhfnlN7EfHekxeRc7Jw6qiVGR34zbeWPzVeWHQ3fAzIkbpuKVCZpM2yCaF4X6aoyoHF90No90OWLOc5bkQKLW1lCehleB6lMKyNPhhDyAkgJmm8CWf/PLJi/69p3YKayR80lh0U3Me7OS3ufttvMAcOFU3aNltwdqjqy2I8DGRWKAfPP3/xHchLiElJVBCBYuk1mrrsnF5g3//S4ZRDZibGqdvWfZBmw== 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=FFgEfnyHh3SB3YL2JjtOnHAQMA/3XxpaWh7KqJezUvU=; b=ATk15gRcY6yrAKF6pUoN/PEJPBD/vOe+rnBlf91nVaz22neZ2HInlupIvs5wGy7A4w+35UylG4E/mRf9gThNE/o63ukAyY6Ipr/GZ+wuxlUp0jxvJOxZ7x25dkZTuC6DRRw08kxwpREfkLt80OTujXWlZtHT+onzLlojHur9NJs= 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 AM6PR08MB3096.eurprd08.prod.outlook.com (2603:10a6:209:43::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5504.17; Tue, 16 Aug 2022 08:42:34 +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.5525.011; Tue, 16 Aug 2022 08:42:34 +0000 From: Stefan Herbrechtsmeier To: u-boot@lists.denx.de Cc: Stefan Herbrechtsmeier , Alper Nebi Yasak , Heiko Thiery , Simon Glass Subject: [PATCH v4 04/13] binman: Remove obsolete compressed data header handling Date: Tue, 16 Aug 2022 10:42:01 +0200 Message-Id: <20220816084210.14972-4-stefan.herbrechtsmeier-oss@weidmueller.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220816084210.14972-1-stefan.herbrechtsmeier-oss@weidmueller.com> References: <20220816084210.14972-1-stefan.herbrechtsmeier-oss@weidmueller.com> X-ClientProxiedBy: FR0P281CA0139.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:96::14) 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: b0fd9b54-1eb6-4d55-1b57-08da7f6343b6 X-MS-TrafficTypeDiagnostic: AM6PR08MB3096:EE_ X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ANYMrMXeiKROk+MVbww9UEl6Gkx4Nt5BQEH/Q3qRINtjxd8UhUtg6RAdwoaFWz6PAkG/Ft6ICFN1SpFUX4Y5b2GshgDRsjMDtvEHXPBBQ+mjijZutNxWaX81G1wzzO6+xgcgMq50LrNfwNNNqgFuxkQmYgcicMd3n8ALtnqUt8A+AMsc1ha+1jJOeBQIZzJL7Ugr/C4jjnGKRc2//4WquBe734rMhVRrBSJVyAvP4jdv5UDJhrIHbqqNyitjC76rFOwjVIJeDMF5hj4lIyFSd0Lls/XLK+QgPSf8fDKLJEvpc9h4RlagWnorOXOQDHmcle6zvD7/BpmGN7todcU0c41Rk1KTK1gJ70MSH0weOdVi8e9yAsaKUF2JPJonPHtjEGF567c+PD3cyzY1dNk4VnKiFBdJNGUDHGe6Mfr8eqcgTDHUMtF8mtyTzx/VLLsyX9CoWVapgDM8QPGApCpAgNqFvTfh4X8gsiK97AtGkQNJah/s1Mo/0fDg23+JbSEM52mExNh5bPBYCS/rJIVZa54TT3aSTc/lI0pWQhBcOAJIg1fqK7dEwP5naH9t0gGLk5cUw5eEfnBz0YDSR2HZEHMVD9A/IHA9kPEHMXCB0ectMUjdOe6+PF2pv5agH0vI+VddRo4mrlPwYoCFdYAmpb/c+ZM3eJERzO653XafsMO7Ci65KyoA0A1CIYF6tpWBQ+M1zQny+7KzRrlu1+hAR52ZQD9nnuK6nUj0X+JM4m5Q37PIb8aP2x2196n1w8IEfc8g9Wg8pUnTrGAuqesHzLrdQ09hp4GEWAyNa2nHpcTTNJzRM2Y68pcyb8cdVFzd 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)(136003)(396003)(376002)(366004)(346002)(39860400002)(6666004)(66556008)(66476007)(38100700002)(38350700002)(478600001)(8676002)(8936002)(66946007)(6486002)(5660300002)(54906003)(4326008)(6506007)(316002)(186003)(26005)(6512007)(2616005)(36756003)(1076003)(83380400001)(86362001)(6916009)(2906002)(52116002)(41300700001); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: QBMO2jbMQUQBeZIdHc3Qq8U+2vhzMH/oTbVsngHzqvaydy3Hdu70qeQrqU7XjRt2bU6lF+bCzVuZpkt20OFZWBeLRW20a/sp6hWwzoKY5Ha4nqyCj/Dfp8yPdYES9WLjpvZsrmocj9JJhoaukSdQ6LX0auCQb7J+Bp3NcHc2PUsZjUi4K1/NCVOYZJp8kk0dxJ2gzRl0Qm/CwWs0NsDU2RSsHBMYF+LAY44wLEvzCc5RMieCN65sCnosiehnOXwVa73XF9fZ5WDF6pzP3P342GGNrMegR2GAdIEb2VKgtWEbchBXMzPZw6JK4Cw7bF51ysscJR30VyqVl5vgMpPV2fC43ppZ7nXEu7uWp765JXWmkjslKFQEmtAiQI4eotEyVCil81ahLKM7d7BAR4bDP+BGqStAj5ss9Ul+VJKY8U9Mxjqppuu3zexO8Dy+BhJ0nGRkoHZdRqtklgKVzWlVf6/UmmeA2cw5xqswGJ0of2CqEWj51ZdfVr+QHjZ372kRYTJOyPFb68BgMindbVLGqR38siIVPYZXPT/d4eL6v2e6vTB2LY8/MdOp3eJW/OUCOoga1DIDiGrHYiEDV9LKd7LtXX/ihHRo4Bgo1hOmUFFPAtgt7eMxJ1mbwb6kHk3mT7amnUA3yfTU1encScedfm+iaH1sUUd3vENtrPBT/aRN42U3dIRbwvYt7ka3fo+s/Dil7MJBHm65N7SZvGdiK5DCYXgNIKOVRDPG2UKx4fJs9UCwmzKTVdTwnzoWRvYGfj/+8f2iB3ux9c9nGjJYjONivbI/BbUfwBaO1IWqK8lEwt+9jZ5jJNecARjpPNk9fU2rZWGUiDO4XTaQMKoOT8pDjiEzyBrHJbV0rZbOvHND/pz/xQmHYADMsKdFz8+wKRMCu01mUUgQT7e++V0quK+KEeDi5zAMQxnDNt2lkeHMpj10PXWMdYIOo/KvEQ//e7zHaIMxXbaOKP7XVFdLMfe//WRT0TEdlw4PIw+eGAYu2bXsidq931GazVnGiKZhmGe7oDclhrFCNmmphf3mdPRKgzL3JJ/FKrNmbWrNnOyY7AkFVWobOSE/HLaDVU+JEdMXVSTFboE5sDj4dY4tmAkAWG0NKkMmiSu5Zqylwl8rV9vyRXfmAtPzc56+FkyVNn8pfnYgREJA0/W624FcZ+zj0/hXREkpFh6CUG5nPCy5+Nqo7jbV8tq9Zc9js3hAqcCXRMzcN5clWgKRXZGPAv3LFLYkuQHzyqXsyEpko84VNHck4Jb8WdaZ2yw7xUOVJ76w8aeH1A3yq9tfjQHxLrKBOWWOynICunieTz3pmTTd3uKdxipuvOxZjBaPApx0Z0WYpHkHnrvdgbYB6gpkZLu3f8HvVBNRtOV5pSfXEV7J22YEklA6xzQNhwLgIR64LmrI8XqLtPCrrSfVZfFKGh6cc6+9ucc4D50aGRiOybbkxbrAa4pNAJ8KRimb5whHR8TRCJZ/sFcXoGLocLsG53Y+8L0YHa+x+ph6mzlzNWc/tv+MgO3oX+wF1+lzngY3XJ63QUPNvmxrLBCyyPvlcJETDz4MuOTbMi8JNwnSVL8BsrEuLFTxSgkPzU4hNaR45H+cHVPqjH65lBZtMyuNbw== X-OriginatorOrg: weidmueller.com X-MS-Exchange-CrossTenant-Network-Message-Id: b0fd9b54-1eb6-4d55-1b57-08da7f6343b6 X-MS-Exchange-CrossTenant-AuthSource: PAXPR08MB6969.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Aug 2022 08:42:34.5061 (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: nulMj1KE6unH3uUZmjg+Y/AjvjhuRjIB1mbFJ8PGWoPhOHG/y5Fu/Xb5HzZadCyyWixqRWGDLQvUvFhBEzsTsw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR08MB3096 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 Remove the obsolete compressed data header handling from the utilities to compress and decompress data. The header is uncommon, not supported by U-Boot and incompatible with external compressed artifacts. Signed-off-by: Stefan Herbrechtsmeier --- (no changes since v3) Changes in v3: - Added tools/binman/cbfs_util.py | 8 ++++---- tools/binman/comp_util.py | 11 ++--------- tools/binman/entry.py | 4 ++-- tools/binman/etype/section.py | 3 +-- tools/binman/ftest.py | 10 ++++------ 5 files changed, 13 insertions(+), 23 deletions(-) diff --git a/tools/binman/cbfs_util.py b/tools/binman/cbfs_util.py index 9cad03886f..a1836f4ad3 100644 --- a/tools/binman/cbfs_util.py +++ b/tools/binman/cbfs_util.py @@ -241,9 +241,9 @@ class CbfsFile(object): """Handle decompressing data if necessary""" indata = self.data if self.compress == COMPRESS_LZ4: - data = comp_util.decompress(indata, 'lz4', with_header=False) + data = comp_util.decompress(indata, 'lz4') elif self.compress == COMPRESS_LZMA: - data = comp_util.decompress(indata, 'lzma', with_header=False) + data = comp_util.decompress(indata, 'lzma') else: data = indata self.memlen = len(data) @@ -362,9 +362,9 @@ class CbfsFile(object): elif self.ftype == TYPE_RAW: orig_data = data if self.compress == COMPRESS_LZ4: - data = comp_util.compress(orig_data, 'lz4', with_header=False) + data = comp_util.compress(orig_data, 'lz4') elif self.compress == COMPRESS_LZMA: - data = comp_util.compress(orig_data, 'lzma', with_header=False) + data = comp_util.compress(orig_data, 'lzma') self.memlen = len(orig_data) self.data_len = len(data) attr = struct.pack(ATTR_COMPRESSION_FORMAT, diff --git a/tools/binman/comp_util.py b/tools/binman/comp_util.py index dc76adab35..269bbf7975 100644 --- a/tools/binman/comp_util.py +++ b/tools/binman/comp_util.py @@ -3,7 +3,6 @@ # """Utilities to compress and decompress data""" -import struct import tempfile from binman import bintool @@ -16,7 +15,7 @@ LZMA_ALONE = bintool.Bintool.create('lzma_alone') HAVE_LZMA_ALONE = LZMA_ALONE.is_present() -def compress(indata, algo, with_header=True): +def compress(indata, algo): """Compress some data using a given algorithm Note that for lzma this uses an old version of the algorithm, not that @@ -41,12 +40,9 @@ def compress(indata, algo, with_header=True): data = LZMA_ALONE.compress(indata) else: raise ValueError("Unknown algorithm '%s'" % algo) - if with_header: - hdr = struct.pack('