From patchwork Thu Jan 28 15:51:23 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: Drop all hardcoded ram_check() calls for now Date: Thu, 28 Jan 2010 15:51:23 -0000 From: Uwe Hermann X-Patchwork-Id: 849 Message-Id: <20100128155123.GD17834@greenwood> To: coreboot@coreboot.org See patch. After my last patch from http://www.coreboot.org/pipermail/coreboot/2009-October/053987.html which makes ram_check() at least partially configurable at build-time via menuconfig didn't get much love, here's a different one. It drops all ram_check() calls from all boards for now. However, I still do believe that it is very useful to have an easy way in menuconfig to enable such a check. This allows us to tell a user "Please enable the RAM check in menuconfig and send a boot log" without having to make/send patches or explain what to add where etc. I'm fine with making it only visible if CONFIG_EXPERT is set, but IMHO the option should be there. My last implementation did admittedly suck though, but this can be implemented in a much nicer way. Uwe. Drop all hardcoded ram_check() calls from coreboot for now. The function itself remains, to allow developers and users to add it to auto.c / cache_as_ram_auto.c as needed to do a RAM init sanity check during bringup or if strange errors are encountered. Signed-off-by: Uwe Hermann Index: src/mainboard/axus/tc320/auto.c =================================================================== --- src/mainboard/axus/tc320/auto.c (Revision 5060) +++ src/mainboard/axus/tc320/auto.c (Arbeitskopie) @@ -45,5 +45,4 @@ report_bist_failure(bist); cs5530_enable_rom(); sdram_init(); - /* ram_check(0, 640 * 1024); */ } Index: src/mainboard/bcom/winnetp680/auto.c =================================================================== --- src/mainboard/bcom/winnetp680/auto.c (Revision 5060) +++ src/mainboard/bcom/winnetp680/auto.c (Arbeitskopie) @@ -122,7 +122,5 @@ ddr_ram_setup(&ctrl); - /* ram_check(0, 640 * 1024); */ - print_spew("Leaving auto.c:main()\r\n"); } Index: src/mainboard/bcom/winnet100/auto.c =================================================================== --- src/mainboard/bcom/winnet100/auto.c (Revision 5060) +++ src/mainboard/bcom/winnet100/auto.c (Arbeitskopie) @@ -51,7 +51,4 @@ /* Initialize RAM. */ sdram_init(); - - /* Check whether RAM works. */ - /* ram_check(0, 640 * 1024); */ } Index: src/mainboard/televideo/tc7020/auto.c =================================================================== --- src/mainboard/televideo/tc7020/auto.c (Revision 5060) +++ src/mainboard/televideo/tc7020/auto.c (Arbeitskopie) @@ -51,7 +51,4 @@ /* Initialize RAM. */ sdram_init(); - - /* Check whether RAM works. */ - /* ram_check(0, 640 * 1024); */ } Index: src/mainboard/thomson/ip1000/auto.c =================================================================== --- src/mainboard/thomson/ip1000/auto.c (Revision 5060) +++ src/mainboard/thomson/ip1000/auto.c (Arbeitskopie) @@ -119,9 +119,5 @@ sdram_set_spd_registers(memctrl); sdram_enable(0, memctrl); - /* Check RAM. */ - /* ram_check(0, 640 * 1024); */ - /* ram_check(64512 * 1024, 65536 * 1024); */ - ac97_io_enable(); } Index: src/mainboard/supermicro/x6dai_g/auto.c =================================================================== --- src/mainboard/supermicro/x6dai_g/auto.c (Revision 5060) +++ src/mainboard/supermicro/x6dai_g/auto.c (Arbeitskopie) @@ -121,19 +121,7 @@ // dump_bar14(PCI_DEV(0, 0x00, 0)); #endif -#if 0 // temporarily disabled - /* Check the first 1M */ -// ram_check(0x00000000, 0x000100000); -// ram_check(0x00000000, 0x000a0000); - ram_check(0x00100000, 0x01000000); - /* check the first 1M in the 3rd Gig */ - ram_check(0x30100000, 0x31000000); -#endif #if 0 - ram_check(0x00000000, 0x02000000); -#endif - -#if 0 while(1) { hlt(); } Index: src/mainboard/supermicro/x6dhe_g/auto.c =================================================================== --- src/mainboard/supermicro/x6dhe_g/auto.c (Revision 5060) +++ src/mainboard/supermicro/x6dhe_g/auto.c (Arbeitskopie) @@ -132,19 +132,7 @@ dump_bar14(PCI_DEV(0, 0x00, 0)); #endif -#if 0 // temporarily disabled - /* Check the first 1M */ -// ram_check(0x00000000, 0x000100000); -// ram_check(0x00000000, 0x000a0000); - ram_check(0x00100000, 0x01000000); - /* check the first 1M in the 3rd Gig */ - ram_check(0x30100000, 0x31000000); -#endif #if 0 - ram_check(0x00000000, 0x02000000); -#endif - -#if 0 while(1) { hlt(); } Index: src/mainboard/supermicro/x6dhe_g2/auto.c =================================================================== --- src/mainboard/supermicro/x6dhe_g2/auto.c (Revision 5060) +++ src/mainboard/supermicro/x6dhe_g2/auto.c (Arbeitskopie) @@ -133,19 +133,7 @@ //dump_bar14(PCI_DEV(0, 0x00, 0)); #endif -#if 0 // temporarily disabled - /* Check the first 1M */ -// ram_check(0x00000000, 0x000100000); -// ram_check(0x00000000, 0x000a0000); - ram_check(0x00100000, 0x01000000); - /* check the first 1M in the 3rd Gig */ - ram_check(0x30100000, 0x31000000); -#endif #if 0 - ram_check(0x00000000, 0x02000000); -#endif - -#if 0 while(1) { hlt(); } Index: src/mainboard/supermicro/x6dhe_g2/auto.updated.c =================================================================== --- src/mainboard/supermicro/x6dhe_g2/auto.updated.c (Revision 5060) +++ src/mainboard/supermicro/x6dhe_g2/auto.updated.c (Arbeitskopie) @@ -132,19 +132,7 @@ //dump_bar14(PCI_DEV(0, 0x00, 0)); #endif -#if 0 // temporarily disabled - /* Check the first 1M */ -// ram_check(0x00000000, 0x000100000); -// ram_check(0x00000000, 0x000a0000); - ram_check(0x00100000, 0x01000000); - /* check the first 1M in the 3rd Gig */ - ram_check(0x30100000, 0x31000000); -#endif #if 0 - ram_check(0x00000000, 0x02000000); -#endif - -#if 0 while(1) { hlt(); } Index: src/mainboard/supermicro/x6dhr_ig/auto.c =================================================================== --- src/mainboard/supermicro/x6dhr_ig/auto.c (Revision 5060) +++ src/mainboard/supermicro/x6dhr_ig/auto.c (Arbeitskopie) @@ -133,20 +133,7 @@ dump_bar14(PCI_DEV(0, 0x00, 0)); #endif -#if 0 // temporarily disabled - /* Check the first 1M */ -// ram_check(0x00000000, 0x000100000); -// ram_check(0x00000000, 0x000a0000); -// ram_check(0x00100000, 0x01000000); - ram_check(0x00100000, 0x00100100); - /* check the first 1M in the 3rd Gig */ -// ram_check(0x30100000, 0x31000000); -#endif #if 0 - ram_check(0x00000000, 0x02000000); -#endif - -#if 0 while(1) { hlt(); } Index: src/mainboard/supermicro/x6dhr_ig2/auto.c =================================================================== --- src/mainboard/supermicro/x6dhr_ig2/auto.c (Revision 5060) +++ src/mainboard/supermicro/x6dhr_ig2/auto.c (Arbeitskopie) @@ -133,20 +133,7 @@ dump_bar14(PCI_DEV(0, 0x00, 0)); #endif -#if 0 // temporarily disabled - /* Check the first 1M */ -// ram_check(0x00000000, 0x000100000); -// ram_check(0x00000000, 0x000a0000); -// ram_check(0x00100000, 0x01000000); - ram_check(0x00100000, 0x00100100); - /* check the first 1M in the 3rd Gig */ -// ram_check(0x30100000, 0x31000000); -#endif #if 0 - ram_check(0x00000000, 0x02000000); -#endif - -#if 0 while(1) { hlt(); } Index: src/mainboard/soyo/sy-6ba-plus-iii/auto.c =================================================================== --- src/mainboard/soyo/sy-6ba-plus-iii/auto.c (Revision 5060) +++ src/mainboard/soyo/sy-6ba-plus-iii/auto.c (Arbeitskopie) @@ -69,5 +69,4 @@ sdram_set_registers(); sdram_set_spd_registers(); sdram_enable(); - /* ram_check(0, 640 * 1024); */ } Index: src/mainboard/kontron/986lcd-m/auto.c =================================================================== --- src/mainboard/kontron/986lcd-m/auto.c (Revision 5060) +++ src/mainboard/kontron/986lcd-m/auto.c (Arbeitskopie) @@ -448,6 +448,7 @@ sdram_dump_mchbar_registers(); #endif +#if 0 { /* This will not work if TSEG is in place! */ u32 tom = pci_read_config32(PCI_DEV(0,2,0), 0x5c); @@ -457,7 +458,9 @@ //ram_check(0x00100000, tom); } #endif + #endif +#endif MCHBAR16(SSKPD) = 0xCAFE; Index: src/mainboard/a-trend/atc-6240/auto.c =================================================================== --- src/mainboard/a-trend/atc-6240/auto.c (Revision 5060) +++ src/mainboard/a-trend/atc-6240/auto.c (Arbeitskopie) @@ -69,5 +69,4 @@ sdram_set_registers(); sdram_set_spd_registers(); sdram_enable(); - /* ram_check(0, 640 * 1024); */ } Index: src/mainboard/a-trend/atc-6220/auto.c =================================================================== --- src/mainboard/a-trend/atc-6220/auto.c (Revision 5060) +++ src/mainboard/a-trend/atc-6220/auto.c (Arbeitskopie) @@ -69,5 +69,4 @@ sdram_set_registers(); sdram_set_spd_registers(); sdram_enable(); - /* ram_check(0, 640 * 1024); */ } Index: src/mainboard/gigabyte/ga-6bxc/auto.c =================================================================== --- src/mainboard/gigabyte/ga-6bxc/auto.c (Revision 5060) +++ src/mainboard/gigabyte/ga-6bxc/auto.c (Arbeitskopie) @@ -69,5 +69,4 @@ sdram_set_registers(); sdram_set_spd_registers(); sdram_enable(); - /* ram_check(0, 640 * 1024); */ } Index: src/mainboard/digitallogic/msm800sev/auto.c =================================================================== --- src/mainboard/digitallogic/msm800sev/auto.c (Revision 5060) +++ src/mainboard/digitallogic/msm800sev/auto.c (Arbeitskopie) @@ -132,7 +132,4 @@ print_err("done cpuRegInit\n"); sdram_initialize(1, memctrl); //GX3 OK almost - - /* Check all of memory */ - //ram_check(0x00000000, 640*1024); } Index: src/mainboard/digitallogic/msm800sev/cache_as_ram_auto.c =================================================================== --- src/mainboard/digitallogic/msm800sev/cache_as_ram_auto.c (Revision 5060) +++ src/mainboard/digitallogic/msm800sev/cache_as_ram_auto.c (Arbeitskopie) @@ -93,9 +93,6 @@ sdram_initialize(1, memctrl); - /* Check all of memory */ - ram_check(0x00000000, 640*1024); - /* Switch from Cache as RAM to real RAM */ /* There are two ways we could think about this. 1. If we are using the auto.inc ROMCC way, the stack is going to be re-setup in the code following this code. Index: src/mainboard/digitallogic/adl855pc/auto.c =================================================================== --- src/mainboard/digitallogic/adl855pc/auto.c (Revision 5060) +++ src/mainboard/digitallogic/adl855pc/auto.c (Arbeitskopie) @@ -127,17 +127,4 @@ dump_pci_device(PCI_DEV(0, 0, 0)); #endif -/* -#if 0 - ram_check(0x00000000, msr.lo+(msr.hi<<32)); -#else -#if 0 - // Check 16MB of memory @ 0 - ram_check(0x00000000, 0x01000000); -#else - // Check 16MB of memory @ 2GB - ram_check(0x80000000, 0x81000000); -#endif -#endif -*/ } Index: src/mainboard/digitallogic/msm586seg/auto.c =================================================================== --- src/mainboard/digitallogic/msm586seg/auto.c (Revision 5060) +++ src/mainboard/digitallogic/msm586seg/auto.c (Arbeitskopie) @@ -237,16 +237,6 @@ dump_pci_device(PCI_DEV(0, 0, 0)); #endif -#if 0 - print_err("RAM CHECK!\r\n"); - // Check 16MB of memory @ 0 - ram_check(0x00000000, 0x01000000); -#endif -#if 0 - print_err("RAM CHECK for 32 MB!\r\n"); - // Check 32MB of memory @ 0 - ram_check(0x00000000, 0x02000000); -#endif #if 1 { volatile unsigned char *src = (unsigned char *) 0x2000000 + 0x60000; Index: src/mainboard/mitac/6513wu/auto.c =================================================================== --- src/mainboard/mitac/6513wu/auto.c (Revision 5060) +++ src/mainboard/mitac/6513wu/auto.c (Arbeitskopie) @@ -65,5 +65,4 @@ sdram_set_registers(); sdram_set_spd_registers(); sdram_enable(); - /* ram_check(0, 640 * 1024); */ } Index: src/mainboard/olpc/btest/auto.c =================================================================== --- src/mainboard/olpc/btest/auto.c (Revision 5060) +++ src/mainboard/olpc/btest/auto.c (Arbeitskopie) @@ -188,7 +188,4 @@ print_err("done cpuRegInit\n"); sdram_initialize(1, memctrl); - - /* Check all of memory */ - //ram_check(0x00000000, 640*1024); } Index: src/mainboard/olpc/rev_a/auto.c =================================================================== --- src/mainboard/olpc/rev_a/auto.c (Revision 5060) +++ src/mainboard/olpc/rev_a/auto.c (Arbeitskopie) @@ -188,7 +188,4 @@ print_err("done cpuRegInit\n"); sdram_initialize(1, memctrl); - - /* Check all of memory */ - //ram_check(0x00000000, 640*1024); } Index: src/mainboard/technologic/ts5300/auto.c =================================================================== --- src/mainboard/technologic/ts5300/auto.c (Revision 5060) +++ src/mainboard/technologic/ts5300/auto.c (Arbeitskopie) @@ -166,13 +166,6 @@ #if 1 identify_system(); #endif - -#if 0 - // Check 32MB of memory @ 0 (very slow!) - print_err("Checking memory:\r\n"); - ram_check(0x00000000, 0x000a0000); - ram_check(0x000b0000, 0x02000000); -#endif TS5300_LED_OFF; } Index: src/mainboard/amd/rumba/auto.c =================================================================== --- src/mainboard/amd/rumba/auto.c (Revision 5060) +++ src/mainboard/amd/rumba/auto.c (Arbeitskopie) @@ -142,7 +142,4 @@ sdram_initialize(1, memctrl); msr_init(); - - /* Check all of memory */ - //ram_check(0x00000000, 640*1024); } Index: src/mainboard/amd/norwich/cache_as_ram_auto.c =================================================================== --- src/mainboard/amd/norwich/cache_as_ram_auto.c (Revision 5060) +++ src/mainboard/amd/norwich/cache_as_ram_auto.c (Arbeitskopie) @@ -126,9 +126,6 @@ sdram_initialize(1, memctrl); - /* Check memory. */ - /* ram_check(0x00000000, 640 * 1024); */ - /* Memory is setup. Return to cache_as_ram.inc and continue to boot. */ return; } Index: src/mainboard/amd/serengeti_cheetah_fam10/cache_as_ram_auto.c =================================================================== --- src/mainboard/amd/serengeti_cheetah_fam10/cache_as_ram_auto.c (Revision 5060) +++ src/mainboard/amd/serengeti_cheetah_fam10/cache_as_ram_auto.c (Arbeitskopie) @@ -365,19 +365,12 @@ dump_pci_device_range(PCI_DEV(0, 0x18, 3), 0, 0x200); */ -// ram_check(0x00200000, 0x00200000 + (640 * 1024)); -// ram_check(0x40200000, 0x40200000 + (640 * 1024)); - - // die("After MCT init before CAR disabled."); post_code(0x42); printk_debug("\n*** Yes, the copy/decompress is taking a while, FIXME!\n"); post_cache_as_ram(); // BSP switch stack to ram, copy then execute LB. post_code(0x43); // Should never see this post code. - - } - #endif /* CONFIG_USE_FAILOVER_IMAGE==0 */ Index: src/mainboard/amd/db800/cache_as_ram_auto.c =================================================================== --- src/mainboard/amd/db800/cache_as_ram_auto.c (Revision 5060) +++ src/mainboard/amd/db800/cache_as_ram_auto.c (Arbeitskopie) @@ -127,9 +127,6 @@ sdram_initialize(1, memctrl); - /* Check memory. */ - /* ram_check(0x00000000, 640 * 1024); */ - /* Memory is setup. Return to cache_as_ram.inc and continue to boot. */ return; } Index: src/mainboard/biostar/m6tba/auto.c =================================================================== --- src/mainboard/biostar/m6tba/auto.c (Revision 5060) +++ src/mainboard/biostar/m6tba/auto.c (Arbeitskopie) @@ -69,5 +69,4 @@ sdram_set_registers(); sdram_set_spd_registers(); sdram_enable(); - /* ram_check(0, 640 * 1024); */ } Index: src/mainboard/rca/rm4100/auto.c =================================================================== --- src/mainboard/rca/rm4100/auto.c (Revision 5060) +++ src/mainboard/rca/rm4100/auto.c (Arbeitskopie) @@ -119,9 +119,5 @@ sdram_set_spd_registers(memctrl); sdram_enable(0, memctrl); - /* Check RAM. */ - /* ram_check(0, 640 * 1024); */ - /* ram_check(130048 * 1024, 131072 * 1024); */ - ac97_io_enable(); } Index: src/mainboard/nec/powermate2000/auto.c =================================================================== --- src/mainboard/nec/powermate2000/auto.c (Revision 5060) +++ src/mainboard/nec/powermate2000/auto.c (Arbeitskopie) @@ -58,5 +58,4 @@ sdram_set_registers(); sdram_set_spd_registers(); sdram_enable(); - /* ram_check(0, 640 * 1024); */ } Index: src/mainboard/azza/pt-6ibd/auto.c =================================================================== --- src/mainboard/azza/pt-6ibd/auto.c (Revision 5060) +++ src/mainboard/azza/pt-6ibd/auto.c (Arbeitskopie) @@ -72,5 +72,4 @@ sdram_set_registers(); sdram_set_spd_registers(); sdram_enable(); - /* ram_check(0, 640 * 1024); */ } Index: src/mainboard/iei/nova4899r/auto.c =================================================================== --- src/mainboard/iei/nova4899r/auto.c (Revision 5060) +++ src/mainboard/iei/nova4899r/auto.c (Arbeitskopie) @@ -52,7 +52,4 @@ /* Initialize RAM. */ sdram_init(); - - /* Check RAM. */ - /* ram_check(0x00000000, 640 * 1024); */ } Index: src/mainboard/iei/pcisa-lx-800-r10/cache_as_ram_auto.c =================================================================== --- src/mainboard/iei/pcisa-lx-800-r10/cache_as_ram_auto.c (Revision 5060) +++ src/mainboard/iei/pcisa-lx-800-r10/cache_as_ram_auto.c (Arbeitskopie) @@ -130,8 +130,6 @@ sdram_initialize(1, memctrl); - /* ram_check(0, 640 * 1024); */ - /* Memory is setup. Return to cache_as_ram.inc and continue to boot. */ return; } Index: src/mainboard/iei/juki-511p/auto.c =================================================================== --- src/mainboard/iei/juki-511p/auto.c (Revision 5060) +++ src/mainboard/iei/juki-511p/auto.c (Arbeitskopie) @@ -57,7 +57,4 @@ /* Initialize RAM. */ sdram_init(); - - /* Check RAM. */ - /* ram_check(0x00000000, 640 * 1024); */ } Index: src/mainboard/hp/e_vectra_p2706t/auto.c =================================================================== --- src/mainboard/hp/e_vectra_p2706t/auto.c (Revision 5060) +++ src/mainboard/hp/e_vectra_p2706t/auto.c (Arbeitskopie) @@ -64,5 +64,4 @@ sdram_set_registers(); sdram_set_spd_registers(); sdram_enable(); - /* ram_check(0, 640 * 1024); */ } Index: src/mainboard/tyan/s1846/auto.c =================================================================== --- src/mainboard/tyan/s1846/auto.c (Revision 5060) +++ src/mainboard/tyan/s1846/auto.c (Arbeitskopie) @@ -69,5 +69,4 @@ sdram_set_registers(); sdram_set_spd_registers(); sdram_enable(); - /* ram_check(0, 640 * 1024); */ } Index: src/mainboard/pcengines/alix1c/cache_as_ram_auto.c =================================================================== --- src/mainboard/pcengines/alix1c/cache_as_ram_auto.c (Revision 5060) +++ src/mainboard/pcengines/alix1c/cache_as_ram_auto.c (Arbeitskopie) @@ -173,10 +173,6 @@ sdram_initialize(1, memctrl); - /* Check memory */ - /* Enable this only if you are having questions. */ - /* ram_check(0, 640 * 1024); */ - /* Switch from Cache as RAM to real RAM. * * There are two ways we could think about this. Index: src/mainboard/artecgroup/dbe61/cache_as_ram_auto.c =================================================================== --- src/mainboard/artecgroup/dbe61/cache_as_ram_auto.c (Revision 5060) +++ src/mainboard/artecgroup/dbe61/cache_as_ram_auto.c (Arbeitskopie) @@ -209,9 +209,6 @@ print_debug(" \n"); }*/ - /* Check memory. */ - /* ram_check(0x00000000, 640 * 1024); */ - /* Memory is setup. Return to cache_as_ram.inc and continue to boot */ return; } Index: src/mainboard/asi/mb_5blgp/auto.c =================================================================== --- src/mainboard/asi/mb_5blgp/auto.c (Revision 5060) +++ src/mainboard/asi/mb_5blgp/auto.c (Arbeitskopie) @@ -44,5 +44,4 @@ report_bist_failure(bist); cs5530_enable_rom(); sdram_init(); - /* ram_check(0, 640 * 1024); */ } Index: src/mainboard/asi/mb_5blmp/auto.c =================================================================== --- src/mainboard/asi/mb_5blmp/auto.c (Revision 5060) +++ src/mainboard/asi/mb_5blmp/auto.c (Arbeitskopie) @@ -51,7 +51,4 @@ /* Initialize RAM. */ sdram_init(); - - /* Check whether RAM works. */ - /* ram_check(0x00000000, 0x4000); */ } Index: src/mainboard/abit/be6-ii_v2_0/auto.c =================================================================== --- src/mainboard/abit/be6-ii_v2_0/auto.c (Revision 5060) +++ src/mainboard/abit/be6-ii_v2_0/auto.c (Arbeitskopie) @@ -72,5 +72,4 @@ sdram_set_registers(); sdram_set_spd_registers(); sdram_enable(); - /* ram_check(0, 640 * 1024); */ } Index: src/mainboard/lippert/roadrunner-lx/cache_as_ram_auto.c =================================================================== --- src/mainboard/lippert/roadrunner-lx/cache_as_ram_auto.c (Revision 5060) +++ src/mainboard/lippert/roadrunner-lx/cache_as_ram_auto.c (Arbeitskopie) @@ -161,9 +161,6 @@ sdram_initialize(1, memctrl); - /* Check memory. */ - /* ram_check(0x00000000, 640 * 1024); */ - /* Memory is setup. Return to cache_as_ram.inc and continue to boot. */ return; } Index: src/mainboard/lippert/frontrunner/auto.c =================================================================== --- src/mainboard/lippert/frontrunner/auto.c (Revision 5060) +++ src/mainboard/lippert/frontrunner/auto.c (Arbeitskopie) @@ -128,9 +128,5 @@ outb( temp, 0x4F); temp = inb(0x4F); //watchdog function. Make sure to let the other Bits unchanged! print_debug_hex8(temp);print_debug("\n"); - /* Check all of memory */ -// ram_check(0, 16384); - ram_check(0x20000, 0x24000); -// ram_check(0x00000000, 640*1024); } Index: src/mainboard/lippert/spacerunner-lx/cache_as_ram_auto.c =================================================================== --- src/mainboard/lippert/spacerunner-lx/cache_as_ram_auto.c (Revision 5060) +++ src/mainboard/lippert/spacerunner-lx/cache_as_ram_auto.c (Arbeitskopie) @@ -230,9 +230,6 @@ sdram_initialize(1, memctrl); - /* Check memory. */ - /* ram_check(0, 640 * 1024); */ - /* Memory is setup. Return to cache_as_ram.inc and continue to boot. */ return; } Index: src/mainboard/via/epia-m700/cache_as_ram_auto.c =================================================================== --- src/mainboard/via/epia-m700/cache_as_ram_auto.c (Revision 5060) +++ src/mainboard/via/epia-m700/cache_as_ram_auto.c (Arbeitskopie) @@ -560,7 +560,6 @@ print_debug("Resume from S3, RAM init was ignored\r\n"); } else { ddr2_ram_setup(); - ram_check(0, 640 * 1024); } #endif Index: src/mainboard/via/epia-m/auto.c =================================================================== --- src/mainboard/via/epia-m/auto.c (Revision 5060) +++ src/mainboard/via/epia-m/auto.c (Arbeitskopie) @@ -122,27 +122,6 @@ ddr_ram_setup((const struct mem_controller *)0); - /* Check all of memory */ -#if 0 - ram_check(0x00000000, msr.lo); -#endif -#if 0 - static const struct { - unsigned long lo, hi; - } check_addrs[] = { - /* Check 16MB of memory @ 0*/ - { 0x00000000, 0x01000000 }, -#if TOTAL_CPUS > 1 - /* Check 16MB of memory @ 2GB */ - { 0x80000000, 0x81000000 }, -#endif - }; - int i; - for(i = 0; i < ARRAY_SIZE(check_addrs); i++) { - ram_check(check_addrs[i].lo, check_addrs[i].hi); - } -#endif - if (bist == 0) { print_debug(" Doing MTRR init.\r\n"); early_mtrr_init(); Index: src/mainboard/via/epia-n/auto.c =================================================================== --- src/mainboard/via/epia-n/auto.c (Revision 5060) +++ src/mainboard/via/epia-n/auto.c (Arbeitskopie) @@ -154,7 +154,5 @@ early_mtrr_init(); } - //ram_check(0, 640 * 1024); - print_spew("Leaving auto.c:main()\r\n"); } Index: src/mainboard/via/epia-cn/auto.c =================================================================== --- src/mainboard/via/epia-cn/auto.c (Revision 5060) +++ src/mainboard/via/epia-cn/auto.c (Arbeitskopie) @@ -119,7 +119,5 @@ ddr_ram_setup(&ctrl); - /* ram_check(0, 640 * 1024); */ - print_spew("Leaving auto.c:main()\r\n"); } Index: src/mainboard/via/epia/auto.c =================================================================== --- src/mainboard/via/epia/auto.c (Revision 5060) +++ src/mainboard/via/epia/auto.c (Arbeitskopie) @@ -104,25 +104,4 @@ sdram_set_registers((const struct mem_controller *) 0); sdram_set_spd_registers((const struct mem_controller *) 0); sdram_enable(0, (const struct mem_controller *) 0); - - /* Check all of memory */ -#if 0 - ram_check(0x00000000, msr.lo); -#endif -#if 0 - static const struct { - unsigned long lo, hi; - } check_addrs[] = { - /* Check 16MB of memory @ 0*/ - { 0x00000000, 0x01000000 }, -#if TOTAL_CPUS > 1 - /* Check 16MB of memory @ 2GB */ - { 0x80000000, 0x81000000 }, -#endif - }; - int i; - for(i = 0; i < ARRAY_SIZE(check_addrs); i++) { - ram_check(check_addrs[i].lo, check_addrs[i].hi); - } -#endif } Index: src/mainboard/via/pc2500e/auto.c =================================================================== --- src/mainboard/via/pc2500e/auto.c (Revision 5060) +++ src/mainboard/via/pc2500e/auto.c (Arbeitskopie) @@ -80,6 +80,4 @@ report_bist_failure(bist); ddr_ram_setup(&ctrl); - - /* ram_check(0, 640 * 1024); */ } Index: src/mainboard/dell/s1850/auto.c =================================================================== --- src/mainboard/dell/s1850/auto.c (Revision 5060) +++ src/mainboard/dell/s1850/auto.c (Arbeitskopie) @@ -351,20 +351,7 @@ // dump_bar14(PCI_DEV(0, 0x00, 0)); #endif -#if 1 // temporarily disabled - /* Check the first 1M */ -// ram_check(0x00000000, 0x000100000); -// ram_check(0x00000000, 0x000a0000); -// ram_check(0x00100000, 0x01000000); - ram_check(0x00100000, 0x00100100); - /* check the first 1M in the 3rd Gig */ -// ram_check(0x30100000, 0x31000000); -#endif #if 0 - ram_check(0x00000000, 0x02000000); -#endif - -#if 0 while(1) { hlt(); } Index: src/mainboard/compaq/deskpro_en_sff_p600/auto.c =================================================================== --- src/mainboard/compaq/deskpro_en_sff_p600/auto.c (Revision 5060) +++ src/mainboard/compaq/deskpro_en_sff_p600/auto.c (Arbeitskopie) @@ -72,5 +72,4 @@ sdram_set_registers(); sdram_set_spd_registers(); sdram_enable(); - /* ram_check(0, 640 * 1024); */ } Index: src/mainboard/roda/rk886ex/auto.c =================================================================== --- src/mainboard/roda/rk886ex/auto.c (Revision 5060) +++ src/mainboard/roda/rk886ex/auto.c (Arbeitskopie) @@ -362,6 +362,7 @@ #if defined(DEBUG_RAM_SETUP) sdram_dump_mchbar_registers(); +#if 0 { /* This will not work if TSEG is in place! */ u32 tom = pci_read_config32(PCI_DEV(0,2,0), 0x5c); @@ -371,8 +372,10 @@ ram_check(0x00100000, tom); } #endif + #endif #endif +#endif MCHBAR16(SSKPD) = 0xCAFE; Index: src/mainboard/msi/ms6119/auto.c =================================================================== --- src/mainboard/msi/ms6119/auto.c (Revision 5060) +++ src/mainboard/msi/ms6119/auto.c (Arbeitskopie) @@ -69,5 +69,4 @@ sdram_set_registers(); sdram_set_spd_registers(); sdram_enable(); - /* ram_check(0, 640 * 1024); */ } Index: src/mainboard/msi/ms6147/auto.c =================================================================== --- src/mainboard/msi/ms6147/auto.c (Revision 5060) +++ src/mainboard/msi/ms6147/auto.c (Arbeitskopie) @@ -69,12 +69,4 @@ sdram_set_registers(); sdram_set_spd_registers(); sdram_enable(); -#if 0 - ram_check(0, 640 * 1024); /* DOS-area */ - ram_check(0x00100000, 0x00400000); /* 1MB to 4MB */ - ram_check(0x00100000, 0x03ffffff); /* 1MB to 64MB- */ - ram_check(0x03fff000, 0x04000010); /* Across 64MB boundary */ - ram_check(0x07ffff00, 0x07fffff0); /* Just below 128MB */ - ram_check(0x00100000, 0x07ffffff); /* 1MB to 128MB- */ -#endif } Index: src/mainboard/msi/ms6156/auto.c =================================================================== --- src/mainboard/msi/ms6156/auto.c (Revision 5060) +++ src/mainboard/msi/ms6156/auto.c (Arbeitskopie) @@ -69,5 +69,4 @@ sdram_set_registers(); sdram_set_spd_registers(); sdram_enable(); - /* ram_check(0, 640 * 1024); */ } Index: src/mainboard/msi/ms6178/auto.c =================================================================== --- src/mainboard/msi/ms6178/auto.c (Revision 5060) +++ src/mainboard/msi/ms6178/auto.c (Arbeitskopie) @@ -65,5 +65,4 @@ sdram_set_registers(); sdram_set_spd_registers(); sdram_enable(); - /* ram_check(0, 640 * 1024); */ } Index: src/mainboard/advantech/pcm-5820/auto.c =================================================================== --- src/mainboard/advantech/pcm-5820/auto.c (Revision 5060) +++ src/mainboard/advantech/pcm-5820/auto.c (Arbeitskopie) @@ -44,5 +44,4 @@ report_bist_failure(bist); cs5530_enable_rom(); sdram_init(); - /* ram_check(0, 640 * 1024); */ } Index: src/mainboard/eaglelion/5bcm/auto.c =================================================================== --- src/mainboard/eaglelion/5bcm/auto.c (Revision 5060) +++ src/mainboard/eaglelion/5bcm/auto.c (Arbeitskopie) @@ -35,25 +35,4 @@ cs5530_enable_rom(); sdram_init(); - - /* Check all of memory */ -#if 0 - ram_check(0x00000000, msr.lo); -#endif -#if 0 - static const struct { - unsigned long lo, hi; - } check_addrs[] = { - /* Check 16MB of memory @ 0*/ - { 0x00000000, 0x01000000 }, -#if TOTAL_CPUS > 1 - /* Check 16MB of memory @ 2GB */ - { 0x80000000, 0x81000000 }, -#endif - }; - int i; - for(i = 0; i < ARRAY_SIZE(check_addrs); i++) { - ram_check(check_addrs[i].lo, check_addrs[i].hi); - } -#endif } Index: src/mainboard/jetway/j7f24/auto.c =================================================================== --- src/mainboard/jetway/j7f24/auto.c (Revision 5060) +++ src/mainboard/jetway/j7f24/auto.c (Arbeitskopie) @@ -124,7 +124,5 @@ ddr_ram_setup(&ctrl); - /* ram_check(0, 640 * 1024); */ - print_spew("Leaving auto.c:main()\r\n"); } Index: src/mainboard/intel/d945gclf/auto.c =================================================================== --- src/mainboard/intel/d945gclf/auto.c (Revision 5060) +++ src/mainboard/intel/d945gclf/auto.c (Arbeitskopie) @@ -308,15 +308,6 @@ #if defined(DEBUG_RAM_SETUP) sdram_dump_mchbar_registers(); #endif - - { - /* This will not work if TSEG is in place! */ - u32 tom = pci_read_config32(PCI_DEV(0,2,0), 0x5c); - - printk_debug("TOM: 0x%08x\n", tom); - ram_check(0x00000000, 0x000a0000); - //ram_check(0x00100000, tom); - } #endif #endif Index: src/mainboard/intel/truxton/auto.c =================================================================== --- src/mainboard/intel/truxton/auto.c (Revision 5060) +++ src/mainboard/intel/truxton/auto.c (Arbeitskopie) @@ -107,9 +107,4 @@ #ifdef TRUXTON_DEBUG dump_bar14(PCI_DEV(0, 0x00, 0)); #endif - -#ifdef TRUXTON_DEBUG - ram_fill(0x00000000, 0x02000000); - ram_verify(0x00000000, 0x02000000); -#endif } Index: src/mainboard/intel/mtarvon/auto.c =================================================================== --- src/mainboard/intel/mtarvon/auto.c (Revision 5060) +++ src/mainboard/intel/mtarvon/auto.c (Arbeitskopie) @@ -123,6 +123,4 @@ /* dump_pci_devices(); */ /* dump_pci_device(PCI_DEV(0, 0x00, 0)); */ /* dump_bar14(PCI_DEV(0, 0x00, 0)); */ - - ram_check(0, 1024 * 1024); } Index: src/mainboard/intel/jarrell/auto.c =================================================================== --- src/mainboard/intel/jarrell/auto.c (Revision 5060) +++ src/mainboard/intel/jarrell/auto.c (Arbeitskopie) @@ -132,18 +132,6 @@ dump_bar14(PCI_DEV(0, 0x00, 0)); #endif -#if 0 // temporarily disabled - /* Check the first 1M */ -// ram_check(0x00000000, 0x000100000); -// ram_check(0x00000000, 0x000a0000); - ram_check(0x00100000, 0x01000000); - /* check the first 1M in the 3rd Gig */ - ram_check(0x30100000, 0x31000000); -#if 0 - ram_check(0x00000000, 0x02000000); -#endif - -#endif #if 0 while(1) { hlt(); Index: src/mainboard/asus/mew-am/auto.c =================================================================== --- src/mainboard/asus/mew-am/auto.c (Revision 5060) +++ src/mainboard/asus/mew-am/auto.c (Arbeitskopie) @@ -64,5 +64,4 @@ sdram_set_registers(); sdram_set_spd_registers(); sdram_enable(); - /* ram_check(0, 640 * 1024); */ } Index: src/mainboard/asus/p2b/auto.c =================================================================== --- src/mainboard/asus/p2b/auto.c (Revision 5060) +++ src/mainboard/asus/p2b/auto.c (Arbeitskopie) @@ -69,5 +69,4 @@ sdram_set_registers(); sdram_set_spd_registers(); sdram_enable(); - /* ram_check(0, 640 * 1024); */ } Index: src/mainboard/asus/p2b-d/auto.c =================================================================== --- src/mainboard/asus/p2b-d/auto.c (Revision 5060) +++ src/mainboard/asus/p2b-d/auto.c (Arbeitskopie) @@ -72,5 +72,4 @@ sdram_set_registers(); sdram_set_spd_registers(); sdram_enable(); - /* ram_check(0, 640 * 1024); */ } Index: src/mainboard/asus/p2b-f/auto.c =================================================================== --- src/mainboard/asus/p2b-f/auto.c (Revision 5060) +++ src/mainboard/asus/p2b-f/auto.c (Arbeitskopie) @@ -72,5 +72,4 @@ sdram_set_registers(); sdram_set_spd_registers(); sdram_enable(); - /* ram_check(0, 640 * 1024); */ } Index: src/mainboard/asus/p2b-ds/auto.c =================================================================== --- src/mainboard/asus/p2b-ds/auto.c (Revision 5060) +++ src/mainboard/asus/p2b-ds/auto.c (Arbeitskopie) @@ -72,5 +72,4 @@ sdram_set_registers(); sdram_set_spd_registers(); sdram_enable(); - /* ram_check(0, 640 * 1024); */ } Index: src/mainboard/asus/p3b-f/auto.c =================================================================== --- src/mainboard/asus/p3b-f/auto.c (Revision 5060) +++ src/mainboard/asus/p3b-f/auto.c (Arbeitskopie) @@ -72,5 +72,4 @@ sdram_set_registers(); sdram_set_spd_registers(); sdram_enable(); - /* ram_check(0, 640 * 1024); */ } Index: src/mainboard/asus/mew-vm/auto.c =================================================================== --- src/mainboard/asus/mew-vm/auto.c (Revision 5060) +++ src/mainboard/asus/mew-vm/auto.c (Arbeitskopie) @@ -64,7 +64,4 @@ sdram_set_registers(); sdram_set_spd_registers(); sdram_enable(); - - /* Check RAM. */ - /* ram_check(0, 640 * 1024); */ } Index: src/northbridge/via/vx800/examples/cache_as_ram_auto.c =================================================================== --- src/northbridge/via/vx800/examples/cache_as_ram_auto.c (Revision 5060) +++ src/northbridge/via/vx800/examples/cache_as_ram_auto.c (Arbeitskopie) @@ -434,7 +434,6 @@ print_debug("Resume from S3, RAM init was ignored\r\n"); } else { ddr2_ram_setup(); - ram_check(0, 640 * 1024); } #endif //ddr2_ram_setup(); Index: src/northbridge/intel/i855gme/raminit.c =================================================================== --- src/northbridge/intel/i855gme/raminit.c (Revision 5060) +++ src/northbridge/intel/i855gme/raminit.c (Arbeitskopie) @@ -288,10 +288,4 @@ print_debug("After configuration:\r\n"); /* dump_pci_devices(); */ - - /* - print_debug("\n\n***** RAM TEST *****\r\n"); - ram_check(0, 0xa0000); - ram_check(0x100000, 0x40000000); - */ }