Skip to contentSkip to conversation

CRIS: Remove MTD_AMSTD and MTD_OBSOLETE_CHIPS

PATCH In review Jesper Nilsson 3 participants 4 messages Nov 5, 2007

lore
Share & tools
lore

Jesper Nilsson

author
#0 lore raw

PATCH 1/1 CRIS: Remove MTD_AMSTD and MTD_OBSOLETE_CHIPS

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 <[email protected]>
---
 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(-)
arch/cris/arch-v10/defconfig +1 -2
index 710c20b..d03bfc0 100644
@@ -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
arch/cris/arch-v10/drivers/Kconfig +0 -2
index e6fc845..faf8b4d 100644
@@ -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
index efd7b0f..ea3cf2e 100644
@@ -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
arch/cris/arch-v32/drivers/Kconfig +0 -2
index cc6ba54..7f72d7c 100644
@@ -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/defconfig +2 -2
index e2d8185..713439b 100644
@@ -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 -- [email protected]

#1 lore raw
Quoted 18 lines · Jesper Nilsson

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 <[email protected]>
---
 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(-)
arch/cris/arch-v10/defconfig +0 -0
index 710c20b..d03bfc0 100644

arch/cris/arch-v10/defconfig CONFIG_MTD=y · line 102

Quoted 5 lines
arch/cris/arch-v10/defconfig +1 -1
@@ -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?

arch/cris/arch-v10/defconfig CONFIG_MTD=y · line 104

Quoted 4 lines
arch/cris/arch-v10/defconfig +2 -2
-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

Signature · 7 lines
========================================================================
Robert P. J. Day
Linux Consulting, Training and Annoying Kernel Pedantry
Waterloo, Ontario, CANADA

http://crashcourse.ca
========================================================================
author
#2 lore raw
Quoted 11 lines · Robert P. J. Day

arch/cris/arch-v10/defconfig CONFIG_MTD=y · line 102

Quoted 8 lines · Jesper Nilsson
arch/cris/arch-v10/defconfig +1 -1
@@ -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.

Quoted 1 line

rday

Thanks,

/^JN - Jesper Nilsson
--
Jesper Nilsson -- [email protected]

#3 lore raw
In reply to Jesper Nilsson
Quoted 17 lines · Jesper Nilsson

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 <[email protected]>
---
 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(-)
arch/cris/arch-v10/defconfig +0 -0
index 710c20b..d03bfc0 100644

arch/cris/arch-v10/defconfig

Quoted 1 line
arch/cris/arch-v10/defconfig +0 -0
...

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).

Quoted 1 line

/^JN - Jesper Nilsson

cu
Adrian

Signature · 4 lines
       "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