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

Commit 1b8be1d8 authored by Jesper Nilsson's avatar Jesper Nilsson Committed by Linus Torvalds
Browse files

CRIS: remove MTD_AMSTD and MTD_OBSOLETE_CHIPS take two 



Remove MTD_AMDSTD and MTD_OBSOLETE_CHIPS from defconfig, Kconfig and code,
instead we'll use MTD_CFI or MTD_JEDECPROBE.

[akpm@linux-foundation.org: codingl-style cleanups]
Signed-off-by: default avatarJesper Nilsson <jesper.nilsson@axis.com>
Cc: Mikael Starvik <starvik@axis.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 77accbf5

arch/cris/arch-v10/defconfig

+0 −2
Original line number Diff line number Diff line
@@ -99,7 +99,6 @@ CONFIG_MTD=y 
CONFIG_MTD_CFI=y

# CONFIG_MTD_CFI_INTELEXT is not set

CONFIG_MTD_CFI_AMDSTD=y

CONFIG_MTD_AMDSTD=y

CONFIG_MTD_CHAR=y

CONFIG_MTD_BLOCK=y

CONFIG_ETRAX_I2C=y
@@ -145,7 +144,6 @@ CONFIG_MTD_CFI=y 
# CONFIG_MTD_CFI_GEOMETRY is not set

# CONFIG_MTD_CFI_INTELEXT is not set

CONFIG_MTD_CFI_AMDSTD=y

CONFIG_MTD_AMDSTD=y

# CONFIG_MTD_SHARP is not set

# CONFIG_MTD_PHYSMAP is not set

# CONFIG_MTD_NORA is not set

arch/cris/arch-v10/drivers/Kconfig

+0 −2
Original line number Diff line number Diff line
@@ -606,8 +606,6 @@ config ETRAX_AXISFLASHMAP 
	select MTD

	select MTD_CFI

	select MTD_CFI_AMDSTD

	select MTD_OBSOLETE_CHIPS

	select MTD_AMDSTD

	select MTD_CHAR

	select MTD_BLOCK

	select MTD_PARTITIONS

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

+4 −4
Original line number Diff line number Diff line
@@ -312,12 +312,12 @@ static struct mtd_info *probe_cs(struct map_info *map_cs) 
               "%s: Probing a 0x%08lx bytes large window at 0x%08lx.\n",

	       map_cs->name, map_cs->size, map_cs->map_priv_1);



#ifdef CONFIG_MTD_AMDSTD

	mtd_cs = do_map_probe("amd_flash", map_cs);

#endif

#ifdef CONFIG_MTD_CFI

	if (!mtd_cs) {

	mtd_cs = do_map_probe("cfi_probe", map_cs);

#endif

#ifdef CONFIG_MTD_JEDECPROBE

	if (!mtd_cs) {

		mtd_cs = do_map_probe("jedec_probe", map_cs);

	}

#endif

arch/cris/arch-v32/drivers/Kconfig

+0 −2
Original line number Diff line number Diff line
@@ -362,8 +362,6 @@ config ETRAX_AXISFLASHMAP 
	select MTD

	select MTD_CFI

	select MTD_CFI_AMDSTD

	select MTD_OBSOLETE_CHIPS

	select MTD_AMDSTD

	select MTD_CHAR

	select MTD_BLOCK

	select MTD_PARTITIONS

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

+4 −5
Original line number Diff line number Diff line
@@ -190,13 +190,12 @@ static struct mtd_info *probe_cs(struct map_info *map_cs) 
	       "%s: Probing a 0x%08lx bytes large window at 0x%08lx.\n",

	       map_cs->name, map_cs->size, map_cs->map_priv_1);



#ifdef CONFIG_MTD_AMDSTD

	mtd_cs = do_map_probe("amd_flash", map_cs);

#endif

#ifdef CONFIG_MTD_CFI

	if (!mtd_cs) {

		mtd_cs = do_map_probe("cfi_probe", map_cs);

	}

#endif

#ifdef CONFIG_MTD_JEDECPROBE

	if (!mtd_cs)

		mtd_cs = do_map_probe("jedec_probe", map_cs);

#endif



	return mtd_cs;