* [PATCH] CRIS: Remove MTD_AMSTD and MTD_OBSOLETE_CHIPS
@ 2007-11-05 13:21 Jesper Nilsson
2007-11-05 14:29 ` Robert P. J. Day
2007-11-05 15:57 ` Adrian Bunk
0 siblings, 2 replies; 4+ messages in thread
From: Jesper Nilsson @ 2007-11-05 13:21 UTC (permalink / raw)
To: Andrew Morton, Mikael Starvik, Jesper Nilsson, linux-kernel
Remove no longer configured MTD_AMDSTD and MTD_OBSOLETE_CHIPS from
defconfig, Kconfig and code, instead we'll use MTD_CFI and/or MTD_JEDECPROBE.
Signed-off-by: Jesper Nilsson <jesper.nilsson@axis.com>
---
arch-v10/defconfig | 3 +--
arch-v10/drivers/Kconfig | 2 --
arch-v10/drivers/axisflashmap.c | 8 ++++----
arch-v32/drivers/Kconfig | 2 --
defconfig | 4 ++--
5 files changed, 7 insertions(+), 12 deletions(-)
diff --git a/arch/cris/arch-v10/defconfig b/arch/cris/arch-v10/defconfig
index 710c20b..d03bfc0 100644
--- a/arch/cris/arch-v10/defconfig
+++ b/arch/cris/arch-v10/defconfig
@@ -99,7 +99,7 @@ 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_AMDSTD is not set
CONFIG_MTD_CHAR=y
CONFIG_MTD_BLOCK=y
CONFIG_ETRAX_I2C=y
@@ -145,7 +145,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
diff --git a/arch/cris/arch-v10/drivers/Kconfig b/arch/cris/arch-v10/drivers/Kconfig
index e6fc845..faf8b4d 100644
--- a/arch/cris/arch-v10/drivers/Kconfig
+++ b/arch/cris/arch-v10/drivers/Kconfig
@@ -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
diff --git a/arch/cris/arch-v10/drivers/axisflashmap.c b/arch/cris/arch-v10/drivers/axisflashmap.c
index efd7b0f..ea3cf2e 100644
--- a/arch/cris/arch-v10/drivers/axisflashmap.c
+++ b/arch/cris/arch-v10/drivers/axisflashmap.c
@@ -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
+ mtd_cs = do_map_probe("cfi_probe", map_cs);
+#endif
+#ifdef CONFIG_MTD_JEDECPROBE
if (!mtd_cs) {
- mtd_cs = do_map_probe("cfi_probe", map_cs);
+ mtd_cs = do_map_probe("jedec_probe", map_cs);
}
#endif
diff --git a/arch/cris/arch-v32/drivers/Kconfig b/arch/cris/arch-v32/drivers/Kconfig
index cc6ba54..7f72d7c 100644
--- a/arch/cris/arch-v32/drivers/Kconfig
+++ b/arch/cris/arch-v32/drivers/Kconfig
@@ -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
diff --git a/arch/cris/defconfig b/arch/cris/defconfig
index e2d8185..713439b 100644
--- a/arch/cris/defconfig
+++ b/arch/cris/defconfig
@@ -226,8 +226,8 @@ CONFIG_MTD_CFI_UTIL=y
CONFIG_MTD_RAM=y
# CONFIG_MTD_ROM is not set
# CONFIG_MTD_ABSENT is not set
-CONFIG_MTD_OBSOLETE_CHIPS=y
-CONFIG_MTD_AMDSTD=y
+# CONFIG_MTD_OBSOLETE_CHIPS is not set
+# CONFIG_MTD_AMDSTD is not set
# CONFIG_MTD_SHARP is not set
# CONFIG_MTD_JEDEC is not set
/^JN - Jesper Nilsson
--
Jesper Nilsson -- jesper.nilsson@axis.com
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] CRIS: Remove MTD_AMSTD and MTD_OBSOLETE_CHIPS
2007-11-05 13:21 [PATCH] CRIS: Remove MTD_AMSTD and MTD_OBSOLETE_CHIPS Jesper Nilsson
@ 2007-11-05 14:29 ` Robert P. J. Day
2007-11-05 15:34 ` Jesper Nilsson
2007-11-05 15:57 ` Adrian Bunk
1 sibling, 1 reply; 4+ messages in thread
From: Robert P. J. Day @ 2007-11-05 14:29 UTC (permalink / raw)
To: Jesper Nilsson; +Cc: Andrew Morton, Mikael Starvik, linux-kernel
On Mon, 5 Nov 2007, Jesper Nilsson wrote:
> Remove no longer configured MTD_AMDSTD and MTD_OBSOLETE_CHIPS from
> defconfig, Kconfig and code, instead we'll use MTD_CFI and/or MTD_JEDECPROBE.
>
> Signed-off-by: Jesper Nilsson <jesper.nilsson@axis.com>
>
> ---
> arch-v10/defconfig | 3 +--
> arch-v10/drivers/Kconfig | 2 --
> arch-v10/drivers/axisflashmap.c | 8 ++++----
> arch-v32/drivers/Kconfig | 2 --
> defconfig | 4 ++--
> 5 files changed, 7 insertions(+), 12 deletions(-)
>
> diff --git a/arch/cris/arch-v10/defconfig b/arch/cris/arch-v10/defconfig
> index 710c20b..d03bfc0 100644
> --- a/arch/cris/arch-v10/defconfig
> +++ b/arch/cris/arch-v10/defconfig
> @@ -99,7 +99,7 @@ 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_AMDSTD is not set
why are you keeping this around?
> -CONFIG_MTD_OBSOLETE_CHIPS=y
> -CONFIG_MTD_AMDSTD=y
> +# CONFIG_MTD_OBSOLETE_CHIPS is not set
> +# CONFIG_MTD_AMDSTD is not set
same here.
rday
--
========================================================================
Robert P. J. Day
Linux Consulting, Training and Annoying Kernel Pedantry
Waterloo, Ontario, CANADA
http://crashcourse.ca
========================================================================
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] CRIS: Remove MTD_AMSTD and MTD_OBSOLETE_CHIPS
2007-11-05 14:29 ` Robert P. J. Day
@ 2007-11-05 15:34 ` Jesper Nilsson
0 siblings, 0 replies; 4+ messages in thread
From: Jesper Nilsson @ 2007-11-05 15:34 UTC (permalink / raw)
To: Robert P. J. Day; +Cc: Andrew Morton, Mikael Starvik, linux-kernel
On Mon, Nov 05, 2007 at 09:29:21AM -0500, Robert P. J. Day wrote:
> On Mon, 5 Nov 2007, Jesper Nilsson wrote:
> > --- a/arch/cris/arch-v10/defconfig
> > +++ b/arch/cris/arch-v10/defconfig
> > @@ -99,7 +99,7 @@ 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_AMDSTD is not set
>
> why are you keeping this around?
Hmm... Good point. I'll resubmit the patch with the values removed entirely.
> rday
Thanks,
/^JN - Jesper Nilsson
--
Jesper Nilsson -- jesper.nilsson@axis.com
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] CRIS: Remove MTD_AMSTD and MTD_OBSOLETE_CHIPS
2007-11-05 13:21 [PATCH] CRIS: Remove MTD_AMSTD and MTD_OBSOLETE_CHIPS Jesper Nilsson
2007-11-05 14:29 ` Robert P. J. Day
@ 2007-11-05 15:57 ` Adrian Bunk
1 sibling, 0 replies; 4+ messages in thread
From: Adrian Bunk @ 2007-11-05 15:57 UTC (permalink / raw)
To: Jesper Nilsson; +Cc: Andrew Morton, Mikael Starvik, linux-kernel
On Mon, Nov 05, 2007 at 02:21:02PM +0100, Jesper Nilsson wrote:
> Remove no longer configured MTD_AMDSTD and MTD_OBSOLETE_CHIPS from
> defconfig, Kconfig and code, instead we'll use MTD_CFI and/or MTD_JEDECPROBE.
>
> Signed-off-by: Jesper Nilsson <jesper.nilsson@axis.com>
>
> ---
> arch-v10/defconfig | 3 +--
> arch-v10/drivers/Kconfig | 2 --
> arch-v10/drivers/axisflashmap.c | 8 ++++----
> arch-v32/drivers/Kconfig | 2 --
> defconfig | 4 ++--
> 5 files changed, 7 insertions(+), 12 deletions(-)
>
> diff --git a/arch/cris/arch-v10/defconfig b/arch/cris/arch-v10/defconfig
> index 710c20b..d03bfc0 100644
> --- a/arch/cris/arch-v10/defconfig
> +++ b/arch/cris/arch-v10/defconfig
>...
Patching defconfig's is not that effective, and defconfig's containing
no longer present options are not a problem.
Simply ignore them for now (but it might make sense to update them
once all your patches got merged).
> /^JN - Jesper Nilsson
cu
Adrian
--
"Is there not promise of rain?" Ling Tan asked suddenly out
of the darkness. There had been need of rain for many days.
"Only a promise," Lao Er said.
Pearl S. Buck - Dragon Seed
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2007-11-05 15:57 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-11-05 13:21 [PATCH] CRIS: Remove MTD_AMSTD and MTD_OBSOLETE_CHIPS Jesper Nilsson
2007-11-05 14:29 ` Robert P. J. Day
2007-11-05 15:34 ` Jesper Nilsson
2007-11-05 15:57 ` Adrian Bunk
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox