From patchwork Tue Aug 16 06:41:42 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Herbrechtsmeier X-Patchwork-Id: 1666686 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=qtc+JB55; 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 4M6M6Z5QDHz1yft for ; Tue, 16 Aug 2022 16:43:18 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 2330E848A6; Tue, 16 Aug 2022 08:42:43 +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="qtc+JB55"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id C39C3848AC; Tue, 16 Aug 2022 08:42:33 +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 EUR03-VE1-obe.outbound.protection.outlook.com (mail-eopbgr50057.outbound.protection.outlook.com [40.107.5.57]) (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 2670C845F2 for ; Tue, 16 Aug 2022 08:42:27 +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=FD6Z5KPkQPO/SOqICY8dBJmL6MiGLwpNpG/5I7PRhBIn3WIM4C8GU2CVIDsehTxvLmeV/pPF5Ga/5MNRpnpuaAFXNfAG9MTbMStCcgu0wuZi5sRz0LF3uBapMC/qNWvHxx9h0CQmGcYvrVEz/iKePonD57zvO9+C/i1Y3PVAsVcvwcyk1k2fDANZ+mrQbUuAX+/TcHprNuhETn0tNHLvTwuBvucInY5LApCAz9Pw4Pj6L1bBP3pgEzoP/m2TAZiYvAJ0Tq308bmAy0tj93hnGOuBIVagomILuCkYelJWxeBXicf9i+zav0fGTGIurC2NinOyRvGoSz0Kpzia6KN6tg== 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=QniTEMk3Kc+/CXs6z7boArcNhGcWq217d0B6tyEKUnY=; b=dLZvK0YHsBLH0gz3eNZVj+MrLL1jtYZkViUJiMNM0Ux2NwvGIXPWlRh/3EYa7TMuUqEZ3Sv3vXsnq55VhRHaAdKi6w7hJlWH7qrybqx0YPJYg1aHyc9BMcPMcSpkwRLTV4B1JYQ8DfiORSICHzCW/3GoqGSKzpVnzrLIKF0p9FjXm07kslqpjoZyAD0FCaGsK4yBIGmS9y8eg07c1hjd0IioGBrQcO5kaWbezGJtu8/KdHLPGM+E7oNIgI0shg353N4kq3XBBuzlzSR/Hzn7TBa9Wq/h/eIaUL4bYtxqNcRegATegSOPFAe8ALh55Wh6HfH9ykqsjzuniU2C4v9tWw== 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=QniTEMk3Kc+/CXs6z7boArcNhGcWq217d0B6tyEKUnY=; b=qtc+JB55kPaPZvIALd6uCI+/NOpWc2qn72nv0lodphBogoZUCL0xcI2Isq0rwECLENzj1GH05E2sd8h3SLxcP2pTkun2ixDfneKkkGOQJkm31lEoY22Gn6QIvhjs+VJdeWJMDiT690RJFd0hP/Xf+ShcUuDdyCzfXGTyZj7DuBo= 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 VE1PR08MB4685.eurprd08.prod.outlook.com (2603:10a6:802:ae::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5504.25; Tue, 16 Aug 2022 06:42:25 +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 06:42:25 +0000 From: Stefan Herbrechtsmeier To: u-boot@lists.denx.de Cc: Stefan Herbrechtsmeier , Alper Nebi Yasak , Heiko Thiery , Simon Glass Subject: [PATCH v3 04/13] binman: Remove obsolete compressed data header handling Date: Tue, 16 Aug 2022 08:41:42 +0200 Message-Id: <20220816064151.9848-4-stefan.herbrechtsmeier-oss@weidmueller.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220816064151.9848-1-stefan.herbrechtsmeier-oss@weidmueller.com> References: <20220816064151.9848-1-stefan.herbrechtsmeier-oss@weidmueller.com> X-ClientProxiedBy: AS9PR06CA0744.eurprd06.prod.outlook.com (2603:10a6:20b:487::19) 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: bf5f0874-754e-4c4a-6f25-08da7f527b12 X-MS-TrafficTypeDiagnostic: VE1PR08MB4685:EE_ X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: cvLYOQGyfN4e+Js4DvCh3J58ICTUufwvgjvAQG+j8cfXJS1RPPbaCe7Cl93T+G5l62IXtF7RJrHWurNhkeVPsFcjIpasCYV39pEaRIucA1UvM5wnJ13vxGVXwghG1sCY7p6+zcc8jHsbGVG+aofr84mM7IWSid6On7S/v/baNnoW/Dvt8FxhnAxwBEqcma1kAsxof92rvtfJ9xVVY1zKPehB4kGYvhuDwe7/kW4HFv+3KFPJ8hNxh65fvdnl3OnHopt6Lo113w2iemDhcnKVDzSnbGLeTKexVPNec/J9C5EmrCbnt9ZtDF6G7quoXTdl2UNCC00EghidYKtBkq0OtBpop4YBzAzbrl/H+a6n9i+nXMCrObtaHKYmxQQ7MC3HdswEs78cVYt+61N6dOhxX0EyiakV2n9PQXGUHOyHPuw44zwY10OQSJPvw0ZywIsjN9GxSdTa0g96PYAxHvptgO1DcjdheFh4NU02VCg1vXh+FXbqaWvQawWpN7OSmo/wNW+IpyTo4EE/v5pfBhMM33BfSEslKAlZbMYtPUQjCrsDmFmgNI9bBeParFRwO8OBs5cF1UU9BKOtkTgAaq7jffgG3oBg/MWKusYxha2Nny9sD0bxYe4xdOEYT9t+MPzEgKpDFnrihhXYlm/zq6W4VQ57CoRt04MoK7/mvB1eqbxbb6rfJGxrh6cRdQOD4I0ds0AGj5FpLOV6K6Qu5UIklEOcj4MY+OIPPLKeMF4wc6Hxz43wHmEcHKMX9h0m3SF3wGNycxeNAooctS1dNLrlLtro+/8xEHQYcJs/D/vAH5Y= 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)(366004)(396003)(346002)(376002)(39860400002)(86362001)(38350700002)(38100700002)(36756003)(316002)(8936002)(41300700001)(4326008)(66946007)(5660300002)(1076003)(66476007)(478600001)(8676002)(66556008)(6486002)(6512007)(26005)(52116002)(83380400001)(6506007)(2906002)(6666004)(186003)(2616005)(6916009)(54906003); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: s2GvnMKJpDaNtCtEjaZFyrQYzXuXAQdpmO8993XagEKMQJNtnB5oVgIKfR8kYPfMFn+YmlidXPRkOYqlZf5GAeeKgjA6CatPYaVw5JPwWcbfvD8o4YrzPAijAtGHeHAzYZumVPZ2+p3gb3C92b/Vq9GYTiOBTql5PQt6Y5g5hxMiLoMtdm3g08k7oO0+dbah2Q/iosMMPyubO28lkKiS5V0ixBskEUHvAUP3EoQezcv2xCvB2L/ZfymvSDj7lQ0DYVwnTcbOLy5CsZmyBxN+KzLEqc41xZTkwMGnbNBRAk65LSL9SmL4ljCpmJDSQTUJlirb7EklNTgkNr3zsUd/QjoRrgvSonTJGeaDdihQEGGn719FXBJ57zxAY6Fv+S+ZiEGAXgBA10LhDWdGW76oA74aXI5zCzuJRYpVQVA4I4YVOJ0/w+R7T3wFK7IvaUh4K1kmVJfdVKPu8tXmYtLhh81CBWBT1VIvs0wHZjQr/kFlLxDqD81IpUDzUJKeHPxtJWfsoa2ZNz//ZxRZx01h629GVIVzmJiNp/YisTuRvXHnUepUc7J0Y8RjOx+U5/XB4V0Vasj8I1V2e2ZGGmOBwdg7tBP7ApkCdbP3OLNFaoyZFj1vBr3TraD85BOuEe8k7DeJTbH0TblEgVeJRWzKDWv6eN5v8zqOAW1n8wWjwLdlucU3V/hdr6AsCtFUimmlUg+CLHCbY361ghzPD5RAzBH8q4lkDlJkNFJkLmf+ZOkAR0b/Key5w6C/7dcLd+guHkBCk9XZXGZ8X/fiuWDiE4oWr6/2/UlfYUEwKjvstxVbESBW84Su1HSLT3iaSk6LjIjWza1GRxtwxJ2uhbzJEHwfKaU3OLJs49CpS9ZXbHMDzuuCUtfcX+rOvFuHCr9BzghaHVaT0CGIFHfIDGutr+9woItrevmwVTzW+HvHpoNGaAAVTLJ+x3jd5a9taiXQr09RAzMC9OYe4nLy319/GI2IUhTTqVzezGKazEFEWJK9N5CR7xgajX17hfrL5QH40lrinaEaIlAf9p8iK/GvsqBc2Gh23gwIXpq+Evipn6kcDwuGGE/lmaEHp+97aXBWSlVPxWAMIEr16ZqpZ+zzYHC3wt+QCxBkXtqHiDHzrB8H2OcEOc/MgSizIFmSxnPPOjVCUNGhKDOlYTsufMIQx41FydUf40i6eq5DHIEyB4TndJtMZgUPIaqp9ps/1SopBrj3UcSLey7VltvGs7S3lD9R7Ni4FbT1MEeVWS3AFGZO1xyXVm48oXWu8DLtZiWr/w+y8Z3cv9EtZpk2DVo69chUr2BVAPXOt92bXneDVL1+r3JXzOppxy/B7Ob+blBCT7F6t744Mfltzz/cdF7+1XHZBXA8hK1x5Yxqw2JiIB4o7w8WjTGaFbBqMuSO0Ws3KrrSdwL1vpNwFLjyfODV3gzBCBg2To5h322YjZPwcKxzfu1h2AIOi+Ge0Gyr0xCzZsXQsyLWzifWdbGa3Ojs1GxT1gzL87jTARREPhngUarCE2rgSvdshF8gkwH3/5gZ+JrBSE1B/T5f2i6TinJ+Wu8u8qVG0fQgd0z9Nyzcqnjmr8eopHZ7H8XmYTSs2gwGjVqfUFPStkmWyfTsRsO8NQ== X-OriginatorOrg: weidmueller.com X-MS-Exchange-CrossTenant-Network-Message-Id: bf5f0874-754e-4c4a-6f25-08da7f527b12 X-MS-Exchange-CrossTenant-AuthSource: PAXPR08MB6969.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Aug 2022 06:42:25.6283 (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: acgHa8XtbvkdVidGP3LRZdl4V7gzA3DBAIXhba4nbwpSlrM4JspOzOGq3mTMxJrfTwLhegMvMzHRfSKZB7kAUg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VE1PR08MB4685 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 --- 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('