Wolfgang,

Here is a patch to correct the sizes of the monitor used by the CFI driver to mark sectors for read-only status. With this patch, we can once again save the environment on the MPC85xx ADS and CDS releases.

Thanks, jdl

* Patch by Jon Loeliger, 02-Sep-2004: Reset monitor size back to 256 so environment can be written to flash on MPC85xx ADS and CDS releases.

Index: include/configs/MPC8540ADS.h =================================================================== RCS file: /cvsroot/u-boot/u-boot/include/configs/MPC8540ADS.h,v retrieving revision 1.1.1.1.4.15 retrieving revision 1.1.1.1.4.16 diff -u -r1.1.1.1.4.15 -r1.1.1.1.4.16 --- include/configs/MPC8540ADS.h 2004/08/18 16:08:50 1.1.1.1.4.15 +++ include/configs/MPC8540ADS.h 2004/08/30 18:48:44 1.1.1.1.4.16 @@ -264,7 +264,7 @@ #define CFG_GBL_DATA_OFFSET (CFG_INIT_RAM_END - CFG_GBL_DATA_SIZE) #define CFG_INIT_SP_OFFSET CFG_GBL_DATA_OFFSET

-#define CFG_MONITOR_LEN (512 * 1024) /* Reserve 256 kB for Mon */ +#define CFG_MONITOR_LEN (256 * 1024) /* Reserve 256 kB for Mon */ #define CFG_MALLOC_LEN (128 * 1024) /* Reserved for malloc */

/* Serial Port */ Index: include/configs/MPC8541CDS.h =================================================================== RCS file: /cvsroot/u-boot/u-boot/include/configs/Attic/MPC8541CDS.h,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -u -r1.1.2.1 -r1.1.2.2 --- include/configs/MPC8541CDS.h 2004/08/20 17:20:17 1.1.2.1 +++ include/configs/MPC8541CDS.h 2004/08/30 18:43:54 1.1.2.2 @@ -254,7 +254,7 @@ #define CFG_GBL_DATA_OFFSET (CFG_INIT_RAM_END - CFG_GBL_DATA_SIZE) #define CFG_INIT_SP_OFFSET CFG_GBL_DATA_OFFSET

-#define CFG_MONITOR_LEN (512 * 1024) /* Reserve 512 kB for Mon */ +#define CFG_MONITOR_LEN (256 * 1024) /* Reserve 256 kB for Mon */ #define CFG_MALLOC_LEN (128 * 1024) /* Reserved for malloc */

/* Serial Port */ Index: include/configs/MPC8555CDS.h =================================================================== RCS file: /cvsroot/u-boot/u-boot/include/configs/Attic/MPC8555CDS.h,v retrieving revision 1.1.4.22 retrieving revision 1.1.4.23 diff -u -r1.1.4.22 -r1.1.4.23 --- include/configs/MPC8555CDS.h 2004/08/20 17:20:17 1.1.4.22 +++ include/configs/MPC8555CDS.h 2004/08/30 18:43:54 1.1.4.23 @@ -254,7 +254,7 @@ #define CFG_GBL_DATA_OFFSET (CFG_INIT_RAM_END - CFG_GBL_DATA_SIZE) #define CFG_INIT_SP_OFFSET CFG_GBL_DATA_OFFSET

-#define CFG_MONITOR_LEN (512 * 1024) /* Reserve 512 kB for Mon */ +#define CFG_MONITOR_LEN (256 * 1024) /* Reserve 256 kB for Mon */ #define CFG_MALLOC_LEN (128 * 1024) /* Reserved for malloc */

/* Serial Port */ Index: include/configs/MPC8560ADS.h =================================================================== RCS file: /cvsroot/u-boot/u-boot/include/configs/MPC8560ADS.h,v retrieving revision 1.1.1.1.4.16 retrieving revision 1.1.1.1.4.17 diff -u -r1.1.1.1.4.16 -r1.1.1.1.4.17 --- include/configs/MPC8560ADS.h 2004/08/18 16:08:50 1.1.1.1.4.16 +++ include/configs/MPC8560ADS.h 2004/08/30 18:48:44 1.1.1.1.4.17 @@ -267,7 +267,7 @@ #define CFG_GBL_DATA_OFFSET (CFG_INIT_RAM_END - CFG_GBL_DATA_SIZE) #define CFG_INIT_SP_OFFSET CFG_GBL_DATA_OFFSET

-#define CFG_MONITOR_LEN (512 * 1024) /* Reserve 256 kB for Mon */ +#define CFG_MONITOR_LEN (256 * 1024) /* Reserve 256 kB for Mon */ #define CFG_MALLOC_LEN (128 * 1024) /* Reserved for malloc */

/* Serial Port */