Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

MIPS: defconfigs: add MTD_SPI_NOR (new dependency for M25P80)

These defconfigs contain the CONFIG_M25P80 symbol, which is now
dependent on the MTD_SPI_NOR symbol. Add CONFIG_MTD_SPI_NOR to satisfy
the new dependency.

At the same time, drop the now-nonexistent CONFIG_MTD_CHAR symbol.

Signed-off-by: Brian Norris <computersforpeace@gmail.com>
Cc: linux-mips@linux-mips.org
Cc: linux-kernel@vger.kernel.org
Cc: Huang Shijie <b32955@freescale.com>
Cc: Marek Vasut <marex@denx.de>
Cc: linux-mtd@lists.infradead.org
Patchwork: https://patchwork.linux-mips.org/patch/6878/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

authored by

Brian Norris and committed by
Ralf Baechle
b8bca000 f4b3aa7c

+3 -3
+1 -2
arch/mips/configs/ath79_defconfig
··· 46 46 CONFIG_MTD_REDBOOT_PARTS=y 47 47 CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-2 48 48 CONFIG_MTD_CMDLINE_PARTS=y 49 - CONFIG_MTD_CHAR=y 50 49 CONFIG_MTD_BLOCK=y 51 50 CONFIG_MTD_CFI=y 52 51 CONFIG_MTD_JEDECPROBE=y ··· 53 54 CONFIG_MTD_COMPLEX_MAPPINGS=y 54 55 CONFIG_MTD_PHYSMAP=y 55 56 CONFIG_MTD_M25P80=y 56 - # CONFIG_M25PXX_USE_FAST_READ is not set 57 + CONFIG_MTD_SPI_NOR=y 57 58 CONFIG_NETDEVICES=y 58 59 # CONFIG_NET_PACKET_ENGINE is not set 59 60 CONFIG_ATH_COMMON=m
+1
arch/mips/configs/db1xxx_defconfig
··· 113 113 CONFIG_MTD_NAND_ECC_BCH=y 114 114 CONFIG_MTD_NAND_AU1550=y 115 115 CONFIG_MTD_NAND_PLATFORM=y 116 + CONFIG_MTD_SPI_NOR=y 116 117 CONFIG_EEPROM_AT24=y 117 118 CONFIG_EEPROM_AT25=y 118 119 CONFIG_SCSI_TGT=y
+1 -1
arch/mips/configs/rt305x_defconfig
··· 81 81 # CONFIG_FIRMWARE_IN_KERNEL is not set 82 82 CONFIG_MTD=y 83 83 CONFIG_MTD_CMDLINE_PARTS=y 84 - CONFIG_MTD_CHAR=y 85 84 CONFIG_MTD_BLOCK=y 86 85 CONFIG_MTD_CFI=y 87 86 CONFIG_MTD_CFI_AMDSTD=y ··· 88 89 CONFIG_MTD_PHYSMAP=y 89 90 CONFIG_MTD_PHYSMAP_OF=y 90 91 CONFIG_MTD_M25P80=y 92 + CONFIG_MTD_SPI_NOR=y 91 93 CONFIG_EEPROM_93CX6=m 92 94 CONFIG_SCSI=y 93 95 CONFIG_BLK_DEV_SD=y