GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-06-23 15:11:16 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

CRIS: remove MTD_AMSTD and MTD_OBSOLETE_CHIPS take two

Browse source 
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: Jesper Nilsson <jesper.nilsson@axis.com>
Cc: Mikael Starvik <starvik@axis.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Jesper Nilsson 2007-11-14 17:01:20 -08:00 • committed by Linus Torvalds
parent 77accbf505
commit 1b8be1d82d
6 changed files with 8 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

2
arch/cris/arch-v10/defconfig
View file

@ -99,7 +99,6 @@ CONFIG_MTD=y
CONFIG_MTD_CFI=y CONFIG_MTD_CFI=y
# CONFIG_MTD_CFI_INTELEXT is not set # CONFIG_MTD_CFI_INTELEXT is not set
CONFIG_MTD_CFI_AMDSTD=y CONFIG_MTD_CFI_AMDSTD=y
CONFIG_MTD_AMDSTD=y
CONFIG_MTD_CHAR=y CONFIG_MTD_CHAR=y
CONFIG_MTD_BLOCK=y CONFIG_MTD_BLOCK=y
CONFIG_ETRAX_I2C=y CONFIG_ETRAX_I2C=y
@ -145,7 +144,6 @@ CONFIG_MTD_CFI=y
# CONFIG_MTD_CFI_GEOMETRY is not set # CONFIG_MTD_CFI_GEOMETRY is not set
# CONFIG_MTD_CFI_INTELEXT is not set # CONFIG_MTD_CFI_INTELEXT is not set
CONFIG_MTD_CFI_AMDSTD=y CONFIG_MTD_CFI_AMDSTD=y
CONFIG_MTD_AMDSTD=y
# CONFIG_MTD_SHARP is not set # CONFIG_MTD_SHARP is not set
# CONFIG_MTD_PHYSMAP is not set # CONFIG_MTD_PHYSMAP is not set
# CONFIG_MTD_NORA is not set # CONFIG_MTD_NORA is not set

2
arch/cris/arch-v10/drivers/Kconfig
View file

@ -606,8 +606,6 @@ config ETRAX_AXISFLASHMAP
select MTD select MTD
select MTD_CFI select MTD_CFI
select MTD_CFI_AMDSTD select MTD_CFI_AMDSTD
select MTD_OBSOLETE_CHIPS
select MTD_AMDSTD
select MTD_CHAR select MTD_CHAR
select MTD_BLOCK select MTD_BLOCK
select MTD_PARTITIONS select MTD_PARTITIONS

8
arch/cris/arch-v10/drivers/axisflashmap.c
View file

@ -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", "%s: Probing a 0x%08lx bytes large window at 0x%08lx.\n",
map_cs->name, map_cs->size, map_cs->map_priv_1); 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 #ifdef CONFIG_MTD_CFI
mtd_cs = do_map_probe("cfi_probe", map_cs);
#endif
#ifdef CONFIG_MTD_JEDECPROBE
if (!mtd_cs) { if (!mtd_cs) {
mtd_cs = do_map_probe("cfi_probe", map_cs); mtd_cs = do_map_probe("jedec_probe", map_cs);
} }
#endif #endif

2
arch/cris/arch-v32/drivers/Kconfig
View file

@ -362,8 +362,6 @@ config ETRAX_AXISFLASHMAP
select MTD select MTD
select MTD_CFI select MTD_CFI
select MTD_CFI_AMDSTD select MTD_CFI_AMDSTD
select MTD_OBSOLETE_CHIPS
select MTD_AMDSTD
select MTD_CHAR select MTD_CHAR
select MTD_BLOCK select MTD_BLOCK
select MTD_PARTITIONS select MTD_PARTITIONS

9
arch/cris/arch-v32/drivers/axisflashmap.c
View file

@ -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", "%s: Probing a 0x%08lx bytes large window at 0x%08lx.\n",
map_cs->name, map_cs->size, map_cs->map_priv_1); 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 #ifdef CONFIG_MTD_CFI
if (!mtd_cs) {
mtd_cs = do_map_probe("cfi_probe", map_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 #endif
return mtd_cs; return mtd_cs;

2
arch/cris/defconfig
View file

@ -226,8 +226,6 @@ CONFIG_MTD_CFI_UTIL=y
CONFIG_MTD_RAM=y CONFIG_MTD_RAM=y
# CONFIG_MTD_ROM is not set # CONFIG_MTD_ROM is not set
# CONFIG_MTD_ABSENT is not set # CONFIG_MTD_ABSENT is not set
CONFIG_MTD_OBSOLETE_CHIPS=y
CONFIG_MTD_AMDSTD=y
# CONFIG_MTD_SHARP is not set # CONFIG_MTD_SHARP is not set
# CONFIG_MTD_JEDEC is not set # CONFIG_MTD_JEDEC is not set