Drop per-board ram_check() calls for now.

Every board had a slightly different invokation, very often commented out
anyway. We could either decide that this is only to be used by developers
during bringup (and thus added manually to romstage.c and removed before
the board gets committed). This method seems to be preferred from what I
have heard on IRC / mailing list in the past.

Or, we add the ram_check() somewhere globally and allow the user to enable
it via menuconfig (possibly only if EXPERT is selected).

Either way, the current method of spreading the calls all over the place is
not really the way to go.

Signed-off-by: Uwe Hermann <uwe@hermann-uwe.de>
Acked-by: Uwe Hermann <uwe@hermann-uwe.de>



git-svn-id: svn://svn.coreboot.org/coreboot/trunk@6115 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
This commit is contained in:
Uwe Hermann 2010-11-22 15:57:57 +00:00
parent 7411eabcdb
commit 0d5a6accc8
56 changed files with 0 additions and 296 deletions

View File

@ -24,7 +24,6 @@
#include <arch/romcc_io.h> #include <arch/romcc_io.h>
#include <arch/hlt.h> #include <arch/hlt.h>
#include <console/console.h> #include <console/console.h>
#include "lib/ramtest.c"
#include "northbridge/amd/gx1/raminit.c" #include "northbridge/amd/gx1/raminit.c"
#include "cpu/x86/bist.h" #include "cpu/x86/bist.h"
#include "superio/winbond/w83977f/w83977f_early_serial.c" #include "superio/winbond/w83977f/w83977f_early_serial.c"
@ -40,5 +39,4 @@ static void main(unsigned long bist)
report_bist_failure(bist); report_bist_failure(bist);
cs5530_enable_rom(); cs5530_enable_rom();
sdram_init(); sdram_init();
/* ram_check(0, 640 * 1024); */
} }

View File

@ -83,9 +83,6 @@ void main(unsigned long bist)
sdram_initialize(1, memctrl); sdram_initialize(1, memctrl);
/* Check memory. */
/* ram_check(0x00000000, 640 * 1024); */
/* Memory is setup. Return to cache_as_ram.inc and continue to boot. */ /* Memory is setup. Return to cache_as_ram.inc and continue to boot. */
return; return;
} }

View File

@ -217,9 +217,6 @@ void cache_as_ram_main(unsigned long bist, unsigned long cpu_init_detectedx)
dump_pci_device_range(PCI_DEV(0, 0x18, 3), 0, 0x200); 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."); // die("After MCT init before CAR disabled.");
rs780_before_pci_init(); rs780_before_pci_init();

View File

@ -84,9 +84,6 @@ void main(unsigned long bist)
sdram_initialize(1, memctrl); sdram_initialize(1, memctrl);
/* Check memory. */
/* ram_check(0x00000000, 640 * 1024); */
/* Memory is setup. Return to cache_as_ram.inc and continue to boot. */ /* Memory is setup. Return to cache_as_ram.inc and continue to boot. */
return; return;
} }

View File

@ -56,7 +56,4 @@ void main(unsigned long bist)
sdram_initialize(1, memctrl); sdram_initialize(1, memctrl);
msr_init(); msr_init();
/* Check all of memory */
//ram_check(0x00000000, 640*1024);
} }

View File

@ -328,9 +328,6 @@ void cache_as_ram_main(unsigned long bist, unsigned long cpu_init_detectedx)
dump_pci_device_range(PCI_DEV(0, 0x18, 3), 0, 0x200); 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."); // die("After MCT init before CAR disabled.");
post_code(0x42); post_code(0x42);

View File

@ -217,10 +217,6 @@ void cache_as_ram_main(unsigned long bist, unsigned long cpu_init_detectedx)
dump_pci_device_range(PCI_DEV(0, 0x18, 3), 0, 0x200); 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."); // die("After MCT init before CAR disabled.");
rs780_before_pci_init(); rs780_before_pci_init();

View File

@ -133,8 +133,4 @@ void main(unsigned long bist)
msr = rdmsr(MC_CF8F_DATA); msr = rdmsr(MC_CF8F_DATA);
print_debug(" \n"); print_debug(" \n");
#endif #endif
/* Check memory. */
// ram_check(0x00000000, 640 * 1024);
// ram_check(1024 * 1024, 2 * 1024 * 1024);
} }

View File

