Message ID | 20211229185759.1432518-9-sjg@chromium.org |
---|---|
State | Accepted, archived |
Commit | 9079486461c369df3f5a1d8bfb5003f8769554dc |
Delegated to: | Heinrich Schuchardt |
Headers | show
Return-Path: <u-boot-bounces@lists.denx.de> X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=ClwDcWJE; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=<UNKNOWN>) Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4JPLLm1p6bz9s0r for <incoming@patchwork.ozlabs.org>; Thu, 30 Dec 2021 06:00:00 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id B71B0830AB; Wed, 29 Dec 2021 19:59:28 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="ClwDcWJE"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id C99D682F73; Wed, 29 Dec 2021 19:58:52 +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.7 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-wm1-x335.google.com (mail-wm1-x335.google.com [IPv6:2a00:1450:4864:20::335]) (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 A7A65830AD for <u-boot@lists.denx.de>; Wed, 29 Dec 2021 19:58:47 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-wm1-x335.google.com with SMTP id n14-20020a7bcbce000000b00332f4abf43fso7379023wmi.0 for <u-boot@lists.denx.de>; Wed, 29 Dec 2021 10:58:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=uw4lw1krsnLL0A3chlneglEb/88+zLVairxH3rrS488=; b=ClwDcWJEI6uggSys407p8iropJgWELPOadsVFbBhceHq/vGIIdjt/Vc7ETYpSIUQbK JbMD3RkiXNtpor2gPcFbsxgZYUkisHe/NDiOnGu3DFnUPir0QPo4f4rVGeYrqRURLytp YL6HluQ+zTwa32Wk7N7qc00BhUTPpelSOP6m4= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=uw4lw1krsnLL0A3chlneglEb/88+zLVairxH3rrS488=; b=V/Juo4+UPTg7amcIB+wqX0oZAx2+CXXmE/hBdt4Qvhi6R8cL3t68lAMOMFDqnTmYCo ngl5o9BIoCWbSY/7AmPOYFxQfEQWvszqdhF0LMespgxS/kUFJXhk+KAbd3cTW+eWAv7p apwpOl2vdzcuF9qJjTrv3ymPjfIFmF9tvWH2Z3foynmYNfl8EXp5ejwOM5loIm7a8mju DCXyg9iYKJabn1E2FwCXb1PedpeNLorQZRot1h7HjJhcvg/Aru1GioUsJrHprMYLMgtf K5QhUweVg3oTplV/k5Gwg+fbz08U4nByUSbt6UyA9w4hXDDdEmSBXjlG0eRyI7ncJEFt Ciqg== X-Gm-Message-State: AOAM532QOTeOPnaCiPYMcwE4qJ6DzNI+AEJhTvnwL8EObX6D+a/WduFU DRFbDvjR+LhVRYAFyS7w55heF5XOuDXvOA== X-Google-Smtp-Source: ABdhPJwIZeulSh2Ivc0wgmGvtqVKZnqpPKMEF7UP40jguMdvGzq4pNSH+fSVcFSLWrhmimpHwyWVDw== X-Received: by 2002:a05:600c:4ed2:: with SMTP id g18mr22989930wmq.41.1640804327064; Wed, 29 Dec 2021 10:58:47 -0800 (PST) Received: from sjg1.roam.corp.google.com (bba170906.alshamil.net.ae. [217.165.245.218]) by smtp.gmail.com with ESMTPSA id j13sm26846884wmq.11.2021.12.29.10.58.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 29 Dec 2021 10:58:46 -0800 (PST) From: Simon Glass <sjg@chromium.org> To: U-Boot Mailing List <u-boot@lists.denx.de> Cc: Heinrich Schuchardt <xypron.glpk@gmx.de>, Tom Rini <trini@konsulko.com>, Ilias Apalodimas <ilias.apalodimas@linaro.org>, Bin Meng <bmeng.cn@gmail.com>, Christian Melki <christian.melki@t2data.com>, Simon Glass <sjg@chromium.org>, Alexander Graf <agraf@csgraf.de> Subject: [PATCH v8 09/25] efi: Fix ll_boot_init() operation with the app Date: Wed, 29 Dec 2021 11:57:43 -0700 Message-Id: <20211229185759.1432518-9-sjg@chromium.org> X-Mailer: git-send-email 2.34.1.448.ga2b2bfdf31-goog In-Reply-To: <20211229185759.1432518-1-sjg@chromium.org> References: <20211229185759.1432518-1-sjg@chromium.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.38 Precedence: list List-Id: U-Boot discussion <u-boot.lists.denx.de> List-Unsubscribe: <https://lists.denx.de/options/u-boot>, <mailto:u-boot-request@lists.denx.de?subject=unsubscribe> List-Archive: <https://lists.denx.de/pipermail/u-boot/> List-Post: <mailto:u-boot@lists.denx.de> List-Help: <mailto:u-boot-request@lists.denx.de?subject=help> List-Subscribe: <https://lists.denx.de/listinfo/u-boot>, <mailto:u-boot-request@lists.denx.de?subject=subscribe> Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" <u-boot-bounces@lists.denx.de> X-Virus-Scanned: clamav-milter 0.103.2 at phobos.denx.de X-Virus-Status: Clean |
Series |
efi: Improvements to U-Boot running on top of UEFI
|
expand
|
On 12/29/21 19:57, Simon Glass wrote: > 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> Reviewed-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
diff --git a/include/init.h b/include/init.h index f2cd46dead0..dcd682c1bf6 100644 --- a/include/init.h +++ b/include/init.h @@ -14,8 +14,11 @@ #include <linux/types.h> -/* Avoid using CONFIG_EFI_STUB directly as we may boot from other loaders */ -#ifdef CONFIG_EFI_STUB +/* + * In case of the EFI app the UEFI firmware provides the low-level + * initialisation. + */ +#ifdef CONFIG_EFI #define ll_boot_init() false #else #include <asm/global_data.h>
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> --- Changes in v8: - Tidy up the comment as well include/init.h | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)