diff options
author | Brian Norris <computersforpeace@gmail.com> | 2014-05-01 02:26:36 -0400 |
---|---|---|
committer | Shawn Guo <shawn.guo@freescale.com> | 2014-05-12 10:58:51 -0400 |
commit | 4776c739adb27231278fa4836de5f722123b6aa5 (patch) | |
tree | 535f30758d251ae3297df382a8b58f3b151591af | |
parent | 08da51c5755ba241774d9c292964baea0e5609cd (diff) |
ARM: imx/mxs 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.
Signed-off-by: Brian Norris <computersforpeace@gmail.com>
Cc: Sascha Hauer <kernel@pengutronix.de>
Cc: linux-arm-kernel@lists.infradead.org
Cc: linux-kernel@vger.kernel.org
Reviewed-by: Marek Vasut <marex@denx.de>
Signed-off-by: Shawn Guo <shawn.guo@freescale.com>
-rw-r--r-- | arch/arm/configs/imx_v6_v7_defconfig | 1 | ||||
-rw-r--r-- | arch/arm/configs/mxs_defconfig | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/configs/imx_v6_v7_defconfig b/arch/arm/configs/imx_v6_v7_defconfig index 8c72096fef17..79153d06abec 100644 --- a/arch/arm/configs/imx_v6_v7_defconfig +++ b/arch/arm/configs/imx_v6_v7_defconfig | |||
@@ -93,6 +93,7 @@ CONFIG_MTD_SST25L=y | |||
93 | CONFIG_MTD_NAND=y | 93 | CONFIG_MTD_NAND=y |
94 | CONFIG_MTD_NAND_GPMI_NAND=y | 94 | CONFIG_MTD_NAND_GPMI_NAND=y |
95 | CONFIG_MTD_NAND_MXC=y | 95 | CONFIG_MTD_NAND_MXC=y |
96 | CONFIG_MTD_SPI_NOR=y | ||
96 | CONFIG_MTD_UBI=y | 97 | CONFIG_MTD_UBI=y |
97 | CONFIG_BLK_DEV_LOOP=y | 98 | CONFIG_BLK_DEV_LOOP=y |
98 | CONFIG_BLK_DEV_RAM=y | 99 | CONFIG_BLK_DEV_RAM=y |
diff --git a/arch/arm/configs/mxs_defconfig b/arch/arm/configs/mxs_defconfig index 51702398557d..a9f992335eb2 100644 --- a/arch/arm/configs/mxs_defconfig +++ b/arch/arm/configs/mxs_defconfig | |||
@@ -53,6 +53,7 @@ CONFIG_MTD_M25P80=y | |||
53 | CONFIG_MTD_SST25L=y | 53 | CONFIG_MTD_SST25L=y |
54 | CONFIG_MTD_NAND=y | 54 | CONFIG_MTD_NAND=y |
55 | CONFIG_MTD_NAND_GPMI_NAND=y | 55 | CONFIG_MTD_NAND_GPMI_NAND=y |
56 | CONFIG_MTD_SPI_NOR=y | ||
56 | CONFIG_MTD_UBI=y | 57 | CONFIG_MTD_UBI=y |
57 | # CONFIG_BLK_DEV is not set | 58 | # CONFIG_BLK_DEV is not set |
58 | CONFIG_EEPROM_AT24=y | 59 | CONFIG_EEPROM_AT24=y |