@ -24,7 +24,6 @@
#include <arch/romcc_io.h> #include <arch/romcc_io.h>
#include <arch/hlt.h> #include <arch/hlt.h>
#include <console/console.h> #include <console/console.h>
#include "lib/ramtest.c"
#include "northbridge/amd/gx1/raminit.c" #include "northbridge/amd/gx1/raminit.c"
#include "cpu/x86/bist.h" #include "cpu/x86/bist.h"
#include "superio/nsc/pc87351/pc87351_early_serial.c" #include "superio/nsc/pc87351/pc87351_early_serial.c"
@ -40,5 +39,4 @@ static void main(unsigned long bist)
report_bist_failure(bist); report_bist_failure(bist);
cs5530_enable_rom(); cs5530_enable_rom();
sdram_init(); sdram_init();
/* ram_check(0, 640 * 1024); */
} }

View File

@ -25,7 +25,6 @@
#include <arch/romcc_io.h> #include <arch/romcc_io.h>
#include <arch/hlt.h> #include <arch/hlt.h>
#include <console/console.h> #include <console/console.h>
#include "lib/ramtest.c"
#include "northbridge/amd/gx1/raminit.c" #include "northbridge/amd/gx1/raminit.c"
#include "superio/nsc/pc87351/pc87351_early_serial.c" #include "superio/nsc/pc87351/pc87351_early_serial.c"
#include "cpu/x86/bist.h" #include "cpu/x86/bist.h"
@ -41,5 +40,4 @@ static void main(unsigned long bist)
report_bist_failure(bist); report_bist_failure(bist);
cs5530_enable_rom(); cs5530_enable_rom();
sdram_init(); sdram_init();
/* ram_check(0x00000000, 0x4000); */
} }

View File

@ -218,10 +218,6 @@ void cache_as_ram_main(unsigned long bist, unsigned long cpu_init_detectedx)
dump_pci_device_range(PCI_DEV(0, 0x18, 3), 0, 0x200); 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."); // die("After MCT init before CAR disabled.");
rs780_before_pci_init(); rs780_before_pci_init();

View File

@ -25,7 +25,6 @@
#include <arch/romcc_io.h> #include <arch/romcc_io.h>
#include <arch/hlt.h> #include <arch/hlt.h>
#include <console/console.h> #include <console/console.h>
#include "lib/ramtest.c"
#include "northbridge/amd/gx1/raminit.c" #include "northbridge/amd/gx1/raminit.c"
#include "superio/nsc/pc97317/pc97317_early_serial.c" #include "superio/nsc/pc97317/pc97317_early_serial.c"
#include "cpu/x86/bist.h" #include "cpu/x86/bist.h"
@ -41,5 +40,4 @@ static void main(unsigned long bist)
report_bist_failure(bist); report_bist_failure(bist);
cs5530_enable_rom(); cs5530_enable_rom();
sdram_init(); sdram_init();
/* ram_check(0, 640 * 1024); */
} }

View File

@ -25,7 +25,6 @@
#include <arch/romcc_io.h> #include <arch/romcc_io.h>
#include <arch/hlt.h> #include <arch/hlt.h>
#include <console/console.h> #include <console/console.h>
#include "lib/ramtest.c"
#include "northbridge/amd/gx1/raminit.c" #include "northbridge/amd/gx1/raminit.c"
#include "superio/nsc/pc97317/pc97317_early_serial.c" #include "superio/nsc/pc97317/pc97317_early_serial.c"
#include "cpu/x86/bist.h" #include "cpu/x86/bist.h"
@ -41,5 +40,4 @@ static void main(unsigned long bist)
report_bist_failure(bist); report_bist_failure(bist);
cs5530_enable_rom(); cs5530_enable_rom();
sdram_init(); sdram_init();
/* ram_check(0, 640 * 1024); */
} }

View File

@ -99,6 +99,4 @@ void main(unsigned long bist)
enable_mainboard_devices(); enable_mainboard_devices();
ddr_ram_setup(&ctrl); ddr_ram_setup(&ctrl);
/* ram_check(0, 640 * 1024); */
} }

View File

