Messages in this thread Patch in this message | | | Date | Tue, 17 Nov 2020 18:03:09 -0000 | From | "tip-bot2 for Geert Uytterhoeven" <> | Subject | [tip: efi/core] efi/libstub: EFI_GENERIC_STUB_INITRD_CMDLINE_LOADER should not default to yes |
| |
The following commit has been merged into the efi/core branch of tip:
Commit-ID: 6edcf9dc2e1aff3aa1f5a69ee420fb30dd0e968a Gitweb: https://git.kernel.org/tip/6edcf9dc2e1aff3aa1f5a69ee420fb30dd0e968a Author: Geert Uytterhoeven <geert+renesas@glider.be> AuthorDate: Wed, 28 Oct 2020 16:34:02 +01:00 Committer: Ard Biesheuvel <ardb@kernel.org> CommitterDate: Thu, 29 Oct 2020 00:36:13 +01:00
efi/libstub: EFI_GENERIC_STUB_INITRD_CMDLINE_LOADER should not default to yes
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 <geert+renesas@glider.be> Link: https://lore.kernel.org/r/20201028153402.1736103-1-geert+renesas@glider.be Signed-off-by: Ard Biesheuvel <ardb@kernel.org> --- 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 36ec1f7..b452cfa 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
| |