From: Ard Biesheuvel Date: Sat, 25 Apr 2020 10:22:04 +0000 (+0200) Subject: efi/libstub: Re-enable command line initrd loading for x86 X-Git-Tag: v5.15~3781^2~3 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=4da0b2b7e67524cc206067865666899bc02e1cb0;p=platform%2Fkernel%2Flinux-starfive.git efi/libstub: Re-enable command line initrd loading for x86 Commit: cf6b83664895a5 ("efi/libstub: Make initrd file loader configurable") inadvertently disabled support on x86 for loading an initrd passed via the initrd= option on the kernel command line. Add X86 to the newly introduced Kconfig option's title and depends declarations, so it gets enabled by default, as before. Signed-off-by: Ard Biesheuvel Signed-off-by: Ingo Molnar Cc: linux-efi@vger.kernel.org --- diff --git a/drivers/firmware/efi/Kconfig b/drivers/firmware/efi/Kconfig index 4e788dd..6b38f9e 100644 --- a/drivers/firmware/efi/Kconfig +++ b/drivers/firmware/efi/Kconfig @@ -125,8 +125,8 @@ config EFI_ARMSTUB_DTB_LOADER this option is necessary. config EFI_GENERIC_STUB_INITRD_CMDLINE_LOADER - bool "Enable the command line initrd loader" - depends on EFI_GENERIC_STUB + bool "Enable the command line initrd loader" if !X86 + depends on EFI_STUB && (EFI_GENERIC_STUB || X86) default y help Select this config option to add support for the initrd= command