From patchwork Tue Sep 2 15:21:40 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 179 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=1756826550; bh=a9ZGPuy+qKlfbZjSk86lzHv5FFttsagJPE23XjFgFRI=; 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=Lj9ayzCEAHSwUJa5whjYyffDqDeK+pq2OYThA7uyvvco7j4rX/GEFOVU33fsr9Yy8 n5M24+mgTa5MATIzzdPU0dzi5oL4LVLdt+Cs6cPT0jvGOU/b06TLROiJVRj6furY5K 15jniwcv2MTmYSYYT2HlkVM0duA4Me3Rn31aytDdA0yAiseRUgdPGJByCVd+6jC7ik INcmSufIbkja2lOAKIYopDGmrTkDrZ0KEj2ro4IuQVYySNZS+l4K7CyXEelsFGgWcQ vpfc6HAJUCv6FcVszSQbk/aL413B6E9+NBqeU0dIGDP/iglkw2rK78tTtXl2IPjaHb Jc2df6EDyN2VQ== Received: from localhost (localhost [127.0.0.1]) by mail.u-boot.org (Postfix) with ESMTP id DDDB6678D3 for ; Tue, 2 Sep 2025 09:22:30 -0600 (MDT) 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 bxNdBM5emXNJ for ; Tue, 2 Sep 2025 09:22:30 -0600 (MDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=u-boot.org; s=default; t=1756826550; bh=a9ZGPuy+qKlfbZjSk86lzHv5FFttsagJPE23XjFgFRI=; 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=Lj9ayzCEAHSwUJa5whjYyffDqDeK+pq2OYThA7uyvvco7j4rX/GEFOVU33fsr9Yy8 n5M24+mgTa5MATIzzdPU0dzi5oL4LVLdt+Cs6cPT0jvGOU/b06TLROiJVRj6furY5K 15jniwcv2MTmYSYYT2HlkVM0duA4Me3Rn31aytDdA0yAiseRUgdPGJByCVd+6jC7ik INcmSufIbkja2lOAKIYopDGmrTkDrZ0KEj2ro4IuQVYySNZS+l4K7CyXEelsFGgWcQ vpfc6HAJUCv6FcVszSQbk/aL413B6E9+NBqeU0dIGDP/iglkw2rK78tTtXl2IPjaHb Jc2df6EDyN2VQ== Received: from mail.u-boot.org (localhost [127.0.0.1]) by mail.u-boot.org (Postfix) with ESMTP id CB720678E9 for ; Tue, 2 Sep 2025 09:22:30 -0600 (MDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=u-boot.org; s=default; t=1756826547; bh=fauBvHrsGF9bDc17erUbGoBiMQyBUQjIKHvlv3LmFK4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=miKVrr0GYXlGLul8+CrxfLikAf/KqNitjkkspjtB5LsrEVgc7tQvEgDJ7yd2SPRLp d/hlN6CpvTshMTb7V53Qyq19YlD5L5uF2B3dE2IX8LumVGYYEfjbAzG8vs4DwZCYJh Zxnygmsrlxpoy1nbpaWG0WexfDWIhxXj/X6Kov2AAY+drIdNmKGioMl9t+0IIIAXTU 1BsKDQmqNEaWnVomuvZ/q8YogUm1vzxD5lThfj8PGMNUi6v5UnhxnLyVRXSVpgeX8T U2pP48cplGQzzuX4rBH4zYkXoiDe0I5ze0mWVv8GGbjA53G/cl2rlcaUuwXkeUyoM/ FKC0pcdZ0y2Ug== Received: from localhost (localhost [127.0.0.1]) by mail.u-boot.org (Postfix) with ESMTP id B45F167867; Tue, 2 Sep 2025 09:22:27 -0600 (MDT) 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 RbL_FwyRiOII; Tue, 2 Sep 2025 09:22:27 -0600 (MDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=u-boot.org; s=default; t=1756826546; bh=u943VtJ9YXyyqmaq1S1YkUnB0nLNpPTl8BQ5ynsxxg4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ldOGCPILBglXGmlUX2RTneB1faiaaQwht2KLlPLq4c1KO9Sv18GrXW+51+iZ02A9U rbP1bjls3fReV+vYpXTuETxwrVvbdTecpj3Ki2fqfiZap0N+UkJzSnWRZ2sBQrtDNq +xmF2otpUnuMr8Gscugew6UuxD1lafRoKJK8lWgQlB9COrz+8S6wXjJMrjudnZ974G MRP1siMknA4d9rZ184F6xQB8MsQ/ofqir7zr0Ftzc0K0zBPNaB8y+4fMc7Znf51PbK uKzcASKCiaXnsu1T9vMD5z9qD1mxZkPT1rNgfqfnfwS17Iz7f6Ssu0gx3KxF9HntyM 3RfLEpIgjVPvg== Received: from u-boot.org (unknown [73.34.74.121]) by mail.u-boot.org (Postfix) with ESMTPSA id 7FC435FE1B; Tue, 2 Sep 2025 09:22:26 -0600 (MDT) From: Simon Glass To: U-Boot Concept Date: Tue, 2 Sep 2025 09:21:40 -0600 Message-ID: <20250902152158.2285264-9-sjg@u-boot.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250902152158.2285264-1-sjg@u-boot.org> References: <20250902152158.2285264-1-sjg@u-boot.org> MIME-Version: 1.0 Message-ID-Hash: EPIPCYJXHVKZAHUA7UHDI5KNDBUCMQBN X-Message-ID-Hash: EPIPCYJXHVKZAHUA7UHDI5KNDBUCMQBN 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 X-Mailman-Version: 3.3.10 Precedence: list Subject: [Concept] [PATCH 08/18] boot: Use the new label finder in bootflow_menu_add() 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 Make use of bootflow_guess_label() to get the label for a menu, since it provides more information for the EFI app. Signed-off-by: Simon Glass --- boot/bootflow_menu.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/boot/bootflow_menu.c b/boot/bootflow_menu.c index 2f08fa54081..5e0e365d12b 100644 --- a/boot/bootflow_menu.c +++ b/boot/bootflow_menu.c @@ -124,7 +124,6 @@ int bootflow_menu_add(struct expo *exp, struct bootflow *bflow, int seq, { struct menu_priv *priv = exp->priv; char str[2], *label, *key; - struct udevice *media; struct scene *scn; const char *name; uint preview_id; @@ -144,11 +143,7 @@ int bootflow_menu_add(struct expo *exp, struct bootflow *bflow, int seq, if (!key) return log_msg_ret("key", -ENOMEM); - media = dev_get_parent(bflow->dev); - if (device_get_uclass_id(media) == UCLASS_MASS_STORAGE) - name = "usb"; - else - name = media->name; + name = bootflow_guess_label(bflow); label = strdup(name); if (!label) {