Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/2206446/?format=api
{ "id": 2206446, "url": "http://patchwork.ozlabs.org/api/patches/2206446/?format=api", "web_url": "http://patchwork.ozlabs.org/project/uboot/patch/20260306181304.2426352-5-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-5-sjg@chromium.org>", "list_archive_url": null, "date": "2026-03-06T18:12:32", "name": "[v2,04/23] binman: test: Move x86 and Intel test files to test/x86/", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "67e8c33f18add0acd3a0ac92a81c412f56e9edf9", "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-5-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/2206446/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/2206446/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=SHFDTNri;\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=\"SHFDTNri\";\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 4fSF0n26Ztz1xyN\n\tfor <incoming@patchwork.ozlabs.org>; Sat, 07 Mar 2026 05:14:17 +1100 (AEDT)", "from h2850616.stratoserver.net (localhost [IPv6:::1])\n\tby phobos.denx.de (Postfix) with ESMTP id 632DC83F9B;\n\tFri, 6 Mar 2026 19:13:43 +0100 (CET)", "by phobos.denx.de (Postfix, from userid 109)\n id 827568382A; Fri, 6 Mar 2026 19:13:42 +0100 (CET)", "from mail-qk1-x72e.google.com (mail-qk1-x72e.google.com\n [IPv6:2607:f8b0:4864:20::72e])\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 39C5683F9A\n for <u-boot@lists.denx.de>; Fri, 6 Mar 2026 19:13:39 +0100 (CET)", "by mail-qk1-x72e.google.com with SMTP id\n af79cd13be357-8cd767d2d70so4727785a.3\n for <u-boot@lists.denx.de>; Fri, 06 Mar 2026 10:13:39 -0800 (PST)", "from chromium.org ([73.34.74.121]) by smtp.gmail.com with ESMTPSA id\n af79cd13be357-8cd6f5736c0sm155930885a.49.2026.03.06.10.13.35\n (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n Fri, 06 Mar 2026 10:13:36 -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=1772820817; x=1773425617; 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=1uJGiejNaioerAwi/eBkP1ZoMpaqS7hajo7uvYuH3ak=;\n b=SHFDTNrisXJNNnR2iSElkDYhaiOHrU17sFUztbjXCa7zkbhQEdX79nmK/sTgm6jV0D\n qEK+1h+eOZVlK4tD2lqlK12YNakUI5Lm3dWCHa7Jh2MZkq2FR4uE0nmbudc9sXXcAVVN\n gRh9AOUO4IkUu5nPXYc0PC1AYsVIAs0As/wB0=", "X-Google-DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=1e100.net; s=20230601; t=1772820817; x=1773425617;\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=1uJGiejNaioerAwi/eBkP1ZoMpaqS7hajo7uvYuH3ak=;\n b=TdrId/pxTz5+4MJdGq1neCycyvUPVUetPNNX995NWaXKnDu7rctAojEXCa4iwOxW9R\n 8bFFcLiZ1U5y5j6yST+W4zjO2ucsb40+QRe6X0KlkgUwZyVHgpdHVG34WmFThgqSJVVo\n ynr937j/BKFRiiN0Wf/1g+37UO6Mujz1GvtUORxE/y0i3+b4vUV/cOQWRu+8D2ccff5c\n 9+mrPA9yIopTYa1N5BF3t6VOUX+DqZ98hZAZeXPN1D2o+wSFrs9gS8xNS/TLLf+jIs7r\n kFsPzMP5kO/3aKpYsRLELeOsM3vQ/rS5Vmn0SRCsLLWwTgpmNkASXOLy0eWyt6tNB0TH\n hDIQ==", "X-Gm-Message-State": "AOJu0YxEQqDQ0weTcPqMHEuKOq5AMuGoZRAJ2jw2AByZliHzlTaOdum0\n i5trN7DpOvbVIH31D/ly9ul5T+DyMaMnC/dR9knOEFC3ycBNT2uUgiScAM3cr+0CeAMXPV6CY7F\n lHCc=", "X-Gm-Gg": "ATEYQzxSS5ivZKsFxfOpISDwzLnhB3MpHfwYTqKM8pKE6R9TM9OUMcszYcqVQpJw+zB\n OY6RTw2Xu+56E4NUURZJoSDmm0B+1YRHNJre4lirdw9IJ62KIWiT0iM6XG4VDstX86m0rlQQ5bF\n WLby1oreLbj01mNNYflAAbLdvT+338RbjBBCLyJP1hwUJNTRPiaYOryPtOByVB7A8lyxyLSHIZe\n Fbiu/e+O9nYUrFKhUc4WIhrf3E74xGcG6fu8+/YR5ul9LCRFW5OU+bpRFfXcWtQxuLTadd49ByK\n XtzT+zyAUbwMMl4tPyraZu1clZEI66+gMTWs1Q/b3H5zX5rax6CVgTAw2ShtNpgHfQeO7odfZ+W\n 4Ulu3cNlwNLlMj7LET2TwMDj0MdB0BOZEXzfDr8qUf3F41evPGmIChOPqXcP9zFuQvBpa+1v3HJ\n wep9B8k6vRM/1NXsA2dA==", "X-Received": "by 2002:a05:620a:4589:b0:8c9:ea05:d15a with SMTP id\n af79cd13be357-8cd6d1e63dcmr426676985a.0.1772820817155;\n Fri, 06 Mar 2026 10:13:37 -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 04/23] binman: test: Move x86 and Intel test files to\n test/x86/", "Date": "Fri, 6 Mar 2026 11:12:32 -0700", "Message-ID": "<20260306181304.2426352-5-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\nMove about 40 test files for x86 and Intel platform support (ROM,\nmicrocode, ME, IFWI, FSP, descriptor, reset16, start16, FIT) into an\nx86/ subdirectory. Drop the numeric prefixes and the redundant x86_\nfilename prefix, and update all references.\n\nSigned-off-by: Simon Glass <simon.glass@canonical.com>\nReviewed-by: Quentin Schulz <quentin.schulz@cherry.de>\n---\n\n(no changes since v1)\n\n tools/binman/fdt_test.py | 2 +-\n tools/binman/ftest.py | 84 +++++++++----------\n .../descriptor_offset.dts} | 0\n .../test/{094_fmap_x86.dts => x86/fmap.dts} | 0\n .../fmap_section.dts} | 0\n .../{043_intel_cmc.dts => x86/intel_cmc.dts} | 0\n .../{147_intel_fit.dts => x86/intel_fit.dts} | 0\n .../intel_fit_missing.dts} | 0\n .../{042_intel_fsp.dts => x86/intel_fsp.dts} | 0\n .../intel_fsp_m.dts} | 0\n .../intel_fsp_s.dts} | 0\n .../intel_fsp_t.dts} | 0\n .../{050_intel_mrc.dts => x86/intel_mrc.dts} | 0\n .../intel_refcode.dts} | 0\n .../{046_intel_vbt.dts => x86/intel_vbt.dts} | 0\n .../{032_intel_vga.dts => x86/intel_vga.dts} | 0\n .../no_ucode.dts} | 0\n .../optional_ucode.dts} | 0\n .../{144_x86_reset16.dts => x86/reset16.dts} | 0\n .../reset16_spl.dts} | 0\n .../reset16_tpl.dts} | 0\n .../test/{029_x86_rom.dts => x86/rom.dts} | 0\n .../rom_ifwi.dts} | 0\n .../rom_ifwi_nodata.dts} | 0\n .../rom_ifwi_nodesc.dts} | 0\n .../rom_ifwi_section.dts} | 0\n .../{031_x86_rom_me.dts => x86/rom_me.dts} | 0\n .../rom_me_empty.dts} | 0\n .../rom_me_missing.dts} | 0\n .../rom_me_no_desc.dts} | 0\n .../single_ucode.dts} | 0\n .../{033_x86_start16.dts => x86/start16.dts} | 0\n .../start16_spl.dts} | 0\n .../start16_tpl.dts} | 0\n .../symbols_tpl.dts} | 0\n .../tpl_ucode.dts} | 0\n .../test/{034_x86_ucode.dts => x86/ucode.dts} | 0\n .../ucode_missing_node.dts} | 0\n .../ucode_missing_node2.dts} | 0\n .../ucode_not_in_image.dts} | 0\n .../ucode_spl.dts} | 0\n .../ucode_spl_needs_retry.dts} | 0\n 42 files changed, 43 insertions(+), 43 deletions(-)\n rename tools/binman/test/{141_descriptor_offset.dts => x86/descriptor_offset.dts} (100%)\n rename tools/binman/test/{094_fmap_x86.dts => x86/fmap.dts} (100%)\n rename tools/binman/test/{095_fmap_x86_section.dts => x86/fmap_section.dts} (100%)\n rename tools/binman/test/{043_intel_cmc.dts => x86/intel_cmc.dts} (100%)\n rename tools/binman/test/{147_intel_fit.dts => x86/intel_fit.dts} (100%)\n rename tools/binman/test/{148_intel_fit_missing.dts => x86/intel_fit_missing.dts} (100%)\n rename tools/binman/test/{042_intel_fsp.dts => x86/intel_fsp.dts} (100%)\n rename tools/binman/test/{152_intel_fsp_m.dts => x86/intel_fsp_m.dts} (100%)\n rename tools/binman/test/{153_intel_fsp_s.dts => x86/intel_fsp_s.dts} (100%)\n rename tools/binman/test/{154_intel_fsp_t.dts => x86/intel_fsp_t.dts} (100%)\n rename tools/binman/test/{050_intel_mrc.dts => x86/intel_mrc.dts} (100%)\n rename tools/binman/test/{100_intel_refcode.dts => x86/intel_refcode.dts} (100%)\n rename tools/binman/test/{046_intel_vbt.dts => x86/intel_vbt.dts} (100%)\n rename tools/binman/test/{032_intel_vga.dts => x86/intel_vga.dts} (100%)\n rename tools/binman/test/{037_x86_no_ucode.dts => x86/no_ucode.dts} (100%)\n rename tools/binman/test/{044_x86_optional_ucode.dts => x86/optional_ucode.dts} (100%)\n rename tools/binman/test/{144_x86_reset16.dts => x86/reset16.dts} (100%)\n rename tools/binman/test/{145_x86_reset16_spl.dts => x86/reset16_spl.dts} (100%)\n rename tools/binman/test/{146_x86_reset16_tpl.dts => x86/reset16_tpl.dts} (100%)\n rename tools/binman/test/{029_x86_rom.dts => x86/rom.dts} (100%)\n rename tools/binman/test/{111_x86_rom_ifwi.dts => x86/rom_ifwi.dts} (100%)\n rename tools/binman/test/{113_x86_rom_ifwi_nodata.dts => x86/rom_ifwi_nodata.dts} (100%)\n rename tools/binman/test/{112_x86_rom_ifwi_nodesc.dts => x86/rom_ifwi_nodesc.dts} (100%)\n rename tools/binman/test/{151_x86_rom_ifwi_section.dts => x86/rom_ifwi_section.dts} (100%)\n rename tools/binman/test/{031_x86_rom_me.dts => x86/rom_me.dts} (100%)\n rename tools/binman/test/{163_x86_rom_me_empty.dts => x86/rom_me_empty.dts} (100%)\n rename tools/binman/test/{164_x86_rom_me_missing.dts => x86/rom_me_missing.dts} (100%)\n rename tools/binman/test/{030_x86_rom_me_no_desc.dts => x86/rom_me_no_desc.dts} (100%)\n rename tools/binman/test/{035_x86_single_ucode.dts => x86/single_ucode.dts} (100%)\n rename tools/binman/test/{033_x86_start16.dts => x86/start16.dts} (100%)\n rename tools/binman/test/{048_x86_start16_spl.dts => x86/start16_spl.dts} (100%)\n rename tools/binman/test/{081_x86_start16_tpl.dts => x86/start16_tpl.dts} (100%)\n rename tools/binman/test/{155_symbols_tpl_x86.dts => x86/symbols_tpl.dts} (100%)\n rename tools/binman/test/{093_x86_tpl_ucode.dts => x86/tpl_ucode.dts} (100%)\n rename tools/binman/test/{034_x86_ucode.dts => x86/ucode.dts} (100%)\n rename tools/binman/test/{038_x86_ucode_missing_node.dts => x86/ucode_missing_node.dts} (100%)\n rename tools/binman/test/{039_x86_ucode_missing_node2.dts => x86/ucode_missing_node2.dts} (100%)\n rename tools/binman/test/{040_x86_ucode_not_in_image.dts => x86/ucode_not_in_image.dts} (100%)\n rename tools/binman/test/{049_x86_ucode_spl.dts => x86/ucode_spl.dts} (100%)\n rename tools/binman/test/{058_x86_ucode_spl_needs_retry.dts => x86/ucode_spl_needs_retry.dts} (100%)", "diff": "diff --git a/tools/binman/fdt_test.py b/tools/binman/fdt_test.py\nindex 564c1770820..ef659c0f276 100644\n--- a/tools/binman/fdt_test.py\n+++ b/tools/binman/fdt_test.py\n@@ -36,7 +36,7 @@ class TestFdt(unittest.TestCase):\n node.DeleteProp('data')\n \n def testFdtNormal(self):\n- fname = self.GetCompiled('034_x86_ucode.dts')\n+ fname = self.GetCompiled('x86/ucode.dts')\n dt = FdtScan(fname)\n self._DeleteProp(dt)\n \ndiff --git a/tools/binman/ftest.py b/tools/binman/ftest.py\nindex 7f02bffc0a9..ac944f507f9 100644\n--- a/tools/binman/ftest.py\n+++ b/tools/binman/ftest.py\n@@ -1211,7 +1211,7 @@ class TestFunctional(unittest.TestCase):\n def testPackX86Rom(self):\n \"\"\"Test that a basic x86 ROM can be created\"\"\"\n self._SetupSplElf()\n- data = self._DoReadFile('029_x86_rom.dts')\n+ data = self._DoReadFile('x86/rom.dts')\n self.assertEqual(U_BOOT_DATA + tools.get_bytes(0, 3) + U_BOOT_SPL_DATA +\n tools.get_bytes(0, 2), data)\n \n@@ -1220,7 +1220,7 @@ class TestFunctional(unittest.TestCase):\n try:\n TestFunctional._MakeInputFile('descriptor-empty.bin', b'')\n with self.assertRaises(ValueError) as e:\n- self._DoTestFile('163_x86_rom_me_empty.dts')\n+ self._DoTestFile('x86/rom_me_empty.dts')\n self.assertIn(\"Node '/binman/intel-descriptor': Cannot find Intel Flash Descriptor (FD) signature\",\n str(e.exception))\n finally:\n@@ -1229,14 +1229,14 @@ class TestFunctional(unittest.TestCase):\n def testPackX86RomBadDesc(self):\n \"\"\"Test that the Intel requires a descriptor entry\"\"\"\n with self.assertRaises(ValueError) as e:\n- self._DoTestFile('030_x86_rom_me_no_desc.dts')\n+ self._DoTestFile('x86/rom_me_no_desc.dts')\n self.assertIn(\"Node '/binman/intel-me': No offset set with \"\n \"offset-unset: should another entry provide this correct \"\n \"offset?\", str(e.exception))\n \n def testPackX86RomMe(self):\n \"\"\"Test that an x86 ROM with an ME region can be created\"\"\"\n- data = self._DoReadFile('031_x86_rom_me.dts')\n+ data = self._DoReadFile('x86/rom_me.dts')\n expected_desc = tools.read_file(self.TestFile('descriptor.bin'))\n if data[:0x1000] != expected_desc:\n self.fail('Expected descriptor binary at start of image')\n@@ -1244,12 +1244,12 @@ class TestFunctional(unittest.TestCase):\n \n def testPackVga(self):\n \"\"\"Test that an image with a VGA binary can be created\"\"\"\n- data = self._DoReadFile('032_intel_vga.dts')\n+ data = self._DoReadFile('x86/intel_vga.dts')\n self.assertEqual(VGA_DATA, data[:len(VGA_DATA)])\n \n def testPackStart16(self):\n \"\"\"Test that an image with an x86 start16 region can be created\"\"\"\n- data = self._DoReadFile('033_x86_start16.dts')\n+ data = self._DoReadFile('x86/start16.dts')\n self.assertEqual(X86_START16_DATA, data[:len(X86_START16_DATA)])\n \n def testPackPowerpcMpc85xxBootpgResetvec(self):\n@@ -1318,7 +1318,7 @@ class TestFunctional(unittest.TestCase):\n u-boot.dtb with the microcode removed\n the microcode\n \"\"\"\n- first, pos_and_size = self._RunMicrocodeTest('034_x86_ucode.dts',\n+ first, pos_and_size = self._RunMicrocodeTest('x86/ucode.dts',\n U_BOOT_NODTB_DATA)\n self.assertEqual(b'nodtb with microcode' + pos_and_size +\n b' somewhere in here', first)\n@@ -1335,7 +1335,7 @@ class TestFunctional(unittest.TestCase):\n # We need the libfdt library to run this test since only that allows\n # finding the offset of a property. This is required by\n # Entry_u_boot_dtb_with_ucode.ObtainContents().\n- data = self._DoReadFile('035_x86_single_ucode.dts', True)\n+ data = self._DoReadFile('x86/single_ucode.dts', True)\n \n second = data[len(U_BOOT_NODTB_DATA):]\n \n@@ -1368,21 +1368,21 @@ class TestFunctional(unittest.TestCase):\n def testNoMicrocode(self):\n \"\"\"Test that a missing microcode region is detected\"\"\"\n with self.assertRaises(ValueError) as e:\n- self._DoReadFile('037_x86_no_ucode.dts', True)\n+ self._DoReadFile('x86/no_ucode.dts', True)\n self.assertIn(\"Node '/binman/u-boot-dtb-with-ucode': No /microcode \"\n \"node found in \", str(e.exception))\n \n def testMicrocodeWithoutNode(self):\n \"\"\"Test that a missing u-boot-dtb-with-ucode node is detected\"\"\"\n with self.assertRaises(ValueError) as e:\n- self._DoReadFile('038_x86_ucode_missing_node.dts', True)\n+ self._DoReadFile('x86/ucode_missing_node.dts', True)\n self.assertIn(\"Node '/binman/u-boot-with-ucode-ptr': Cannot find \"\n \"microcode region u-boot-dtb-with-ucode\", str(e.exception))\n \n def testMicrocodeWithoutNode2(self):\n \"\"\"Test that a missing u-boot-ucode node is detected\"\"\"\n with self.assertRaises(ValueError) as e:\n- self._DoReadFile('039_x86_ucode_missing_node2.dts', True)\n+ self._DoReadFile('x86/ucode_missing_node2.dts', True)\n self.assertIn(\"Node '/binman/u-boot-with-ucode-ptr': Cannot find \"\n \"microcode region u-boot-ucode\", str(e.exception))\n \n@@ -1406,7 +1406,7 @@ class TestFunctional(unittest.TestCase):\n def testMicrocodeNotInImage(self):\n \"\"\"Test that microcode must be placed within the image\"\"\"\n with self.assertRaises(ValueError) as e:\n- self._DoReadFile('040_x86_ucode_not_in_image.dts', True)\n+ self._DoReadFile('x86/ucode_not_in_image.dts', True)\n self.assertIn(\"Node '/binman/u-boot-with-ucode-ptr': Microcode \"\n \"pointer _dt_ucode_base_size at fffffe14 is outside the \"\n \"section ranging from 00000000 to 0000002e\", str(e.exception))\n@@ -1415,7 +1415,7 @@ class TestFunctional(unittest.TestCase):\n \"\"\"Test that we can cope with an image without microcode (e.g. qemu)\"\"\"\n TestFunctional._MakeInputFile('u-boot',\n tools.read_file(self.ElfTestFile('u_boot_no_ucode_ptr')))\n- data, dtb, _, _ = self._DoReadFileDtb('044_x86_optional_ucode.dts', True)\n+ data, dtb, _, _ = self._DoReadFileDtb('x86/optional_ucode.dts', True)\n \n # Now check the device tree has no microcode\n self.assertEqual(U_BOOT_NODTB_DATA, data[:len(U_BOOT_NODTB_DATA)])\n@@ -1437,17 +1437,17 @@ class TestFunctional(unittest.TestCase):\n \n def testPackFsp(self):\n \"\"\"Test that an image with a FSP binary can be created\"\"\"\n- data = self._DoReadFile('042_intel_fsp.dts')\n+ data = self._DoReadFile('x86/intel_fsp.dts')\n self.assertEqual(FSP_DATA, data[:len(FSP_DATA)])\n \n def testPackCmc(self):\n \"\"\"Test that an image with a CMC binary can be created\"\"\"\n- data = self._DoReadFile('043_intel_cmc.dts')\n+ data = self._DoReadFile('x86/intel_cmc.dts')\n self.assertEqual(CMC_DATA, data[:len(CMC_DATA)])\n \n def testPackVbt(self):\n \"\"\"Test that an image with a VBT binary can be created\"\"\"\n- data = self._DoReadFile('046_intel_vbt.dts')\n+ data = self._DoReadFile('x86/intel_vbt.dts')\n self.assertEqual(VBT_DATA, data[:len(VBT_DATA)])\n \n def testSplBssPad(self):\n@@ -1468,7 +1468,7 @@ class TestFunctional(unittest.TestCase):\n \n def testPackStart16Spl(self):\n \"\"\"Test that an image with an x86 start16 SPL region can be created\"\"\"\n- data = self._DoReadFile('048_x86_start16_spl.dts')\n+ data = self._DoReadFile('x86/start16_spl.dts')\n self.assertEqual(X86_START16_SPL_DATA, data[:len(X86_START16_SPL_DATA)])\n \n def _PackUbootSplMicrocode(self, dts, ucode_second=False):\n@@ -1494,7 +1494,7 @@ class TestFunctional(unittest.TestCase):\n def testPackUbootSplMicrocode(self):\n \"\"\"Test that x86 microcode can be handled correctly in SPL\"\"\"\n self._SetupSplElf()\n- self._PackUbootSplMicrocode('049_x86_ucode_spl.dts')\n+ self._PackUbootSplMicrocode('x86/ucode_spl.dts')\n \n def testPackUbootSplMicrocodeReorder(self):\n \"\"\"Test that order doesn't matter for microcode entries\n@@ -1503,12 +1503,12 @@ class TestFunctional(unittest.TestCase):\n u-boot-ucode entry we have not yet seen the u-boot-dtb-with-ucode\n entry, so we reply on binman to try later.\n \"\"\"\n- self._PackUbootSplMicrocode('058_x86_ucode_spl_needs_retry.dts',\n+ self._PackUbootSplMicrocode('x86/ucode_spl_needs_retry.dts',\n ucode_second=True)\n \n def testPackMrc(self):\n \"\"\"Test that an image with an MRC binary can be created\"\"\"\n- data = self._DoReadFile('050_intel_mrc.dts')\n+ data = self._DoReadFile('x86/intel_mrc.dts')\n self.assertEqual(MRC_DATA, data[:len(MRC_DATA)])\n \n def testSplDtb(self):\n@@ -2055,7 +2055,7 @@ class TestFunctional(unittest.TestCase):\n \n def testPackStart16Tpl(self):\n \"\"\"Test that an image with an x86 start16 TPL region can be created\"\"\"\n- data = self._DoReadFile('081_x86_start16_tpl.dts')\n+ data = self._DoReadFile('x86/start16_tpl.dts')\n self.assertEqual(X86_START16_TPL_DATA, data[:len(X86_START16_TPL_DATA)])\n \n def testSelectImage(self):\n@@ -2304,14 +2304,14 @@ class TestFunctional(unittest.TestCase):\n the microcode\n \"\"\"\n self._SetupTplElf('u_boot_ucode_ptr')\n- first, pos_and_size = self._RunMicrocodeTest('093_x86_tpl_ucode.dts',\n+ first, pos_and_size = self._RunMicrocodeTest('x86/tpl_ucode.dts',\n U_BOOT_TPL_NODTB_DATA)\n self.assertEqual(b'tplnodtb with microc' + pos_and_size +\n b'ter somewhere in here', first)\n \n def testFmapX86(self):\n \"\"\"Basic test of generation of a flashrom fmap\"\"\"\n- data = self._DoReadFile('094_fmap_x86.dts')\n+ data = self._DoReadFile('x86/fmap.dts')\n fhdr, fentries = fmap_util.DecodeFmap(data[32:])\n expected = U_BOOT_DATA + MRC_DATA + tools.get_bytes(ord('a'), 32 - 7)\n self.assertEqual(expected, data[:32])\n@@ -2335,7 +2335,7 @@ class TestFunctional(unittest.TestCase):\n \n def testFmapX86Section(self):\n \"\"\"Basic test of generation of a flashrom fmap\"\"\"\n- data = self._DoReadFile('095_fmap_x86_section.dts')\n+ data = self._DoReadFile('x86/fmap_section.dts')\n expected = U_BOOT_DATA + MRC_DATA + tools.get_bytes(ord('b'), 32 - 7)\n self.assertEqual(expected, data[:32])\n fhdr, fentries = fmap_util.DecodeFmap(data[36:])\n@@ -2401,7 +2401,7 @@ class TestFunctional(unittest.TestCase):\n \n def testPackRefCode(self):\n \"\"\"Test that an image with an Intel Reference code binary works\"\"\"\n- data = self._DoReadFile('100_intel_refcode.dts')\n+ data = self._DoReadFile('x86/intel_refcode.dts')\n self.assertEqual(REFCODE_DATA, data[:len(REFCODE_DATA)])\n \n def testSectionOffset(self):\n@@ -2556,20 +2556,20 @@ class TestFunctional(unittest.TestCase):\n def testPackX86RomIfwi(self):\n \"\"\"Test that an x86 ROM with Integrated Firmware Image can be created\"\"\"\n self._SetupIfwi('fitimage.bin')\n- data = self._DoReadFile('111_x86_rom_ifwi.dts')\n+ data = self._DoReadFile('x86/rom_ifwi.dts')\n self._CheckIfwi(data)\n \n def testPackX86RomIfwiNoDesc(self):\n \"\"\"Test that an x86 ROM with IFWI can be created from an ifwi.bin file\"\"\"\n self._SetupIfwi('ifwi.bin')\n- data = self._DoReadFile('112_x86_rom_ifwi_nodesc.dts')\n+ data = self._DoReadFile('x86/rom_ifwi_nodesc.dts')\n self._CheckIfwi(data)\n \n def testPackX86RomIfwiNoData(self):\n \"\"\"Test that an x86 ROM with IFWI handles missing data\"\"\"\n self._SetupIfwi('ifwi.bin')\n with self.assertRaises(ValueError) as e:\n- data = self._DoReadFile('113_x86_rom_ifwi_nodata.dts')\n+ data = self._DoReadFile('x86/rom_ifwi_nodata.dts')\n self.assertIn('Could not complete processing of contents',\n str(e.exception))\n \n@@ -2577,7 +2577,7 @@ class TestFunctional(unittest.TestCase):\n \"\"\"Test that binman still produces an image if ifwitool is missing\"\"\"\n self._SetupIfwi('fitimage.bin')\n with terminal.capture() as (_, stderr):\n- self._DoTestFile('111_x86_rom_ifwi.dts',\n+ self._DoTestFile('x86/rom_ifwi.dts',\n force_missing_bintools='ifwitool')\n err = stderr.getvalue()\n self.assertRegex(err,\n@@ -3554,7 +3554,7 @@ class TestFunctional(unittest.TestCase):\n \n def testDescriptorOffset(self):\n \"\"\"Test that the Intel descriptor is always placed at at the start\"\"\"\n- data = self._DoReadFileDtb('141_descriptor_offset.dts')\n+ data = self._DoReadFileDtb('x86/descriptor_offset.dts')\n image = control.images['image']\n entries = image.GetEntries()\n desc = entries['intel-descriptor']\n@@ -3778,22 +3778,22 @@ class TestFunctional(unittest.TestCase):\n \n def testPackReset16(self):\n \"\"\"Test that an image with an x86 reset16 region can be created\"\"\"\n- data = self._DoReadFile('144_x86_reset16.dts')\n+ data = self._DoReadFile('x86/reset16.dts')\n self.assertEqual(X86_RESET16_DATA, data[:len(X86_RESET16_DATA)])\n \n def testPackReset16Spl(self):\n \"\"\"Test that an image with an x86 reset16-spl region can be created\"\"\"\n- data = self._DoReadFile('145_x86_reset16_spl.dts')\n+ data = self._DoReadFile('x86/reset16_spl.dts')\n self.assertEqual(X86_RESET16_SPL_DATA, data[:len(X86_RESET16_SPL_DATA)])\n \n def testPackReset16Tpl(self):\n \"\"\"Test that an image with an x86 reset16-tpl region can be created\"\"\"\n- data = self._DoReadFile('146_x86_reset16_tpl.dts')\n+ data = self._DoReadFile('x86/reset16_tpl.dts')\n self.assertEqual(X86_RESET16_TPL_DATA, data[:len(X86_RESET16_TPL_DATA)])\n \n def testPackIntelFit(self):\n \"\"\"Test that an image with an Intel FIT and pointer can be created\"\"\"\n- data = self._DoReadFile('147_intel_fit.dts')\n+ data = self._DoReadFile('x86/intel_fit.dts')\n self.assertEqual(U_BOOT_DATA, data[:len(U_BOOT_DATA)])\n fit = data[16:32];\n self.assertEqual(b'_FIT_ \\x01\\x00\\x00\\x00\\x00\\x01\\x80}' , fit)\n@@ -3807,7 +3807,7 @@ class TestFunctional(unittest.TestCase):\n def testPackIntelFitMissing(self):\n \"\"\"Test detection of a FIT pointer with not FIT region\"\"\"\n with self.assertRaises(ValueError) as e:\n- self._DoReadFile('148_intel_fit_missing.dts')\n+ self._DoReadFile('x86/intel_fit_missing.dts')\n self.assertIn(\"'intel-fit-ptr' section must have an 'intel-fit' sibling\",\n str(e.exception))\n \n@@ -3840,29 +3840,29 @@ class TestFunctional(unittest.TestCase):\n \"\"\"Test binman can assign symbols in a section with end-at-4gb\"\"\"\n self._SetupSplElf('u_boot_binman_syms_x86')\n self._SetupTplElf('u_boot_binman_syms_x86')\n- self._CheckSymbolsTplSection('155_symbols_tpl_x86.dts',\n+ self._CheckSymbolsTplSection('x86/symbols_tpl.dts',\n [0xffffff04, 0xffffff20, 0xffffff3c,\n 0x04])\n \n def testPackX86RomIfwiSectiom(self):\n \"\"\"Test that a section can be placed in an IFWI region\"\"\"\n self._SetupIfwi('fitimage.bin')\n- data = self._DoReadFile('151_x86_rom_ifwi_section.dts')\n+ data = self._DoReadFile('x86/rom_ifwi_section.dts')\n self._CheckIfwi(data)\n \n def testPackFspM(self):\n \"\"\"Test that an image with a FSP memory-init binary can be created\"\"\"\n- data = self._DoReadFile('152_intel_fsp_m.dts')\n+ data = self._DoReadFile('x86/intel_fsp_m.dts')\n self.assertEqual(FSP_M_DATA, data[:len(FSP_M_DATA)])\n \n def testPackFspS(self):\n \"\"\"Test that an image with a FSP silicon-init binary can be created\"\"\"\n- data = self._DoReadFile('153_intel_fsp_s.dts')\n+ data = self._DoReadFile('x86/intel_fsp_s.dts')\n self.assertEqual(FSP_S_DATA, data[:len(FSP_S_DATA)])\n \n def testPackFspT(self):\n \"\"\"Test that an image with a FSP temp-ram-init binary can be created\"\"\"\n- data = self._DoReadFile('154_intel_fsp_t.dts')\n+ data = self._DoReadFile('x86/intel_fsp_t.dts')\n self.assertEqual(FSP_T_DATA, data[:len(FSP_T_DATA)])\n \n def testMkimage(self):\n@@ -3927,7 +3927,7 @@ class TestFunctional(unittest.TestCase):\n def testPackX86RomMeMissingDesc(self):\n \"\"\"Test that an missing Intel descriptor entry is allowed\"\"\"\n with terminal.capture() as (stdout, stderr):\n- self._DoTestFile('164_x86_rom_me_missing.dts', allow_missing=True)\n+ self._DoTestFile('x86/rom_me_missing.dts', allow_missing=True)\n err = stderr.getvalue()\n self.assertRegex(err, \"Image 'image'.*missing.*: intel-descriptor\")\n \n@@ -3937,7 +3937,7 @@ class TestFunctional(unittest.TestCase):\n pathname = os.path.join(self._indir, 'fitimage.bin')\n os.remove(pathname)\n with terminal.capture() as (stdout, stderr):\n- self._DoTestFile('111_x86_rom_ifwi.dts', allow_missing=True)\n+ self._DoTestFile('x86/rom_ifwi.dts', allow_missing=True)\n err = stderr.getvalue()\n self.assertRegex(err, \"Image 'image'.*missing.*: intel-ifwi\")\n \ndiff --git a/tools/binman/test/141_descriptor_offset.dts b/tools/binman/test/x86/descriptor_offset.dts\nsimilarity index 100%\nrename from tools/binman/test/141_descriptor_offset.dts\nrename to tools/binman/test/x86/descriptor_offset.dts\ndiff --git a/tools/binman/test/094_fmap_x86.dts b/tools/binman/test/x86/fmap.dts\nsimilarity index 100%\nrename from tools/binman/test/094_fmap_x86.dts\nrename to tools/binman/test/x86/fmap.dts\ndiff --git a/tools/binman/test/095_fmap_x86_section.dts b/tools/binman/test/x86/fmap_section.dts\nsimilarity index 100%\nrename from tools/binman/test/095_fmap_x86_section.dts\nrename to tools/binman/test/x86/fmap_section.dts\ndiff --git a/tools/binman/test/043_intel_cmc.dts b/tools/binman/test/x86/intel_cmc.dts\nsimilarity index 100%\nrename from tools/binman/test/043_intel_cmc.dts\nrename to tools/binman/test/x86/intel_cmc.dts\ndiff --git a/tools/binman/test/147_intel_fit.dts b/tools/binman/test/x86/intel_fit.dts\nsimilarity index 100%\nrename from tools/binman/test/147_intel_fit.dts\nrename to tools/binman/test/x86/intel_fit.dts\ndiff --git a/tools/binman/test/148_intel_fit_missing.dts b/tools/binman/test/x86/intel_fit_missing.dts\nsimilarity index 100%\nrename from tools/binman/test/148_intel_fit_missing.dts\nrename to tools/binman/test/x86/intel_fit_missing.dts\ndiff --git a/tools/binman/test/042_intel_fsp.dts b/tools/binman/test/x86/intel_fsp.dts\nsimilarity index 100%\nrename from tools/binman/test/042_intel_fsp.dts\nrename to tools/binman/test/x86/intel_fsp.dts\ndiff --git a/tools/binman/test/152_intel_fsp_m.dts b/tools/binman/test/x86/intel_fsp_m.dts\nsimilarity index 100%\nrename from tools/binman/test/152_intel_fsp_m.dts\nrename to tools/binman/test/x86/intel_fsp_m.dts\ndiff --git a/tools/binman/test/153_intel_fsp_s.dts b/tools/binman/test/x86/intel_fsp_s.dts\nsimilarity index 100%\nrename from tools/binman/test/153_intel_fsp_s.dts\nrename to tools/binman/test/x86/intel_fsp_s.dts\ndiff --git a/tools/binman/test/154_intel_fsp_t.dts b/tools/binman/test/x86/intel_fsp_t.dts\nsimilarity index 100%\nrename from tools/binman/test/154_intel_fsp_t.dts\nrename to tools/binman/test/x86/intel_fsp_t.dts\ndiff --git a/tools/binman/test/050_intel_mrc.dts b/tools/binman/test/x86/intel_mrc.dts\nsimilarity index 100%\nrename from tools/binman/test/050_intel_mrc.dts\nrename to tools/binman/test/x86/intel_mrc.dts\ndiff --git a/tools/binman/test/100_intel_refcode.dts b/tools/binman/test/x86/intel_refcode.dts\nsimilarity index 100%\nrename from tools/binman/test/100_intel_refcode.dts\nrename to tools/binman/test/x86/intel_refcode.dts\ndiff --git a/tools/binman/test/046_intel_vbt.dts b/tools/binman/test/x86/intel_vbt.dts\nsimilarity index 100%\nrename from tools/binman/test/046_intel_vbt.dts\nrename to tools/binman/test/x86/intel_vbt.dts\ndiff --git a/tools/binman/test/032_intel_vga.dts b/tools/binman/test/x86/intel_vga.dts\nsimilarity index 100%\nrename from tools/binman/test/032_intel_vga.dts\nrename to tools/binman/test/x86/intel_vga.dts\ndiff --git a/tools/binman/test/037_x86_no_ucode.dts b/tools/binman/test/x86/no_ucode.dts\nsimilarity index 100%\nrename from tools/binman/test/037_x86_no_ucode.dts\nrename to tools/binman/test/x86/no_ucode.dts\ndiff --git a/tools/binman/test/044_x86_optional_ucode.dts b/tools/binman/test/x86/optional_ucode.dts\nsimilarity index 100%\nrename from tools/binman/test/044_x86_optional_ucode.dts\nrename to tools/binman/test/x86/optional_ucode.dts\ndiff --git a/tools/binman/test/144_x86_reset16.dts b/tools/binman/test/x86/reset16.dts\nsimilarity index 100%\nrename from tools/binman/test/144_x86_reset16.dts\nrename to tools/binman/test/x86/reset16.dts\ndiff --git a/tools/binman/test/145_x86_reset16_spl.dts b/tools/binman/test/x86/reset16_spl.dts\nsimilarity index 100%\nrename from tools/binman/test/145_x86_reset16_spl.dts\nrename to tools/binman/test/x86/reset16_spl.dts\ndiff --git a/tools/binman/test/146_x86_reset16_tpl.dts b/tools/binman/test/x86/reset16_tpl.dts\nsimilarity index 100%\nrename from tools/binman/test/146_x86_reset16_tpl.dts\nrename to tools/binman/test/x86/reset16_tpl.dts\ndiff --git a/tools/binman/test/029_x86_rom.dts b/tools/binman/test/x86/rom.dts\nsimilarity index 100%\nrename from tools/binman/test/029_x86_rom.dts\nrename to tools/binman/test/x86/rom.dts\ndiff --git a/tools/binman/test/111_x86_rom_ifwi.dts b/tools/binman/test/x86/rom_ifwi.dts\nsimilarity index 100%\nrename from tools/binman/test/111_x86_rom_ifwi.dts\nrename to tools/binman/test/x86/rom_ifwi.dts\ndiff --git a/tools/binman/test/113_x86_rom_ifwi_nodata.dts b/tools/binman/test/x86/rom_ifwi_nodata.dts\nsimilarity index 100%\nrename from tools/binman/test/113_x86_rom_ifwi_nodata.dts\nrename to tools/binman/test/x86/rom_ifwi_nodata.dts\ndiff --git a/tools/binman/test/112_x86_rom_ifwi_nodesc.dts b/tools/binman/test/x86/rom_ifwi_nodesc.dts\nsimilarity index 100%\nrename from tools/binman/test/112_x86_rom_ifwi_nodesc.dts\nrename to tools/binman/test/x86/rom_ifwi_nodesc.dts\ndiff --git a/tools/binman/test/151_x86_rom_ifwi_section.dts b/tools/binman/test/x86/rom_ifwi_section.dts\nsimilarity index 100%\nrename from tools/binman/test/151_x86_rom_ifwi_section.dts\nrename to tools/binman/test/x86/rom_ifwi_section.dts\ndiff --git a/tools/binman/test/031_x86_rom_me.dts b/tools/binman/test/x86/rom_me.dts\nsimilarity index 100%\nrename from tools/binman/test/031_x86_rom_me.dts\nrename to tools/binman/test/x86/rom_me.dts\ndiff --git a/tools/binman/test/163_x86_rom_me_empty.dts b/tools/binman/test/x86/rom_me_empty.dts\nsimilarity index 100%\nrename from tools/binman/test/163_x86_rom_me_empty.dts\nrename to tools/binman/test/x86/rom_me_empty.dts\ndiff --git a/tools/binman/test/164_x86_rom_me_missing.dts b/tools/binman/test/x86/rom_me_missing.dts\nsimilarity index 100%\nrename from tools/binman/test/164_x86_rom_me_missing.dts\nrename to tools/binman/test/x86/rom_me_missing.dts\ndiff --git a/tools/binman/test/030_x86_rom_me_no_desc.dts b/tools/binman/test/x86/rom_me_no_desc.dts\nsimilarity index 100%\nrename from tools/binman/test/030_x86_rom_me_no_desc.dts\nrename to tools/binman/test/x86/rom_me_no_desc.dts\ndiff --git a/tools/binman/test/035_x86_single_ucode.dts b/tools/binman/test/x86/single_ucode.dts\nsimilarity index 100%\nrename from tools/binman/test/035_x86_single_ucode.dts\nrename to tools/binman/test/x86/single_ucode.dts\ndiff --git a/tools/binman/test/033_x86_start16.dts b/tools/binman/test/x86/start16.dts\nsimilarity index 100%\nrename from tools/binman/test/033_x86_start16.dts\nrename to tools/binman/test/x86/start16.dts\ndiff --git a/tools/binman/test/048_x86_start16_spl.dts b/tools/binman/test/x86/start16_spl.dts\nsimilarity index 100%\nrename from tools/binman/test/048_x86_start16_spl.dts\nrename to tools/binman/test/x86/start16_spl.dts\ndiff --git a/tools/binman/test/081_x86_start16_tpl.dts b/tools/binman/test/x86/start16_tpl.dts\nsimilarity index 100%\nrename from tools/binman/test/081_x86_start16_tpl.dts\nrename to tools/binman/test/x86/start16_tpl.dts\ndiff --git a/tools/binman/test/155_symbols_tpl_x86.dts b/tools/binman/test/x86/symbols_tpl.dts\nsimilarity index 100%\nrename from tools/binman/test/155_symbols_tpl_x86.dts\nrename to tools/binman/test/x86/symbols_tpl.dts\ndiff --git a/tools/binman/test/093_x86_tpl_ucode.dts b/tools/binman/test/x86/tpl_ucode.dts\nsimilarity index 100%\nrename from tools/binman/test/093_x86_tpl_ucode.dts\nrename to tools/binman/test/x86/tpl_ucode.dts\ndiff --git a/tools/binman/test/034_x86_ucode.dts b/tools/binman/test/x86/ucode.dts\nsimilarity index 100%\nrename from tools/binman/test/034_x86_ucode.dts\nrename to tools/binman/test/x86/ucode.dts\ndiff --git a/tools/binman/test/038_x86_ucode_missing_node.dts b/tools/binman/test/x86/ucode_missing_node.dts\nsimilarity index 100%\nrename from tools/binman/test/038_x86_ucode_missing_node.dts\nrename to tools/binman/test/x86/ucode_missing_node.dts\ndiff --git a/tools/binman/test/039_x86_ucode_missing_node2.dts b/tools/binman/test/x86/ucode_missing_node2.dts\nsimilarity index 100%\nrename from tools/binman/test/039_x86_ucode_missing_node2.dts\nrename to tools/binman/test/x86/ucode_missing_node2.dts\ndiff --git a/tools/binman/test/040_x86_ucode_not_in_image.dts b/tools/binman/test/x86/ucode_not_in_image.dts\nsimilarity index 100%\nrename from tools/binman/test/040_x86_ucode_not_in_image.dts\nrename to tools/binman/test/x86/ucode_not_in_image.dts\ndiff --git a/tools/binman/test/049_x86_ucode_spl.dts b/tools/binman/test/x86/ucode_spl.dts\nsimilarity index 100%\nrename from tools/binman/test/049_x86_ucode_spl.dts\nrename to tools/binman/test/x86/ucode_spl.dts\ndiff --git a/tools/binman/test/058_x86_ucode_spl_needs_retry.dts b/tools/binman/test/x86/ucode_spl_needs_retry.dts\nsimilarity index 100%\nrename from tools/binman/test/058_x86_ucode_spl_needs_retry.dts\nrename to tools/binman/test/x86/ucode_spl_needs_retry.dts\n", "prefixes": [ "v2", "04/23" ] }