@ -6,7 +6,6 @@
#include <cpu/x86/lapic.h> #include <cpu/x86/lapic.h>
#include <stdlib.h> #include <stdlib.h>
#include <console/console.h> #include <console/console.h>
#include "lib/ramtest.c"
#include "southbridge/intel/i82801ex/i82801ex_early_smbus.c" #include "southbridge/intel/i82801ex/i82801ex_early_smbus.c"
#include "northbridge/intel/e7520/raminit.h" #include "northbridge/intel/e7520/raminit.h"
#include "superio/nsc/pc8374/pc8374_early_init.c" #include "superio/nsc/pc8374/pc8374_early_init.c"
@ -323,17 +322,4 @@ static void main(unsigned long bist)
dump_pci_device(PCI_DEV(0, 0x00, 0)); dump_pci_device(PCI_DEV(0, 0x00, 0));
// dump_bar14(PCI_DEV(0, 0x00, 0)); // dump_bar14(PCI_DEV(0, 0x00, 0));
#endif #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
} }

View File

@ -62,12 +62,5 @@ void main(unsigned long bist)
#if 0 #if 0
dump_pci_devices(); dump_pci_devices();
dump_pci_device(PCI_DEV(0, 0, 0)); dump_pci_device(PCI_DEV(0, 0, 0));
// Check all of memory
ram_check(0x00000000, msr.lo+(msr.hi<<32));
// Check 16MB of memory @ 0
ram_check(0x00000000, 0x01000000);
// Check 16MB of memory @ 2GB
ram_check(0x80000000, 0x81000000);
#endif #endif
} }

View File

@ -6,7 +6,6 @@
#include <arch/hlt.h> #include <arch/hlt.h>
#include <pc80/mc146818rtc.h> #include <pc80/mc146818rtc.h>
#include <console/console.h> #include <console/console.h>
#include "lib/ramtest.c"
#include "cpu/x86/bist.h" #include "cpu/x86/bist.h"
void setup_pars(void) void setup_pars(void)
@ -203,16 +202,6 @@ static void main(unsigned long bist)
dump_pci_device(PCI_DEV(0, 0, 0)); dump_pci_device(PCI_DEV(0, 0, 0));
#endif #endif
#if 0
print_err("RAM CHECK!\n");
// Check 16MB of memory @ 0
ram_check(0x00000000, 0x01000000);
#endif
#if 0
print_err("RAM CHECK for 32 MB!\n");
// Check 32MB of memory @ 0
ram_check(0x00000000, 0x02000000);
#endif
#if 1 #if 1
{ {
volatile unsigned char *src = (unsigned char *) 0x2000000 + 0x60000; volatile unsigned char *src = (unsigned char *) 0x2000000 + 0x60000;

View File

@ -66,9 +66,6 @@ void main(unsigned long bist)
sdram_initialize(1, memctrl); sdram_initialize(1, memctrl);
/* Check all of memory */
ram_check(0x00000000, 640*1024);
/* Switch from Cache as RAM to real RAM */ /* Switch from Cache as RAM to real RAM */
/* There are two ways we could think about this. /* There are two ways we could think about this.
1. If we are using the romstage.inc ROMCC way, the stack is going to be re-setup in the code following this code. 1. If we are using the romstage.inc ROMCC way, the stack is going to be re-setup in the code following this code.

View File

@ -6,7 +6,6 @@
#include <arch/hlt.h> #include <arch/hlt.h>
#include <stdlib.h> #include <stdlib.h>
#include <console/console.h> #include <console/console.h>
#include "lib/ramtest.c"
#include "superio/nsc/pc97317/pc97317_early_serial.c" #include "superio/nsc/pc97317/pc97317_early_serial.c"
#include "cpu/x86/bist.h" #include "cpu/x86/bist.h"
#include "southbridge/amd/cs5530/cs5530_enable_rom.c" #include "southbridge/amd/cs5530/cs5530_enable_rom.c"

View File

@ -214,10 +214,6 @@ void cache_as_ram_main(unsigned long bist, unsigned long cpu_init_detectedx)
dump_pci_device_range(PCI_DEV(0, 0x18, 3), 0, 0x200); 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."); // die("After MCT init before CAR disabled.");
rs780_before_pci_init(); rs780_before_pci_init();

View File

@ -216,9 +216,6 @@ void cache_as_ram_main(unsigned long bist, unsigned long cpu_init_detectedx)
dump_pci_device_range(PCI_DEV(0, 0x18, 3), 0, 0x200); 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."); // die("After MCT init before CAR disabled.");
rs780_before_pci_init(); rs780_before_pci_init();

View File

@ -25,7 +25,6 @@
#include <arch/romcc_io.h> #include <arch/romcc_io.h>
#include <arch/hlt.h> #include <arch/hlt.h>
#include <console/console.h> #include <console/console.h>
#include "lib/ramtest.c"
#include "superio/winbond/w83977f/w83977f_early_serial.c" #include "superio/winbond/w83977f/w83977f_early_serial.c"
#include "southbridge/amd/cs5530/cs5530_enable_rom.c" #include "southbridge/amd/cs5530/cs5530_enable_rom.c"
#include "cpu/x86/bist.h" #include "cpu/x86/bist.h"
@ -47,5 +46,4 @@ static void main(unsigned long bist)
cs5530_enable_rom(); cs5530_enable_rom();
sdram_init(); sdram_init();
/* ram_check(0x00000000, 640 * 1024); */
} }

