From patchwork Thu Aug 28 22:16:52 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 169 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=1756419466; 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=YS2x5NTp77y4mrBjoDaMb0GCMgJYqjIxMUgbjVN3oxK4EgVCGD0G3Q2MN8Rza9P7o 0z4HT4pZPSc2Ng03LhCu4V/H2yP1IZsDwjJ9p9XQq+cfHq7lziK7dThCWE1VzNi3K3 QFJOz3zwyHiP7ZLlL4XWGENugM7ZttlfEPfTqIm2KdGrihWsXpNCXxXqIIidOup1qE dI+yj5xA7kp/tAJ7Da4A9M/NXATuh2vPEnQZYd3bi6ZCKpEMs79xT/zRzlPIkpsQ3g xNbsVpfin0DIvJ59a1xzWYYjKC3yQO9TYrzvHXm0w4U/JhM3wXNLJG1vEmhC67OOzN B1+UVD821JmmA== Received: from localhost (localhost [127.0.0.1]) by mail.u-boot.org (Postfix) with ESMTP id C11B967848 for ; Thu, 28 Aug 2025 16:17:46 -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 halvCM9wmIPi for ; Thu, 28 Aug 2025 16:17:46 -0600 (MDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=u-boot.org; s=default; t=1756419465; 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=uGe4OvLLhb7afc5j187TbPLcRmJrSiZULX7BrFbKEkf4+eJ+qiUBLFWZclDe1SVVX uADEM9FRtFvuytDnqq2NWY4rmRHghAbhvz35j97pWtm/4BU6TpSt6E0yCUt5uApeFf yT/7QvS+Wypf26D5xtoPzTnEgNQSZFpmP8wtI9iMGcaHHMnShwtyISlVGGtPb0NEge Pgsg2tyaj/Gjf8FUCal7ujYCn+rzbMRCf3G8RQXHhAprNabcxDla0wAeUzbKCwTXul HDJ/zjaauSVUOVW5sPb/OOctNm/Y5kRtrIOLRL3Q2wcNQN2js3YkLJW6lDHd7N584+ HkgUhhivzFSYA== Received: from mail.u-boot.org (localhost [127.0.0.1]) by mail.u-boot.org (Postfix) with ESMTP id CB5F96784C for ; Thu, 28 Aug 2025 16:17:45 -0600 (MDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=u-boot.org; s=default; t=1756419462; bh=fauBvHrsGF9bDc17erUbGoBiMQyBUQjIKHvlv3LmFK4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=tlImnI1sEGbg5UklbDZcVhNhqhkMhvl8nA+PeuzLKmgjYNL7O0sKaxg5OpjNKK40/ OQFaJfP4KKuSM02+S76lFVNLI82Hp0/Kfl8hu/XlnCDHSKMrqzH+QeHXSFJs7cvhVC a20In2t6FBiO4a/SwQq3Il/bNvdAyk/U2PtJVfvwmtHtVwVErWnyBbb3C/q0iabkRa 88QGgBxw1izQ7IJHLU/yUk3MGIFEu/KcKFUHQ+evSv/xe4T8o9/mCIgmh8qE3eVivR 6Oct5FvWkr5SULlHN9f9cbDRKEOjHNkrx3zr2HIghL78QOnKyYAGwClfKkfvuu06FG LLjVux7qYWPmQ== Received: from localhost (localhost [127.0.0.1]) by mail.u-boot.org (Postfix) with ESMTP id E7BA5675BB; Thu, 28 Aug 2025 16:17:42 -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 jh61CBAYX2Kl; Thu, 28 Aug 2025 16:17:42 -0600 (MDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=u-boot.org; s=default; t=1756419462; bh=u943VtJ9YXyyqmaq1S1YkUnB0nLNpPTl8BQ5ynsxxg4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=XCsRBXLri7U/HjdC81HW69KFDBu7m/+q0gHMNhjTxgnS20I1sVW+20yuAy59OD4PL zFJGKeuxXRkV6iS7FbIO7QKAKpuoeIcoS4Z5aICHL6mznlQfrKV3cgTArmKFLt1Zxd YuWkCRCqOI0nrU1pm0x6COIypYwyHFlk17uO5XAU2jRlxNxNwuvGv3vZIgzh7zp2Jx nM/tf02xg4tfvStnrSBTIVLVLXOYTdboP43XcHcB1btFEbDt7ixTc0T+otKwN0LaqO KSOUZ00OsiVWMGhCbk90bfHgAXR0piJpJAbilxZd3as92l7Ssf1gKJhdAccTUHl2fv Wl1nSM3g7iTXw== Received: from u-boot.org (unknown [73.34.74.121]) by mail.u-boot.org (Postfix) with ESMTPSA id 64A546779A; Thu, 28 Aug 2025 16:17:42 -0600 (MDT) From: Simon Glass To: U-Boot Concept Date: Thu, 28 Aug 2025 16:16:52 -0600 Message-ID: <20250828221713.3218908-7-sjg@u-boot.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250828221713.3218908-1-sjg@u-boot.org> References: <20250828221713.3218908-1-sjg@u-boot.org> MIME-Version: 1.0 Message-ID-Hash: IVFLGXHXV5UKAISGB2HZJGBSJJK55G4K X-Message-ID-Hash: IVFLGXHXV5UKAISGB2HZJGBSJJK55G4K 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 6/8] bootstd: 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) {