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

mtd: spi-nor: shorten Kconfig naming

Signed-off-by: Brian Norris <computersforpeace@gmail.com>
Reviewed-by: Marek Vasut <marex@denx.de>
Acked-by: Huang Shijie <b32955@freescale.com>

Brian Norris e43b2061 254592db

+11 -6
+1 -1
drivers/mtd/Makefile
··· 32 32 33 33 obj-y += chips/ lpddr/ maps/ devices/ nand/ onenand/ tests/ 34 34 35 - obj-$(CONFIG_MTD_SPI_NOR_BASE) += spi-nor/ 35 + obj-$(CONFIG_MTD_SPI_NOR) += spi-nor/ 36 36 obj-$(CONFIG_MTD_UBI) += ubi/
+1 -1
drivers/mtd/devices/Kconfig
··· 80 80 81 81 config MTD_M25P80 82 82 tristate "Support most SPI Flash chips (AT26DF, M25P, W25X, ...)" 83 - depends on SPI_MASTER && MTD_SPI_NOR_BASE 83 + depends on SPI_MASTER && MTD_SPI_NOR 84 84 help 85 85 This enables access to most modern SPI flash chips, used for 86 86 program and data storage. Series supported include Atmel AT26DF,
+8 -3
drivers/mtd/spi-nor/Kconfig
··· 1 - config MTD_SPI_NOR_BASE 2 - bool "the framework for SPI-NOR support" 1 + config MTD_SPI_NOR 2 + bool "SPI-NOR device support" 3 3 depends on MTD 4 4 help 5 5 This is the framework for the SPI NOR which can be used by the SPI 6 6 device drivers and the SPI-NOR device driver. 7 + 8 + if MTD_SPI_NOR 9 + 7 10 config SPI_FSL_QUADSPI 8 11 tristate "Freescale Quad SPI controller" 9 - depends on ARCH_MXC && MTD_SPI_NOR_BASE 12 + depends on ARCH_MXC 10 13 help 11 14 This enables support for the Quad SPI controller in master mode. 12 15 We only connect the NOR to this controller now. 16 + 17 + endif # MTD_SPI_NOR
+1 -1
drivers/mtd/spi-nor/Makefile
··· 1 - obj-$(CONFIG_MTD_SPI_NOR_BASE) += spi-nor.o 1 + obj-$(CONFIG_MTD_SPI_NOR) += spi-nor.o 2 2 obj-$(CONFIG_SPI_FSL_QUADSPI) += fsl-quadspi.o