Received: by 2002:a05:6a10:9e8c:0:0:0:0 with SMTP id y12csp228856pxx; Thu, 29 Oct 2020 00:43:08 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzI12P27Qa3FTsSU9OHfJD1g2/vwdoe+BdDy4mT/ueeafl/b1HRUvuSUe8zU7Tr5Ezy7Qv8 X-Received: by 2002:a17:906:2e0e:: with SMTP id n14mr2743639eji.120.1603957388414; Thu, 29 Oct 2020 00:43:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1603957388; cv=none; d=google.com; s=arc-20160816; b=hgNOnrVt+ZfC+SDAFm0AZ7VAsAAmf9Sw5xIbX0czdoy8nEjlJa/m2Xy15qoH1gUXPn rR6bO+6IuJcCwK+g3tmVlaOP8oNgPyk9QCqFZppl1lWji/Bba+thb2LlB8d224wr18EH TsED7XPz6PlgQebZ/HVSpm2Z3Fm/pzk3BRkGRuKqM7W7hrXE4ZWksSqMyv7ZUeXeLrZo 3e0fbJkGom7S6A5qu2UF11nQ5kmz5UIJIPqF0MXH+KpWJd7cTslqRbxsUM29dgLPIvIk RcmQn2DJQvEOUR+CsRjfHJhZEsiU4rnCI6NPuSu6og9kvlJ8cCo3pPjXimeQ5bjudYdA 1m5w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from; bh=oqp/D8JPR9XIR2dRmbVhswTA43oUnqIy9tutETM2pVM=; b=d+TESOmW/+UbhhUWD4pgVQpDCNcEdpjaws3NnMzzq4Y2EGiGiQaTVAO9jC9aun84c3 aQ2L0+cj5ULzqCQ5IuTq8K8CAHvgqJT702MWUMrKEIyx7WB+fC/WjCJCFq/ucDBGwwwG ArdnN260+0jMYqiLsW5Lk0Pin/d0PR5GYrZGdSVwfJYXN+9yLPBixLW1s1cUFAf5JEZv iHRoE6JiBnlcRBgfGwf6gC90VhiR9oLtdM8+pVuqJB6NFatigwWu5AmlSFXaHK0pXrQ5 1voEOB7EUrNff3ckDBMX5n3MIaTzx3anZrP3UWMgNRYvGLOn1WH1Nwgbg02Ex8K5l4xW QxBA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id h12si1507245edr.102.2020.10.29.00.42.46; Thu, 29 Oct 2020 00:43:08 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389008AbgJ1WkV (ORCPT + 99 others); Wed, 28 Oct 2020 18:40:21 -0400 Received: from newton.telenet-ops.be ([195.130.132.45]:59184 "EHLO newton.telenet-ops.be" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2389006AbgJ1WkU (ORCPT ); Wed, 28 Oct 2020 18:40:20 -0400 Received: from michel.telenet-ops.be (michel.telenet-ops.be [IPv6:2a02:1800:110:4::f00:18]) by newton.telenet-ops.be (Postfix) with ESMTPS id 4CLt0F16TZzMwnqb for ; Wed, 28 Oct 2020 16:34:05 +0100 (CET) Received: from ramsan.of.borg ([84.195.186.194]) by michel.telenet-ops.be with bizsmtp id lTa42300Q4C55Sk06Ta4mw; Wed, 28 Oct 2020 16:34:04 +0100 Received: from rox.of.borg ([192.168.97.57]) by ramsan.of.borg with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.93) (envelope-from ) id 1kXnSe-000pOh-6j; Wed, 28 Oct 2020 16:34:04 +0100 Received: from geert by rox.of.borg with local (Exim 4.93) (envelope-from ) id 1kXnSd-007HeQ-O3; Wed, 28 Oct 2020 16:34:03 +0100 From: Geert Uytterhoeven To: Ard Biesheuvel , Ingo Molnar , Arvind Sankar Cc: linux-efi@vger.kernel.org, linux-kernel@vger.kernel.org, Geert Uytterhoeven Subject: [PATCH v2] efi/libstub: EFI_GENERIC_STUB_INITRD_CMDLINE_LOADER should not default to yes Date: Wed, 28 Oct 2020 16:34:02 +0100 Message-Id: <20201028153402.1736103-1-geert+renesas@glider.be> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org EFI_GENERIC_STUB_INITRD_CMDLINE_LOADER is deprecated, so it should not be enabled by default. In light of commit 4da0b2b7e67524cc ("efi/libstub: Re-enable command line initrd loading for x86"), keep the default for X86. Fixes: cf6b83664895a5c7 ("efi/libstub: Make initrd file loader configurable") Signed-off-by: Geert Uytterhoeven --- Hopefully kernelCI has updated its QEMU firmware since v1 was posted... v2: - Rebase on top of commit d7071743db31b4f6 ("RISC-V: Add EFI stub support.") in v5.10-rc1. --- drivers/firmware/efi/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/firmware/efi/Kconfig b/drivers/firmware/efi/Kconfig index 36ec1f7188934ca4..b452cfa2100b401c 100644 --- a/drivers/firmware/efi/Kconfig +++ b/drivers/firmware/efi/Kconfig @@ -122,7 +122,7 @@ config EFI_ARMSTUB_DTB_LOADER config EFI_GENERIC_STUB_INITRD_CMDLINE_LOADER bool "Enable the command line initrd loader" if !X86 depends on EFI_STUB && (EFI_GENERIC_STUB || X86) - default y + default y if X86 depends on !RISCV help Select this config option to add support for the initrd= command -- 2.25.1