When commit ed22f0605d38 ("arm64: enable spi flash memory on aarch64
too") added CONFIG_MTD_M25P80 to the configuration generation system the
corresponding Kconfig symbol had just been dropped upstream. So drop it
from that system too.
Signed-off-by: Paul Bolle <pebolle(a)tiscali.nl>
---
configs/fedora/generic/arm/CONFIG_MTD_M25P80 | 1 -
kernel-aarch64-debug-fedora.config | 1 -
kernel-aarch64-fedora.config | 1 -
kernel-armv7hl-debug-fedora.config | 1 -
kernel-armv7hl-fedora.config | 1 -
kernel-armv7hl-lpae-debug-fedora.config | 1 -
kernel-armv7hl-lpae-fedora.config | 1 -
7 files changed, 7 deletions(-)
delete mode 100644 configs/fedora/generic/arm/CONFIG_MTD_M25P80
diff --git a/configs/fedora/generic/arm/CONFIG_MTD_M25P80
b/configs/fedora/generic/arm/CONFIG_MTD_M25P80
deleted file mode 100644
index 9e4ab3f0b170..000000000000
--- a/configs/fedora/generic/arm/CONFIG_MTD_M25P80
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_MTD_M25P80=m
diff --git a/kernel-aarch64-debug-fedora.config b/kernel-aarch64-debug-fedora.config
index 295fa689b00f..874daa8e972e 100644
--- a/kernel-aarch64-debug-fedora.config
+++ b/kernel-aarch64-debug-fedora.config
@@ -3676,7 +3676,6 @@ CONFIG_MTD_CFI_STAA=m
# CONFIG_MTD_LPDDR2_NVM is not set
# CONFIG_MTD_LPDDR is not set
CONFIG_MTD=m
-CONFIG_MTD_M25P80=m
CONFIG_MTD_MAP_BANK_WIDTH_1=y
CONFIG_MTD_MAP_BANK_WIDTH_2=y
CONFIG_MTD_MAP_BANK_WIDTH_4=y
diff --git a/kernel-aarch64-fedora.config b/kernel-aarch64-fedora.config
index b0b11eaa8f63..22c07305d04a 100644
--- a/kernel-aarch64-fedora.config
+++ b/kernel-aarch64-fedora.config
@@ -3656,7 +3656,6 @@ CONFIG_MTD_CFI_STAA=m
# CONFIG_MTD_LPDDR2_NVM is not set
# CONFIG_MTD_LPDDR is not set
CONFIG_MTD=m
-CONFIG_MTD_M25P80=m
CONFIG_MTD_MAP_BANK_WIDTH_1=y
CONFIG_MTD_MAP_BANK_WIDTH_2=y
CONFIG_MTD_MAP_BANK_WIDTH_4=y
diff --git a/kernel-armv7hl-debug-fedora.config b/kernel-armv7hl-debug-fedora.config
index 2d665bad1c9f..f57a0254945e 100644
--- a/kernel-armv7hl-debug-fedora.config
+++ b/kernel-armv7hl-debug-fedora.config
@@ -3737,7 +3737,6 @@ CONFIG_MTD_DATAFLASH_WRITE_VERIFY=y
# CONFIG_MTD_LPDDR2_NVM is not set
# CONFIG_MTD_LPDDR is not set
CONFIG_MTD=m
-CONFIG_MTD_M25P80=m
CONFIG_MTD_MAP_BANK_WIDTH_1=y
CONFIG_MTD_MAP_BANK_WIDTH_2=y
CONFIG_MTD_MAP_BANK_WIDTH_4=y
diff --git a/kernel-armv7hl-fedora.config b/kernel-armv7hl-fedora.config
index da2420ab579f..d470e2297abf 100644
--- a/kernel-armv7hl-fedora.config
+++ b/kernel-armv7hl-fedora.config
@@ -3718,7 +3718,6 @@ CONFIG_MTD_DATAFLASH_WRITE_VERIFY=y
# CONFIG_MTD_LPDDR2_NVM is not set
# CONFIG_MTD_LPDDR is not set
CONFIG_MTD=m
-CONFIG_MTD_M25P80=m
CONFIG_MTD_MAP_BANK_WIDTH_1=y
CONFIG_MTD_MAP_BANK_WIDTH_2=y
CONFIG_MTD_MAP_BANK_WIDTH_4=y
diff --git a/kernel-armv7hl-lpae-debug-fedora.config
b/kernel-armv7hl-lpae-debug-fedora.config
index 6e50a3bc4902..2bccdbcf06f5 100644
--- a/kernel-armv7hl-lpae-debug-fedora.config
+++ b/kernel-armv7hl-lpae-debug-fedora.config
@@ -3637,7 +3637,6 @@ CONFIG_MTD_DATAFLASH_WRITE_VERIFY=y
# CONFIG_MTD_LPDDR2_NVM is not set
# CONFIG_MTD_LPDDR is not set
CONFIG_MTD=m
-CONFIG_MTD_M25P80=m
CONFIG_MTD_MAP_BANK_WIDTH_1=y
CONFIG_MTD_MAP_BANK_WIDTH_2=y
CONFIG_MTD_MAP_BANK_WIDTH_4=y
diff --git a/kernel-armv7hl-lpae-fedora.config b/kernel-armv7hl-lpae-fedora.config
index b74888936c37..be9dc8710f4f 100644
--- a/kernel-armv7hl-lpae-fedora.config
+++ b/kernel-armv7hl-lpae-fedora.config
@@ -3618,7 +3618,6 @@ CONFIG_MTD_DATAFLASH_WRITE_VERIFY=y
# CONFIG_MTD_LPDDR2_NVM is not set
# CONFIG_MTD_LPDDR is not set
CONFIG_MTD=m
-CONFIG_MTD_M25P80=m
CONFIG_MTD_MAP_BANK_WIDTH_1=y
CONFIG_MTD_MAP_BANK_WIDTH_2=y
CONFIG_MTD_MAP_BANK_WIDTH_4=y
--
2.21.0