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

Commit 06f2ae3c authored by Dmitry Eremin-Solenikov's avatar Dmitry Eremin-Solenikov Committed by David Woodhouse
Browse files

CRIS: stop checking for MTD_CONCAT 



As MTD_CONCAT support is becoming an integral part of MTD core,
there is no need for it's special treatment. So stop checking for
MTD_CONCAT availability.

Acked by Jesper Nilsson <jesper.nilsson@axis.com> for merging this
via the MTD tree.

Signed-off-by: default avatarDmitry Eremin-Solenikov <dbaryshkov@gmail.com>
Acked-by: default avatarStefan Roese <sr@denx.de>
Signed-off-by: default avatarJesper Nilsson <jesper.nilsson@axis.com>
Signed-off-by: default avatarArtem Bityutskiy <Artem.Bityutskiy@nokia.com>
Signed-off-by: default avatarDavid Woodhouse <David.Woodhouse@intel.com>
parent a8adc3f0

arch/cris/Kconfig

+0 −1
Original line number Original line Diff line number Diff line
@@ -275,7 +275,6 @@ config ETRAX_AXISFLASHMAP 
	select MTD_CHAR

	select MTD_CHAR

	select MTD_BLOCK

	select MTD_BLOCK

	select MTD_PARTITIONS

	select MTD_PARTITIONS

	select MTD_CONCAT

	select MTD_COMPLEX_MAPPINGS

	select MTD_COMPLEX_MAPPINGS

	help

	help

	  This option enables MTD mapping of flash devices.  Needed to use

	  This option enables MTD mapping of flash devices.  Needed to use

arch/cris/arch-v10/drivers/axisflashmap.c

+0 −6
Original line number Original line Diff line number Diff line
@@ -234,7 +234,6 @@ static struct mtd_info *flash_probe(void) 
	}

	}





	if (mtd_cse0 && mtd_cse1) {

	if (mtd_cse0 && mtd_cse1) {

#ifdef CONFIG_MTD_CONCAT

		struct mtd_info *mtds[] = { mtd_cse0, mtd_cse1 };

		struct mtd_info *mtds[] = { mtd_cse0, mtd_cse1 };





		/* Since the concatenation layer adds a small overhead we

		/* Since the concatenation layer adds a small overhead we
@@ -246,11 +245,6 @@ static struct mtd_info *flash_probe(void) 
		 */

		 */

		mtd_cse = mtd_concat_create(mtds, ARRAY_SIZE(mtds),

		mtd_cse = mtd_concat_create(mtds, ARRAY_SIZE(mtds),

					    "cse0+cse1");

					    "cse0+cse1");

#else

		printk(KERN_ERR "%s and %s: Cannot concatenate due to kernel "

		       "(mis)configuration!\n", map_cse0.name, map_cse1.name);

		mtd_cse = NULL;

#endif

		if (!mtd_cse) {

		if (!mtd_cse) {

			printk(KERN_ERR "%s and %s: Concatenation failed!\n",

			printk(KERN_ERR "%s and %s: Concatenation failed!\n",

			       map_cse0.name, map_cse1.name);

			       map_cse0.name, map_cse1.name);

arch/cris/arch-v32/drivers/Kconfig

+0 −1
Original line number Original line Diff line number Diff line
@@ -406,7 +406,6 @@ config ETRAX_AXISFLASHMAP 
	select MTD_CHAR

	select MTD_CHAR

	select MTD_BLOCK

	select MTD_BLOCK

	select MTD_PARTITIONS

	select MTD_PARTITIONS

	select MTD_CONCAT

	select MTD_COMPLEX_MAPPINGS

	select MTD_COMPLEX_MAPPINGS

	help

	help

	  This option enables MTD mapping of flash devices.  Needed to use

	  This option enables MTD mapping of flash devices.  Needed to use

arch/cris/arch-v32/drivers/axisflashmap.c

+0 −6
Original line number Original line Diff line number Diff line
@@ -275,7 +275,6 @@ static struct mtd_info *flash_probe(void) 
	}

	}





	if (count > 1) {

	if (count > 1) {

#ifdef CONFIG_MTD_CONCAT

		/* Since the concatenation layer adds a small overhead we

		/* Since the concatenation layer adds a small overhead we

		 * could try to figure out if the chips in cse0 and cse1 are

		 * could try to figure out if the chips in cse0 and cse1 are

		 * identical and reprobe the whole cse0+cse1 window. But since

		 * identical and reprobe the whole cse0+cse1 window. But since
@@ -284,11 +283,6 @@ static struct mtd_info *flash_probe(void) 
		 * complicating the probing procedure.

		 * complicating the probing procedure.

		 */

		 */

		mtd_total = mtd_concat_create(mtds, count, "cse0+cse1");

		mtd_total = mtd_concat_create(mtds, count, "cse0+cse1");

#else

		printk(KERN_ERR "%s and %s: Cannot concatenate due to kernel "

		       "(mis)configuration!\n", map_cse0.name, map_cse1.name);

		mtd_toal = NULL;

#endif

		if (!mtd_total) {

		if (!mtd_total) {

			printk(KERN_ERR "%s and %s: Concatenation failed!\n",

			printk(KERN_ERR "%s and %s: Concatenation failed!\n",

				map_cse0.name, map_cse1.name);

				map_cse0.name, map_cse1.name);