mtd: Introduce CONFIG_MTD_DEVICE to select compilation of mtdcore.o

This new define enables mtdcore.c compilation and with this we can
select the MTD device infrastructure needed for the reworked mtdparts
command.

We now have the 2 MTD infrastructure defines, CONFIG_MTD_DEVICE and
CONFIG_MTD_PARTITIONS. CONFIG_MTD_DEVICE is needed (as explained above)
for the "mtdparts" command and CONFIG_MTD_PARTITIONS is needed for UBI.

Signed-off-by: Stefan Roese <sr@denx.de>
Cc: Scott Wood <scottwood@freescale.com>

diff --git a/README b/README
index 75fc4b7b311dc4aa8b74b3dfb386138d76eaabf7..561c100166da916e3381d7e46a621e828635a7e6 100644 (file)
--- a/README
+++ b/README
@@ -1846,6 +1846,17 @@ The following options need to be configured:
                These options enable and control the auto-update feature;
                for a more detailed description refer to doc/README.update.
 
+- MTD Support (mtdparts command, UBI support)
+               CONFIG_MTD_DEVICE
+
+               Adds the MTD device infrastructure from the Linux kernel.
+               Needed for mtdparts command support.
+
+               CONFIG_MTD_PARTITIONS
+
+               Adds the MTD partitioning infrastructure from the Linux
+               kernel. Needed for UBI support.
+
 Legacy uImage format:
 
   Arg  Where                   When

diff --git a/drivers/mtd/Makefile b/drivers/mtd/Makefile
index 19dc02b0c3026766a578761c9b52722e79d1413f..754d648a90d02402928031ae5b987a0bd2dd76b9 100644 (file)
--- a/drivers/mtd/Makefile
+++ b/drivers/mtd/Makefile
@@ -25,7 +25,8 @@ include $(TOPDIR)/config.mk
 
 LIB    := $(obj)libmtd.a
 
-COBJS-$(CONFIG_MTD_PARTITIONS) += mtdcore.o mtdpart.o
+COBJS-$(CONFIG_MTD_DEVICE) += mtdcore.o
+COBJS-$(CONFIG_MTD_PARTITIONS) += mtdpart.o
 COBJS-$(CONFIG_MTD_CONCAT) += mtdconcat.o
 COBJS-$(CONFIG_HAS_DATAFLASH) += at45.o
 COBJS-$(CONFIG_FLASH_CFI_DRIVER) += cfi_flash.o

diff --git a/drivers/mtd/nand/nand.c b/drivers/mtd/nand/nand.c
index d3691151f0513eb3c613d43dc29bbcf1ad4a7ab4..9065fa91c6f5c6de4adfde822c293c0cba7b9941 100644 (file)
--- a/drivers/mtd/nand/nand.c
+++ b/drivers/mtd/nand/nand.c
@@ -57,7 +57,7 @@ static void nand_init_chip(struct mtd_info *mtd, struct nand_chip *nand,
                        else
                                mtd->name += gd->reloc_off;
 
-#ifdef CONFIG_MTD_PARTITIONS
+#ifdef CONFIG_MTD_DEVICE
                        /*
                         * 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 a95b922a8f4d8d99e43c6a38f08ee587a635a548..9823b5b47839e389e54e89bb36219b1b0904c707 100644 (file)
--- a/drivers/mtd/onenand/onenand_uboot.c
+++ b/drivers/mtd/onenand/onenand_uboot.c
@@ -43,7 +43,7 @@ void onenand_init(void)
        puts("OneNAND: ");
        print_size(onenand_mtd.size, "\n");
 
-#ifdef CONFIG_MTD_PARTITIONS
+#ifdef CONFIG_MTD_DEVICE
        /*
         * Add MTD device so that we can reference it later
         * via the mtdcore infrastructure (e.g. ubi).