From patchwork Mon Dec 18 02:38:40 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: AKASHI Takahiro X-Patchwork-Id: 755454 Delivered-To: patch@linaro.org Received: by 2002:adf:b181:0:b0:336:6142:bf13 with SMTP id q1csp675201wra; Sun, 17 Dec 2023 18:39:17 -0800 (PST) X-Google-Smtp-Source: AGHT+IGPpwxh/pInFoU4Bc/3ZhXDGPj+5AopgwukGPwbLvw/y+zBVN/bU4wOCYDWPVboyCWHch/L X-Received: by 2002:a7b:c411:0:b0:40b:5433:17cd with SMTP id k17-20020a7bc411000000b0040b543317cdmr7813309wmi.21.1702867157020; Sun, 17 Dec 2023 18:39:17 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1702867157; cv=none; d=google.com; s=arc-20160816; b=r1Nuz0LkG6XhIf0Ntm4oPMsTBD1UmPyxdv0FH7QF7yoXg0Qx5uqf7vRhaP+SNswGIw rPU29VfKoTwDIpSd8JRJW8JYYAl2AWUHqZCST3yHqedWCtOTmMGFN9k053jnvnSxBxqY g6Feu1i5uwT9hU/YeAAZNn2cxth4S3VsKRTa8WwcU/Pz7i1pXHb8loHbvWTHq1UaKV7R hXlJJQvv+69KLOEIkfhBsInIdXPa/oaesMt0/6cUAYemM27uW3K58RMTLPWcDmI0xwxZ O1JftYMHVmXdzdCNqRNQDjDzcD72lV13i08xa+9yMaEpzV9Ga3oXu5mtfKDG+kWCOvEJ sp9Q== 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:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=SG3xnS2inJXNhiw+bFYo8TG93VPJM5qNAM//uYJAgkk=; fh=p8OTi/tJSbfUA0ykVxDxRCnpqUhQqJazFYHXT9edm5U=; b=jfZbGf/Ek02VSFHKSaFSmfE9JKx75S4qVtYJh7D3vSGKZCQLKxgrjj2s1G/YzyPdLb w/mT+3ftscbuXZU2YXGg6w4dHMactA4tc+4oyL1Oz8YD+5u4MKWhfzKkvNvVubgO4Gyi Uwjr5zQwdwfJghUfXAbsDaLP7gtJXFzl7/Y7b9og6SqSE67EnY8z80IleKtuVmXhhgmk lk6432jww6I5PtVo15J3KlY3T9C9F8OFovWf3d/dM1xhVuM1sPnBC+Wrrphon5jRCl72 rVL7mDyX9+lkbdQOmmRxsNqSol54MUUo6bt8f7o05RWQsPWrlls2pNn8Jl+NpcerlIr/ hcmw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Kevrj0Et; spf=pass (google.com: domain of u-boot-bounces@lists.denx.de designates 2a01:238:438b:c500:173d:9f52:ddab:ee01 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. [2a01:238:438b:c500:173d:9f52:ddab:ee01]) by mx.google.com with ESMTPS id g4-20020a05600c310400b0040c59766ff6si5918128wmo.23.2023.12.17.18.39.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 17 Dec 2023 18:39:16 -0800 (PST) Received-SPF: pass (google.com: domain of u-boot-bounces@lists.denx.de designates 2a01:238:438b:c500:173d:9f52:ddab:ee01 as permitted sender) client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Kevrj0Et; spf=pass (google.com: domain of u-boot-bounces@lists.denx.de designates 2a01:238:438b:c500:173d:9f52:ddab:ee01 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 3C63087DB5; Mon, 18 Dec 2023 03:39:14 +0100 (CET) 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="Kevrj0Et"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 6D02E87DCA; Mon, 18 Dec 2023 03:39:12 +0100 (CET) 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-pl1-x62c.google.com (mail-pl1-x62c.google.com [IPv6:2607:f8b0:4864:20::62c]) (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 2B29787DB2 for ; Mon, 18 Dec 2023 03:39:10 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=takahiro.akashi@linaro.org Received: by mail-pl1-x62c.google.com with SMTP id d9443c01a7336-1d3b3877fc1so2046315ad.1 for ; Sun, 17 Dec 2023 18:39:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1702867148; x=1703471948; darn=lists.denx.de; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=SG3xnS2inJXNhiw+bFYo8TG93VPJM5qNAM//uYJAgkk=; b=Kevrj0Et+XEQAYDak9m1IVKy4gbY2sfG5ixot1msPsUMbQFXZZgU8UyEbM6+bXe6L7 F+gSbvRx8Mtk+GxP55L93K15GiWmnNzp4tfEtegG1+II3D0QAplz8tT3DqFOK7UBuY9H wlxYdicuAZv4Okd2t83BNvh9hjBmfuiv4DSO8cTC7aPzSg97DzTAaq1Qt5c0h8j1wyOm cEJLlASVTC1kc6XwD0CChAnChne/9uxSorYf2vu1mgyU+FXgQuFQLWzXxX34T/tGvfCk hbF7oFaHeXOpcbfEguHPjzKYStNSJD6jvMxg14Y5Cwsc38qy+w+YUh3hzxwVmKSZCRTC tnPg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1702867148; x=1703471948; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=SG3xnS2inJXNhiw+bFYo8TG93VPJM5qNAM//uYJAgkk=; b=tVDGllDVaFn26gHQUhvV7S0a4ox3K9VZ8t58FhP9xzQu+Ka7BgtYE4nsuT47iXiWu3 Y9J3QEMvEJTXJMu7zyNqRLKCysK+s5GMQUpNG4ikoPUh4DDeKV31MyCpgBx3imHybgGJ NHNDd3h8U5RaZFj6QRKqBS/ynv6GbqJ597HQjT2mjOyoFEjA27ufgiTop3oK6yW3Rflu LkhhHVxPKtNNkmr8alpjdQT9TUW1vdULILWuQWqBoQHhpC+hna5E9RxfBYJUaLLJ0o03 aRzl6boAvgxsgoPn8xIwZ4SivxT0vMmGC1owZiPPdMly9TFnbcSSFBWJeA4VzB+Biz5v n6nQ== X-Gm-Message-State: AOJu0Yx9sI1P33Truz3f16zcQcCxVrQOQA0btCMADcFMK9qrLNCpB/ET RuOWF9UeT58XYDeXfxAjtG2oXQ== X-Received: by 2002:a17:903:2311:b0:1d0:7c59:2a4f with SMTP id d17-20020a170903231100b001d07c592a4fmr31860123plh.0.1702867148527; Sun, 17 Dec 2023 18:39:08 -0800 (PST) Received: from octopus.. ([2400:4050:c3e1:100:a448:a260:721d:a9f0]) by smtp.gmail.com with ESMTPSA id w24-20020a1709029a9800b001d316770044sm13754305plp.56.2023.12.17.18.39.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 17 Dec 2023 18:39:08 -0800 (PST) From: AKASHI Takahiro To: trini@konsulko.com, sjg@chromium.org, xypron.glpk@gmx.de, ilias.apalodimas@linaro.org Cc: u-boot@lists.denx.de, AKASHI Takahiro Subject: [PATCH v3 2/4] efi_loader: rename BOOTEFI_BOOTMGR to EFI_BOOTMGR Date: Mon, 18 Dec 2023 11:38:40 +0900 Message-Id: <20231218023842.281336-3-takahiro.akashi@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231218023842.281336-1-takahiro.akashi@linaro.org> References: <20231218023842.281336-1-takahiro.akashi@linaro.org> MIME-Version: 1.0 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.8 at phobos.denx.de X-Virus-Status: Clean At this point, EFI boot manager interfaces is fully independent from bootefi command. So just rename the configuration parameter. Signed-off-by: AKASHI Takahiro Reviewed-by: Simon Glass --- boot/Makefile | 2 +- cmd/Kconfig | 4 ++-- cmd/efidebug.c | 4 ++-- lib/efi_loader/Kconfig | 2 +- lib/efi_loader/Makefile | 2 +- test/boot/bootflow.c | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/boot/Makefile b/boot/Makefile index a90ebea5a867..bcd01cfc890c 100644 --- a/boot/Makefile +++ b/boot/Makefile @@ -34,7 +34,7 @@ obj-$(CONFIG_$(SPL_TPL_)BOOTMETH_CROS) += bootm.o bootm_os.o bootmeth_cros.o obj-$(CONFIG_$(SPL_TPL_)BOOTMETH_SANDBOX) += bootmeth_sandbox.o obj-$(CONFIG_$(SPL_TPL_)BOOTMETH_SCRIPT) += bootmeth_script.o ifdef CONFIG_$(SPL_TPL_)BOOTSTD_FULL -obj-$(CONFIG_BOOTEFI_BOOTMGR) += bootmeth_efi_mgr.o +obj-$(CONFIG_EFI_BOOTMGR) += bootmeth_efi_mgr.o obj-$(CONFIG_$(SPL_TPL_)EXPO) += bootflow_menu.o obj-$(CONFIG_$(SPL_TPL_)BOOTSTD) += bootflow_menu.o obj-$(CONFIG_$(SPL_TPL_)CEDIT) += cedit.o diff --git a/cmd/Kconfig b/cmd/Kconfig index 2c993496b70e..856ff9f5395d 100644 --- a/cmd/Kconfig +++ b/cmd/Kconfig @@ -374,7 +374,7 @@ config CMD_BOOTEFI_BINARY config CMD_BOOTEFI_BOOTMGR bool "UEFI Boot Manager command" - depends on BOOTEFI_BOOTMGR + depends on EFI_BOOTMGR default y help Select this option to enable the 'bootmgr' subcommand of 'bootefi'. @@ -2122,7 +2122,7 @@ config CMD_EFIDEBUG config CMD_EFICONFIG bool "eficonfig - provide menu-driven uefi variables maintenance interface" default y if !HAS_BOARD_SIZE_LIMIT - depends on BOOTEFI_BOOTMGR + depends on EFI_BOOTMGR select MENU help Enable the 'eficonfig' command which provides the menu-driven UEFI diff --git a/cmd/efidebug.c b/cmd/efidebug.c index e10fbf891a42..b4954258eeba 100644 --- a/cmd/efidebug.c +++ b/cmd/efidebug.c @@ -1410,7 +1410,7 @@ static __maybe_unused int do_efi_test_bootmgr(struct cmd_tbl *cmdtp, int flag, } static struct cmd_tbl cmd_efidebug_test_sub[] = { -#ifdef CONFIG_BOOTEFI_BOOTMGR +#ifdef CONFIG_EFI_BOOTMGR U_BOOT_CMD_MKENT(bootmgr, CONFIG_SYS_MAXARGS, 1, do_efi_test_bootmgr, "", ""), #endif @@ -1604,7 +1604,7 @@ U_BOOT_LONGHELP(efidebug, " - show UEFI memory map\n" "efidebug tables\n" " - show UEFI configuration tables\n" -#ifdef CONFIG_BOOTEFI_BOOTMGR +#ifdef CONFIG_EFI_BOOTMGR "efidebug test bootmgr\n" " - run simple bootmgr for test\n" #endif diff --git a/lib/efi_loader/Kconfig b/lib/efi_loader/Kconfig index 64f2f1cdd161..db5571de1d95 100644 --- a/lib/efi_loader/Kconfig +++ b/lib/efi_loader/Kconfig @@ -41,7 +41,7 @@ config EFI_BINARY_EXEC You may enable CMD_BOOTEFI_BINARY so that you can use bootefi command to do that. -config BOOTEFI_BOOTMGR +config EFI_BOOTMGR bool "UEFI Boot Manager" default y select BOOTMETH_GLOBAL if BOOTSTD diff --git a/lib/efi_loader/Makefile b/lib/efi_loader/Makefile index 0a2cb6e3c476..f882474bba6f 100644 --- a/lib/efi_loader/Makefile +++ b/lib/efi_loader/Makefile @@ -42,7 +42,7 @@ targets += initrddump.o endif obj-$(CONFIG_CMD_BOOTEFI_HELLO) += helloworld_efi.o -obj-$(CONFIG_BOOTEFI_BOOTMGR) += efi_bootmgr.o +obj-$(CONFIG_EFI_BOOTMGR) += efi_bootmgr.o obj-y += efi_boottime.o obj-y += efi_helper.o obj-$(CONFIG_EFI_HAVE_CAPSULE_SUPPORT) += efi_capsule.o diff --git a/test/boot/bootflow.c b/test/boot/bootflow.c index f3e5a839da47..57e48fe62694 100644 --- a/test/boot/bootflow.c +++ b/test/boot/bootflow.c @@ -374,7 +374,7 @@ static int bootflow_system(struct unit_test_state *uts) { struct udevice *bootstd, *dev; - if (!IS_ENABLED(CONFIG_BOOTEFI_BOOTMGR)) + if (!IS_ENABLED(CONFIG_EFI_BOOTMGR)) return -EAGAIN; ut_assertok(uclass_first_device_err(UCLASS_BOOTSTD, &bootstd)); ut_assertok(device_bind(bootstd, DM_DRIVER_GET(bootmeth_efi_mgr),