From ed22f0605d384c35f358239b5864910276345354 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Fri, 11 Oct 2019 17:19:22 +0100 Subject: arm64: enable spi flash memory on aarch64 too --- configs/fedora/generic/arm/CONFIG_MTD_M25P80 | 1 + configs/fedora/generic/arm/CONFIG_MTD_SPI_NOR | 1 + configs/fedora/generic/arm/CONFIG_MTD_SPI_NOR_USE_4K_SECTORS | 1 + configs/fedora/generic/arm/CONFIG_SPI_CADENCE_QUADSPI | 1 + configs/fedora/generic/arm/armv7/CONFIG_MTD_SPI_NOR | 1 - configs/fedora/generic/arm/armv7/CONFIG_MTD_SPI_NOR_USE_4K_SECTORS | 1 - kernel-aarch64-debug.config | 6 +++++- kernel-aarch64.config | 6 +++++- kernel-armv7hl-debug.config | 1 + kernel-armv7hl-lpae-debug.config | 1 + kernel-armv7hl-lpae.config | 1 + kernel-armv7hl.config | 1 + 12 files changed, 18 insertions(+), 4 deletions(-) create mode 100644 configs/fedora/generic/arm/CONFIG_MTD_M25P80 create mode 100644 configs/fedora/generic/arm/CONFIG_MTD_SPI_NOR create mode 100644 configs/fedora/generic/arm/CONFIG_MTD_SPI_NOR_USE_4K_SECTORS create mode 100644 configs/fedora/generic/arm/CONFIG_SPI_CADENCE_QUADSPI delete mode 100644 configs/fedora/generic/arm/armv7/CONFIG_MTD_SPI_NOR delete mode 100644 configs/fedora/generic/arm/armv7/CONFIG_MTD_SPI_NOR_USE_4K_SECTORS 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/CONFIG_MTD_SPI_NOR b/configs/fedora/generic/arm/CONFIG_MTD_SPI_NOR new file mode 100644 index 000000000..913b13234 --- /dev/null +++ b/configs/fedora/generic/arm/CONFIG_MTD_SPI_NOR @@ -0,0 +1 @@ +CONFIG_MTD_SPI_NOR=m diff --git a/configs/fedora/generic/arm/CONFIG_MTD_SPI_NOR_USE_4K_SECTORS b/configs/fedora/generic/arm/CONFIG_MTD_SPI_NOR_USE_4K_SECTORS new file mode 100644 index 000000000..347ef2dc3 --- /dev/null +++ b/configs/fedora/generic/arm/CONFIG_MTD_SPI_NOR_USE_4K_SECTORS @@ -0,0 +1 @@ +# CONFIG_MTD_SPI_NOR_USE_4K_SECTORS is not set 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/configs/fedora/generic/arm/armv7/CONFIG_MTD_SPI_NOR b/configs/fedora/generic/arm/armv7/CONFIG_MTD_SPI_NOR deleted file mode 100644 index 913b13234..000000000 --- a/configs/fedora/generic/arm/armv7/CONFIG_MTD_SPI_NOR +++ /dev/null @@ -1 +0,0 @@ -CONFIG_MTD_SPI_NOR=m diff --git a/configs/fedora/generic/arm/armv7/CONFIG_MTD_SPI_NOR_USE_4K_SECTORS b/configs/fedora/generic/arm/armv7/CONFIG_MTD_SPI_NOR_USE_4K_SECTORS deleted file mode 100644 index 347ef2dc3..000000000 --- a/configs/fedora/generic/arm/armv7/CONFIG_MTD_SPI_NOR_USE_4K_SECTORS +++ /dev/null @@ -1 +0,0 @@ -# CONFIG_MTD_SPI_NOR_USE_4K_SECTORS is not set diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config index b61778531..acde27bfd 100644 --- a/kernel-aarch64-debug.config +++ b/kernel-aarch64-debug.config @@ -3621,6 +3621,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 @@ -3665,7 +3666,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 @@ -6106,6 +6108,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 @@ -6116,6 +6119,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 8116137c1..fd8b5d6e9 100644 --- a/kernel-aarch64.config +++ b/kernel-aarch64.config @@ -3601,6 +3601,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 @@ -3645,7 +3646,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 @@ -6084,6 +6086,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 @@ -6094,6 +6097,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-armv7hl-debug.config b/kernel-armv7hl-debug.config index 2ad58e8e6..7754cdcf0 100644 --- a/kernel-armv7hl-debug.config +++ b/kernel-armv7hl-debug.config @@ -3691,6 +3691,7 @@ 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.config b/kernel-armv7hl-lpae-debug.config index 6ccfaa4ac..5656aa1e0 100644 --- a/kernel-armv7hl-lpae-debug.config +++ b/kernel-armv7hl-lpae-debug.config @@ -3567,6 +3567,7 @@ 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.config b/kernel-armv7hl-lpae.config index ddf3eb2c0..f4ffc0f6a 100644 --- a/kernel-armv7hl-lpae.config +++ b/kernel-armv7hl-lpae.config @@ -3548,6 +3548,7 @@ 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.config b/kernel-armv7hl.config index 1ff57d584..2ffb8bf9c 100644 --- a/kernel-armv7hl.config +++ b/kernel-armv7hl.config @@ -3672,6 +3672,7 @@ 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 -- cgit