diff --git a/include/common.h b/include/common.h
index 2ff1c8c..0a252c5 100644
--- a/include/common.h
+++ b/include/common.h
@@ -128,6 +128,7 @@
 int	checkdram     (void);
 char *	strmhz(char *buf, long hz);
 int	last_stage_init(void);
+extern ulong monitor_flash_len;
 
 /* common/flash.c */
 void flash_perror (int);
diff --git a/include/configs/ETX094.h b/include/configs/ETX094.h
index 9d7c868..b6e1941 100644
--- a/include/configs/ETX094.h
+++ b/include/configs/ETX094.h
@@ -262,7 +262,6 @@
  *-----------------------------------------------------------------------
  *
  */
-/*#define	CFG_DER	0x2002000F*/
 #define CFG_DER	0
 
 /*
diff --git a/include/configs/FPS850L.h b/include/configs/FPS850L.h
index d04616d..89a4d43 100644
--- a/include/configs/FPS850L.h
+++ b/include/configs/FPS850L.h
@@ -242,7 +242,6 @@
  *-----------------------------------------------------------------------
  *
  */
-/*#define	CFG_DER	0x2002000F*/
 #define CFG_DER	0
 
 /*
diff --git a/include/configs/FPS860L.h b/include/configs/FPS860L.h
index d2ac9d2..14546f0 100644
--- a/include/configs/FPS860L.h
+++ b/include/configs/FPS860L.h
@@ -243,7 +243,6 @@
  *-----------------------------------------------------------------------
  *
  */
-/*#define	CFG_DER	0x2002000F*/
 #define CFG_DER	0
 
 /*
diff --git a/include/configs/IP860.h b/include/configs/IP860.h
index d7dce71..fddf0ca 100644
--- a/include/configs/IP860.h
+++ b/include/configs/IP860.h
@@ -304,7 +304,6 @@
  *-----------------------------------------------------------------------
  *
  */
-/*#define	CFG_DER	0x2002000F*/
 #define CFG_DER	0
 
 /*
diff --git a/include/configs/IVML24.h b/include/configs/IVML24.h
index 85900b5..77746e8 100644
--- a/include/configs/IVML24.h
+++ b/include/configs/IVML24.h
@@ -327,7 +327,6 @@
  *-----------------------------------------------------------------------
  *
  */
-/*#define	CFG_DER	0x2002000F*/
 #define CFG_DER	0
 
 /*
diff --git a/include/configs/IVMS8.h b/include/configs/IVMS8.h
index 2725e77..19063fa 100644
--- a/include/configs/IVMS8.h
+++ b/include/configs/IVMS8.h
@@ -322,7 +322,6 @@
  *-----------------------------------------------------------------------
  *
  */
-/*#define	CFG_DER	0x2002000F*/
 #define CFG_DER	0
 
 /*
diff --git a/include/configs/KUP4K.h b/include/configs/KUP4K.h
index d02ec0d..f68f1e1 100644
--- a/include/configs/KUP4K.h
+++ b/include/configs/KUP4K.h
@@ -319,7 +319,6 @@
  *-----------------------------------------------------------------------
  *
  */
-/*#define	CFG_DER	0x2002000F*/
 #define CFG_DER	0
 
 /*
diff --git a/include/configs/LANTEC.h b/include/configs/LANTEC.h
index 7f4869f..81e2079 100644
--- a/include/configs/LANTEC.h
+++ b/include/configs/LANTEC.h
@@ -276,7 +276,6 @@
  *-----------------------------------------------------------------------
  *
  */
-/*#define	CFG_DER	0x2002000F*/
 #define CFG_DER	0
 
 /*
diff --git a/include/configs/R360MPI.h b/include/configs/R360MPI.h
index 8aba25e..8fa328e 100644
--- a/include/configs/R360MPI.h
+++ b/include/configs/R360MPI.h
@@ -332,8 +332,7 @@
  *-----------------------------------------------------------------------
  *
  */
-#define	CFG_DER	0x2002000F
-/*#define CFG_DER	0*/
+#define CFG_DER	0
 
 /*
  * Init Memory Controller:
diff --git a/include/configs/RRvision.h b/include/configs/RRvision.h
index acfe747..a1327e7 100644
--- a/include/configs/RRvision.h
+++ b/include/configs/RRvision.h
@@ -345,7 +345,6 @@
  *-----------------------------------------------------------------------
  *
  */
