linux-efi.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH v2] efi/libstub: EFI_GENERIC_STUB_INITRD_CMDLINE_LOADER should not default to yes
@ 2020-10-28 15:34 Geert Uytterhoeven
  2020-10-28 15:54 ` Ard Biesheuvel
  0 siblings, 1 reply; 2+ messages in thread
From: Geert Uytterhoeven @ 2020-10-28 15:34 UTC (permalink / raw)
  To: Ard Biesheuvel, Ingo Molnar, Arvind Sankar
  Cc: linux-efi, linux-kernel, Geert Uytterhoeven

EFI_GENERIC_STUB_INITRD_CMDLINE_LOADER is deprecated, so it should not
be enabled by default.

In light of commit 4da0b2b7e67524cc ("efi/libstub: Re-enable command
line initrd loading for x86"), keep the default for X86.

Fixes: cf6b83664895a5c7 ("efi/libstub: Make initrd file loader configurable")
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
Hopefully kernelCI has updated its QEMU firmware since v1 was posted...

v2:
  - Rebase on top of commit d7071743db31b4f6 ("RISC-V: Add EFI stub
    support.") in v5.10-rc1.
---
 drivers/firmware/efi/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/firmware/efi/Kconfig b/drivers/firmware/efi/Kconfig
index 36ec1f7188934ca4..b452cfa2100b401c 100644
--- a/drivers/firmware/efi/Kconfig
+++ b/drivers/firmware/efi/Kconfig
@@ -122,7 +122,7 @@ config EFI_ARMSTUB_DTB_LOADER
 config EFI_GENERIC_STUB_INITRD_CMDLINE_LOADER
 	bool "Enable the command line initrd loader" if !X86
 	depends on EFI_STUB && (EFI_GENERIC_STUB || X86)
-	default y
+	default y if X86
 	depends on !RISCV
 	help
 	  Select this config option to add support for the initrd= command
-- 
2.25.1


^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH v2] efi/libstub: EFI_GENERIC_STUB_INITRD_CMDLINE_LOADER should not default to yes
  2020-10-28 15:34 [PATCH v2] efi/libstub: EFI_GENERIC_STUB_INITRD_CMDLINE_LOADER should not default to yes Geert Uytterhoeven
@ 2020-10-28 15:54 ` Ard Biesheuvel
  0 siblings, 0 replies; 2+ messages in thread
From: Ard Biesheuvel @ 2020-10-28 15:54 UTC (permalink / raw)
  To: Geert Uytterhoeven
  Cc: Ingo Molnar, Arvind Sankar, linux-efi, Linux Kernel Mailing List

On Wed, 28 Oct 2020 at 16:34, Geert Uytterhoeven
<geert+renesas@glider.be> wrote:
>
> EFI_GENERIC_STUB_INITRD_CMDLINE_LOADER is deprecated, so it should not
> be enabled by default.
>
> In light of commit 4da0b2b7e67524cc ("efi/libstub: Re-enable command
> line initrd loading for x86"), keep the default for X86.
>
> Fixes: cf6b83664895a5c7 ("efi/libstub: Make initrd file loader configurable")
> Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
> ---
> Hopefully kernelCI has updated its QEMU firmware since v1 was posted...

Yes it has!

>
> v2:
>   - Rebase on top of commit d7071743db31b4f6 ("RISC-V: Add EFI stub
>     support.") in v5.10-rc1.

Thanks, I'll queue this up

> ---
>  drivers/firmware/efi/Kconfig | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/firmware/efi/Kconfig b/drivers/firmware/efi/Kconfig
> index 36ec1f7188934ca4..b452cfa2100b401c 100644
> --- a/drivers/firmware/efi/Kconfig
> +++ b/drivers/firmware/efi/Kconfig
> @@ -122,7 +122,7 @@ config EFI_ARMSTUB_DTB_LOADER
>  config EFI_GENERIC_STUB_INITRD_CMDLINE_LOADER
>         bool "Enable the command line initrd loader" if !X86
>         depends on EFI_STUB && (EFI_GENERIC_STUB || X86)
> -       default y
> +       default y if X86
>         depends on !RISCV
>         help
>           Select this config option to add support for the initrd= command
> --
> 2.25.1
>

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2020-10-28 23:52 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-10-28 15:34 [PATCH v2] efi/libstub: EFI_GENERIC_STUB_INITRD_CMDLINE_LOADER should not default to yes Geert Uytterhoeven
2020-10-28 15:54 ` Ard Biesheuvel

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).