View File

@ -219,9 +219,6 @@ void cache_as_ram_main(unsigned long bist, unsigned long cpu_init_detectedx)
dump_pci_device_range(PCI_DEV(0, 0x18, 3), 0, 0x200); 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."); // die("After MCT init before CAR disabled.");
rs780_before_pci_init(); rs780_before_pci_init();

View File

@ -25,7 +25,6 @@
#include <arch/romcc_io.h> #include <arch/romcc_io.h>
#include <arch/hlt.h> #include <arch/hlt.h>
#include <console/console.h> #include <console/console.h>
#include "lib/ramtest.c"
#include "superio/winbond/w83977tf/w83977tf_early_serial.c" #include "superio/winbond/w83977tf/w83977tf_early_serial.c"
#include "southbridge/amd/cs5530/cs5530_enable_rom.c" #include "southbridge/amd/cs5530/cs5530_enable_rom.c"
#include "cpu/x86/bist.h" #include "cpu/x86/bist.h"
@ -42,5 +41,4 @@ static void main(unsigned long bist)
report_bist_failure(bist); report_bist_failure(bist);
cs5530_enable_rom(); cs5530_enable_rom();
sdram_init(); sdram_init();
/* ram_check(0x00000000, 640 * 1024); */
} }

View File

@ -87,8 +87,6 @@ void main(unsigned long bist)
sdram_initialize(1, memctrl); sdram_initialize(1, memctrl);
/* ram_check(0, 640 * 1024); */
/* Memory is setup. Return to cache_as_ram.inc and continue to boot. */ /* Memory is setup. Return to cache_as_ram.inc and continue to boot. */
return; return;
} }

View File

@ -6,7 +6,6 @@
#include <cpu/x86/lapic.h> #include <cpu/x86/lapic.h>
#include <stdlib.h> #include <stdlib.h>
#include <console/console.h> #include <console/console.h>
#include "lib/ramtest.c"
#include "southbridge/intel/i82801ex/i82801ex_early_smbus.c" #include "southbridge/intel/i82801ex/i82801ex_early_smbus.c"
#include "northbridge/intel/e7520/raminit.h" #include "northbridge/intel/e7520/raminit.h"
#include "superio/nsc/pc87427/pc87427.h" #include "superio/nsc/pc87427/pc87427.h"
@ -105,17 +104,4 @@ static void main(unsigned long bist)
dump_pci_device(PCI_DEV(0, 0x00, 0)); dump_pci_device(PCI_DEV(0, 0x00, 0));
dump_bar14(PCI_DEV(0, 0x00, 0)); dump_bar14(PCI_DEV(0, 0x00, 0));
#endif #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
} }

View File

@ -118,6 +118,4 @@ void main(unsigned long bist)
/* dump_pci_devices(); */ /* dump_pci_devices(); */
/* dump_pci_device(PCI_DEV(0, 0x00, 0)); */ /* dump_pci_device(PCI_DEV(0, 0x00, 0)); */
/* dump_bar14(PCI_DEV(0, 0x00, 0)); */ /* dump_bar14(PCI_DEV(0, 0x00, 0)); */
ram_check(0, 1024 * 1024);
} }

View File

@ -28,7 +28,6 @@
#include <pc80/mc146818rtc.h> #include <pc80/mc146818rtc.h>
#include "pc80/udelay_io.c" #include "pc80/udelay_io.c"
#include <console/console.h> #include <console/console.h>
#include "lib/ramtest.c"
#include "southbridge/intel/i3100/i3100_early_smbus.c" #include "southbridge/intel/i3100/i3100_early_smbus.c"
#include "southbridge/intel/i3100/i3100_early_lpc.c" #include "southbridge/intel/i3100/i3100_early_lpc.c"
#include "northbridge/intel/i3100/raminit_ep80579.h" #include "northbridge/intel/i3100/raminit_ep80579.h"
@ -98,9 +97,4 @@ static void main(unsigned long bist)
#ifdef TRUXTON_DEBUG #ifdef TRUXTON_DEBUG
dump_bar14(PCI_DEV(0, 0x00, 0)); dump_bar14(PCI_DEV(0, 0x00, 0));
#endif #endif
#ifdef TRUXTON_DEBUG
ram_fill(0x00000000, 0x02000000);
ram_verify(0x00000000, 0x02000000);
#endif
} }

