Drop secure boot Kconfig symbols too

Commit cc1db7f34788 ("Updates for secure boot") and commit 8e8de459e7ba
("Forgot to remove dropped patches") removed the patches that added
Kconfig symbols EFI_SIGNATURE_LIST_PARSER and LOAD_UEFI_KEYS. Remove
these symbols from the configuration generation directory and from the
shipped .config files.

Signed-off-by: Paul Bolle <pebolle@tiscali.nl>

18 files changed, 0 insertions, 32 deletions

diff --git a/configs/fedora/generic/CONFIG_EFI_SIGNATURE_LIST_PARSER b/configs/fedora/generic/CONFIG_EFI_SIGNATURE_LIST_PARSER
deleted file mode 100644
index 4c9e08c11..000000000
--- a/configs/fedora/generic/CONFIG_EFI_SIGNATURE_LIST_PARSER
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_EFI_SIGNATURE_LIST_PARSER is not set
diff --git a/configs/fedora/generic/CONFIG_LOAD_UEFI_KEYS b/configs/fedora/generic/CONFIG_LOAD_UEFI_KEYS
deleted file mode 100644
index de1de5c25..000000000
--- a/configs/fedora/generic/CONFIG_LOAD_UEFI_KEYS
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_LOAD_UEFI_KEYS is not set
diff --git a/configs/fedora/generic/x86/CONFIG_EFI_SIGNATURE_LIST_PARSER b/configs/fedora/generic/x86/CONFIG_EFI_SIGNATURE_LIST_PARSER
deleted file mode 100644
index 9671a3c39..000000000
--- a/configs/fedora/generic/x86/CONFIG_EFI_SIGNATURE_LIST_PARSER
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_EFI_SIGNATURE_LIST_PARSER=y
diff --git a/configs/fedora/generic/x86/CONFIG_LOAD_UEFI_KEYS b/configs/fedora/generic/x86/CONFIG_LOAD_UEFI_KEYS
deleted file mode 100644
index 22502e981..000000000
--- a/configs/fedora/generic/x86/CONFIG_LOAD_UEFI_KEYS
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_LOAD_UEFI_KEYS=y
diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config
index ded0235e0..980f7b1b5 100644
--- a/kernel-aarch64-debug.config
+++ b/kernel-aarch64-debug.config
@@ -1637,7 +1637,6 @@ CONFIG_EFI_ARMSTUB_DTB_LOADER=y
 # CONFIG_EFI_CAPSULE_LOADER is not set
 CONFIG_EFI_PARTITION=y
 CONFIG_EFI_PGT_DUMP=y
-# CONFIG_EFI_SIGNATURE_LIST_PARSER is not set
 # CONFIG_EFI_TEST is not set
 CONFIG_EFIVAR_FS=y
 CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE=y
@@ -3039,7 +3038,6 @@ CONFIG_LIRC=y
 # CONFIG_LLC2 is not set
 CONFIG_LLC=m
 CONFIG_LMP91000=m
-# CONFIG_LOAD_UEFI_KEYS is not set
 CONFIG_LOCALVERSION=""
 # CONFIG_LOCALVERSION_AUTO is not set
 CONFIG_LOCKD=m
diff --git a/kernel-aarch64.config b/kernel-aarch64.config
index 3b5a17509..6ec58c4c9 100644
--- a/kernel-aarch64.config
+++ b/kernel-aarch64.config
@@ -1628,7 +1628,6 @@ CONFIG_EFI_ARMSTUB_DTB_LOADER=y
 # CONFIG_EFI_CAPSULE_LOADER is not set
 CONFIG_EFI_PARTITION=y
 # CONFIG_EFI_PGT_DUMP is not set
-# CONFIG_EFI_SIGNATURE_LIST_PARSER is not set
 # CONFIG_EFI_TEST is not set
 CONFIG_EFIVAR_FS=y
 CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE=y
@@ -3020,7 +3019,6 @@ CONFIG_LIRC=y
 # CONFIG_LLC2 is not set
 CONFIG_LLC=m
 CONFIG_LMP91000=m
-# CONFIG_LOAD_UEFI_KEYS is not set
 CONFIG_LOCALVERSION=""
 # CONFIG_LOCALVERSION_AUTO is not set
 CONFIG_LOCKD=m
diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config
index dcc00466e..887c47eb1 100644
--- a/kernel-armv7hl-debug.config
+++ b/kernel-armv7hl-debug.config
@@ -1720,7 +1720,6 @@ CONFIG_EFI_ARMSTUB_DTB_LOADER=y
 # CONFIG_EFI_CAPSULE_LOADER is not set
 CONFIG_EFI_PARTITION=y
 CONFIG_EFI_PGT_DUMP=y
-# CONFIG_EFI_SIGNATURE_LIST_PARSER is not set
 # CONFIG_EFI_TEST is not set
 CONFIG_EFIVAR_FS=y
 CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE=y
@@ -3173,7 +3172,6 @@ CONFIG_LIRC=y
 # CONFIG_LLC2 is not set
 CONFIG_LLC=m
 CONFIG_LMP91000=m
-# CONFIG_LOAD_UEFI_KEYS is not set
 CONFIG_LOCALVERSION=""
 # CONFIG_LOCALVERSION_AUTO is not set
 CONFIG_LOCKD=m
diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config
index a06581ecd..25d155ae5 100644
--- a/kernel-armv7hl-lpae-debug.config
+++ b/kernel-armv7hl-lpae-debug.config
@@ -1633,7 +1633,6 @@ CONFIG_EFI_ARMSTUB_DTB_LOADER=y
 # CONFIG_EFI_CAPSULE_LOADER is not set
 CONFIG_EFI_PARTITION=y
 CONFIG_EFI_PGT_DUMP=y
-# CONFIG_EFI_SIGNATURE_LIST_PARSER is not set
 # CONFIG_EFI_TEST is not set
 CONFIG_EFIVAR_FS=y
 CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE=y
@@ -3035,7 +3034,6 @@ CONFIG_LIRC=y
 # CONFIG_LLC2 is not set
 CONFIG_LLC=m
 CONFIG_LMP91000=m
-# CONFIG_LOAD_UEFI_KEYS is not set
 CONFIG_LOCALVERSION=""
 # CONFIG_LOCALVERSION_AUTO is not set
 CONFIG_LOCKD=m
diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config
index 6d32c001b..5640fba45 100644
--- a/kernel-armv7hl-lpae.config
+++ b/kernel-armv7hl-lpae.config
@@ -1625,7 +1625,6 @@ CONFIG_EFI_ARMSTUB_DTB_LOADER=y
 # CONFIG_EFI_CAPSULE_LOADER is not set
 CONFIG_EFI_PARTITION=y
 # CONFIG_EFI_PGT_DUMP is not set
-# CONFIG_EFI_SIGNATURE_LIST_PARSER is not set
 # CONFIG_EFI_TEST is not set
 CONFIG_EFIVAR_FS=y
 CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE=y
@@ -3017,7 +3016,6 @@ CONFIG_LIRC=y
 # CONFIG_LLC2 is not set
 CONFIG_LLC=m
 CONFIG_LMP91000=m
-# CONFIG_LOAD_UEFI_KEYS is not set
 CONFIG_LOCALVERSION=""
 # CONFIG_LOCALVERSION_AUTO is not set
 CONFIG_LOCKD=m
diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config
index e76531563..ee1c53e34 100644
--- a/kernel-armv7hl.config
+++ b/kernel-armv7hl.config
@@ -1712,7 +1712,6 @@ CONFIG_EFI_ARMSTUB_DTB_LOADER=y
 # CONFIG_EFI_CAPSULE_LOADER is not set
 CONFIG_EFI_PARTITION=y
 # CONFIG_EFI_PGT_DUMP is not set
-# CONFIG_EFI_SIGNATURE_LIST_PARSER is not set
 # CONFIG_EFI_TEST is not set
 CONFIG_EFIVAR_FS=y
 CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE=y
@@ -3155,7 +3154,6 @@ CONFIG_LIRC=y
 # CONFIG_LLC2 is not set
 CONFIG_LLC=m
 CONFIG_LMP91000=m
-# CONFIG_LOAD_UEFI_KEYS is not set
 CONFIG_LOCALVERSION=""
 # CONFIG_LOCALVERSION_AUTO is not set
 CONFIG_LOCKD=m
