From patchwork Fri Jan 9 23:11:13 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1400 Return-Path: X-Original-To: u-boot-concept@u-boot.org Delivered-To: u-boot-concept@u-boot.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=u-boot.org; s=default; t=1768000354; bh=VM5Rd9GD0kBTumslDVptv9baUoSbBPhKlo3EBrOFsb4=; h=From:To:Date:In-Reply-To:References:CC:Subject:List-Id: List-Archive:List-Help:List-Owner:List-Post:List-Subscribe: List-Unsubscribe:From; b=iqa7LySEGpM7iCOtkGHtOpNTzF/LTd/TVh7MjF18eCS1YoSBF1Y2O1nv6bV8BhRXC MU+mSx6lz8ShBPiBU1X/ZAL9kjNsk+yA1tZFiMd6BuGdjk1tvj55Dfd33orQSXVxIa CgPvTX8txAWJSUOG8+e05cl+vdmoVU47owfXzKv/8jYznuf2S2GhBfH/D6GDxEBZw8 t//L79/zh24EEiVKRlxuj1DYU5Qu8XauqUxf7/EjOI7DqwqIU7Li/binBpiCjr/E7t RFSnr0plW40ekjARmYdCd7rBihhDM5Y0q1fuNBLNtLZd9Ko7UzfmfC0D6SvWil1gH9 7ZQDdysbgpA3A== Received: from localhost (localhost [127.0.0.1]) by mail.u-boot.org (Postfix) with ESMTP id 7A98E6923D for ; Fri, 9 Jan 2026 16:12:34 -0700 (MST) X-Virus-Scanned: Debian amavis at Received: from mail.u-boot.org ([127.0.0.1]) by localhost (mail.u-boot.org [127.0.0.1]) (amavis, port 10024) with ESMTP id JvDwLHmKoiOS for ; Fri, 9 Jan 2026 16:12:34 -0700 (MST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=u-boot.org; s=default; t=1768000354; bh=VM5Rd9GD0kBTumslDVptv9baUoSbBPhKlo3EBrOFsb4=; h=From:To:Date:In-Reply-To:References:CC:Subject:List-Id: List-Archive:List-Help:List-Owner:List-Post:List-Subscribe: List-Unsubscribe:From; b=iqa7LySEGpM7iCOtkGHtOpNTzF/LTd/TVh7MjF18eCS1YoSBF1Y2O1nv6bV8BhRXC MU+mSx6lz8ShBPiBU1X/ZAL9kjNsk+yA1tZFiMd6BuGdjk1tvj55Dfd33orQSXVxIa CgPvTX8txAWJSUOG8+e05cl+vdmoVU47owfXzKv/8jYznuf2S2GhBfH/D6GDxEBZw8 t//L79/zh24EEiVKRlxuj1DYU5Qu8XauqUxf7/EjOI7DqwqIU7Li/binBpiCjr/E7t RFSnr0plW40ekjARmYdCd7rBihhDM5Y0q1fuNBLNtLZd9Ko7UzfmfC0D6SvWil1gH9 7ZQDdysbgpA3A== Received: from mail.u-boot.org (localhost [127.0.0.1]) by mail.u-boot.org (Postfix) with ESMTP id 651FE69239 for ; Fri, 9 Jan 2026 16:12:34 -0700 (MST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=u-boot.org; s=default; t=1768000353; bh=tPEjfvbEW6KHjmNTtmtpuqeQp9r0QY/Aibv+0TWnXlM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=YntkLXRZ/ry4KsQ861tLztP1k1UqPQOOiasVuCfphQRVifbqNBuchhkEfCAStZlLa 2HZrhEngaa2eMY81MOUbYSRZRaNCqxzONw4lGMcNY4piMdMdBmGWTB1QF/R2bKoRjW WxgAf98P19UR5LTx8Ho8ryC8+VjAc5MRRuPH3hd6LcUoj1nnvrXXs25bzmv5GlDnmr p+PYWB3A1ct4z+urXx6dtHOPQQIFu+5J2WYR8iXNUVKBwb1/IWQFBfstuxsu0/yyXe 0hlLjbS22UW81OOSwCvc5LoZkYq7CaOcgBiWEETH4UxgOwxajdebQmlGZUgGz08FYv 0tz2N8EFWt84w== Received: from localhost (localhost [127.0.0.1]) by mail.u-boot.org (Postfix) with ESMTP id 7C00C69218; Fri, 9 Jan 2026 16:12:33 -0700 (MST) X-Virus-Scanned: Debian amavis at Received: from mail.u-boot.org ([127.0.0.1]) by localhost (mail.u-boot.org [127.0.0.1]) (amavis, port 10026) with ESMTP id IqPWV-yJ5qsO; Fri, 9 Jan 2026 16:12:33 -0700 (MST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=u-boot.org; s=default; t=1768000349; bh=ytAau9Po52p6F9X9t0XW1CLo9nZD4OSpDBLtk7af0RI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=jKKz8XC0FNcMFzrQJrC+J28acHtLbBl70C3Pl8V0geUxBCSJ94IXw0pHNRjBR6RFd AlfX1KZVeVtTC1+yfV5uW1CydgxOwgLC2/Ptkia9M2uGk/5nX05AKdQ3RWEKtogRh7 WPnCuzN7xnzDBTd/5aKw+qVtklyatRkZ2XSQF23B2mEDaN/PzNXMRDLn7mYtB05INB 1B45t9egABQ22BH+F6XNLiUz+9L8vSzMcA2ddDim6GrfaOacqWrtt5EzSbEgoUI9wa 8ybWpdMqQbf3dS2aq9zh9+OwcbWNA5U6kjtEh+T0uoOxX+ig0PIFFXuEhccCvKprVu EapGOuDSk8+Xw== Received: from u-boot.org (unknown [73.34.74.121]) by mail.u-boot.org (Postfix) with ESMTPSA id 1EB0C69206; Fri, 9 Jan 2026 16:12:29 -0700 (MST) From: Simon Glass To: U-Boot Concept Date: Fri, 9 Jan 2026 16:11:13 -0700 Message-ID: <20260109231151.4056804-5-sjg@u-boot.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260109231151.4056804-1-sjg@u-boot.org> References: <20260109231151.4056804-1-sjg@u-boot.org> MIME-Version: 1.0 Message-ID-Hash: BPQKEZMWBKTVPCQ22BM6WDZWK5TVIXFZ X-Message-ID-Hash: BPQKEZMWBKTVPCQ22BM6WDZWK5TVIXFZ X-MailFrom: sjg@u-boot.org X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header CC: Heinrich Schuchardt , Simon Glass , "Claude Opus 4 . 5" X-Mailman-Version: 3.3.10 Precedence: list Subject: [Concept] [PATCH 04/32] test: pxe: Test devicetree alias keywords List-Id: Discussion and patches related to U-Boot Concept Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: From: Simon Glass Test the alias keywords for device tree options: - devicetree (alias for fdt) - devicetreedir (alias for fdtdir) - devicetree-overlay (alias for fdtoverlays) These use the same parsing code as their primary keywords, but verifying they work correctly ensures compatibility with configs that use either form. Co-developed-by: Claude Opus 4.5 Signed-off-by: Simon Glass --- test/py/tests/test_pxe_parser.py | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/test/py/tests/test_pxe_parser.py b/test/py/tests/test_pxe_parser.py index d52bf3e6b50..61ff6d11e3e 100644 --- a/test/py/tests/test_pxe_parser.py +++ b/test/py/tests/test_pxe_parser.py @@ -84,8 +84,11 @@ def create_extlinux_conf(srcdir, labels, menu_opts=None): - initrd: Initrd path (optional) - append: Kernel arguments (optional) - fdt: Device tree path (optional) + - devicetree: Device tree path (alias for fdt) - fdtdir: Device tree directory (optional) + - devicetreedir: Device tree directory (alias for fdtdir) - fdtoverlays: Device tree overlays (optional) + - devicetree-overlay: Device tree overlays (alias) - localboot: Local boot flag (optional) - ipappend: IP append flags (optional) - fit: FIT config path (optional) @@ -145,10 +148,16 @@ def create_extlinux_conf(srcdir, labels, menu_opts=None): fd.write(f" append {label['append']}\n") if 'fdt' in label: fd.write(f" fdt {label['fdt']}\n") + if 'devicetree' in label: + fd.write(f" devicetree {label['devicetree']}\n") if 'fdtdir' in label: fd.write(f" fdtdir {label['fdtdir']}\n") + if 'devicetreedir' in label: + fd.write(f" devicetreedir {label['devicetreedir']}\n") if 'fdtoverlays' in label: fd.write(f" fdtoverlays {label['fdtoverlays']}\n") + if 'devicetree-overlay' in label: + fd.write(f" devicetree-overlay {label['devicetree-overlay']}\n") if 'localboot' in label: fd.write(f" localboot {label['localboot']}\n") if 'ipappend' in label: @@ -181,8 +190,9 @@ def pxe_image(u_boot_config): 'kernel': '/vmlinuz', 'initrd': '/initrd.img', 'append': 'root=/dev/sda1 quiet', - 'fdt': '/dtb/board.dtb', - 'fdtoverlays': '/dtb/overlay1.dtbo /dtb/overlay2.dtbo', + # Use aliases to test devicetree/devicetree-overlay keywords + 'devicetree': '/dtb/board.dtb', + 'devicetree-overlay': '/dtb/overlay1.dtbo /dtb/overlay2.dtbo', 'kaslrseed': True, 'say': 'Booting default Linux kernel', 'default': True, @@ -192,7 +202,7 @@ def pxe_image(u_boot_config): 'menu': 'Rescue Mode', 'linux': '/vmlinuz-rescue', # test 'linux' keyword 'append': 'single', - 'fdtdir': '/dtb/', + 'devicetreedir': '/dtb/', # test alias for fdtdir 'ipappend': '3', }, {