[v6,11/27] efi: Fix ll_boot_init() operation with the app

Message ID	20211217194059.858580-8-sjg@chromium.org
State	Superseded
Delegated to:	Heinrich Schuchardt
Headers	show Return-Path: <u-boot-bounces@lists.denx.de> From: Simon Glass <sjg@chromium.org> To: U-Boot Mailing List <u-boot@lists.denx.de> Cc: Bin Meng <bmeng.cn@gmail.com>, Heinrich Schuchardt <xypron.glpk@gmx.de>, Tom Rini <trini@konsulko.com>, Ilias Apalodimas <ilias.apalodimas@linaro.org>, Christian Melki <christian.melki@t2data.com>, Simon Glass <sjg@chromium.org>, Alexander Graf <agraf@csgraf.de> Subject: [PATCH v6 11/27] efi: Fix ll_boot_init() operation with the app Date: Fri, 17 Dec 2021 12:40:43 -0700 Message-Id: <20211217194059.858580-8-sjg@chromium.org> In-Reply-To: <20211217194059.858580-1-sjg@chromium.org> References: <20211217194059.858580-1-sjg@chromium.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: list Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" <u-boot-bounces@lists.denx.de>
Series	efi: Improvements to U-Boot running on top of UEFI \| expand [v6,00/27] efi: Improvements to U-Boot running on top of UEFI [v6,01/27] efi: Rename UCLASS_EFI and IF_TYPE_EFI [v6,02/27] efi: Add EFI uclass for media [v6,03/27] efi: Add a media/block driver for EFI block devices [v6,04/27] efi: Locate all block devices in the app [v6,05/27] efi: serial: Support arrow keys [v6,06/27] x86: Allow booting a kernel from the EFI app [v6,07/27] x86: Don't process the kernel command line unless enabled [v6,08/27] x86: efi: Add room for the binman definition in the dtb [v6,09/27] efi: Drop device_path from struct efi_priv [v6,10/27] efi: Add comments to struct efi_priv [v6,11/27] efi: Fix ll_boot_init() operation with the app [v6,12/27] efi: Add a few comments to the stub [v6,13/27] efi: Share struct efi_priv between the app and stub code [v6,14/27] efi: Move exit_boot_services into a function [v6,15/27] efi: Check for failure when initing the app [v6,16/27] efi: Mention that efi_info_get() is only used in the stub [v6,17/27] efi: Show when allocated pages are used [v6,18/27] efi: Allow easy selection of serial-only operation [v6,19/27] x86: efi: Update efi_get_next_mem_desc() to avoid needing a map [v6,20/27] efi: Support the efi command in the app [v6,21/27] x86: efi: Show the system-table revision [v6,22/27] x86: efi: Don't set up global_data again with EFI [v6,23/27] x86: efi: Tweak the code used for the 64-bit EFI app [v6,24/27] x86: efi: Round out the link script for 64-bit EFI [v6,25/27] x86: efi: Don't use the 64-bit link script for the EFI app [v6,26/27] x86: efi: Set the correct link flags for the 64-bit EFI app [v6,27/27] efi: Build the 64-bit app properly

Message ID

20211217194059.858580-8-sjg@chromium.org

State

Superseded

Delegated to:

Heinrich Schuchardt

Headers

From: Simon Glass <sjg@chromium.org>
To: U-Boot Mailing List <u-boot@lists.denx.de>
Cc: Bin Meng <bmeng.cn@gmail.com>, Heinrich Schuchardt <xypron.glpk@gmx.de>,
 Tom Rini <trini@konsulko.com>,
 Ilias Apalodimas <ilias.apalodimas@linaro.org>,
 Christian Melki <christian.melki@t2data.com>,
 Simon Glass <sjg@chromium.org>, Alexander Graf <agraf@csgraf.de>
Subject: [PATCH v6 11/27] efi: Fix ll_boot_init() operation with the app
Date: Fri, 17 Dec 2021 12:40:43 -0700
Message-Id: <20211217194059.858580-8-sjg@chromium.org>
In-Reply-To: <20211217194059.858580-1-sjg@chromium.org>
References: <20211217194059.858580-1-sjg@chromium.org>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Precedence: list
Errors-To: u-boot-bounces@lists.denx.de
Sender: "U-Boot" <u-boot-bounces@lists.denx.de>

Series

efi: Improvements to U-Boot running on top of UEFI | expand

Commit Message

Simon Glass Dec. 17, 2021, 7:40 p.m. UTC

This should return false when the EFI app is running, since UEFI has done
the required low-level init. Fix it.

Signed-off-by: Simon Glass <sjg@chromium.org>
---

(no changes since v1)

 include/init.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/init.h b/include/init.h
index f2cd46dead0..3ce7b8b95bd 100644
--- a/include/init.h
+++ b/include/init.h
@@ -15,7 +15,7 @@ 
 #include <linux/types.h>
 
 /* Avoid using CONFIG_EFI_STUB directly as we may boot from other loaders */
-#ifdef CONFIG_EFI_STUB
+#ifdef CONFIG_EFI
 #define ll_boot_init()	false
 #else
 #include <asm/global_data.h>

[v6,11/27] efi: Fix ll_boot_init() operation with the app

Commit Message

Patch