From patchwork Fri Jan 9 23:11:38 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1425 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=1768000460; bh=UuiORVaWMWzj7sYropLNo7Glysan3pDiAzwzD8lrhKk=; 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=ZxU5GjsYhNVh4R1oZ4pM3t75leE17z4DDAXtubQ0jz9BGayU5vbE0uA5IrZhw+UV5 lEyPTqQZWlW8gh5Oipm+jvtzx3vzzATc6RMchkHOUYq/jOOhCm6GQrvLmEHUDDtP0q vWd+o7TcVF9Zh9TGVg33ot0KjcIjdFz60DAsHphvO1xfAbtsM+vMNdGxDj2xAYUay2 RyeuROJ15Rv/XzVUknRpCqDEmhm5VoxztdQbVsCf9tqyXJ2XKfPCIkYXf6HUHTvrLp LI3N62+SaG57dAPQ9WCu8d1iXYPb80NhXZYwuWWWYwC6UyBftJHP1eKgXPzx7umrHX w48QWKWPHp2sA== Received: from localhost (localhost [127.0.0.1]) by mail.u-boot.org (Postfix) with ESMTP id DC75B69243 for ; Fri, 9 Jan 2026 16:14:20 -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 8cYLE-Wajt55 for ; Fri, 9 Jan 2026 16:14:20 -0700 (MST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=u-boot.org; s=default; t=1768000460; bh=UuiORVaWMWzj7sYropLNo7Glysan3pDiAzwzD8lrhKk=; 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=ZxU5GjsYhNVh4R1oZ4pM3t75leE17z4DDAXtubQ0jz9BGayU5vbE0uA5IrZhw+UV5 lEyPTqQZWlW8gh5Oipm+jvtzx3vzzATc6RMchkHOUYq/jOOhCm6GQrvLmEHUDDtP0q vWd+o7TcVF9Zh9TGVg33ot0KjcIjdFz60DAsHphvO1xfAbtsM+vMNdGxDj2xAYUay2 RyeuROJ15Rv/XzVUknRpCqDEmhm5VoxztdQbVsCf9tqyXJ2XKfPCIkYXf6HUHTvrLp LI3N62+SaG57dAPQ9WCu8d1iXYPb80NhXZYwuWWWYwC6UyBftJHP1eKgXPzx7umrHX w48QWKWPHp2sA== Received: from mail.u-boot.org (localhost [127.0.0.1]) by mail.u-boot.org (Postfix) with ESMTP id CBD3869221 for ; Fri, 9 Jan 2026 16:14:20 -0700 (MST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=u-boot.org; s=default; t=1768000458; bh=vVRRC7vc5ltICFdtA0FKW8IfEToqbQ9A7PvazWIiObU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=hxx3ktCdT7bFK0Vf//uECalgAz67CTCc2Cy8+edMgnqQ0UMnEtEIwMtnWC40TMFVf MxhB4ekM/aqV0NGKoK/vZENXYRn6kbg4ECYW1T7Ti3KtFKbXd8fBEaV9SbMUbw+c+8 FyGukDfvWLsqAzQSkiwOmcWSgQLUWpoXBN5LXLPeCWkwmtYqDzNosR54emNlDai/Gk VDk0qC3VnYj94eGM2MbyLMYzhpS8n9HRWD1sM9h/7/o+2A5sMywO3yB8doO0uJm4ws 7GQH9QA78uMuMVlvQfqa0z62S4sF+ie4Q/erl5o+irT88vTBebKTRINczhKjBOvShv uW7dSXrD7WQsg== Received: from localhost (localhost [127.0.0.1]) by mail.u-boot.org (Postfix) with ESMTP id CB51169221; Fri, 9 Jan 2026 16:14:18 -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 Xu3Y3NZCR_0U; Fri, 9 Jan 2026 16:14:18 -0700 (MST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=u-boot.org; s=default; t=1768000454; bh=2ZKvIeZ3Qaw4MwBH4HE+nEwW+qUrWNuvSbCuF4gkKTY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=lxwhjQPqUDlJ4twVCtL2TwTfTL1Lu4fj01Yw/S2SsGyku9rzxyCZ70/lzGFFBN8tz epFsr2n/Qh97OcQot3tAxwORp5hc+cNd9/LOjxI2oeVnl3LbXMYh15m1NERFxV6oCI RHybDlcQ5uKDFbL9aGz4JDNWPJ4SSwe5/yb9l29BMBxEi7HSmvHpJJIpCMa1fVAbIU 4/wu3CQzr8LTb06xq6nDDWYNB5ZtoGuGbdrP+nwm4fZXrzUk3jEox9prYhOCggf2e1 j0eOPKt00mOqPvvbAY3U9OkzYnLJ7QxVcXbNB04okLfzlH+lejQn6gMzO5mmGuqKAw yIIeRi8T2QJow== Received: from u-boot.org (unknown [73.34.74.121]) by mail.u-boot.org (Postfix) with ESMTPSA id B686E5FF82; Fri, 9 Jan 2026 16:14:13 -0700 (MST) From: Simon Glass To: U-Boot Concept Date: Fri, 9 Jan 2026 16:11:38 -0700 Message-ID: <20260109231151.4056804-30-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: XX2UZ4MPZYCDD5Y4XE62347QL5OFZJI4 X-Message-ID-Hash: XX2UZ4MPZYCDD5Y4XE62347QL5OFZJI4 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 29/32] boot: pxe: Move overlay loading to pxe_load_files() 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 Move the overlay loading from label_process_fdt() to pxe_load_files(), grouping all file loading (kernel, initrd, FDT, overlays) in one place. The overlay applying remains in label_process_fdt() since it operates on the working FDT after it has been set up. Co-developed-by: Claude Opus 4.5 Signed-off-by: Simon Glass --- boot/pxe_utils.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/boot/pxe_utils.c b/boot/pxe_utils.c index 4bae830f353..e336b125716 100644 --- a/boot/pxe_utils.c +++ b/boot/pxe_utils.c @@ -515,10 +515,8 @@ static int label_process_fdt(struct pxe_context *ctx, struct pxe_label *label) if (label->kaslrseed) label_boot_kaslrseed(ctx); - if (IS_ENABLED(CONFIG_OF_LIBFDT_OVERLAY) && label->fdtoverlays.count) { - label_load_fdtoverlays(ctx, label); + if (IS_ENABLED(CONFIG_OF_LIBFDT_OVERLAY) && label->fdtoverlays.count) label_apply_fdtoverlays(ctx, label); - } return 0; } @@ -681,6 +679,9 @@ static int pxe_load_files(struct pxe_context *ctx, struct pxe_label *label, } } + if (IS_ENABLED(CONFIG_OF_LIBFDT_OVERLAY) && label->fdtoverlays.count) + label_load_fdtoverlays(ctx, label); + return 0; }