Skip to contentSkip to conversation

efi/libstub: Re-enable command line initrd loading for x86

PATCH In review Ard Biesheuvel 2 participants 2 messages Apr 25, 2020 EFI

lore
Share & tools
lore

Ard Biesheuvel

author maintainer
#0 lore raw

PATCH 1/1 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.

---

Ingo,

Mind taking this directly into tip/efi/core? Thanks.

 drivers/firmware/efi/Kconfig | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/firmware/efi/Kconfig +2 -2
index 4e788dd55b03..9e6ff0743bc1 100644
@@ -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
Signature · 1 line
2.17.1
#1 lore raw
Quoted 10 lines · Ard Biesheuvel

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.

Quoted 6 lines

---

Ingo,

Mind taking this directly into tip/efi/core? Thanks.

Sure, done!

Thanks,

Ingo