Index: README =================================================================== RCS file: /home/cvsroot/Projects/u-boot/README,v retrieving revision 1.1.1.2 diff -p -u -r1.1.1.2 README --- README 15 Aug 2005 12:33:44 -0000 1.1.1.2 +++ README 13 Sep 2005 15:07:42 -0000 @@ -1639,10 +1639,10 @@ Configuration Settings: - CFG_ALT_MEMTEST: Enable an alternate, more extensive memory test. + This requires CFG_MEMTEST_SCRATCH to be set. - CFG_MEMTEST_SCRATCH: Scratch address used by the alternate memory test - You only need to set this if address zero isn't writeable - CFG_TFTP_LOADADDR: Default load address for network file downloads Index: common/cmd_mem.c =================================================================== RCS file: /home/cvsroot/Projects/u-boot/common/cmd_mem.c,v retrieving revision 1.1.1.1 diff -p -u -r1.1.1.1 cmd_mem.c --- common/cmd_mem.c 28 Jun 2005 17:32:26 -0000 1.1.1.1 +++ common/cmd_mem.c 13 Sep 2005 15:07:42 -0000 @@ -704,11 +704,6 @@ int do_mem_mtest (cmd_tbl_t *cmdtp, int vu_long temp; vu_long anti_pattern; vu_long num_words; -#if defined(CFG_MEMTEST_SCRATCH) - vu_long *dummy = (vu_long*)CFG_MEMTEST_SCRATCH; -#else - vu_long *dummy = NULL; -#endif int j; int iterations = 1; @@ -747,7 +742,14 @@ int do_mem_mtest (cmd_tbl_t *cmdtp, int } #if defined(CFG_ALT_MEMTEST) +#if !defined(CFG_MEMTEST_SCRATCH) +#error "CFG_MEMTEST_SCRATCH must be defined if CFG_ALT_MEMTEST is enabled" +#endif + + vu_long *dummy = (vu_long*)CFG_MEMTEST_SCRATCH; + printf ("Testing %08x ... %08x:\n", (uint)start, (uint)end); + printf ("Scratch address = %08x\n", dummy); PRINTF("%s:%d: start 0x%p end 0x%p\n", __FUNCTION__, __LINE__, start, end); Index: include/configs/GEN860T.h =================================================================== RCS file: /home/cvsroot/Projects/u-boot/include/configs/GEN860T.h,v retrieving revision 1.1.1.1 diff -p -u -r1.1.1.1 GEN860T.h --- include/configs/GEN860T.h 28 Jun 2005 17:32:30 -0000 1.1.1.1 +++ include/configs/GEN860T.h 13 Sep 2005 15:07:42 -0000 @@ -335,6 +335,7 @@ * Select the more full-featured memory test */ #define CFG_ALT_MEMTEST +#define CFG_MEMTEST_SCRATCH 0x00000000 /* * Default load address Index: include/configs/TQM5200.h =================================================================== RCS file: /home/cvsroot/Projects/u-boot/include/configs/TQM5200.h,v retrieving revision 1.1.1.1 diff -p -u -r1.1.1.1 TQM5200.h --- include/configs/TQM5200.h 28 Jun 2005 17:32:29 -0000 1.1.1.1 +++ include/configs/TQM5200.h 13 Sep 2005 15:07:42 -0000 @@ -434,7 +434,7 @@ /* Enable an alternate, more extensive memory test */ #define CFG_ALT_MEMTEST - +#define CFG_MEMTEST_SCRATCH 0x00000000 #define CFG_MEMTEST_START 0x00100000 /* memtest works on */ #define CFG_MEMTEST_END 0x00f00000 /* 1 ... 15 MB in DRAM */ Index: include/configs/VCMA9.h =================================================================== RCS file: /home/cvsroot/Projects/u-boot/include/configs/VCMA9.h,v retrieving revision 1.1.1.2 diff -p -u -r1.1.1.2 VCMA9.h --- include/configs/VCMA9.h 15 Aug 2005 12:33:48 -0000 1.1.1.2 +++ include/configs/VCMA9.h 13 Sep 2005 15:07:42 -0000 @@ -165,6 +165,7 @@ #define CFG_MEMTEST_END 0x30F80000 /* 15.5 MB in DRAM */ #define CFG_ALT_MEMTEST +#define CFG_MEMTEST_SCRATCH 0x00000000 #define CFG_LOAD_ADDR 0x30800000 /* default load address */ Index: include/configs/VoVPN-GW.h =================================================================== RCS file: /home/cvsroot/Projects/u-boot/include/configs/VoVPN-GW.h,v retrieving revision 1.1.1.1 diff -p -u -r1.1.1.1 VoVPN-GW.h --- include/configs/VoVPN-GW.h 28 Jun 2005 17:32:29 -0000 1.1.1.1 +++ include/configs/VoVPN-GW.h 13 Sep 2005 15:07:42 -0000 @@ -227,6 +227,7 @@ #define CFG_MEMTEST_END 0x00f00000 /* full featured memtest */ #define CFG_ALT_MEMTEST +#define CFG_MEMTEST_SCRATCH 0x00000000 /* default load address */ #define CFG_LOAD_ADDR 0x00100000 Index: include/configs/aev.h =================================================================== RCS file: /home/cvsroot/Projects/u-boot/include/configs/aev.h,v retrieving revision 1.1.1.1 diff -p -u -r1.1.1.1 aev.h --- include/configs/aev.h 15 Aug 2005 12:33:48 -0000 1.1.1.1 +++ include/configs/aev.h 13 Sep 2005 15:07:42 -0000 @@ -335,6 +335,7 @@ /* Enable an alternate, more extensive memory test */ #define CFG_ALT_MEMTEST +#define CFG_MEMTEST_SCRATCH 0x00000000 #define CFG_MEMTEST_START 0x00100000 /* memtest works on */ #define CFG_MEMTEST_END 0x00f00000 /* 1 ... 15 MB in DRAM */ Index: include/configs/eXalion.h =================================================================== RCS file: /home/cvsroot/Projects/u-boot/include/configs/eXalion.h,v retrieving revision 1.1.1.1 diff -p -u -r1.1.1.1 eXalion.h --- include/configs/eXalion.h 28 Jun 2005 17:32:29 -0000 1.1.1.1 +++ include/configs/eXalion.h 13 Sep 2005 15:07:42 -0000 @@ -134,6 +134,8 @@ #define CFG_MALLOC_LEN (128 * 1024) /* Reserve 128 kB for malloc() */ #define CFG_ALT_MEMTEST 1 /* use real memory test */ +#define CFG_MEMTEST_SCRATCH 0x00000000 + #define CFG_MEMTEST_START 0x00004000 /* memtest works on */ #define CFG_MEMTEST_END 0x02000000 /* 0 ... 32 MB in DRAM */ Index: include/configs/hmi1001.h =================================================================== RCS file: /home/cvsroot/Projects/u-boot/include/configs/hmi1001.h,v retrieving revision 1.1.1.2 diff -p -u -r1.1.1.2 hmi1001.h --- include/configs/hmi1001.h 15 Aug 2005 12:33:48 -0000 1.1.1.2 +++ include/configs/hmi1001.h 13 Sep 2005 15:07:42 -0000 @@ -225,7 +225,7 @@ /* Enable an alternate, more extensive memory test */ #define CFG_ALT_MEMTEST - +#define CFG_MEMTEST_SCRATCH 0x00000000 #define CFG_MEMTEST_START 0x00100000 /* memtest works on */ #define CFG_MEMTEST_END 0x00f00000 /* 1 ... 15 MB in DRAM */ Index: include/configs/inka4x0.h =================================================================== RCS file: /home/cvsroot/Projects/u-boot/include/configs/inka4x0.h,v retrieving revision 1.1.1.1 diff -p -u -r1.1.1.1 inka4x0.h --- include/configs/inka4x0.h 28 Jun 2005 17:32:30 -0000 1.1.1.1 +++ include/configs/inka4x0.h 13 Sep 2005 15:07:42 -0000 @@ -230,6 +230,7 @@ /* Enable an alternate, more extensive memory test */ #define CFG_ALT_MEMTEST +#define CFG_MEMTEST_SCRATCH 0x00000000 #define CFG_MEMTEST_START 0x00100000 /* memtest works on */ #define CFG_MEMTEST_END 0x00f00000 /* 1 ... 15 MB in DRAM */ Index: include/configs/quantum.h =================================================================== RCS file: /home/cvsroot/Projects/u-boot/include/configs/quantum.h,v retrieving revision 1.1.1.1 diff -p -u -r1.1.1.1 quantum.h --- include/configs/quantum.h 28 Jun 2005 17:32:29 -0000 1.1.1.1 +++ include/configs/quantum.h 13 Sep 2005 15:07:42 -0000 @@ -73,6 +73,7 @@ * Select the more full-featured memory test (Barr embedded systems) */ #define CFG_ALT_MEMTEST +#define CFG_MEMTEST_SCRATCH 0x00000000 #define CONFIG_LOADS_ECHO 1 /* echo on for serial download */ #undef CFG_LOADS_BAUD_CHANGE /* don't allow baudrate change */ Index: include/configs/sacsng.h =================================================================== RCS file: /home/cvsroot/Projects/u-boot/include/configs/sacsng.h,v retrieving revision 1.1.1.2 diff -p -u -r1.1.1.2 sacsng.h --- include/configs/sacsng.h 15 Aug 2005 12:33:48 -0000 1.1.1.2 +++ include/configs/sacsng.h 13 Sep 2005 15:07:42 -0000 @@ -608,6 +608,8 @@ #define CFG_HZ 1000 /* decrementer freq: 1 ms ticks */ #define CFG_ALT_MEMTEST /* Select full-featured memory test */ +#define CFG_MEMTEST_SCRATCH 0x00000000 + #define CFG_MEMTEST_START 0x2000 /* memtest works from the end of */ /* the exception vector table */ /* to the end of the DRAM */ Index: include/configs/sbc8260.h =================================================================== RCS file: /home/cvsroot/Projects/u-boot/include/configs/sbc8260.h,v retrieving revision 1.1.1.2 diff -p -u -r1.1.1.2 sbc8260.h --- include/configs/sbc8260.h 15 Aug 2005 12:33:48 -0000 1.1.1.2 +++ include/configs/sbc8260.h 13 Sep 2005 15:07:42 -0000 @@ -506,6 +506,8 @@ #define CFG_HZ 1000 /* decrementer freq: 1 ms ticks */ #define CFG_ALT_MEMTEST /* Select full-featured memory test */ +#define CFG_MEMTEST_SCRATCH 0x00000000 + #define CFG_MEMTEST_START 0x2000 /* memtest works from the end of */ /* the exception vector table */ /* to the end of the DRAM */ Index: include/configs/spieval.h =================================================================== RCS file: /home/cvsroot/Projects/u-boot/include/configs/spieval.h,v retrieving revision 1.1.1.1 diff -p -u -r1.1.1.1 spieval.h --- include/configs/spieval.h 15 Aug 2005 12:33:48 -0000 1.1.1.1 +++ include/configs/spieval.h 13 Sep 2005 15:07:42 -0000 @@ -434,6 +434,7 @@ /* Enable an alternate, more extensive memory test */ #define CFG_ALT_MEMTEST +#define CFG_MEMTEST_SCRATCH 0x00000000 #define CFG_MEMTEST_START 0x00100000 /* memtest works on */ #define CFG_MEMTEST_END 0x00f00000 /* 1 ... 15 MB in DRAM */