View File

@ -8,7 +8,6 @@
#include <stdlib.h> #include <stdlib.h>
#include <pc80/mc146818rtc.h> #include <pc80/mc146818rtc.h>
#include <console/console.h> #include <console/console.h>
#include "lib/ramtest.c"
#include "southbridge/intel/i82801cx/i82801cx_early_smbus.c" #include "southbridge/intel/i82801cx/i82801cx_early_smbus.c"
#include "northbridge/intel/e7501/raminit.h" #include "northbridge/intel/e7501/raminit.h"
#include "cpu/x86/lapic/boot_cpu.c" #include "cpu/x86/lapic/boot_cpu.c"

View File

@ -104,6 +104,4 @@ void main(unsigned long bist)
enable_mainboard_devices(); enable_mainboard_devices();
ddr_ram_setup(&ctrl); ddr_ram_setup(&ctrl);
/* ram_check(0, 640 * 1024); */
} }

View File

@ -224,9 +224,6 @@ void cache_as_ram_main(unsigned long bist, unsigned long cpu_init_detectedx)
dump_pci_device_range(PCI_DEV(0, 0x18, 3), 0, 0x200); 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."); // die("After MCT init before CAR disabled.");
rs780_before_pci_init(); rs780_before_pci_init();

View File

@ -80,16 +80,4 @@ void main(unsigned long bist)
sdram_set_spd_registers(); sdram_set_spd_registers();
sdram_enable(); sdram_enable();
} }
#if 0
dump_pci_devices();
dump_pci_device(PCI_DEV(0, 0, 0));
// Check all of memory
ram_check(0x00000000, msr.lo+(msr.hi<<32));
// Check 16MB of memory @ 0
ram_check(0x00000000, 0x01000000);
// Check 16MB of memory @ 2GB
ram_check(0x80000000, 0x81000000);
#endif
} }

View File

@ -127,8 +127,4 @@ void main(unsigned long bist)
outb( temp, 0x4F); outb( temp, 0x4F);
temp = inb(0x4F); //watchdog function. Make sure to let the other Bits unchanged! temp = inb(0x4F); //watchdog function. Make sure to let the other Bits unchanged!
print_debug_hex8(temp);print_debug("\n"); print_debug_hex8(temp);print_debug("\n");
/* Check all of memory */
// ram_check(0, 16384);
ram_check(0x20000, 0x24000);
// ram_check(0x00000000, 640*1024);
} }

View File

@ -157,9 +157,6 @@ void main(unsigned long bist)
sdram_initialize(1, memctrl); sdram_initialize(1, memctrl);
/* Check memory. */
/* ram_check(0, 640 * 1024); */
/* Memory is setup. Return to cache_as_ram.inc and continue to boot. */ /* Memory is setup. Return to cache_as_ram.inc and continue to boot. */
return; return;
} }

View File

@ -197,9 +197,6 @@ void main(unsigned long bist)
sdram_initialize(1, memctrl); sdram_initialize(1, memctrl);
/* Check memory. */
/* ram_check(0, 640 * 1024); */
/* Memory is setup. Return to cache_as_ram.inc and continue to boot. */ /* Memory is setup. Return to cache_as_ram.inc and continue to boot. */
return; return;
} }

View File

@ -122,9 +122,6 @@ void main(unsigned long bist)
sdram_initialize(1, memctrl); sdram_initialize(1, memctrl);
/* Check memory. */
/* ram_check(0x00000000, 640 * 1024); */
/* Memory is setup. Return to cache_as_ram.inc and continue to boot. */ /* Memory is setup. Return to cache_as_ram.inc and continue to boot. */
return; return;
} }

View File

@ -194,9 +194,6 @@ void main(unsigned long bist)
sdram_initialize(1, memctrl); sdram_initialize(1, memctrl);
/* Check memory. */
/* ram_check(0, 640 * 1024); */
/* Memory is setup. Return to cache_as_ram.inc and continue to boot. */ /* Memory is setup. Return to cache_as_ram.inc and continue to boot. */
return; return;
} }

