From patchwork Tue Aug 16 08:42:10 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Herbrechtsmeier X-Patchwork-Id: 1666741 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=JDZIFCgY; 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 4M6Pq31mM2z1yft for ; Tue, 16 Aug 2022 18:45:03 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id C1E1884A2A; Tue, 16 Aug 2022 10:43:20 +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="JDZIFCgY"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 75E9F848C4; Tue, 16 Aug 2022 10:42:48 +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 EUR02-HE1-obe.outbound.protection.outlook.com (mail-eopbgr10053.outbound.protection.outlook.com [40.107.1.53]) (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 A13A484994 for ; Tue, 16 Aug 2022 10:42:40 +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=TxmXLsh3iZm7ZICbGcw5GBu0uby/7qhlcS1WYsF+1EGb6I7rmL37ppOK/dFwXBlhtVy657tPqslh2U9fLQnGsyWiyf1KsCauqV4X75OC73ApB1S1KFt0qEE0+utnpmZRe0ZRqOVmFCtBH3N2rucmQTZS/FGDtHJfBxD+Su2Bc84+nrWLIm9/7m/OzX2emBn3y2yX/yzd8pwPwyBuWwlv0I3CyRylRPXJdGe16dwdUtUfYbIv3EgS5iEMo7Oz3PBt9V2gCoGcQf6SDL5JAcJdhxLUZx70PwZ2ti6S2iH3Zs1XL6ayQYOMB0BoNDh/BVqBQzB7YvgEYKaG4FriFPdOMw== 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=2Enfo+fdJrbYaWyUjrDMNvib+jOqsGZyysjHD2LR5lc=; b=LKgVReOD101jxfhu9HWgoPmec1SNo1Ht4OxOOhZMHYUaBShe2zAqHQKyKbBW3oq1TTn2PXfBpk2xb054kM6AwbJVb6s9jYHAUNpTUfYHd3i85M8ZpV2h6vMF0ieoEmAxtS0N+NzBkns2937FepVpIgnCz3UbpNFMHmK0Rmd/gZnSi+vMFnKrLHcAmWIbC9RawM/ilvCau2kKOIXJl67kYiHy23GGW+Y/g2uk7Js1ajqM+6wPFDDRM+e00O7qlInG7d0jYX1Mr1ozZirndHrutLZrHg2IDzWMaW0AbTqW+zPOe33LXd4U6BdbM3KzDKdlwcvsxWTAJJJ6jJrvsHN9Rg== 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=2Enfo+fdJrbYaWyUjrDMNvib+jOqsGZyysjHD2LR5lc=; b=JDZIFCgYCd9c9cnYoRssiBjA5kPn2/o9JoPhSCH3t27z+7k2cPcZqXiDPHZ672S/hU8MkN3YtIY+mYFW35EZo01i6uVfU/tD8hOYsOjDmneO6P1PAobMvWKgEzadySGj3LvJdOPu06e+hUvmsDCUhQh7xmIFi6dJ3ru4Rgo6vzk= 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:39 +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:39 +0000 From: Stefan Herbrechtsmeier To: u-boot@lists.denx.de Cc: Stefan Herbrechtsmeier , Alper Nebi Yasak , Simon Glass Subject: [PATCH v4 13/13] binman: Support missing compression tools Date: Tue, 16 Aug 2022 10:42:10 +0200 Message-Id: <20220816084210.14972-13-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: b6b34523-d6f4-46be-0ae0-08da7f6346df 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: pGUubso6oS78qOd+vTjZf1Vte40w8mQp1Zs4DxT1NMPJb6L71pTGBKl73414rFe1TjWb6VnRmWVW76FO1yW12bki97iJyLJ8ngjWPqxDmlW84eyxAjPrRUIJn7QuSsqysi3Qz+J4j3DjW0PieFPIgGzpnErL/tB+6VwGMHi/T946Tab9uQpDqISI6uC6SZzw6Wy2iEiAq7MC8LX4gHYR0Qvk9UAOAiOpJVSrQOLmqOfZAjVdXWzzejpzO3xQ7PEVhJ0jbF11SBnrfsO7QHC57aITctj+ZCBvphkF8sllfBTB9Uj+kUAZWu/7OQ+uoNQeW0hlJgkck0qBHjo85mNujjdGAjTO0TGSr0x0LRACndw4rmbO5IuDlTn+JZJtzWZMAiwiTSBjgkVJapAs2xKUGvUoIP8Hz7vWXuelZh6vWFIx88DYPZ7ip2NKo81HRck5d6hnKxxzUKqunALTd7uO2JNCzcWE8+Iku3QZp6ytRYoY7wkeQpA6Dr6fkcqNIEvW+Qs/CqeG/9PBpDGr+l3f1IEtj3CKQuQ9hi7qqkm1GUKG/fngOyUE2iuUOgarrS1f4QEDTXw7qohPMwnMoEH/Frb4dlmz0OFCs2QPcZFhYjrOSO56hczEGhPYRwf+yof6U7Ll4ARqhb0vNV72T8LvYUQlrmlQwwKIb5xoHo+vgb0g9y967FcGzyFcEHXdY0y652q4AN6kseJvjYNFb+KtGF4mi/izraix9mtaoe1yXUU25nuWXpKWCCW58zWVShp7fqEelOa4fMLb2RnDTrdb8rwtkWmn9Ay6p+hv4amDcm0= 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: oiIqFS8grUxQP8l9+5iDTjvF/dFPgD3qfqlr/VcCUq9qBrWgxGhF0/IhC7KgfOleMNjY4ymiRmrykRT711tLS6wb82STAqCpQjkFKv97CRZlpexD48x7v0NpKvkSAU7ZVNEByKMlNe8SdEaM9mlykWihmbrbujY6W8e10PKCrmxKN2DvnOdElexkBcCqY1eGMcRPPQtmQ5irlIxNt5QUTF3cArYvMj1y1vwbPTq4QkwNPEKh6CKdmY7RTZfO7sqAMxqgGOaFzu46vZkABDury69FXz84mhtkivPK3RVG60XAkdzWQp0bs5vVBjE2VVG20irTCC+/59m1hacr9ltiLpUrBUhNkZ1GPRb2zuJaXgAFXXOKymMDMVva929b7DWqgnx0kv8gL2vJ2tl2LN912yyPWV4foJt7IvckL/wHrORk8aam4Rh8rtJ8SMxHOCojxu6lr/yRm20+3KEcp4dQ6TdPAZL6eXTJvlO53qffKPuaxUGmcI6y/nAzJ0gLxHydmz+zqkZV/1lg4gO9l1oPHlCQWSGrRmcd0azlmXlVOjUrj0J2TkIdLmdMeU0O/2lTLwaQnH8YyfnujP5M5lwtU8D+vS1LwimlBdOQ4eLQO8CQ7ckOJMtfTUoRuSt77ur7UZBLS0ZxgcJEpuCfMSaSbRq9tvh0kkAyrKFWIcERTIZAzXsexcxrga/N8AkiYNlNBm9B4Z5AbGC0hi1IDysHfYUrxu1ScA5v/nS1SCIK2jKuOdoasXX9J4MKZBcwhDUre3zil1YIcds+Rz8umjFL1hcnQMDizWXYeRG8hew3IyR1weDMvOFUpphq+OpDStHWM8QskHc6jYxJMnR89oPjr0JGpG6fJp6TxNYfjqjSTVq+wmYAQfAJMiQYLFg102f/NRxuta4Woadb8dwC9NTHwDtry2kE43PKMEUti9/cY/Xz9BXdFNFbh161x1Z460l0qArj8hDePZkl4r/V4ixs7wjcTk1UW25OGSbQ+3rFa+gq1jmjmWZlh6HYNLOq2SK2B7OCbaPVOJqwK8N4GOr1qBT71FXX8PD/0fIAoxmabXgs+rnZcjQqX/1GpyjMXh60EuecwK7+87dmCTDb+5VHieiTqV7ApPym/FwrFqGdauDxWlzSgfIi3IKUzJ4zqDQalrLDPoyXy9xkXR+uH2+vt3xRMiMY265bKEkqTll+NRAHzQtji3O27iMGMRsvHGrTBWgm0S7u3kMuJdMH/INKmxsuBkprC9vXMTyfvLcyvz6D7bQNu74BiDDFOD5lTcYYxAmizTEpE5zwT6ek4LpuqQP1wmnarVy09JzRx6JrqEV/qB9QYAqSFbhU4o6GVJtlVcpzeMSpq89r83j2GSY8WfZtT2M8emODGvAZjRxEajNO71cX/wUftj42z87nCNd83gGWG3ol+44BZgFCd2wHKsngOEX3bWmsATXwrdY4nxCywopigEQ1ILNhj0ZCawG8pO2WNrbqF3BZOewOpGM/lE49RGW8TIouFb7BE3y6ccf1YPLUF731LiQHQnHKsAcQ+dwJn3Bd3ODu/aa84aujSBHd+GMuKv88g6zyntr84Wmzd8eU/CbSr2a7rqj+cay1DKFZnx+yf8R3r0HNursRow== X-OriginatorOrg: weidmueller.com X-MS-Exchange-CrossTenant-Network-Message-Id: b6b34523-d6f4-46be-0ae0-08da7f6346df 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:39.5108 (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: vtezfVo5TtliV/G1hW7VbYaZ20Cy0TbpeQbm5Y63N3r4Y+RJcG6EUkAaBONPZrv7fn3+tHxLjE8S1b409eU0yw== 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 Handle missing compression tools by returning empty data and marking the entry as 'missing'. Signed-off-by: Stefan Herbrechtsmeier --- Changes in v4: - Add missing 236_compress_dtb_missing_bintool.dts file Changes in v3: - Added tools/binman/entry.py | 4 ++++ tools/binman/ftest.py | 8 ++++++++ .../test/236_compress_dtb_missing_bintool.dts | 16 ++++++++++++++++ 3 files changed, 28 insertions(+) create mode 100644 tools/binman/test/236_compress_dtb_missing_bintool.dts diff --git a/tools/binman/entry.py b/tools/binman/entry.py index 9ec5811b46..c86b757a4e 100644 --- a/tools/binman/entry.py +++ b/tools/binman/entry.py @@ -1078,7 +1078,11 @@ features to produce new behaviours. """ self.uncomp_data = indata if self.compress != 'none': + if not comp_util.is_present(self.compress): + self.missing = True + return b'' self.uncomp_size = len(indata) + data = comp_util.compress(indata, self.compress) return data diff --git a/tools/binman/ftest.py b/tools/binman/ftest.py index a360ebeef5..eac7ccb087 100644 --- a/tools/binman/ftest.py +++ b/tools/binman/ftest.py @@ -2557,6 +2557,14 @@ class TestFunctional(unittest.TestCase): } self.assertEqual(expected, props) + def testCompressMissingBintool(self): + """Test that compress of device-tree files with missing bintool is + supported + """ + data = self.data = self._DoReadFileRealDtb('236_compress_dtb_missing_bintool.dts') + self.assertEqual(U_BOOT_DATA, data[:len(U_BOOT_DATA)]) + dtb_data = data[len(U_BOOT_DATA):] + self.assertEqual(0, len(dtb_data)) def testCbfsUpdateFdt(self): """Test that we can update the device tree with CBFS offset/size info""" diff --git a/tools/binman/test/236_compress_dtb_missing_bintool.dts b/tools/binman/test/236_compress_dtb_missing_bintool.dts new file mode 100644 index 0000000000..e7ce1b893d --- /dev/null +++ b/tools/binman/test/236_compress_dtb_missing_bintool.dts @@ -0,0 +1,16 @@ +// SPDX-License-Identifier: GPL-2.0+ + +/dts-v1/; + +/ { + #address-cells = <1>; + #size-cells = <1>; + + binman { + u-boot { + }; + u-boot-dtb { + compress = "_testing"; + }; + }; +};