-/*#define	CFG_DER	0x2002000F*/
 #define CFG_DER	0
 
 /*
diff --git a/include/configs/SM850.h b/include/configs/SM850.h
index 5dfa8f3..c23b386 100644
--- a/include/configs/SM850.h
+++ b/include/configs/SM850.h
@@ -268,7 +268,6 @@
  *-----------------------------------------------------------------------
  *
  */
-/*#define	CFG_DER	0x2002000F*/
 #define CFG_DER	0
 
 /*
diff --git a/include/configs/SPD823TS.h b/include/configs/SPD823TS.h
index 9ad1839..51f2c25 100644
--- a/include/configs/SPD823TS.h
+++ b/include/configs/SPD823TS.h
@@ -307,7 +307,6 @@
  *-----------------------------------------------------------------------
  *
  */
-/*#define	CFG_DER 0x2002000F*/
 #define CFG_DER 0
 
 /*
diff --git a/include/configs/TQM823L.h b/include/configs/TQM823L.h
index cc51ce6..66e3c91 100644
--- a/include/configs/TQM823L.h
+++ b/include/configs/TQM823L.h
@@ -330,7 +330,6 @@
  *-----------------------------------------------------------------------
  *
  */
-/*#define	CFG_DER	0x2002000F*/
 #define CFG_DER	0
 
 /*
diff --git a/include/configs/TQM850L.h b/include/configs/TQM850L.h
index 60aacfb..07e6faa 100644
--- a/include/configs/TQM850L.h
+++ b/include/configs/TQM850L.h
@@ -322,7 +322,6 @@
  *-----------------------------------------------------------------------
  *
  */
-/*#define	CFG_DER	0x2002000F*/
 #define CFG_DER	0
 
 /*
diff --git a/include/configs/TQM855L.h b/include/configs/TQM855L.h
index 37363a2..7f1f153 100644
--- a/include/configs/TQM855L.h
+++ b/include/configs/TQM855L.h
@@ -322,7 +322,6 @@
  *-----------------------------------------------------------------------
  *
  */
-/*#define	CFG_DER	0x2002000F*/
 #define CFG_DER	0
 
 /*
diff --git a/include/configs/TQM860L.h b/include/configs/TQM860L.h
index a9d1aff..c386d3c 100644
--- a/include/configs/TQM860L.h
+++ b/include/configs/TQM860L.h
@@ -323,7 +323,6 @@
  *-----------------------------------------------------------------------
  *
  */
-/*#define	CFG_DER	0x2002000F*/
 #define CFG_DER	0
 
 /*
diff --git a/include/configs/TQM862L.h b/include/configs/TQM862L.h
index 608c4e1..653d0c7 100644
--- a/include/configs/TQM862L.h
+++ b/include/configs/TQM862L.h
@@ -325,7 +325,6 @@
  *-----------------------------------------------------------------------
  *
  */
-/*#define	CFG_DER	0x2002000F*/
 #define CFG_DER	0
 
 /*
diff --git a/include/configs/c2mon.h b/include/configs/c2mon.h
index b38150f..a4859b5 100644
--- a/include/configs/c2mon.h
+++ b/include/configs/c2mon.h
@@ -321,7 +321,6 @@
  *-----------------------------------------------------------------------
  *
  */
-/*#define	CFG_DER	0x2002000F*/
 #define CFG_DER	0
 
 /*
diff --git a/include/configs/hermes.h b/include/configs/hermes.h
index 2d275f3..1486377 100644
--- a/include/configs/hermes.h
+++ b/include/configs/hermes.h
@@ -253,7 +253,6 @@
  *-----------------------------------------------------------------------
  *
  */
-/*#define	CFG_DER	0x2002000F*/
 #define CFG_DER	0
 
 /*
diff --git a/include/configs/lwmon.h b/include/configs/lwmon.h
index 8ab650e..2989d42 100644
--- a/include/configs/lwmon.h
+++ b/include/configs/lwmon.h
@@ -484,7 +484,6 @@
  *-----------------------------------------------------------------------
  *
  */
-/*#define	CFG_DER 0x2002000F*/
 #define CFG_DER 0
 
 /*