From patchwork Wed Aug 24 06:37:35 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahisa Kojima X-Patchwork-Id: 599725 Delivered-To: patch@linaro.org Received: by 2002:a05:7000:4388:0:0:0:0 with SMTP id w8csp2943066mae; Tue, 23 Aug 2022 23:37:45 -0700 (PDT) X-Google-Smtp-Source: AA6agR48Dnxg1EX/cycM9Z+qia7Bt3hdSlbcjQ53KXcyhmX7yu8GONpl1qetY2vgIWWodFF6VYt3 X-Received: by 2002:a17:906:9748:b0:73d:adc4:5f81 with SMTP id o8-20020a170906974800b0073dadc45f81mr2021007ejy.655.1661323065218; Tue, 23 Aug 2022 23:37:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1661323065; cv=none; d=google.com; s=arc-20160816; b=nW7WLoZX1lH+xji3ljbVkxn9cm5toQ6S2kNbYzwrpLDmnNvf+fcL8afvdu/TVs7VZX 9FK1EPpWcb5cTRnuw9TF/BZY7KZNpRg/Inyo2xTmGWuBl3S5vi1YAuPbyI3saJBWUkDG tC+807bgvcTzyCM2YI1yuSX6oYXTpbaTpnZEYElL5/Zzp7uOS1lmBhMeWZKZ+j7pHI4K 414IIUS6M7EPJjO3ypcHbVsKpF9b8lfqht9oisCmKQKrzjItTOMygfSWhkHFyl1LA48r hmD4lUyPEmHF5W6g0tGpFO70iv7vOAE5zuq6inv8DmNc38bXoeYQz5ABXeeoJjbCWJZ3 ZmgA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=woVjOTZOSq8URfVdDMS6rXWDpW5KI4BEWkYzhXYVAAw=; b=GhPekJ/AK2g4YzE14IhjIffzTPw17X/svv0teiRNcMXQbQCWc2AupcnHqCquwV5/gq qh0qiyjXjsJROrVseI76aDCweimB/vH6qUNKlaTbY5ZdIshUEV4fauAFyONb+g9KpD8w arYBMi7yLU54gz1Iaf6IgKma3fFB8r054EajE5PAgLi6TNAPqdm5DSoWOFvgvg2TSCAR pl6plCiYIVwpaZCRMser2ek67kRuNl+hbTyUlBz9dh/ZY87ghPrWEHFG3ZFX+NaX/3Sj Fb5dk3UgRaO0XiDr69tOQA7Hsy2rGzZscK4dhotbGwZg/jT1+NfT3T2/skH96x0737pZ 6XCw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="vYY5iOm/"; spf=pass (google.com: domain of u-boot-bounces@lists.denx.de designates 85.214.62.61 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from phobos.denx.de (phobos.denx.de. [85.214.62.61]) by mx.google.com with ESMTPS id jr16-20020a170906a99000b007313312730esi1219160ejb.85.2022.08.23.23.37.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 Aug 2022 23:37:45 -0700 (PDT) Received-SPF: pass (google.com: domain of u-boot-bounces@lists.denx.de designates 85.214.62.61 as permitted sender) client-ip=85.214.62.61; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="vYY5iOm/"; spf=pass (google.com: domain of u-boot-bounces@lists.denx.de designates 85.214.62.61 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 146BD84867; Wed, 24 Aug 2022 08:37:17 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="vYY5iOm/"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id B04098484B; Wed, 24 Aug 2022 08:37:02 +0200 (CEST) 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,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-pj1-x1029.google.com (mail-pj1-x1029.google.com [IPv6:2607:f8b0:4864:20::1029]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 8085884859 for ; Wed, 24 Aug 2022 08:36:55 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=masahisa.kojima@linaro.org Received: by mail-pj1-x1029.google.com with SMTP id f21so16127278pjt.2 for ; Tue, 23 Aug 2022 23:36:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=references:in-reply-to:message-id:date:subject:cc:to:from:from:to :cc; bh=woVjOTZOSq8URfVdDMS6rXWDpW5KI4BEWkYzhXYVAAw=; b=vYY5iOm/Kj0s9JkhYuVzGMPzqcLNUInAwv+128/RThnDTLQvHHEsp3a8hl080zPOVd YOlbxTiSZeMny2JCERjnoPPUwcxGVCIEykQP86g5J2QASIa9225x2fJIx66vDx5lEMiw 9NNTvCyIMssL+vSJ52QufyLsMHjPPimZOkiKvNQayAj4bE7XJyqKjQdwR+zKRR/6lL87 stwyi4MpViHZytFeaCmXavxA/+Jrw1F818ntalCSlRNCZTSXGCDnyoej251micJZj4uu zE7MTSdM6ZM5JXY5amZDgM+VFt3qjbEwHnoBnOYuH/0Faj0R1/1YNWhzDBZ0yFKDZ2Rp YJhQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=references:in-reply-to:message-id:date:subject:cc:to:from :x-gm-message-state:from:to:cc; bh=woVjOTZOSq8URfVdDMS6rXWDpW5KI4BEWkYzhXYVAAw=; b=TasDwFz1BW+vJqLaukxt0N9phHk1y8/LgsoNa7eZe18NImEjaxAZL+pliW9xTWPxvD oHtv6N8/Ngdc5gSpsR7ifIt7YuCzB3rfrbtaEFK2iFAo7bwKYpteAeGHIKID6ZOiZLMY t36pmapZ2dDHmfR8lJzWO6DUb6lzwuL+G+Da6guVlGRZsceWQ12p/ol54NFsYQZrTbxP yhdUCVlodN/DtzkawXmaAOicZk4EjZi2G5EDL0bKUDVqyM/pN5X975JWZREU1i19j2jd DWsbir+/sfFqQPEk8SlHnZJKI/AvV+o/Awo+2Uu+BO8cKy0JvoJ0LFSib88dzjRnBz4m MhaQ== X-Gm-Message-State: ACgBeo1K4qLYzDPZOJrlacdUP7yxlZiJ+SnuzoSbz82KJK6HzkxwiA0O QxF09oYl8bBn+9cxGeXa85ebdvU6vFC4Hw== X-Received: by 2002:a17:902:8643:b0:172:e067:d7ac with SMTP id y3-20020a170902864300b00172e067d7acmr14736272plt.164.1661323013363; Tue, 23 Aug 2022 23:36:53 -0700 (PDT) Received: from localhost.localdomain ([240d:1a:cf7:5800:82fa:5bff:fe4b:26b1]) by smtp.gmail.com with ESMTPSA id a26-20020aa7971a000000b0052d40c4c06esm6958761pfg.39.2022.08.23.23.36.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 Aug 2022 23:36:53 -0700 (PDT) From: Masahisa Kojima To: u-boot@lists.denx.de Cc: Heinrich Schuchardt , Ilias Apalodimas , Simon Glass , Takahiro Akashi , Mark Kettenis , Masahisa Kojima Subject: [PATCH v13 4/9] eficonfig: add "Delete Boot Option" menu entry Date: Wed, 24 Aug 2022 15:37:35 +0900 Message-Id: <20220824063740.5760-5-masahisa.kojima@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220824063740.5760-1-masahisa.kojima@linaro.org> References: <20220824063740.5760-1-masahisa.kojima@linaro.org> X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.6 at phobos.denx.de X-Virus-Status: Clean This commit adds the menu entry to delete the UEFI boot option. User moves the entry with UP/DOWN key, changes, then presses ENTER key to delete the selected boot option. Signed-off-by: Masahisa Kojima --- No update since v11 Changes in v11: - update function interface to show boot selection menu - support to delete the load option is not included in BootOrder No update since v9 Changes in v9: - add function comment Changes in v8: - function and structure prefix is changed to "eficonfig" Changes in v7: - to stay the boot order list after user delete the entry no update in v6: changes in v5: cmd/eficonfig.c | 71 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 71 insertions(+) diff --git a/cmd/eficonfig.c b/cmd/eficonfig.c index 22389b537f..537f3f2bbc 100644 --- a/cmd/eficonfig.c +++ b/cmd/eficonfig.c @@ -1716,6 +1716,76 @@ out: return ret; } +/** + * delete_boot_option() - delete selected boot option + * + * @boot_index: boot option index to delete + * Return: status code + */ +static efi_status_t delete_boot_option(u16 boot_index) +{ + u16 *bootorder; + u16 varname[9]; + efi_status_t ret; + unsigned int index; + efi_uintn_t num, size; + + efi_create_indexed_name(varname, sizeof(varname), + "Boot", boot_index); + ret = efi_set_variable_int(varname, &efi_global_variable_guid, + 0, 0, NULL, false); + if (ret != EFI_SUCCESS) { + log_err("delete boot option(%ls) failed\n", varname); + return ret; + } + + /* update BootOrder if necessary */ + bootorder = efi_get_var(u"BootOrder", &efi_global_variable_guid, &size); + if (!bootorder) + return EFI_SUCCESS; + + num = size / sizeof(u16); + if (!search_bootorder(bootorder, num, boot_index, &index)) + return EFI_SUCCESS; + + memmove(&bootorder[index], &bootorder[index + 1], + (num - index - 1) * sizeof(u16)); + size -= sizeof(u16); + ret = efi_set_variable_int(u"BootOrder", &efi_global_variable_guid, + EFI_VARIABLE_NON_VOLATILE | + EFI_VARIABLE_BOOTSERVICE_ACCESS | + EFI_VARIABLE_RUNTIME_ACCESS, + size, bootorder, false); + + return ret; +} + +/** + * eficonfig_process_delete_boot_option() - handler to delete boot option + * + * @data: pointer to the data for each entry + * Return: status code + */ +static efi_status_t eficonfig_process_delete_boot_option(void *data) +{ + efi_status_t ret; + unsigned int selected; + + while (1) { + ret = eficonfig_show_boot_selection(&selected); + if (ret == EFI_SUCCESS) + ret = delete_boot_option(selected); + + if (ret != EFI_SUCCESS) + break; + } + + /* to stay the parent menu */ + ret = (ret == EFI_ABORTED) ? EFI_NOT_READY : ret; + + return ret; +} + /** * eficonfig_init() - do required initialization for eficonfig command * @@ -1746,6 +1816,7 @@ static efi_status_t eficonfig_init(void) static const struct eficonfig_item maintenance_menu_items[] = { {"Add Boot Option", eficonfig_process_add_boot_option}, {"Edit Boot Option", eficonfig_process_edit_boot_option}, + {"Delete Boot Option", eficonfig_process_delete_boot_option}, {"Quit", eficonfig_process_quit}, };