Skip to content

Commit

Permalink
efi/libstub: Re-enable command line initrd loading for x86
Browse files Browse the repository at this point in the history
Commit:

  cf6b836 ("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 <ardb@kernel.org>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Cc: linux-efi@vger.kernel.org
  • Loading branch information
Ard Biesheuvel authored and Ingo Molnar committed Apr 25, 2020
1 parent 4353dd3 commit 4da0b2b
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions drivers/firmware/efi/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 4da0b2b

Please sign in to comment.