diff options
| author | Geert Uytterhoeven <geert+renesas@glider.be> | 2020-10-28 16:34:02 +0100 |
|---|---|---|
| committer | Ard Biesheuvel <ardb@kernel.org> | 2020-10-29 00:36:13 +0100 |
| commit | 6edcf9dc2e1aff3aa1f5a69ee420fb30dd0e968a (patch) | |
| tree | f8580daabec875bca052975f735e7846c0fdafc0 | |
| parent | efi/x86: Only copy the compressed kernel image in efi_relocate_kernel() (diff) | |
| download | linux-6edcf9dc2e1aff3aa1f5a69ee420fb30dd0e968a.tar.xz linux-6edcf9dc2e1aff3aa1f5a69ee420fb30dd0e968a.zip | |
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>
| -rw-r--r-- | drivers/firmware/efi/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/firmware/efi/Kconfig b/drivers/firmware/efi/Kconfig index 36ec1f718893..b452cfa2100b 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 |