diff --git a/kernel-i686-debug.config b/kernel-i686-debug.config
index d484f53f5..0cef8c0c6 100644
--- a/kernel-i686-debug.config
+++ b/kernel-i686-debug.config
@@ -1453,7 +1453,6 @@ CONFIG_EFI_PARTITION=y
 CONFIG_EFI_PCDP=y
 CONFIG_EFI_PGT_DUMP=y
 CONFIG_EFI_RUNTIME_MAP=y
-CONFIG_EFI_SIGNATURE_LIST_PARSER=y
 CONFIG_EFI_STUB=y
 # CONFIG_EFI_TEST is not set
 CONFIG_EFIVAR_FS=y
@@ -2897,7 +2896,6 @@ CONFIG_LIRC=y
 # CONFIG_LLC2 is not set
 CONFIG_LLC=m
 CONFIG_LMP91000=m
-CONFIG_LOAD_UEFI_KEYS=y
 CONFIG_LOCALVERSION=""
 # CONFIG_LOCALVERSION_AUTO is not set
 CONFIG_LOCKD=m
diff --git a/kernel-i686.config b/kernel-i686.config
index 0a9f203ee..c675db0ba 100644
--- a/kernel-i686.config
+++ b/kernel-i686.config
@@ -1443,7 +1443,6 @@ CONFIG_EFI_PARTITION=y
 CONFIG_EFI_PCDP=y
 # CONFIG_EFI_PGT_DUMP is not set
 CONFIG_EFI_RUNTIME_MAP=y
-CONFIG_EFI_SIGNATURE_LIST_PARSER=y
 CONFIG_EFI_STUB=y
 # CONFIG_EFI_TEST is not set
 CONFIG_EFIVAR_FS=y
@@ -2877,7 +2876,6 @@ CONFIG_LIRC=y
 # CONFIG_LLC2 is not set
 CONFIG_LLC=m
 CONFIG_LMP91000=m
-CONFIG_LOAD_UEFI_KEYS=y
 CONFIG_LOCALVERSION=""
 # CONFIG_LOCALVERSION_AUTO is not set
 CONFIG_LOCKD=m
diff --git a/kernel-ppc64le-debug.config b/kernel-ppc64le-debug.config
index 0401d39a7..e7446b0ee 100644
--- a/kernel-ppc64le-debug.config
+++ b/kernel-ppc64le-debug.config
@@ -1324,7 +1324,6 @@ CONFIG_EEPROM_LEGACY=m
 CONFIG_EEPROM_MAX6875=m
 CONFIG_EFI_PARTITION=y
 CONFIG_EFI_PGT_DUMP=y
-# CONFIG_EFI_SIGNATURE_LIST_PARSER is not set
 # CONFIG_EFI_TEST is not set
 # CONFIG_EFS_FS is not set
 CONFIG_EHEA=m
@@ -2676,7 +2675,6 @@ CONFIG_LIRC=y
 # CONFIG_LLC2 is not set
 CONFIG_LLC=m
 CONFIG_LMP91000=m
-# CONFIG_LOAD_UEFI_KEYS is not set
 CONFIG_LOCALVERSION=""
 # CONFIG_LOCALVERSION_AUTO is not set
 CONFIG_LOCKD=m
diff --git a/kernel-ppc64le.config b/kernel-ppc64le.config
index 19b2457d8..312435e56 100644
--- a/kernel-ppc64le.config
+++ b/kernel-ppc64le.config
@@ -1314,7 +1314,6 @@ CONFIG_EEPROM_LEGACY=m
 CONFIG_EEPROM_MAX6875=m
 CONFIG_EFI_PARTITION=y
 # CONFIG_EFI_PGT_DUMP is not set
-# CONFIG_EFI_SIGNATURE_LIST_PARSER is not set
 # CONFIG_EFI_TEST is not set
 # CONFIG_EFS_FS is not set
 CONFIG_EHEA=m
@@ -2656,7 +2655,6 @@ CONFIG_LIRC=y
 # CONFIG_LLC2 is not set
 CONFIG_LLC=m
 CONFIG_LMP91000=m
-# CONFIG_LOAD_UEFI_KEYS is not set
 CONFIG_LOCALVERSION=""
 # CONFIG_LOCALVERSION_AUTO is not set
 CONFIG_LOCKD=m
