diff --git a/include/configs/FPS850L.h b/include/configs/FPS850L.h
index dd8051d..c9d6c91 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 1af28b3..bf20a0d 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 807781c..c58cb8c 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 d30c7bc..c896b58 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 6311902..dc4582f 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 53272e1..7ea7342 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 812cea1..473c390 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 512c55d..4de5a33 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 36e2fbf..2ba94c8 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 2da1f3a..7699d51 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 87462a5..23d0dd6 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 9dc8745..e8d2ec43 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 c039e9d..74c815b 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 cc5ee6d..a5fc38d 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 bf3bbb2..9e14d99 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 10dbed9..f3f43c3 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
  */