From 4cf5ecf39d58751cbddbbeb3133886acaecc9550 Mon Sep 17 00:00:00 2001 From: Uwe Hermann Date: Thu, 20 Nov 2008 23:18:10 +0000 Subject: Get rid of the unnecessary indirection by 'struct mem_controller' for the Intel 810 chipset (and all boards using it). This isn't required for this chipset as there's only one memory controller. This also helps a lot with romcc register usage, you should see the dreaded "too few registers" less often. Build-tested with all three boards using the Intel 810 chipset. Signed-off-by: Uwe Hermann Acked-by: Corey Osgood git-svn-id: svn://svn.coreboot.org/coreboot/trunk@3764 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1 --- src/mainboard/asus/mew-am/auto.c | 14 ++++---------- src/mainboard/asus/mew-vm/auto.c | 19 ++++--------------- src/mainboard/msi/ms6178/auto.c | 15 +++++---------- 3 files changed, 13 insertions(+), 35 deletions(-) (limited to 'src/mainboard') diff --git a/src/mainboard/asus/mew-am/auto.c b/src/mainboard/asus/mew-am/auto.c index 22cb164d37..ea09d6c371 100644 --- a/src/mainboard/asus/mew-am/auto.c +++ b/src/mainboard/asus/mew-am/auto.c @@ -48,17 +48,9 @@ static inline int spd_read_byte(unsigned int device, unsigned int address) #include "northbridge/intel/i82810/raminit.c" /* #include "northbridge/intel/i82810/debug.c" */ -#include "sdram/generic_sdram.c" static void main(unsigned long bist) { - static const struct mem_controller memctrl[] = { - { - .d0 = PCI_DEV(0, 0, 0), - .channel0 = {0x50, 0x51}, - } - }; - if (bist == 0) early_mtrr_init(); @@ -67,7 +59,9 @@ static void main(unsigned long bist) console_init(); report_bist_failure(bist); enable_smbus(); - /* dump_spd_registers(&memctrl[0]); */ - sdram_initialize(ARRAY_SIZE(memctrl), memctrl); + /* dump_spd_registers(); */ + sdram_set_registers(); + sdram_set_spd_registers(); + sdram_enable(); /* ram_check(0, 640 * 1024); */ } diff --git a/src/mainboard/asus/mew-vm/auto.c b/src/mainboard/asus/mew-vm/auto.c index 78f9f48254..721f6116b1 100644 --- a/src/mainboard/asus/mew-vm/auto.c +++ b/src/mainboard/asus/mew-vm/auto.c @@ -52,17 +52,9 @@ void udelay(int usecs) #include "northbridge/intel/i82810/raminit.c" #include "northbridge/intel/i82810/debug.c" -#include "sdram/generic_sdram.c" static void main(unsigned long bist) { - static const struct mem_controller memctrl[] = { - { - .d0 = PCI_DEV(0, 0, 0), - .channel0 = {0x50, 0x51}, - } - }; - if (bist == 0) early_mtrr_init(); @@ -75,14 +67,11 @@ static void main(unsigned long bist) /* Halt if there was a built in self test failure. */ report_bist_failure(bist); - /* dump_spd_registers(&memctrl[0]); */ - - /* sdram_initialize() runs out of registers. */ - /* sdram_initialize(ARRAY_SIZE(memctrl), memctrl); */ + /* dump_spd_registers(); */ - sdram_set_registers(memctrl); - sdram_set_spd_registers(memctrl); - sdram_enable(0, memctrl); + sdram_set_registers(); + sdram_set_spd_registers(); + sdram_enable(); /* Check RAM. */ /* ram_check(0, 640 * 1024); */ diff --git a/src/mainboard/msi/ms6178/auto.c b/src/mainboard/msi/ms6178/auto.c index d92aa6b53b..a59074d17a 100644 --- a/src/mainboard/msi/ms6178/auto.c +++ b/src/mainboard/msi/ms6178/auto.c @@ -37,19 +37,11 @@ #include "southbridge/intel/i82801xx/i82801xx_early_smbus.c" #include "pc80/udelay_io.c" #include "northbridge/intel/i82810/raminit.c" -#include "sdram/generic_sdram.c" #define SERIAL_DEV PNP_DEV(0x2e, W83627HF_SP1) static void main(unsigned long bist) { - static const struct mem_controller memctrl[] = { - { - .d0 = PCI_DEV(0, 0, 0), - .channel0 = {0x50, 0x51}, - } - }; - if (bist == 0) early_mtrr_init(); @@ -66,7 +58,10 @@ static void main(unsigned long bist) enable_smbus(); report_bist_failure(bist); - /* dump_spd_registers(&memctrl[0]); */ - sdram_initialize(ARRAY_SIZE(memctrl), memctrl); + + /* dump_spd_registers(); */ + sdram_set_registers(); + sdram_set_spd_registers(); + sdram_enable(); /* ram_check(0, 640 * 1024); */ } -- cgit v1.2.3