View File

@ -142,10 +142,6 @@ void main(unsigned long bist)
sdram_initialize(1, memctrl); 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. /* Switch from Cache as RAM to real RAM.
* *
* There are two ways we could think about this. * There are two ways we could think about this.

View File

@ -166,10 +166,6 @@ void main(unsigned long bist)
sdram_initialize(1, memctrl); 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. /* Switch from Cache as RAM to real RAM.
* *
* There are two ways we could think about this. * There are two ways we could think about this.

View File

@ -121,8 +121,4 @@ void main(unsigned long bist)
/* Initialize memory */ /* Initialize memory */
sdram_initialize(); sdram_initialize();
/* Check RAM. */
/* ram_check(0, 640 * 1024); */
/* ram_check(64512 * 1024, 65536 * 1024); */
} }

View File

@ -6,7 +6,6 @@
#include <cpu/x86/lapic.h> #include <cpu/x86/lapic.h>
#include <stdlib.h> #include <stdlib.h>
#include <console/console.h> #include <console/console.h>
#include "lib/ramtest.c"
#include "pc80/udelay_io.c" #include "pc80/udelay_io.c"
#include "lib/delay.c" #include "lib/delay.c"
#include "southbridge/intel/esb6300/esb6300_early_smbus.c" #include "southbridge/intel/esb6300/esb6300_early_smbus.c"
@ -99,16 +98,4 @@ static void main(unsigned long bist)
dump_pci_device(PCI_DEV(0, 0x00, 0)); dump_pci_device(PCI_DEV(0, 0x00, 0));
// dump_bar14(PCI_DEV(0, 0x00, 0)); // dump_bar14(PCI_DEV(0, 0x00, 0));
#endif #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
} }

View File

@ -6,7 +6,6 @@
#include <cpu/x86/lapic.h> #include <cpu/x86/lapic.h>
#include <stdlib.h> #include <stdlib.h>
#include <console/console.h> #include <console/console.h>
#include "lib/ramtest.c"
#include "pc80/udelay_io.c" #include "pc80/udelay_io.c"
#include "lib/delay.c" #include "lib/delay.c"
#include "southbridge/intel/esb6300/esb6300_early_smbus.c" #include "southbridge/intel/esb6300/esb6300_early_smbus.c"
@ -103,16 +102,4 @@ static void main(unsigned long bist)
dump_pci_device(PCI_DEV(0, 0x00, 0)); dump_pci_device(PCI_DEV(0, 0x00, 0));
dump_bar14(PCI_DEV(0, 0x00, 0)); dump_bar14(PCI_DEV(0, 0x00, 0));
#endif #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
} }

View File

@ -6,7 +6,6 @@
#include <cpu/x86/lapic.h> #include <cpu/x86/lapic.h>
#include <stdlib.h> #include <stdlib.h>
#include <console/console.h> #include <console/console.h>
#include "lib/ramtest.c"
#include "southbridge/intel/i82801ex/i82801ex_early_smbus.c" #include "southbridge/intel/i82801ex/i82801ex_early_smbus.c"
#include "northbridge/intel/e7520/raminit.h" #include "northbridge/intel/e7520/raminit.h"
#include "superio/nsc/pc87427/pc87427.h" #include "superio/nsc/pc87427/pc87427.h"
@ -103,16 +102,4 @@ static void main(unsigned long bist)
dump_pci_device(PCI_DEV(0, 0x00, 0)); dump_pci_device(PCI_DEV(0, 0x00, 0));
//dump_bar14(PCI_DEV(0, 0x00, 0)); //dump_bar14(PCI_DEV(0, 0x00, 0));
#endif #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
} }

View File

