TQM8xx: Fix CFI flash driver support for all TQM8xx based boards

After switching to using the CFI flash driver, the correct remapping
of the flash banks was forgotten.

Also, some boards were not adapted, and the old legacy flash driver
was not removed yet.

Signed-off-by: Wolfgang Denk <wd@denx.de>

16 files changed, 43 insertions, 10 deletions

diff --git a/include/configs/FPS850L.h b/include/configs/FPS850L.h
index dd8051d637..c9d6c91291 100644
--- a/include/configs/FPS850L.h
+++ b/include/configs/FPS850L.h
@@ -211,6 +211,8 @@
 
 #define	CFG_USE_PPCENV			/* Environment embedded in sect .ppcenv */
 
+#define CONFIG_MISC_INIT_R		/* Make sure to remap flashes correctly */
+
 /*-----------------------------------------------------------------------
  * Dynamic MTD partition support
  */
diff --git a/include/configs/FPS860L.h b/include/configs/FPS860L.h
index 1af28b39f5..bf20a0d733 100644
--- a/include/configs/FPS860L.h
+++ b/include/configs/FPS860L.h
@@ -211,6 +211,8 @@
 
 #define	CFG_USE_PPCENV			/* Environment embedded in sect .ppcenv */
 
+#define CONFIG_MISC_INIT_R		/* Make sure to remap flashes correctly */
+
 /*-----------------------------------------------------------------------
  * Dynamic MTD partition support
  */
diff --git a/include/configs/HMI10.h b/include/configs/HMI10.h
index 807781c1c2..c58cb8c52a 100644
--- a/include/configs/HMI10.h
+++ b/include/configs/HMI10.h
@@ -1,5 +1,5 @@
 /*
- * (C) Copyright 2000-2005
+ * (C) Copyright 2000-2008
  * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
  *
  * See file CREDITS for list of people who contributed to this
diff --git a/include/configs/SM850.h b/include/configs/SM850.h
index d30c7bcf47..c896b58638 100644
--- a/include/configs/SM850.h
+++ b/include/configs/SM850.h
@@ -1,5 +1,5 @@
 /*
- * (C) Copyright 2000
+ * (C) Copyright 2000-2008
  * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
  *
  * See file CREDITS for list of people who contributed to this
@@ -157,16 +157,21 @@
 /*-----------------------------------------------------------------------
  * FLASH organization
  */
+/* use CFI flash driver */
+#define CFG_FLASH_CFI		1	/* Flash is CFI conformant */
+#define CONFIG_FLASH_CFI_DRIVER	1	/* Use the common driver */
+#define CFG_FLASH_BANKS_LIST	{ CFG_FLASH_BASE, CFG_FLASH_BASE+flash_info[0].size }
+#define CFG_FLASH_EMPTY_INFO
+#define CFG_FLASH_USE_BUFFER_WRITE	1
 #define CFG_MAX_FLASH_BANKS	2	/* max number of memory banks		*/
-#define CFG_MAX_FLASH_SECT	67	/* max number of sectors on one chip	*/
-
-#define CFG_FLASH_ERASE_TOUT	120000	/* Timeout for Flash Erase (in ms)	*/
-#define CFG_FLASH_WRITE_TOUT	500	/* Timeout for Flash Write (in ms)	*/
+#define CFG_MAX_FLASH_SECT	71	/* max number of sectors on one chip */
 
 #define	CONFIG_ENV_IS_IN_FLASH	1
-#define	CONFIG_ENV_OFFSET		0x8000	/*   Offset   of Environment Sector	*/
+#define	CONFIG_ENV_OFFSET	0x8000	/*   Offset   of Environment Sector	*/
 #define	CONFIG_ENV_SIZE		0x4000	/* Total Size of Environment Sector	*/
 
+#define CONFIG_MISC_INIT_R		/* Make sure to remap flashes correctly */
+
 /*-----------------------------------------------------------------------
  * Hardware Information Block
  */
diff --git a/include/configs/TQM823L.h b/include/configs/TQM823L.h
index 631190295c..dc4582ff5b 100644
--- a/include/configs/TQM823L.h
+++ b/include/configs/TQM823L.h
@@ -225,6 +225,8 @@
 
 #define	CFG_USE_PPCENV			/* Environment embedded in sect .ppcenv */
 
+#define CONFIG_MISC_INIT_R		/* Make sure to remap flashes correctly */
+
 /*-----------------------------------------------------------------------
  * Dynamic MTD partition support
  */
diff --git a/include/configs/TQM823M.h b/include/configs/TQM823M.h
index 53272e1722..7ea73427b9 100644
--- a/include/configs/TQM823M.h
+++ b/include/configs/TQM823M.h
@@ -221,6 +221,8 @@
 
 #define	CFG_USE_PPCENV			/* Environment embedded in sect .ppcenv */
 
+#define CONFIG_MISC_INIT_R		/* Make sure to remap flashes correctly */
+
 /*-----------------------------------------------------------------------
  * Dynamic MTD partition support
  */
diff --git a/include/configs/TQM850L.h b/include/configs/TQM850L.h
index 812cea16c0..473c390066 100644
--- a/include/configs/TQM850L.h
+++ b/include/configs/TQM850L.h
@@ -210,6 +210,8 @@
 
 #define	CFG_USE_PPCENV			/* Environment embedded in sect .ppcenv */
 
+#define CONFIG_MISC_INIT_R		/* Make sure to remap flashes correctly */
+
 /*-----------------------------------------------------------------------
  * Dynamic MTD partition support
  */
