Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/2206462/?format=api
{ "id": 2206462, "url": "http://patchwork.ozlabs.org/api/patches/2206462/?format=api", "web_url": "http://patchwork.ozlabs.org/project/uboot/patch/20260306181304.2426352-21-sjg@chromium.org/", "project": { "id": 18, "url": "http://patchwork.ozlabs.org/api/projects/18/?format=api", "name": "U-Boot", "link_name": "uboot", "list_id": "u-boot.lists.denx.de", "list_email": "u-boot@lists.denx.de", "web_url": null, "scm_url": null, "webscm_url": null, "list_archive_url": "", "list_archive_url_format": "", "commit_url_format": "" }, "msgid": "<20260306181304.2426352-21-sjg@chromium.org>", "list_archive_url": null, "date": "2026-03-06T18:12:48", "name": "[v2,20/23] binman: test: Fix code coverage for iMX8 and cst bintool", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "62cbf75c2354041b5c5c323c3aed3c33317dfa62", "submitter": { "id": 6170, "url": "http://patchwork.ozlabs.org/api/people/6170/?format=api", "name": "Simon Glass", "email": "sjg@chromium.org" }, "delegate": { "id": 3184, "url": "http://patchwork.ozlabs.org/api/users/3184/?format=api", "username": "sjg", "first_name": "Simon", "last_name": "Glass", "email": "sjg@chromium.org" }, "mbox": "http://patchwork.ozlabs.org/project/uboot/patch/20260306181304.2426352-21-sjg@chromium.org/mbox/", "series": [ { "id": 494765, "url": "http://patchwork.ozlabs.org/api/series/494765/?format=api", "web_url": "http://patchwork.ozlabs.org/project/uboot/list/?series=494765", "date": "2026-03-06T18:12:28", "name": "binman: test: Organise test files into subdirectories", "version": 2, "mbox": "http://patchwork.ozlabs.org/series/494765/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/2206462/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/2206462/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<u-boot-bounces@lists.denx.de>", "X-Original-To": "incoming@patchwork.ozlabs.org", "Delivered-To": "patchwork-incoming@legolas.ozlabs.org", "Authentication-Results": [ "legolas.ozlabs.org;\n\tdkim=pass (1024-bit key;\n unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256\n header.s=google header.b=OwFqQUsD;\n\tdkim-atps=neutral", "legolas.ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de\n (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de;\n envelope-from=u-boot-bounces@lists.denx.de; receiver=patchwork.ozlabs.org)", "phobos.denx.de;\n dmarc=pass (p=none dis=none) header.from=chromium.org", "phobos.denx.de;\n spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de", "phobos.denx.de;\n\tdkim=pass (1024-bit key;\n unprotected) header.d=chromium.org header.i=@chromium.org\n header.b=\"OwFqQUsD\";\n\tdkim-atps=neutral", "phobos.denx.de;\n dmarc=pass (p=none dis=none) header.from=chromium.org", "phobos.denx.de;\n spf=pass smtp.mailfrom=sjg@chromium.org" ], "Received": [ "from phobos.denx.de (phobos.denx.de\n [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01])\n\t(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)\n\t key-exchange x25519)\n\t(No client certificate requested)\n\tby legolas.ozlabs.org (Postfix) with ESMTPS id 4fSF3y1Sn5z1xw1\n\tfor <incoming@patchwork.ozlabs.org>; Sat, 07 Mar 2026 05:17:02 +1100 (AEDT)", "from h2850616.stratoserver.net (localhost [IPv6:::1])\n\tby phobos.denx.de (Postfix) with ESMTP id CD0738407F;\n\tFri, 6 Mar 2026 19:14:23 +0100 (CET)", "by phobos.denx.de (Postfix, from userid 109)\n id E1B248407F; Fri, 6 Mar 2026 19:14:22 +0100 (CET)", "from mail-qk1-x72f.google.com (mail-qk1-x72f.google.com\n [IPv6:2607:f8b0:4864:20::72f])\n (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits))\n (No client certificate requested)\n by phobos.denx.de (Postfix) with ESMTPS id 9C8EB8401A\n for <u-boot@lists.denx.de>; Fri, 6 Mar 2026 19:14:20 +0100 (CET)", "by mail-qk1-x72f.google.com with SMTP id\n af79cd13be357-8cd75abd09dso18502385a.0\n for <u-boot@lists.denx.de>; Fri, 06 Mar 2026 10:14:20 -0800 (PST)", "from chromium.org ([73.34.74.121]) by smtp.gmail.com with ESMTPSA id\n af79cd13be357-8cd6f5736c0sm155930885a.49.2026.03.06.10.14.17\n (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n Fri, 06 Mar 2026 10:14:18 -0800 (PST)" ], "X-Spam-Checker-Version": "SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de", "X-Spam-Level": "", "X-Spam-Status": "No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,\n DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,\n RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE,SPF_PASS autolearn=ham\n autolearn_force=no version=3.4.2", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=chromium.org; s=google; t=1772820859; x=1773425659; darn=lists.denx.de;\n h=content-transfer-encoding:mime-version:references:in-reply-to\n :message-id:date:subject:cc:to:from:from:to:cc:subject:date\n :message-id:reply-to;\n bh=NkhNLHFPJbNUTo54bcOEJgt1uzQm2YQ8wF/nNTVbBiQ=;\n b=OwFqQUsDEbEvN3ythUMlCw/ErpfdEkeAFSJZm8kjhH7+u4TDhNV8LgvEhhrdq6f2ft\n V64t6q2mtex2l6V5nT4waC28fVz7Ws+H/i9eaNPM+C1y0b1iGlkyQoIXVdd+ipq/C7yP\n xNhFnfZWVV6h4W+iLndc6avQ343QrNqa2hG8o=", "X-Google-DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=1e100.net; s=20230601; t=1772820859; x=1773425659;\n h=content-transfer-encoding:mime-version:references:in-reply-to\n :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from\n :to:cc:subject:date:message-id:reply-to;\n bh=NkhNLHFPJbNUTo54bcOEJgt1uzQm2YQ8wF/nNTVbBiQ=;\n b=mIY6vsKBcBjgSEcX5cDjuagi8j/ZcM0Eiq7hp28dHRxY+hjyTmVPvWtKbX2AUduXff\n qY1qLfYqDq9yIVPxXoUZZCsJcgCAPJrM95QJbttNp6kqtt/6Hm+LbeADn+h6gKG8Mcku\n 1bAfqmrilVej2BrrF6GFMVWouQODj3wG2Or8XAoUaitQ0M6zEFs0p0me2W5g75SCbyJl\n ez/MUEgR6tIlnMk2iap53WmCC1hAx5h0/FrLaYxoMgniyDiXqz/xpEE5wbt86TJ3BaV7\n TWgZuTnkeYOXgNfmF/WmNgUHQYOt+8ic3fyvTGjK2lsqMWdv7jTiedWps+eG4OnQoOkm\n YVYQ==", "X-Gm-Message-State": "AOJu0Yy/ccJTiC1QMlQztmBzZOaa2b+J7C3rX89efAoVd3Oy1M4a9wjV\n 5CZWXdZLXkG/ykdJjS3ZLnsPaOb9f1J3ay3FlwdEBSRK2XuolEGEEjcTPKIhX9LCAo78uWnjO4a\n HIJM=", "X-Gm-Gg": "ATEYQzxTkk0j5yz71DR7vMBuFrgwRxh8pQntDRo17xMQF+vZ84nthzeNUlSNkwVTttP\n v7HSGym2dsO618M0Exk95G1hsq8R5Cvg3RGhh+sh+wGPOu46+Yrf7A0GhSq3n4lVmsaRW2jvMry\n rfkIa5Vg745XrEK6X0JR6bnpK+pUmxrPT/eH9s+nY48cxL0iu8vNfUKiixaiYqufNK1eH4jacqy\n UQ3QxSw4FJ3ww1sXG56xDJZQ+pFe2CLr0yituYjbQO9UnbLYSZR4tyzNhLYZlLQ7tDvy9ON7SkJ\n /ym/zvVebUTbuaJ1qRPMf4zKBtkkts2LbwftqZU84nRlLo3a5y3xU0Uqh3J03GFjdR5/VLhitLu\n Jdxoe5usneYAxJm4ccz+1XgNqqqOAMhdNgQFCr62hiKVT3q4+iAF4Se+fBFXTfWr6We+1+YcsCN\n 1EcPEsuSVjk0BNe+5snA==", "X-Received": "by 2002:a05:620a:4723:b0:8cb:a7f1:8ea7 with SMTP id\n af79cd13be357-8cd6d42f5d2mr374218885a.31.1772820858889;\n Fri, 06 Mar 2026 10:14:18 -0800 (PST)", "From": "Simon Glass <sjg@chromium.org>", "To": "u-boot@lists.denx.de", "Cc": "Tom Rini <trini@konsulko.com>, Quentin Schulz <quentin.schulz@cherry.de>,\n Simon Glass <simon.glass@canonical.com>,\n Alper Nebi Yasak <alpernebiyasak@gmail.com>, Bryan Brattlof <bb@ti.com>,\n Neha Malcom Francis <n-francis@ti.com>, Peng Fan <peng.fan@nxp.com>,\n Philippe Reynes <philippe.reynes@softathome.com>,\n Simon Glass <sjg@chromium.org>,\n Stefan Herbrechtsmeier <stefan.herbrechtsmeier@weidmueller.com>,\n Yannic Moog <y.moog@phytec.de>", "Subject": "[PATCH v2 20/23] binman: test: Fix code coverage for iMX8 and cst\n bintool", "Date": "Fri, 6 Mar 2026 11:12:48 -0700", "Message-ID": "<20260306181304.2426352-21-sjg@chromium.org>", "X-Mailer": "git-send-email 2.43.0", "In-Reply-To": "<20260306181304.2426352-1-sjg@chromium.org>", "References": "<20260306181304.2426352-1-sjg@chromium.org>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "X-BeenThere": "u-boot@lists.denx.de", "X-Mailman-Version": "2.1.39", "Precedence": "list", "List-Id": "U-Boot discussion <u-boot.lists.denx.de>", "List-Unsubscribe": "<https://lists.denx.de/options/u-boot>,\n <mailto:u-boot-request@lists.denx.de?subject=unsubscribe>", "List-Archive": "<https://lists.denx.de/pipermail/u-boot/>", "List-Post": "<mailto:u-boot@lists.denx.de>", "List-Help": "<mailto:u-boot-request@lists.denx.de?subject=help>", "List-Subscribe": "<https://lists.denx.de/listinfo/u-boot>,\n <mailto:u-boot-request@lists.denx.de?subject=subscribe>", "Errors-To": "u-boot-bounces@lists.denx.de", "Sender": "\"U-Boot\" <u-boot-bounces@lists.denx.de>", "X-Virus-Scanned": "clamav-milter 0.103.8 at phobos.denx.de", "X-Virus-Status": "Clean" }, "content": "From: Simon Glass <simon.glass@canonical.com>\n\nThree files are currently missing test coverage: nxp_imx8mcst,\nnxp_imx8mimage and cst\n\nAdd test methods to cover all missing code paths, trying to reuse the\nsame .dts files where possible.\n\nThis brings all three files to 100% coverage.\n\nSigned-off-by: Simon Glass <simon.glass@canonical.com>\n---\n\n(no changes since v1)\n\n tools/binman/ftest.py | 106 ++++++++++++++++++\n tools/binman/test/vendor/nxp_imx8.dts | 3 +\n tools/binman/test/vendor/nxp_imx8_csf.dts | 26 +++++\n .../test/vendor/nxp_imx8_csf_fast_auth.dts | 21 ++++\n .../binman/test/vendor/nxp_imx8_imagename.dts | 27 +++++\n 5 files changed, 183 insertions(+)\n create mode 100644 tools/binman/test/vendor/nxp_imx8_csf.dts\n create mode 100644 tools/binman/test/vendor/nxp_imx8_csf_fast_auth.dts\n create mode 100644 tools/binman/test/vendor/nxp_imx8_imagename.dts", "diff": "diff --git a/tools/binman/ftest.py b/tools/binman/ftest.py\nindex 612237d0b41..9cc1a97f95c 100644\n--- a/tools/binman/ftest.py\n+++ b/tools/binman/ftest.py\n@@ -7899,6 +7899,112 @@ fdt fdtmap Extract the devicetree blob from the fdtmap\n \"\"\"Test that binman can produce an iMX8 image\"\"\"\n self._DoTestFile('vendor/nxp_imx8.dts')\n \n+ def testNxpImx8ImageMissing(self):\n+ \"\"\"Test that binman produces an iMX8 image if mkimage is missing\"\"\"\n+ with terminal.capture() as (_, stderr):\n+ self._DoTestFile('vendor/nxp_imx8.dts',\n+ force_missing_bintools='mkimage')\n+ err = stderr.getvalue()\n+ self.assertRegex(err, \"Image 'image'.*missing bintools.*: mkimage\")\n+\n+ def testNxpImx8ImagePos(self):\n+ \"\"\"Test SetImagePos for iMX8 image\"\"\"\n+ with terminal.capture() as (_, stderr):\n+ self._DoTestFile('vendor/nxp_imx8.dts', update_dtb=True,\n+ force_missing_bintools='mkimage')\n+ err = stderr.getvalue()\n+ self.assertRegex(err, \"Image 'image'.*missing bintools.*: mkimage\")\n+\n+ def testNxpImx8mCSTNormal(self):\n+ \"\"\"Test CST signing with IVT-format input (normal auth, no unlock)\"\"\"\n+ # Create fake IVT blob: magic(4) + padding(20) + signsize_addr(4)\n+ # + padding(36) = 64 bytes\n+ ivt_data = struct.pack('<I', 0x412000d1)\n+ ivt_data += b'\\x00' * 20\n+ ivt_data += struct.pack('<I', 0)\n+ ivt_data += b'\\x00' * 36\n+ self._MakeInputFile('imx8m-ivt.bin', ivt_data)\n+ with terminal.capture() as (_, stderr):\n+ self._DoTestFile('vendor/nxp_imx8_csf.dts',\n+ force_missing_bintools='cst')\n+ err = stderr.getvalue()\n+ self.assertRegex(err, \"Image 'image'.*missing bintools.*: cst\")\n+\n+ def testNxpImx8mCSTFastAuth(self):\n+ \"\"\"Test CST signing with fast-auth mode, unlock, and FIT format\"\"\"\n+ # FIT magic covers the FIT-signing path; fast-auth/unlock cover the\n+ # ReadNode() and config-generation branches\n+ fit_data = struct.pack('<I', 0xedfe0dd0)\n+ fit_data += b'\\x00' * 60\n+ self._MakeInputFile('imx8m-fit.bin', fit_data)\n+ with terminal.capture() as (_, stderr):\n+ self._DoTestFile('vendor/nxp_imx8_csf_fast_auth.dts',\n+ force_missing_bintools='cst')\n+ err = stderr.getvalue()\n+ self.assertRegex(err, \"Image 'image'.*missing bintools.*: cst\")\n+\n+ def testNxpImx8mCSTUnknownMagic(self):\n+ \"\"\"Test CST with unknown input magic passes data through\"\"\"\n+ # Trigger the pass-through path use data with neither IVT nor FIT magic\n+ data = b'\\x00' * 64\n+ self._MakeInputFile('imx8m-ivt.bin', data)\n+ self._DoTestFile('vendor/nxp_imx8_csf.dts', force_missing_bintools='cst')\n+\n+ def testNxpImx8ImageSizeNone(self):\n+ \"\"\"Test SetImagePos() early return when an entry has no size\"\"\"\n+ # The imagename entry is in GetEntries() but not packed, so has\n+ # size=None, which triggers the early-return guard in SetImagePos()\n+ with terminal.capture() as (_, stderr):\n+ self._DoTestFile('vendor/nxp_imx8_imagename.dts',\n+ force_missing_bintools='mkimage')\n+\n+ def testNxpImx8mCSTSigned(self):\n+ \"\"\"Test CST-signing-success path with mocked cst invocation\"\"\"\n+ ivt_data = struct.pack('<I', 0x412000d1)\n+ ivt_data += b'\\x00' * 20\n+ ivt_data += struct.pack('<I', 0)\n+ ivt_data += b'\\x00' * 36\n+ self._MakeInputFile('imx8m-ivt.bin', ivt_data)\n+\n+ # Mock run_cmd() so that when cst is invoked, it creates a fake output\n+ # blob and returns success, thus covering the signing path\n+ original = bintool.Bintool.run_cmd\n+\n+ def fake_cst_run_cmd(self_tool, *args, binary=False):\n+ if self_tool.name == 'cst':\n+ arg_list = list(args)\n+ if '-o' in arg_list:\n+ idx = arg_list.index('-o')\n+ tools.write_file(arg_list[idx + 1], b'\\x00' * 32)\n+ return 'fake cst output'\n+ return original(self_tool, *args, binary=binary)\n+\n+ with unittest.mock.patch.object(bintool.Bintool, 'run_cmd',\n+ new=fake_cst_run_cmd):\n+ self._DoTestFile('vendor/nxp_imx8_csf.dts')\n+\n+ def testNxpImx8mCSTBintool(self):\n+ \"\"\"Test the cst bintool run() and fetch() methods\"\"\"\n+ cst = bintool.Bintool.create('cst')\n+ self.assertEqual('cst', cst.name)\n+\n+ # Mark cst as missing so run() exercises the code without needing the\n+ # real tool (which fails without valid signing keys)\n+ old_missing = bintool.Bintool.missing_list\n+ bintool.Bintool.set_missing_list(['cst'])\n+ try:\n+ self.assertIsNone(cst.run('test.bin'))\n+ finally:\n+ bintool.Bintool.set_missing_list(old_missing)\n+ # fetch() only supports FETCH_BUILD; other methods return None\n+ self.assertIsNone(cst.fetch(bintool.FETCH_BIN))\n+\n+ # fetch(FETCH_BUILD) calls build_from_git() so mock it\n+ with unittest.mock.patch.object(\n+ bintool.Bintool, 'build_from_git', return_value=('cst', None)):\n+ result = cst.fetch(bintool.FETCH_BUILD)\n+ self.assertEqual(('cst', None), result)\n+\n def testNxpHeaderDdrfw(self):\n \"\"\"Test that binman can add a header to DDR PHY firmware images\"\"\"\n data = self._DoReadFile('vendor/nxp_ddrfw_imx95.dts')\ndiff --git a/tools/binman/test/vendor/nxp_imx8.dts b/tools/binman/test/vendor/nxp_imx8.dts\nindex cb512ae9aa2..d9fc86635b4 100644\n--- a/tools/binman/test/vendor/nxp_imx8.dts\n+++ b/tools/binman/test/vendor/nxp_imx8.dts\n@@ -12,6 +12,9 @@\n \t\t\tnxp,boot-from = \"sd\";\n \t\t\tnxp,rom-version = <1>;\n \t\t\tnxp,loader-address = <0x10>;\n+\n+\t\t\tu-boot {\n+\t\t\t};\n \t\t};\n \t};\n };\ndiff --git a/tools/binman/test/vendor/nxp_imx8_csf.dts b/tools/binman/test/vendor/nxp_imx8_csf.dts\nnew file mode 100644\nindex 00000000000..148f4668bb9\n--- /dev/null\n+++ b/tools/binman/test/vendor/nxp_imx8_csf.dts\n@@ -0,0 +1,26 @@\n+// SPDX-License-Identifier: GPL-2.0+\n+\n+/dts-v1/;\n+\n+/ {\n+\t#address-cells = <1>;\n+\t#size-cells = <1>;\n+\n+\tbinman {\n+\t\tnxp-imx8mcst {\n+\t\t\targs;\n+\t\t\tnxp,loader-address = <0x10>;\n+\n+\t\t\tblob {\n+\t\t\t\tfilename = \"imx8m-ivt.bin\";\n+\t\t\t};\n+\n+\t\t\timagename {\n+\t\t\t\ttype = \"section\";\n+\n+\t\t\t\tu-boot {\n+\t\t\t\t};\n+\t\t\t};\n+\t\t};\n+\t};\n+};\ndiff --git a/tools/binman/test/vendor/nxp_imx8_csf_fast_auth.dts b/tools/binman/test/vendor/nxp_imx8_csf_fast_auth.dts\nnew file mode 100644\nindex 00000000000..af35f2569df\n--- /dev/null\n+++ b/tools/binman/test/vendor/nxp_imx8_csf_fast_auth.dts\n@@ -0,0 +1,21 @@\n+// SPDX-License-Identifier: GPL-2.0+\n+\n+/dts-v1/;\n+\n+/ {\n+\t#address-cells = <1>;\n+\t#size-cells = <1>;\n+\n+\tbinman {\n+\t\tnxp-imx8mcst {\n+\t\t\targs;\n+\t\t\tnxp,loader-address = <0x10>;\n+\t\t\tnxp,fast-auth;\n+\t\t\tnxp,unlock;\n+\n+\t\t\tblob {\n+\t\t\t\tfilename = \"imx8m-fit.bin\";\n+\t\t\t};\n+\t\t};\n+\t};\n+};\ndiff --git a/tools/binman/test/vendor/nxp_imx8_imagename.dts b/tools/binman/test/vendor/nxp_imx8_imagename.dts\nnew file mode 100644\nindex 00000000000..58dd1ca3d5d\n--- /dev/null\n+++ b/tools/binman/test/vendor/nxp_imx8_imagename.dts\n@@ -0,0 +1,27 @@\n+// SPDX-License-Identifier: GPL-2.0+\n+\n+/dts-v1/;\n+\n+/ {\n+\t#address-cells = <1>;\n+\t#size-cells = <1>;\n+\n+\tbinman {\n+\t\tnxp-imx8mimage {\n+\t\t\targs;\t/* TODO: Needed by mkimage etype superclass */\n+\t\t\tnxp,boot-from = \"sd\";\n+\t\t\tnxp,rom-version = <1>;\n+\t\t\tnxp,loader-address = <0x10>;\n+\n+\t\t\tu-boot {\n+\t\t\t};\n+\n+\t\t\timagename {\n+\t\t\t\ttype = \"section\";\n+\n+\t\t\t\tu-boot {\n+\t\t\t\t};\n+\t\t\t};\n+\t\t};\n+\t};\n+};\n", "prefixes": [ "v2", "20/23" ] }