@ -6,7 +6,6 @@
#include <cpu/x86/lapic.h> #include <cpu/x86/lapic.h>
#include <stdlib.h> #include <stdlib.h>
#include <console/console.h> #include <console/console.h>
#include "lib/ramtest.c"
#include "southbridge/intel/i82801ex/i82801ex_early_smbus.c" #include "southbridge/intel/i82801ex/i82801ex_early_smbus.c"
#include "northbridge/intel/e7520/raminit.h" #include "northbridge/intel/e7520/raminit.h"
#include "superio/winbond/w83627hf/w83627hf.h" #include "superio/winbond/w83627hf/w83627hf.h"
@ -48,12 +47,6 @@ static void main(unsigned long bist)
static const struct mem_controller mch[] = { static const struct mem_controller mch[] = {
{ {
.node_id = 0, .node_id = 0,
/*
.f0 = PCI_DEV(0, 0x00, 0),
.f1 = PCI_DEV(0, 0x00, 1),
.f2 = PCI_DEV(0, 0x00, 2),
.f3 = PCI_DEV(0, 0x00, 3),
*/
.channel0 = {DIMM3, DIMM2, DIMM1, DIMM0, }, .channel0 = {DIMM3, DIMM2, DIMM1, DIMM0, },
.channel1 = {DIMM7, DIMM6, DIMM5, DIMM4, }, .channel1 = {DIMM7, DIMM6, DIMM5, DIMM4, },
} }
@ -110,17 +103,4 @@ static void main(unsigned long bist)
dump_pci_device(PCI_DEV(0, 0x00, 0)); dump_pci_device(PCI_DEV(0, 0x00, 0));
dump_bar14(PCI_DEV(0, 0x00, 0)); dump_bar14(PCI_DEV(0, 0x00, 0));
#endif #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
} }

View File

@ -6,7 +6,6 @@
#include <cpu/x86/lapic.h> #include <cpu/x86/lapic.h>
#include <stdlib.h> #include <stdlib.h>
#include <console/console.h> #include <console/console.h>
#include "lib/ramtest.c"
#include "southbridge/intel/i82801ex/i82801ex_early_smbus.c" #include "southbridge/intel/i82801ex/i82801ex_early_smbus.c"
#include "northbridge/intel/e7520/raminit.h" #include "northbridge/intel/e7520/raminit.h"
#include "superio/winbond/w83627hf/w83627hf.h" #include "superio/winbond/w83627hf/w83627hf.h"
@ -102,17 +101,4 @@ static void main(unsigned long bist)
dump_pci_device(PCI_DEV(0, 0x00, 0)); dump_pci_device(PCI_DEV(0, 0x00, 0));
dump_bar14(PCI_DEV(0, 0x00, 0)); dump_bar14(PCI_DEV(0, 0x00, 0));
#endif #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
} }

View File

@ -12,7 +12,6 @@
#include <arch/hlt.h> #include <arch/hlt.h>
#include <pc80/mc146818rtc.h> #include <pc80/mc146818rtc.h>
#include <console/console.h> #include <console/console.h>
#include "lib/ramtest.c"
#include "cpu/x86/bist.h" #include "cpu/x86/bist.h"
#define TS5300_LED_OFF outb((inb(0x77)&0xfe), 0x77) #define TS5300_LED_OFF outb((inb(0x77)&0xfe), 0x77)
@ -162,12 +161,5 @@ static void main(unsigned long bist)
identify_system(); identify_system();
#endif #endif
#if 0
// Check 32MB of memory @ 0 (very slow!)
print_err("Checking memory:\n");
ram_check(0x00000000, 0x000a0000);
ram_check(0x000b0000, 0x02000000);
#endif
TS5300_LED_OFF; TS5300_LED_OFF;
} }

View File

@ -25,7 +25,6 @@
#include <arch/romcc_io.h> #include <arch/romcc_io.h>
#include <arch/hlt.h> #include <arch/hlt.h>
#include <console/console.h> #include <console/console.h>
#include "lib/ramtest.c"
#include "northbridge/amd/gx1/raminit.c" #include "northbridge/amd/gx1/raminit.c"
#include "superio/nsc/pc97317/pc97317_early_serial.c" #include "superio/nsc/pc97317/pc97317_early_serial.c"
#include "cpu/x86/bist.h" #include "cpu/x86/bist.h"
@ -41,5 +40,4 @@ static void main(unsigned long bist)
report_bist_failure(bist); report_bist_failure(bist);
cs5530_enable_rom(); cs5530_enable_rom();
sdram_init(); sdram_init();
/* ram_check(0, 640 * 1024); */
} }

View File

@ -124,7 +124,4 @@ void main(unsigned long bist)
#if CONFIG_LLSHELL #if CONFIG_LLSHELL
llshell(); llshell();
#endif #endif
/* Check RAM. */
/* ram_check(0, 640 * 1024); */
/* ram_check(64512 * 1024, 65536 * 1024); */
} }

View File