diff --git a/kernel-s390x-debug.config b/kernel-s390x-debug.config
index bcc854d4b..1d322a22b 100644
--- a/kernel-s390x-debug.config
+++ b/kernel-s390x-debug.config
@@ -1323,7 +1323,6 @@ CONFIG_EEPROM_LEGACY=m
 CONFIG_EEPROM_MAX6875=m
 CONFIG_EFI_PARTITION=y
 CONFIG_EFI_PGT_DUMP=y
-# CONFIG_EFI_SIGNATURE_LIST_PARSER is not set
 # CONFIG_EFI_TEST is not set
 # CONFIG_EFS_FS is not set
 # CONFIG_EMBEDDED is not set
@@ -2620,7 +2619,6 @@ CONFIG_LIRC=y
 # CONFIG_LLC2 is not set
 CONFIG_LLC=m
 CONFIG_LMP91000=m
-# CONFIG_LOAD_UEFI_KEYS is not set
 CONFIG_LOCALVERSION=""
 # CONFIG_LOCALVERSION_AUTO is not set
 CONFIG_LOCKD=m
diff --git a/kernel-s390x.config b/kernel-s390x.config
index 7f4bd349d..c9b9db85b 100644
--- a/kernel-s390x.config
+++ b/kernel-s390x.config
@@ -1313,7 +1313,6 @@ CONFIG_EEPROM_LEGACY=m
 CONFIG_EEPROM_MAX6875=m
 CONFIG_EFI_PARTITION=y
 # CONFIG_EFI_PGT_DUMP is not set
-# CONFIG_EFI_SIGNATURE_LIST_PARSER is not set
 # CONFIG_EFI_TEST is not set
 # CONFIG_EFS_FS is not set
 # CONFIG_EMBEDDED is not set
@@ -2600,7 +2599,6 @@ CONFIG_LIRC=y
 # CONFIG_LLC2 is not set
 CONFIG_LLC=m
 CONFIG_LMP91000=m
-# CONFIG_LOAD_UEFI_KEYS is not set
 CONFIG_LOCALVERSION=""
 # CONFIG_LOCALVERSION_AUTO is not set
 CONFIG_LOCKD=m
diff --git a/kernel-x86_64-debug.config b/kernel-x86_64-debug.config
index c3aa9840b..a614d4dc6 100644
--- a/kernel-x86_64-debug.config
+++ b/kernel-x86_64-debug.config
@@ -1500,7 +1500,6 @@ CONFIG_EFI_PARTITION=y
 CONFIG_EFI_PCDP=y
 CONFIG_EFI_PGT_DUMP=y
 CONFIG_EFI_RUNTIME_MAP=y
-CONFIG_EFI_SIGNATURE_LIST_PARSER=y
 CONFIG_EFI_STUB=y
 # CONFIG_EFI_TEST is not set
 CONFIG_EFIVAR_FS=y
@@ -2951,7 +2950,6 @@ CONFIG_LIRC=y
 # CONFIG_LLC2 is not set
 CONFIG_LLC=m
 CONFIG_LMP91000=m
-CONFIG_LOAD_UEFI_KEYS=y
 CONFIG_LOCALVERSION=""
 # CONFIG_LOCALVERSION_AUTO is not set
 CONFIG_LOCKD=m
diff --git a/kernel-x86_64.config b/kernel-x86_64.config
index 33977108a..a8536e82e 100644
--- a/kernel-x86_64.config
+++ b/kernel-x86_64.config
@@ -1490,7 +1490,6 @@ CONFIG_EFI_PARTITION=y
 CONFIG_EFI_PCDP=y
 # CONFIG_EFI_PGT_DUMP is not set
 CONFIG_EFI_RUNTIME_MAP=y
-CONFIG_EFI_SIGNATURE_LIST_PARSER=y
 CONFIG_EFI_STUB=y
 # CONFIG_EFI_TEST is not set
 CONFIG_EFIVAR_FS=y
@@ -2931,7 +2930,6 @@ CONFIG_LIRC=y
 # CONFIG_LLC2 is not set
 CONFIG_LLC=m
 CONFIG_LMP91000=m
-CONFIG_LOAD_UEFI_KEYS=y
 CONFIG_LOCALVERSION=""
 # CONFIG_LOCALVERSION_AUTO is not set
 CONFIG_LOCKD=m