Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b8bca000 authored by Brian Norris's avatar Brian Norris Committed by Ralf Baechle
Browse files

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: default avatarBrian 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: default avatarRalf Baechle <ralf@linux-mips.org>
parent f4b3aa7c

arch/mips/configs/ath79_defconfig

+1 −2
Original line number Diff line number Diff line
@@ -46,7 +46,6 @@ CONFIG_MTD=y 
CONFIG_MTD_REDBOOT_PARTS=y

CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-2

CONFIG_MTD_CMDLINE_PARTS=y

CONFIG_MTD_CHAR=y

CONFIG_MTD_BLOCK=y

CONFIG_MTD_CFI=y

CONFIG_MTD_JEDECPROBE=y
@@ -54,7 +53,7 @@ CONFIG_MTD_CFI_AMDSTD=y 
CONFIG_MTD_COMPLEX_MAPPINGS=y

CONFIG_MTD_PHYSMAP=y

CONFIG_MTD_M25P80=y

# CONFIG_M25PXX_USE_FAST_READ is not set

CONFIG_MTD_SPI_NOR=y

CONFIG_NETDEVICES=y

# CONFIG_NET_PACKET_ENGINE is not set

CONFIG_ATH_COMMON=m

arch/mips/configs/db1xxx_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -113,6 +113,7 @@ CONFIG_MTD_NAND=y 
CONFIG_MTD_NAND_ECC_BCH=y

CONFIG_MTD_NAND_AU1550=y

CONFIG_MTD_NAND_PLATFORM=y

CONFIG_MTD_SPI_NOR=y

CONFIG_EEPROM_AT24=y

CONFIG_EEPROM_AT25=y

CONFIG_SCSI_TGT=y

arch/mips/configs/rt305x_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -81,7 +81,6 @@ CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 
# CONFIG_FIRMWARE_IN_KERNEL is not set

CONFIG_MTD=y

CONFIG_MTD_CMDLINE_PARTS=y

CONFIG_MTD_CHAR=y

CONFIG_MTD_BLOCK=y

CONFIG_MTD_CFI=y

CONFIG_MTD_CFI_AMDSTD=y
@@ -89,6 +88,7 @@ CONFIG_MTD_COMPLEX_MAPPINGS=y 
CONFIG_MTD_PHYSMAP=y

CONFIG_MTD_PHYSMAP_OF=y

CONFIG_MTD_M25P80=y

CONFIG_MTD_SPI_NOR=y

CONFIG_EEPROM_93CX6=m

CONFIG_SCSI=y

CONFIG_BLK_DEV_SD=y