diff --git a/include/configs/TQM850M.h b/include/configs/TQM850M.h
index 512c55dc0c..4de5a33aa4 100644
--- a/include/configs/TQM850M.h
+++ b/include/configs/TQM850M.h
@@ -210,6 +210,8 @@
 
 #define	CFG_USE_PPCENV			/* Environment embedded in sect .ppcenv */
 
+#define CONFIG_MISC_INIT_R		/* Make sure to remap flashes correctly */
+
 /*-----------------------------------------------------------------------
  * Dynamic MTD partition support
  */
diff --git a/include/configs/TQM855L.h b/include/configs/TQM855L.h
index 36e2fbf2e2..2ba94c8cc3 100644
--- a/include/configs/TQM855L.h
+++ b/include/configs/TQM855L.h
@@ -215,6 +215,8 @@
 
 #define	CFG_USE_PPCENV			/* Environment embedded in sect .ppcenv */
 
+#define CONFIG_MISC_INIT_R		/* Make sure to remap flashes correctly */
+
 /*-----------------------------------------------------------------------
  * Dynamic MTD partition support
  */
diff --git a/include/configs/TQM855M.h b/include/configs/TQM855M.h
index 2da1f3ae09..7699d51c07 100644
--- a/include/configs/TQM855M.h
+++ b/include/configs/TQM855M.h
@@ -250,6 +250,8 @@
 
 #define	CFG_USE_PPCENV			/* Environment embedded in sect .ppcenv */
 
+#define CONFIG_MISC_INIT_R		/* Make sure to remap flashes correctly */
+
 /*-----------------------------------------------------------------------
  * Dynamic MTD partition support
  */
diff --git a/include/configs/TQM860L.h b/include/configs/TQM860L.h
index 87462a5611..23d0dd6c89 100644
--- a/include/configs/TQM860L.h
+++ b/include/configs/TQM860L.h
@@ -214,6 +214,8 @@
 
 #define	CFG_USE_PPCENV			/* Environment embedded in sect .ppcenv */
 
+#define CONFIG_MISC_INIT_R		/* Make sure to remap flashes correctly */
+
 /*-----------------------------------------------------------------------
  * Dynamic MTD partition support
  */
diff --git a/include/configs/TQM860M.h b/include/configs/TQM860M.h
index 9dc874550c..e8d2ec43d7 100644
--- a/include/configs/TQM860M.h
+++ b/include/configs/TQM860M.h
@@ -1,5 +1,5 @@
 /*
- * (C) Copyright 2000-2005
+ * (C) Copyright 2000-2008
  * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
  *
  * See file CREDITS for list of people who contributed to this
@@ -215,6 +215,8 @@
 
 #define	CFG_USE_PPCENV			/* Environment embedded in sect .ppcenv */
 
+#define CONFIG_MISC_INIT_R		/* Make sure to remap flashes correctly */
+
 /*-----------------------------------------------------------------------
  * Dynamic MTD partition support
  */
diff --git a/include/configs/TQM862L.h b/include/configs/TQM862L.h
index c039e9d3e3..74c815b88a 100644
--- a/include/configs/TQM862L.h
+++ b/include/configs/TQM862L.h
@@ -218,6 +218,8 @@
 
 #define	CFG_USE_PPCENV			/* Environment embedded in sect .ppcenv */
 
+#define CONFIG_MISC_INIT_R		/* Make sure to remap flashes correctly */
+
 /*-----------------------------------------------------------------------
  * Dynamic MTD partition support
  */
diff --git a/include/configs/TQM862M.h b/include/configs/TQM862M.h
index cc5ee6da07..a5fc38db03 100644
--- a/include/configs/TQM862M.h
+++ b/include/configs/TQM862M.h
@@ -1,5 +1,5 @@
 /*
- * (C) Copyright 2000-2005
+ * (C) Copyright 2000-2008
  * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
  *
  * See file CREDITS for list of people who contributed to this
@@ -219,6 +219,8 @@
 
 #define	CFG_USE_PPCENV			/* Environment embedded in sect .ppcenv */
 
+#define CONFIG_MISC_INIT_R		/* Make sure to remap flashes correctly */
+
 /*-----------------------------------------------------------------------
  * Dynamic MTD partition support
  */
diff --git a/include/configs/TQM866M.h b/include/configs/TQM866M.h
index bf3bbb264a..9e14d995ab 100644
--- a/include/configs/TQM866M.h
+++ b/include/configs/TQM866M.h
@@ -1,5 +1,5 @@
 /*
- * (C) Copyright 2000-2005
+ * (C) Copyright 2000-2008
  * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
  *
  * See file CREDITS for list of people who contributed to this
@@ -259,6 +259,8 @@
 
 #define	CFG_USE_PPCENV			/* Environment embedded in sect .ppcenv */
 
+#define CONFIG_MISC_INIT_R		/* Make sure to remap flashes correctly */
+
 /*-----------------------------------------------------------------------
  * Dynamic MTD partition support
  */
diff --git a/include/configs/virtlab2.h b/include/configs/virtlab2.h
index 10dbed96ff..f3f43c3d26 100644
--- a/include/configs/virtlab2.h
+++ b/include/configs/virtlab2.h
@@ -219,6 +219,8 @@
 
 #define	CFG_USE_PPCENV			/* Environment embedded in sect .ppcenv */
 
+#define CONFIG_MISC_INIT_R		/* Make sure to remap flashes correctly */
+
 /*-----------------------------------------------------------------------
  * Dynamic MTD partition support
  */