summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Robinson <pbrobinson@gmail.com>2019-10-11 17:19:22 +0100
committerPeter Robinson <pbrobinson@gmail.com>2019-10-11 17:21:21 +0100
commit30675b84bb5e82190342091a49f81e86df95a2c6 (patch)
treed5956f2f3c1bbd0978c220170a86932d54d412c1
parent839d783d52c88e8999994d87725351d24a192d9e (diff)
downloadkernel-30675b84bb5e82190342091a49f81e86df95a2c6.tar.gz
kernel-30675b84bb5e82190342091a49f81e86df95a2c6.tar.xz
kernel-30675b84bb5e82190342091a49f81e86df95a2c6.zip
arm64: enable spi flash memory on aarch64 too
-rw-r--r--configs/fedora/generic/arm/CONFIG_MTD_M25P801
-rw-r--r--configs/fedora/generic/arm/CONFIG_MTD_SPI_NOR (renamed from configs/fedora/generic/arm/armv7/CONFIG_MTD_SPI_NOR)0
-rw-r--r--configs/fedora/generic/arm/CONFIG_MTD_SPI_NOR_USE_4K_SECTORS (renamed from configs/fedora/generic/arm/armv7/CONFIG_MTD_SPI_NOR_USE_4K_SECTORS)0
-rw-r--r--configs/fedora/generic/arm/CONFIG_SPI_CADENCE_QUADSPI1
-rw-r--r--kernel-aarch64-debug.config6
-rw-r--r--kernel-aarch64.config6
6 files changed, 12 insertions, 2 deletions
diff --git a/configs/fedora/generic/arm/CONFIG_MTD_M25P80 b/configs/fedora/generic/arm/CONFIG_MTD_M25P80
new file mode 100644
index 000000000..9e4ab3f0b
--- /dev/null
+++ b/configs/fedora/generic/arm/CONFIG_MTD_M25P80
@@ -0,0 +1 @@
+CONFIG_MTD_M25P80=m
diff --git a/configs/fedora/generic/arm/armv7/CONFIG_MTD_SPI_NOR b/configs/fedora/generic/arm/CONFIG_MTD_SPI_NOR
index 913b13234..913b13234 100644
--- a/configs/fedora/generic/arm/armv7/CONFIG_MTD_SPI_NOR
+++ b/configs/fedora/generic/arm/CONFIG_MTD_SPI_NOR
diff --git a/configs/fedora/generic/arm/armv7/CONFIG_MTD_SPI_NOR_USE_4K_SECTORS b/configs/fedora/generic/arm/CONFIG_MTD_SPI_NOR_USE_4K_SECTORS
index 347ef2dc3..347ef2dc3 100644
--- a/configs/fedora/generic/arm/armv7/CONFIG_MTD_SPI_NOR_USE_4K_SECTORS
+++ b/configs/fedora/generic/arm/CONFIG_MTD_SPI_NOR_USE_4K_SECTORS
diff --git a/configs/fedora/generic/arm/CONFIG_SPI_CADENCE_QUADSPI b/configs/fedora/generic/arm/CONFIG_SPI_CADENCE_QUADSPI
new file mode 100644
index 000000000..7c242fd0d
--- /dev/null
+++ b/configs/fedora/generic/arm/CONFIG_SPI_CADENCE_QUADSPI
@@ -0,0 +1 @@
+# CONFIG_SPI_CADENCE_QUADSPI is not set
diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config
index 708e79178..be66d4230 100644
--- a/kernel-aarch64-debug.config
+++ b/kernel-aarch64-debug.config
@@ -3577,6 +3577,7 @@ 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
@@ -3620,7 +3621,8 @@ CONFIG_MTD_RAW_NAND=m
# CONFIG_MTD_SHARPSL_PARTS is not set
# CONFIG_MTD_SLRAM is not set
CONFIG_MTD_SPI_NAND=m
-# CONFIG_MTD_SPI_NOR is not set
+CONFIG_MTD_SPI_NOR=m
+# CONFIG_MTD_SPI_NOR_USE_4K_SECTORS is not set
# CONFIG_MTD_SST25L is not set
# CONFIG_MTD_SWAP is not set
# CONFIG_MTD_TESTS is not set
@@ -6041,6 +6043,7 @@ CONFIG_SPI_BCM2835=m
CONFIG_SPI_BITBANG=m
# CONFIG_SPI_BUTTERFLY is not set
CONFIG_SPI_CADENCE=m
+# CONFIG_SPI_CADENCE_QUADSPI is not set
# CONFIG_SPI_DEBUG is not set
CONFIG_SPI_DESIGNWARE=m
# CONFIG_SPI_DW_MID_DMA is not set
@@ -6051,6 +6054,7 @@ CONFIG_SPI_FSL_LPSPI=m
CONFIG_SPI_FSL_QUADSPI=m
# CONFIG_SPI_FSL_SPI is not set
CONFIG_SPI_GPIO=m
+CONFIG_SPI_HISI_SFC=m
CONFIG_SPI_IMX=m
# CONFIG_SPI_LM70_LLP is not set
# CONFIG_SPI_LOOPBACK_TEST is not set
diff --git a/kernel-aarch64.config b/kernel-aarch64.config
index 15cfed8ee..2219b41b1 100644
--- a/kernel-aarch64.config
+++ b/kernel-aarch64.config
@@ -3557,6 +3557,7 @@ 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
@@ -3600,7 +3601,8 @@ CONFIG_MTD_RAW_NAND=m
# CONFIG_MTD_SHARPSL_PARTS is not set
# CONFIG_MTD_SLRAM is not set
CONFIG_MTD_SPI_NAND=m
-# CONFIG_MTD_SPI_NOR is not set
+CONFIG_MTD_SPI_NOR=m
+# CONFIG_MTD_SPI_NOR_USE_4K_SECTORS is not set
# CONFIG_MTD_SST25L is not set
# CONFIG_MTD_SWAP is not set
# CONFIG_MTD_TESTS is not set
@@ -6019,6 +6021,7 @@ CONFIG_SPI_BCM2835=m
CONFIG_SPI_BITBANG=m
# CONFIG_SPI_BUTTERFLY is not set
CONFIG_SPI_CADENCE=m
+# CONFIG_SPI_CADENCE_QUADSPI is not set
# CONFIG_SPI_DEBUG is not set
CONFIG_SPI_DESIGNWARE=m
# CONFIG_SPI_DW_MID_DMA is not set
@@ -6029,6 +6032,7 @@ CONFIG_SPI_FSL_LPSPI=m
CONFIG_SPI_FSL_QUADSPI=m
# CONFIG_SPI_FSL_SPI is not set
CONFIG_SPI_GPIO=m
+CONFIG_SPI_HISI_SFC=m
CONFIG_SPI_IMX=m
# CONFIG_SPI_LM70_LLP is not set
# CONFIG_SPI_LOOPBACK_TEST is not set