From patchwork Sat Sep 25 00:30:46 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1532593 X-Patchwork-Delegate: xypron.glpk@gmx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: 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=TYAZKlB1; 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=) 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 ozlabs.org (Postfix) with ESMTPS id 4HGVYT2qc5z9t4b for ; Sat, 25 Sep 2021 10:45:17 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 3050B834F2; Sat, 25 Sep 2021 02:44:32 +0200 (CEST) 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="TYAZKlB1"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id B665C8352E; Sat, 25 Sep 2021 02:32:40 +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=-3.6 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-oi1-x22b.google.com (mail-oi1-x22b.google.com [IPv6:2607:f8b0:4864:20::22b]) (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 367AE8351F for ; Sat, 25 Sep 2021 02:31:32 +0200 (CEST) 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-oi1-x22b.google.com with SMTP id s24so14264872oij.8 for ; Fri, 24 Sep 2021 17:31:32 -0700 (PDT) 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=nyJqKFJ8s3AAOc84xJXs+a9YJwRqF9X7MWNDvESLfa0=; b=TYAZKlB1IXcEtKgN103/ohM+F1R/RjY0HbK1Y/EBszQcjH0cagsjTAO9Rq57YQmJPK FhqNGtyPxuWiAU0xq0FvayvYCDFZgJqdhzRNB8nijuYRncYxo+xTO9y8fowNph60IPC+ qD8B7JQoAPY4g94jAGtzBU9vyIcUIwmfRV1cg= 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=nyJqKFJ8s3AAOc84xJXs+a9YJwRqF9X7MWNDvESLfa0=; b=bUnILrMXD/oNLid3L1ShAWPXjH6cVd1oxwk0ePT+b9FYc5tjnZ1jF2v7geZOB68k0n 5cptKF8FcJCxwNv+JYa2zj0M5XtfVF59AWunZeA1+HaRnjhBvPyvBArcW10Xjcl+l6hd zOlT9kwH+WGbsE9hCGLtys6FyjktYoJHsgbuDBgD4e4nIX94yrr/8w7wawujq8f0QIcC BPuMLQUaVMUp9H+7OuuiEMiu1RgY1bC8Kb3DCowVG7ZxOPUNzumL7RZhhRXOa3Yh5nTp Gnhl8VzGDqtuIEA3HgHEjYcLiPnWgFl+e3uOiPHs5hTe3coW6ILqS9cP+DTVsjFQvfOR 9gRg== X-Gm-Message-State: AOAM531rfcJvvdvcvk4lLHostcsSetY09BbyYRm/ANEop42tFsbh5PXV KxcwuZwqj53aI3RUIFEedWcsRom9pm/h4w== X-Google-Smtp-Source: ABdhPJyWIIQ6F+kcF4uZVCCZbaMhlfZ5I3Jwl7wpKZ5ivGbhR7Zu225QjxQSXmdRYT0dtZb84Auflg== X-Received: by 2002:a05:6808:1586:: with SMTP id t6mr3670320oiw.83.1632529889476; Fri, 24 Sep 2021 17:31:29 -0700 (PDT) Received: from kiwi.bld.corp.google.com (c-67-190-101-114.hsd1.co.comcast.net. [67.190.101.114]) by smtp.gmail.com with ESMTPSA id y83sm2491462oia.47.2021.09.24.17.31.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Sep 2021 17:31:29 -0700 (PDT) From: Simon Glass To: U-Boot Mailing List Cc: Heinrich Schuchardt , Bin Meng , Christian Melki , Tom Rini , Ilias Apalodimas , Simon Glass , Alexander Graf Subject: [PATCH v2 30/39] efi: Fix ll_boot_init() operation with the app Date: Fri, 24 Sep 2021 18:30:46 -0600 Message-Id: <20210925003055.759305-15-sjg@chromium.org> X-Mailer: git-send-email 2.33.0.685.g46640cef36-goog In-Reply-To: <20210925003055.759305-1-sjg@chromium.org> References: <20210925003055.759305-1-sjg@chromium.org> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 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.2 at phobos.denx.de X-Virus-Status: Clean 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 --- (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 c781789e367..6d682b02b05 100644 --- a/include/init.h +++ b/include/init.h @@ -15,7 +15,7 @@ #include /* 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