CRIS: Remove MTD_AMSTD and MTD_OBSOLETE_CHIPS take two

PATCH New Jesper Nilsson 1 participant 1 message Nov 5, 2007

Share & tools

Jesper Nilsson

author

2007-11-05 16:43 UTC #0 lore raw

PATCH 1/1 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.

Signed-off-by Jesper Nilsson <[email protected]>

---
 arch-v10/defconfig              |    2 --
 arch-v10/drivers/Kconfig        |    2 --
 arch-v10/drivers/axisflashmap.c |    8 ++++----
 arch-v32/drivers/Kconfig        |    2 --
 arch-v32/drivers/axisflashmap.c |    8 ++++----
 defconfig                       |    2 --
 6 files changed, 8 insertions(+), 16 deletions(-)

arch/cris/arch-v10/defconfig +0 -2

index 710c20b..572f119 100644
@@ -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

index 03e2e68..136a0c6 100644
@@ -605,8 +605,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/arch-v32/drivers/axisflashmap.c +4 -4

index 3ec12ea..7904d98 100644
@@ -190,12 +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

arch/cris/defconfig +0 -2

index 142a108..e3e91f6 100644
@@ -226,8 +226,6 @@ 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_SHARP is not set
 # CONFIG_MTD_JEDEC is not set

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