Skip to content

Commit 963fabf

Browse files
committed
efi: efivars: limit availability to X86 builds
CONFIG_EFI_VARS controls the code that exposes EFI variables via sysfs entries, which was deprecated before support for non-Intel architectures was added to EFI. So let's limit its availability to Intel architectures for the time being, and hopefully remove it entirely in the not too distant future. While at it, let's remove the module alias so that the module is no longer loaded automatically. Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
1 parent 5ee70cd commit 963fabf

3 files changed

Lines changed: 5 additions & 11 deletions

File tree

Documentation/arm/uefi.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ makes it possible for the kernel to support additional features:
2323
For actually enabling [U]EFI support, enable:
2424

2525
- CONFIG_EFI=y
26-
- CONFIG_EFI_VARS=y or m
26+
- CONFIG_EFIVAR_FS=y or m
2727

2828
The implementation depends on receiving information about the UEFI environment
2929
in a Flattened Device Tree (FDT) - so is only available with CONFIG_OF.

drivers/firmware/efi/Kconfig

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,15 @@ menu "EFI (Extensible Firmware Interface) Support"
44

55
config EFI_VARS
66
tristate "EFI Variable Support via sysfs"
7-
depends on EFI
7+
depends on EFI && (X86 || IA64)
88
default n
99
help
1010
If you say Y here, you are able to get EFI (Extensible Firmware
1111
Interface) variable information via sysfs. You may read,
1212
write, create, and destroy EFI variables through this interface.
13-
14-
Note that using this driver in concert with efibootmgr requires
15-
at least test release version 0.5.0-test3 or later, which is
16-
available from:
17-
<http://linux.dell.com/efibootmgr/testing/efibootmgr-0.5.0-test3.tar.gz>
18-
19-
Subsequent efibootmgr releases may be found at:
20-
<http://github.com/vathpela/efibootmgr>
13+
Note that this driver is only retained for compatibility with
14+
legacy users: new users should use the efivarfs filesystem
15+
instead.
2116

2217
config EFI_ESRT
2318
bool

drivers/firmware/efi/efivars.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ MODULE_AUTHOR("Matt Domsch <Matt_Domsch@Dell.com>");
2222
MODULE_DESCRIPTION("sysfs interface to EFI Variables");
2323
MODULE_LICENSE("GPL");
2424
MODULE_VERSION(EFIVARS_VERSION);
25-
MODULE_ALIAS("platform:efivars");
2625

2726
static LIST_HEAD(efivar_sysfs_list);
2827

0 commit comments

Comments
 (0)