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

Commit 4776c739 authored by Brian Norris's avatar Brian Norris Committed by Shawn Guo
Browse files

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: default avatarBrian 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: default avatarMarek Vasut <marex@denx.de>
Signed-off-by: default avatarShawn Guo <shawn.guo@freescale.com>
parent 08da51c5

arch/arm/configs/imx_v6_v7_defconfig

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

CONFIG_MTD_NAND=y

CONFIG_MTD_NAND_GPMI_NAND=y

CONFIG_MTD_NAND_GPMI_NAND=y

CONFIG_MTD_NAND_MXC=y

CONFIG_MTD_NAND_MXC=y

CONFIG_MTD_SPI_NOR=y

CONFIG_MTD_UBI=y

CONFIG_MTD_UBI=y

CONFIG_BLK_DEV_LOOP=y

CONFIG_BLK_DEV_LOOP=y

CONFIG_BLK_DEV_RAM=y

CONFIG_BLK_DEV_RAM=y

arch/arm/configs/mxs_defconfig

+1 −0
Original line number Original line Diff line number Diff line
@@ -53,6 +53,7 @@ CONFIG_MTD_M25P80=y 
CONFIG_MTD_SST25L=y

CONFIG_MTD_SST25L=y

CONFIG_MTD_NAND=y

CONFIG_MTD_NAND=y

CONFIG_MTD_NAND_GPMI_NAND=y

CONFIG_MTD_NAND_GPMI_NAND=y

CONFIG_MTD_SPI_NOR=y

CONFIG_MTD_UBI=y

CONFIG_MTD_UBI=y

# CONFIG_BLK_DEV is not set

# CONFIG_BLK_DEV is not set

CONFIG_EEPROM_AT24=y

CONFIG_EEPROM_AT24=y