@ -85,9 +85,6 @@ void main(unsigned long bist)
sdram_initialize(1, memctrl); sdram_initialize(1, memctrl);
/* Check memory. */
/* ram_check(0x00000000, 640 * 1024); */
/* Memory is setup. Return to cache_as_ram.inc and continue to boot. */ /* Memory is setup. Return to cache_as_ram.inc and continue to boot. */
return; return;
} }

View File

@ -93,5 +93,4 @@ void main(unsigned long bist)
report_bist_failure(bist); report_bist_failure(bist);
enable_mainboard_devices(); enable_mainboard_devices();
ddr_ram_setup(&ctrl); ddr_ram_setup(&ctrl);
/* ram_check(0, 640 * 1024); */
} }

View File

@ -7,7 +7,6 @@
#include <arch/hlt.h> #include <arch/hlt.h>
#include <stdlib.h> #include <stdlib.h>
#include <console/console.h> #include <console/console.h>
#include "lib/ramtest.c"
#include "northbridge/via/vt8623/raminit.h" #include "northbridge/via/vt8623/raminit.h"
#include "cpu/x86/mtrr/earlymtrr.c" #include "cpu/x86/mtrr/earlymtrr.c"
#include "cpu/x86/bist.h" #include "cpu/x86/bist.h"
@ -105,20 +104,6 @@ static void main(unsigned long bist)
ddr_ram_setup((const struct mem_controller *)0); ddr_ram_setup((const struct mem_controller *)0);
/* Check all of memory */
#if 0
static const struct {
unsigned long lo, hi;
} check_addrs[] = {
/* Check 16MB of memory @ 0*/
{ 0x00000000, 0x01000000 },
};
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) if (bist == 0)
early_mtrr_init(); early_mtrr_init();

View File

@ -27,7 +27,6 @@
#include <arch/romcc_io.h> #include <arch/romcc_io.h>
#include <arch/hlt.h> #include <arch/hlt.h>
#include <console/console.h> #include <console/console.h>
#include "lib/ramtest.c"
#include "northbridge/via/cn400/raminit.h" #include "northbridge/via/cn400/raminit.h"
#include "cpu/x86/mtrr/earlymtrr.c" #include "cpu/x86/mtrr/earlymtrr.c"
#include "cpu/x86/bist.h" #include "cpu/x86/bist.h"
@ -134,6 +133,4 @@ static void main(unsigned long bist)
if (bist == 0) if (bist == 0)
early_mtrr_init(); early_mtrr_init();
//ram_check(0, 640 * 1024);
} }

View File

@ -6,7 +6,6 @@
#include <arch/hlt.h> #include <arch/hlt.h>
#include <stdlib.h> #include <stdlib.h>
#include <console/console.h> #include <console/console.h>
#include "lib/ramtest.c"
#include "northbridge/via/vt8601/raminit.h" #include "northbridge/via/vt8601/raminit.h"
#include "cpu/x86/mtrr/earlymtrr.c" #include "cpu/x86/mtrr/earlymtrr.c"
#include "cpu/x86/bist.h" #include "cpu/x86/bist.h"
@ -95,25 +94,4 @@ static void main(unsigned long bist)
sdram_set_registers((const struct mem_controller *) 0); sdram_set_registers((const struct mem_controller *) 0);
sdram_set_spd_registers((const struct mem_controller *) 0); sdram_set_spd_registers((const struct mem_controller *) 0);
sdram_enable(0, (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
} }

View File

@ -67,5 +67,4 @@ void main(unsigned long bist)
smbus_fixup(&ctrl); smbus_fixup(&ctrl);
report_bist_failure(bist); report_bist_failure(bist);
ddr_ram_setup(&ctrl); ddr_ram_setup(&ctrl);
/* ram_check(0, 640 * 1024); */
} }

View File

@ -86,9 +86,6 @@ void main(unsigned long bist)
sdram_initialize(1, memctrl); sdram_initialize(1, memctrl);
/* Check memory. */
/* ram_check(0x00000000, 640 * 1024); */
/* Memory is setup. Return to cache_as_ram.inc and continue to boot. */ /* Memory is setup. Return to cache_as_ram.inc and continue to boot. */
return; return;
} }

View File

@ -78,7 +78,4 @@ void main(unsigned long bist)
print_err("ram setup done\n"); print_err("ram setup done\n");
msr_init(); msr_init();
/* Check all of memory */
/*ram_check(0x00000000, 640*1024);*/
} }