korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-26 05:34:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

efi: libstub: Always enable initrd command line loader and bump version

Browse Source 
In preparation for setting a cross-architecture baseline for EFI boot
support, remove the Kconfig option that permits the command line initrd
loader to be disabled. Also, bump the minor version so that any image
built with the new version can be identified as supporting this.

Acked-by: Leif Lindholm <quic_llindhol@quicinc.com>
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
This commit is contained in:
Ard Biesheuvel 2022-11-29 18:23:08 +01:00
parent a89474aaf7
commit e346bebbd3
3 changed files with 2 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
drivers/firmware/efi/Kconfig
View File

@ -106,21 +106,6 @@ config EFI_ARMSTUB_DTB_LOADER
functionality for bootloaders that do not have such support
this option is necessary.
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 if X86
help
Select this config option to add support for the initrd= command
line parameter, allowing an initrd to be loaded into memory that
resides on a file system backed by an implementation of
EFI_SIMPLE_FILE_SYSTEM_PROTOCOL.
This method has been superseded by the simpler LoadFile2 based
initrd loading method, but the initrd= loader is retained as it
can be used from the UEFI Shell or other generic loaders that
don't implement the Linux specific LoadFile2 method.
config EFI_BOOTLOADER_CONTROL
tristate "EFI Bootloader Control"
select UCS2_STRING

3
drivers/firmware/efi/libstub/efi-stub-helper.c
View File

@ -538,8 +538,7 @@ efi_status_t efi_load_initrd_cmdline(efi_loaded_image_t *image,
unsigned long soft_limit,
unsigned long hard_limit)
{
if (!IS_ENABLED(CONFIG_EFI_GENERIC_STUB_INITRD_CMDLINE_LOADER) ||
(IS_ENABLED(CONFIG_X86) && image == NULL))
if (image == NULL)
return EFI_UNSUPPORTED;
return handle_cmdline_files(image, L"initrd=", sizeof(L"initrd=") - 2,

2
include/linux/pe.h
View File

@ -29,7 +29,7 @@
* handover_offset and xloadflags fields in the bootparams structure.
*/
#define LINUX_EFISTUB_MAJOR_VERSION 0x1
#define LINUX_EFISTUB_MINOR_VERSION 0x0
#define LINUX_EFISTUB_MINOR_VERSION 0x1
#define MZ_MAGIC 0x5a4d /* "MZ" */