diff options
author | Brian Norris <computersforpeace@gmail.com> | 2014-05-01 02:26:45 -0400 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2014-05-28 04:53:14 -0400 |
commit | b8bca000f6d43f772628a72b325bdefe431129f6 (patch) | |
tree | 358d4b29697fbdb92baed587c806ae58d852e161 /arch/mips/configs | |
parent | f4b3aa7cd9d32407670e67238c5ee752bb98f481 (diff) |
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>
Diffstat (limited to 'arch/mips/configs')
-rw-r--r-- | arch/mips/configs/ath79_defconfig | 3 | ||||
-rw-r--r-- | arch/mips/configs/db1xxx_defconfig | 1 | ||||
-rw-r--r-- | arch/mips/configs/rt305x_defconfig | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/arch/mips/configs/ath79_defconfig b/arch/mips/configs/ath79_defconfig index e3a3836508ec..134879c1310a 100644 --- a/arch/mips/configs/ath79_defconfig +++ b/arch/mips/configs/ath79_defconfig | |||
@@ -46,7 +46,6 @@ CONFIG_MTD=y | |||
46 | CONFIG_MTD_REDBOOT_PARTS=y | 46 | CONFIG_MTD_REDBOOT_PARTS=y |
47 | CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-2 | 47 | CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-2 |
48 | CONFIG_MTD_CMDLINE_PARTS=y | 48 | CONFIG_MTD_CMDLINE_PARTS=y |
49 | CONFIG_MTD_CHAR=y | ||
50 | CONFIG_MTD_BLOCK=y | 49 | CONFIG_MTD_BLOCK=y |
51 | CONFIG_MTD_CFI=y | 50 | CONFIG_MTD_CFI=y |
52 | CONFIG_MTD_JEDECPROBE=y | 51 | CONFIG_MTD_JEDECPROBE=y |
@@ -54,7 +53,7 @@ CONFIG_MTD_CFI_AMDSTD=y | |||
54 | CONFIG_MTD_COMPLEX_MAPPINGS=y | 53 | CONFIG_MTD_COMPLEX_MAPPINGS=y |
55 | CONFIG_MTD_PHYSMAP=y | 54 | CONFIG_MTD_PHYSMAP=y |
56 | CONFIG_MTD_M25P80=y | 55 | CONFIG_MTD_M25P80=y |
57 | # CONFIG_M25PXX_USE_FAST_READ is not set | 56 | CONFIG_MTD_SPI_NOR=y |
58 | CONFIG_NETDEVICES=y | 57 | CONFIG_NETDEVICES=y |
59 | # CONFIG_NET_PACKET_ENGINE is not set | 58 | # CONFIG_NET_PACKET_ENGINE is not set |
60 | CONFIG_ATH_COMMON=m | 59 | CONFIG_ATH_COMMON=m |
diff --git a/arch/mips/configs/db1xxx_defconfig b/arch/mips/configs/db1xxx_defconfig index c99b6eeda90b..a64b30b96a0d 100644 --- a/arch/mips/configs/db1xxx_defconfig +++ b/arch/mips/configs/db1xxx_defconfig | |||
@@ -113,6 +113,7 @@ CONFIG_MTD_NAND=y | |||
113 | CONFIG_MTD_NAND_ECC_BCH=y | 113 | CONFIG_MTD_NAND_ECC_BCH=y |
114 | CONFIG_MTD_NAND_AU1550=y | 114 | CONFIG_MTD_NAND_AU1550=y |
115 | CONFIG_MTD_NAND_PLATFORM=y | 115 | CONFIG_MTD_NAND_PLATFORM=y |
116 | CONFIG_MTD_SPI_NOR=y | ||
116 | CONFIG_EEPROM_AT24=y | 117 | CONFIG_EEPROM_AT24=y |
117 | CONFIG_EEPROM_AT25=y | 118 | CONFIG_EEPROM_AT25=y |
118 | CONFIG_SCSI_TGT=y | 119 | CONFIG_SCSI_TGT=y |
diff --git a/arch/mips/configs/rt305x_defconfig b/arch/mips/configs/rt305x_defconfig index d1741bcf8949..d14ae2fa7d13 100644 --- a/arch/mips/configs/rt305x_defconfig +++ b/arch/mips/configs/rt305x_defconfig | |||
@@ -81,7 +81,6 @@ CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | |||
81 | # CONFIG_FIRMWARE_IN_KERNEL is not set | 81 | # CONFIG_FIRMWARE_IN_KERNEL is not set |
82 | CONFIG_MTD=y | 82 | CONFIG_MTD=y |
83 | CONFIG_MTD_CMDLINE_PARTS=y | 83 | CONFIG_MTD_CMDLINE_PARTS=y |
84 | CONFIG_MTD_CHAR=y | ||
85 | CONFIG_MTD_BLOCK=y | 84 | CONFIG_MTD_BLOCK=y |
86 | CONFIG_MTD_CFI=y | 85 | CONFIG_MTD_CFI=y |
87 | CONFIG_MTD_CFI_AMDSTD=y | 86 | CONFIG_MTD_CFI_AMDSTD=y |
@@ -89,6 +88,7 @@ CONFIG_MTD_COMPLEX_MAPPINGS=y | |||
89 | CONFIG_MTD_PHYSMAP=y | 88 | CONFIG_MTD_PHYSMAP=y |
90 | CONFIG_MTD_PHYSMAP_OF=y | 89 | CONFIG_MTD_PHYSMAP_OF=y |
91 | CONFIG_MTD_M25P80=y | 90 | CONFIG_MTD_M25P80=y |
91 | CONFIG_MTD_SPI_NOR=y | ||
92 | CONFIG_EEPROM_93CX6=m | 92 | CONFIG_EEPROM_93CX6=m |
93 | CONFIG_SCSI=y | 93 | CONFIG_SCSI=y |
94 | CONFIG_BLK_DEV_SD=y | 94 | CONFIG_BLK_DEV_SD=y |