Received: by 2002:a05:6902:102b:0:0:0:0 with SMTP id x11csp3678009ybt; Tue, 23 Jun 2020 08:12:25 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwpswMkQBH3pN7nxopQy0WdJomAobT3alRzkulwqVCuIf0E45wWpE+8i72AgKLmmYj9YMjL X-Received: by 2002:a17:907:2052:: with SMTP id pg18mr19705079ejb.513.1592925145381; Tue, 23 Jun 2020 08:12:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1592925145; cv=none; d=google.com; s=arc-20160816; b=vuB1WW7p/vT0qu1HXtgdcCLmW7IRzSVhmDdp0KorcsMnHubpP7X4RYU9ljIOff21d3 Um/AnJK1epVF5udr4DpC89gqwJWI3iXY5ihq9vM4yuohJuRRoioj6Ozr/KL2j9KEtLq0 aapMn6dHxo9FfAiqtB76SvM/CL5I9dNsDCzm9q1Z35iA7MlW7O06+SJzNzqB0cdo6sv1 +MpCw1lz7N8pBc2MLCRA2ZaNr8pLKImUqXTZkQpn1+SdL53bEx4K/p+6WgHW6wWvU+UO VxuS3+LT8EHcYrqltF5lKE7V9H9qiYQNowHi6LK5aaNSgSkOeBizqYHKsDclTnqeBL8h cjZQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from; bh=kQm5FrlptpyRtM69u2/A7PEMHAitz7y41+0gaU1dhnE=; b=IyMdF7QicX3jPXfxNWVTkBgq75dHhkh7tStICyHArnfi7IgcUi0HkzE2+AzYpzhYdS Q/VCgrIiTZwcpYcFLa7U1XrOcnLPrQT6Nhe0DqQJNbN8Yfoo0D3xZiI6qnWUFR9XKZYL pXKNkaNXhvf8kQm5IPch/wxv5gH2Y+1/zu5eMjTinfu4aQwVTwjwfMq/JaFVQvp+g2Dl XMQqSzUDGVivkIWVMyk86dysV51n+l5apnHk0MxDMdLt4E4fe3FxDeLQlDTRFvv16JKR V9SE6www2LdeAeqVR3RJP4FH2Xdj4zR1UgMTztUgP7QlVxGyRU1nKDOkMKK5WXSeeTk/ UAZA== 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 se20si11903919ejb.165.2020.06.23.08.12.01; Tue, 23 Jun 2020 08:12:25 -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 S1732925AbgFWPJn (ORCPT + 99 others); Tue, 23 Jun 2020 11:09:43 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60752 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732862AbgFWPJm (ORCPT ); Tue, 23 Jun 2020 11:09:42 -0400 Received: from laurent.telenet-ops.be (laurent.telenet-ops.be [IPv6:2a02:1800:110:4::f00:19]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 88EABC061573 for ; Tue, 23 Jun 2020 08:09:42 -0700 (PDT) Received: from ramsan ([IPv6:2a02:1810:ac12:ed20:26:93a1:ff06:f8b0]) by laurent.telenet-ops.be with bizsmtp id uf9h220034qCYS801f9hoj; Tue, 23 Jun 2020 17:09:41 +0200 Received: from rox.of.borg ([192.168.97.57]) by ramsan with esmtp (Exim 4.90_1) (envelope-from ) id 1jnkYO-0007jy-TP; Tue, 23 Jun 2020 17:09:40 +0200 Received: from geert by rox.of.borg with local (Exim 4.90_1) (envelope-from ) id 1jnkYO-0008Nr-Qd; Tue, 23 Jun 2020 17:09:40 +0200 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] efi/libstub: EFI_GENERIC_STUB_INITRD_CMDLINE_LOADER should not default to yes Date: Tue, 23 Jun 2020 17:09:35 +0200 Message-Id: <20200623150935.32181-1-geert+renesas@glider.be> X-Mailer: git-send-email 2.17.1 Sender: linux-kernel-owner@vger.kernel.org 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 --- 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 e6fc022bc87e03ab..56055c61904e49f4 100644 --- a/drivers/firmware/efi/Kconfig +++ b/drivers/firmware/efi/Kconfig @@ -127,7 +127,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 help Select this config option to add support for the initrd= command line parameter, allowing an initrd that resides on the same volume -- 2.17.1