From: Ard Biesheuvel <ardb@kernel.org>
To: linux-efi@vger.kernel.org, mingo@kernel.org
Cc: Ard Biesheuvel <ardb@kernel.org>
Subject: [PATCH] efi/libstub: Re-enable command line initrd loading for x86
Date: Sat, 25 Apr 2020 12:22:04 +0200 [thread overview]
Message-ID: <20200425102204.2622-1-ardb@kernel.org> (raw)
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>
---
Ingo,
Mind taking this directly into tip/efi/core? Thanks.
drivers/firmware/efi/Kconfig | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/firmware/efi/Kconfig b/drivers/firmware/efi/Kconfig
index 4e788dd55b03..9e6ff0743bc1 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
--
2.17.1
next reply other threads:[~2020-04-25 10:22 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-25 10:22 Ard Biesheuvel [this message]
2020-04-25 10:26 ` [PATCH] efi/libstub: Re-enable command line initrd loading for x86 Ingo Molnar
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200425102204.2622-1-ardb@kernel.org \
--to=ardb@kernel.org \
--cc=linux-efi@vger.kernel.org \
--cc=mingo@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.