diff options
| author |   Ard Biesheuvel <ardb@kernel.org> | 2020-04-25 12:22:04 +0200 |
|---|---|---|
| committer |   Ingo Molnar <mingo@kernel.org> | 2020-04-25 12:26:32 +0200 |
| commit | 4da0b2b7e67524cc206067865666899bc02e1cb0 (patch) | |
| tree | 20bcb0864119a87207a999efc23f312424e0f484 /drivers/firmware/efi/Kconfig | |
| parent | Merge tag 'efi-next' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi into efi/core (diff) | |
| download | linux-dev-4da0b2b7e67524cc206067865666899bc02e1cb0.tar.xz linux-dev-4da0b2b7e67524cc206067865666899bc02e1cb0.zip | |
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 <ardb@kernel.org>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Cc: linux-efi@vger.kernel.org
Diffstat (limited to 'drivers/firmware/efi/Kconfig')
| -rw-r--r-- | drivers/firmware/efi/Kconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/firmware/efi/Kconfig b/drivers/firmware/efi/Kconfig index 4e788dd55b03..6b38f9e5d203 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 |