From 888f184abe995b2f8f73064503ca6e48dc775d4a Mon Sep 17 00:00:00 2001 From: Miquel Raynal Date: Thu, 3 Oct 2019 19:50:05 +0200 Subject: mtd: rename CONFIG_MTD_DEVICE -> CONFIG_MTD Like in Linux, just use CONFIG_MTD to compile the MTD stack. Signed-off-by: Miquel Raynal Reviewed-by: Boris Brezillon --- drivers/mtd/Kconfig | 12 ++++++------ drivers/mtd/Makefile | 2 +- drivers/mtd/nand/raw/nand.c | 2 +- drivers/mtd/onenand/onenand_uboot.c | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) (limited to 'drivers') diff --git a/drivers/mtd/Kconfig b/drivers/mtd/Kconfig index fe31273..5e7571c 100644 --- a/drivers/mtd/Kconfig +++ b/drivers/mtd/Kconfig @@ -3,6 +3,12 @@ menu "MTD Support" config MTD_PARTITIONS bool +config MTD + bool "Enable MTD layer" + help + Enable the MTD stack, necessary to interract with NAND, NOR, + SPI-NOR, SPI-NAND, onenand, etc. + config DM_MTD bool "Enable Driver Model for MTD drivers" depends on DM @@ -16,12 +22,6 @@ config MTD_NOR_FLASH help Enable support for parallel NOR flash. -config MTD_DEVICE - bool "Enable MTD Device for NAND and ONENAND devices" - help - Adds the MTD device infrastructure from the Linux kernel. - Needed for mtdparts command support. - config FLASH_CFI_DRIVER bool "Enable CFI Flash driver" help diff --git a/drivers/mtd/Makefile b/drivers/mtd/Makefile index 88e5711..bd4f533 100644 --- a/drivers/mtd/Makefile +++ b/drivers/mtd/Makefile @@ -3,7 +3,7 @@ # (C) Copyright 2000-2007 # Wolfgang Denk, DENX Software Engineering, wd@denx.de. -ifneq (,$(findstring y,$(CONFIG_MTD_DEVICE)$(CONFIG_CMD_NAND)$(CONFIG_CMD_ONENAND)$(CONFIG_CMD_SF)$(CONFIG_CMD_MTD))) +ifneq (,$(findstring y,$(CONFIG_MTD)$(CONFIG_CMD_NAND)$(CONFIG_CMD_ONENAND)$(CONFIG_CMD_SF)$(CONFIG_CMD_MTD))) obj-y += mtdcore.o mtd_uboot.o endif obj-$(CONFIG_DM_MTD) += mtd-uclass.o diff --git a/drivers/mtd/nand/raw/nand.c b/drivers/mtd/nand/raw/nand.c index bca51ff..026419e 100644 --- a/drivers/mtd/nand/raw/nand.c +++ b/drivers/mtd/nand/raw/nand.c @@ -59,7 +59,7 @@ int nand_register(int devnum, struct mtd_info *mtd) sprintf(dev_name[devnum], "nand%d", devnum); mtd->name = dev_name[devnum]; -#ifdef CONFIG_MTD_DEVICE +#ifdef CONFIG_MTD /* * Add MTD device so that we can reference it later * via the mtdcore infrastructure (e.g. ubi). diff --git a/drivers/mtd/onenand/onenand_uboot.c b/drivers/mtd/onenand/onenand_uboot.c index c15ec9d..6893394 100644 --- a/drivers/mtd/onenand/onenand_uboot.c +++ b/drivers/mtd/onenand/onenand_uboot.c @@ -43,7 +43,7 @@ void onenand_init(void) puts("Flex-"); puts("OneNAND: "); -#ifdef CONFIG_MTD_DEVICE +#ifdef CONFIG_MTD /* * Add MTD device so that we can reference it later * via the mtdcore infrastructure (e.g. ubi). -- cgit v1.1