From patchwork Wed Sep 23 16:14:02 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 254205 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-14.3 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 50A3EC2D0A8 for ; Wed, 23 Sep 2020 16:15:11 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 0FBF8208E4 for ; Wed, 23 Sep 2020 16:15:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1600877711; bh=HORO4TYQh0n5xyJmt9DuvWW1jd+OsLPkVApF2GDMtMA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=pPZUi9tparzJIUJkBZMaoW0bV7m7TRTPI5l5b/1tqft+pvnBYSaDylrUMCm38TjPS c09Rkz1Hj2Ye2uFuVCgh5x1rvP1NC68rI8hetNQIqBofx3P2e6so/eAue7LPr/yrut 3CA6u9D2jQ2FApW4for/6rwINzGpma2PRkMOOSGs= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726762AbgIWQPK (ORCPT ); Wed, 23 Sep 2020 12:15:10 -0400 Received: from mail.kernel.org ([198.145.29.99]:42116 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726794AbgIWQPH (ORCPT ); Wed, 23 Sep 2020 12:15:07 -0400 Received: from e123331-lin.nice.arm.com (lfbn-nic-1-188-42.w2-15.abo.wanadoo.fr [2.15.37.42]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 2F8B520936; Wed, 23 Sep 2020 16:15:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1600877707; bh=HORO4TYQh0n5xyJmt9DuvWW1jd+OsLPkVApF2GDMtMA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=s+JX9BZmY3oa4Efk4QNgu/1Y0UsFiXoR2rxIgMwvrG83RSBLLrghnTVwu3Y6Ml1E7 hLGz+myix28LLB6TXIwThXuPtKY2JSBoKCq04ZQnQoY/2e0UAAY2Npk0GhQp4QBRTa TWMBm0AUVztwNwYVgmJJ/oMq2NkRU8VIEGbSHIGI= From: Ard Biesheuvel To: linux-kernel@vger.kernel.org Cc: linux-efi@vger.kernel.org, Ard Biesheuvel , Matthew Garrett , Peter Jones , Kees Cook , Anton Vorontsov , Colin Cross , Tony Luck Subject: [PATCH 5/7] efi: remove some false dependencies on CONFIG_EFI_VARS Date: Wed, 23 Sep 2020 18:14:02 +0200 Message-Id: <20200923161404.17811-6-ardb@kernel.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200923161404.17811-1-ardb@kernel.org> References: <20200923161404.17811-1-ardb@kernel.org> Precedence: bulk List-ID: X-Mailing-List: linux-efi@vger.kernel.org Remove some false dependencies on CONFIG_EFI_VARS, which only controls the creation of the sysfs entries, whereas the underlying functionality that these modules rely on is enabled unconditionally when CONFIG_EFI is set. Signed-off-by: Ard Biesheuvel --- drivers/firmware/efi/Kconfig | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/firmware/efi/Kconfig b/drivers/firmware/efi/Kconfig index dd8d10817bdf..80f5c67e3638 100644 --- a/drivers/firmware/efi/Kconfig +++ b/drivers/firmware/efi/Kconfig @@ -137,7 +137,6 @@ config EFI_GENERIC_STUB_INITRD_CMDLINE_LOADER config EFI_BOOTLOADER_CONTROL tristate "EFI Bootloader Control" - depends on EFI_VARS default n help This module installs a reboot hook, such that if reboot() is @@ -281,7 +280,7 @@ config EFI_EARLYCON config EFI_CUSTOM_SSDT_OVERLAYS bool "Load custom ACPI SSDT overlay from an EFI variable" - depends on EFI_VARS && ACPI + depends on EFI && ACPI default ACPI_TABLE_UPGRADE help Allow loading of an ACPI SSDT overlay from an EFI variable specified