From c13093b1484565382bd5e00722149442e46635ee Mon Sep 17 00:00:00 2001 From: Stefan Reinauer Date: Wed, 23 Sep 2009 18:51:03 +0000 Subject: simplify source tree hierarchy: move files from sdram/ and ram/ to lib/ It's only three files. Also fix up all the paths (Gotta love included C files) Signed-off-by: Stefan Reinauer Acked-by: Ronald G. Minnich git-svn-id: svn://svn.coreboot.org/coreboot/trunk@4661 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1 --- src/lib/generic_dump_spd.c | 93 ++++++++++++ src/lib/generic_sdram.c | 67 +++++++++ src/lib/ramtest.c | 161 +++++++++++++++++++++ src/mainboard/a-trend/atc-6220/auto.c | 2 +- src/mainboard/a-trend/atc-6240/auto.c | 2 +- src/mainboard/abit/be6-ii_v2_0/auto.c | 2 +- src/mainboard/advantech/pcm-5820/auto.c | 2 +- src/mainboard/amd/db800/cache_as_ram_auto.c | 4 +- src/mainboard/amd/dbm690t/cache_as_ram_auto.c | 2 +- src/mainboard/amd/norwich/cache_as_ram_auto.c | 4 +- src/mainboard/amd/pistachio/cache_as_ram_auto.c | 2 +- src/mainboard/amd/rumba/auto.c | 4 +- .../amd/serengeti_cheetah/cache_as_ram_auto.c | 2 +- .../serengeti_cheetah_fam10/cache_as_ram_auto.c | 2 +- src/mainboard/arima/hdama/cache_as_ram_auto.c | 4 +- src/mainboard/artecgroup/dbe61/cache_as_ram_auto.c | 4 +- src/mainboard/asi/mb_5blgp/auto.c | 2 +- src/mainboard/asi/mb_5blmp/auto.c | 2 +- src/mainboard/asus/a8n_e/cache_as_ram_auto.c | 4 +- src/mainboard/asus/a8v-e_se/cache_as_ram_auto.c | 2 +- src/mainboard/asus/m2v-mx_se/cache_as_ram_auto.c | 2 +- src/mainboard/asus/mew-am/auto.c | 2 +- src/mainboard/asus/mew-vm/auto.c | 2 +- src/mainboard/asus/p2b-d/auto.c | 2 +- src/mainboard/asus/p2b-ds/auto.c | 2 +- src/mainboard/asus/p2b-f/auto.c | 2 +- src/mainboard/asus/p2b/auto.c | 2 +- src/mainboard/asus/p3b-f/auto.c | 2 +- src/mainboard/axus/tc320/auto.c | 2 +- src/mainboard/azza/pt-6ibd/auto.c | 2 +- src/mainboard/bcom/winnet100/auto.c | 2 +- src/mainboard/bcom/winnetp680/auto.c | 2 +- src/mainboard/biostar/m6tba/auto.c | 2 +- src/mainboard/broadcom/blast/cache_as_ram_auto.c | 4 +- src/mainboard/compaq/deskpro_en_sff_p600/auto.c | 2 +- src/mainboard/dell/s1850/auto.c | 4 +- src/mainboard/digitallogic/adl855pc/auto.c | 4 +- src/mainboard/digitallogic/msm586seg/auto.c | 4 +- src/mainboard/digitallogic/msm800sev/auto.c | 4 +- .../digitallogic/msm800sev/cache_as_ram_auto.c | 4 +- src/mainboard/eaglelion/5bcm/auto.c | 2 +- src/mainboard/gigabyte/ga-6bxc/auto.c | 2 +- .../gigabyte/ga_2761gxdk/cache_as_ram_auto.c | 4 +- src/mainboard/gigabyte/m57sli/cache_as_ram_auto.c | 4 +- src/mainboard/hp/dl145_g3/cache_as_ram_auto.c | 4 +- src/mainboard/ibm/e325/cache_as_ram_auto.c | 4 +- src/mainboard/ibm/e326/cache_as_ram_auto.c | 4 +- src/mainboard/iei/juki-511p/auto.c | 2 +- src/mainboard/iei/nova4899r/auto.c | 2 +- .../iei/pcisa-lx-800-r10/cache_as_ram_auto.c | 4 +- src/mainboard/intel/eagleheights/auto.c | 4 +- src/mainboard/intel/jarrell/auto.c | 4 +- src/mainboard/intel/mtarvon/auto.c | 4 +- src/mainboard/intel/truxton/auto.c | 4 +- src/mainboard/intel/xe7501devkit/auto.c | 4 +- src/mainboard/iwill/dk8_htx/cache_as_ram_auto.c | 4 +- src/mainboard/iwill/dk8s2/cache_as_ram_auto.c | 4 +- src/mainboard/iwill/dk8x/cache_as_ram_auto.c | 4 +- src/mainboard/jetway/j7f24/auto.c | 2 +- src/mainboard/kontron/986lcd-m/auto.c | 2 +- src/mainboard/lippert/frontrunner/auto.c | 4 +- .../lippert/roadrunner-lx/cache_as_ram_auto.c | 4 +- .../lippert/spacerunner-lx/cache_as_ram_auto.c | 4 +- src/mainboard/mitac/6513wu/auto.c | 2 +- src/mainboard/msi/ms6119/auto.c | 2 +- src/mainboard/msi/ms6147/auto.c | 2 +- src/mainboard/msi/ms6178/auto.c | 2 +- src/mainboard/msi/ms7135/cache_as_ram_auto.c | 4 +- src/mainboard/msi/ms7260/cache_as_ram_auto.c | 4 +- src/mainboard/msi/ms9185/cache_as_ram_auto.c | 2 +- src/mainboard/msi/ms9282/cache_as_ram_auto.c | 2 +- src/mainboard/nec/powermate2000/auto.c | 2 +- src/mainboard/newisys/khepri/cache_as_ram_auto.c | 4 +- src/mainboard/nvidia/l1_2pvv/cache_as_ram_auto.c | 4 +- src/mainboard/olpc/btest/auto.c | 4 +- src/mainboard/olpc/rev_a/auto.c | 4 +- src/mainboard/pcengines/alix1c/cache_as_ram_auto.c | 4 +- src/mainboard/rca/rm4100/auto.c | 4 +- src/mainboard/soyo/sy-6ba-plus-iii/auto.c | 2 +- src/mainboard/sunw/ultra40/cache_as_ram_auto.c | 4 +- src/mainboard/supermicro/h8dme/cache_as_ram_auto.c | 4 +- src/mainboard/supermicro/h8dmr/cache_as_ram_auto.c | 4 +- src/mainboard/supermicro/x6dai_g/auto.c | 4 +- src/mainboard/supermicro/x6dhe_g/auto.c | 4 +- src/mainboard/supermicro/x6dhe_g2/auto.c | 4 +- src/mainboard/supermicro/x6dhe_g2/auto.updated.c | 4 +- src/mainboard/supermicro/x6dhr_ig/auto.c | 4 +- src/mainboard/supermicro/x6dhr_ig2/auto.c | 4 +- .../technexion/tim8690/cache_as_ram_auto.c | 2 +- src/mainboard/technologic/ts5300/auto.c | 2 +- src/mainboard/televideo/tc7020/auto.c | 2 +- src/mainboard/thomson/ip1000/auto.c | 4 +- src/mainboard/tyan/s1846/auto.c | 2 +- src/mainboard/tyan/s2735/cache_as_ram_auto.c | 4 +- src/mainboard/tyan/s2850/cache_as_ram_auto.c | 4 +- src/mainboard/tyan/s2875/cache_as_ram_auto.c | 4 +- src/mainboard/tyan/s2880/cache_as_ram_auto.c | 4 +- src/mainboard/tyan/s2881/cache_as_ram_auto.c | 4 +- src/mainboard/tyan/s2882/cache_as_ram_auto.c | 4 +- src/mainboard/tyan/s2885/cache_as_ram_auto.c | 4 +- src/mainboard/tyan/s2891/cache_as_ram_auto.c | 4 +- src/mainboard/tyan/s2892/cache_as_ram_auto.c | 4 +- src/mainboard/tyan/s2895/cache_as_ram_auto.c | 4 +- src/mainboard/tyan/s2912/cache_as_ram_auto.c | 4 +- src/mainboard/tyan/s2912_fam10/cache_as_ram_auto.c | 2 +- src/mainboard/tyan/s4880/cache_as_ram_auto.c | 4 +- src/mainboard/tyan/s4882/cache_as_ram_auto.c | 4 +- src/mainboard/via/epia-cn/auto.c | 2 +- src/mainboard/via/epia-m/auto.c | 2 +- src/mainboard/via/epia-m700/cache_as_ram_auto.c | 2 +- src/mainboard/via/epia-n/auto.c | 2 +- src/mainboard/via/epia/auto.c | 4 +- src/mainboard/via/pc2500e/auto.c | 2 +- src/mainboard/via/vt8454c/auto.c | 2 +- src/northbridge/amd/amdk8/raminit_test.c | 2 +- src/northbridge/intel/e7520/raminit_test.c | 2 +- src/northbridge/intel/e7525/raminit_test.c | 2 +- .../via/vx800/examples/cache_as_ram_auto.c | 2 +- src/ram/ramtest.c | 161 --------------------- src/sdram/generic_dump_spd.c | 93 ------------ src/sdram/generic_sdram.c | 67 --------- 121 files changed, 497 insertions(+), 497 deletions(-) create mode 100644 src/lib/generic_dump_spd.c create mode 100644 src/lib/generic_sdram.c create mode 100644 src/lib/ramtest.c delete mode 100644 src/ram/ramtest.c delete mode 100644 src/sdram/generic_dump_spd.c delete mode 100644 src/sdram/generic_sdram.c diff --git a/src/lib/generic_dump_spd.c b/src/lib/generic_dump_spd.c new file mode 100644 index 0000000000..2a71353b60 --- /dev/null +++ b/src/lib/generic_dump_spd.c @@ -0,0 +1,93 @@ +/* + * This code is derived from the Opteron boards' debug.c. + * It should go away either there or here, depending what fits better. + */ + +static void dump_spd_registers(const struct mem_controller *ctrl) +{ + int i; + print_debug("\r\n"); + for(i = 0; i < 4; i++) { + unsigned device; + device = ctrl->channel0[i]; + if (device) { + int j; + print_debug("dimm: "); + print_debug_hex8(i); + print_debug(".0: "); + print_debug_hex8(device); + for(j = 0; j < 256; j++) { + int status; + unsigned char byte; + if ((j & 0xf) == 0) { + print_debug("\r\n"); + print_debug_hex8(j); + print_debug(": "); + } + status = spd_read_byte(device, j); + if (status < 0) { + print_debug("bad device\r\n"); + break; + } + byte = status & 0xff; + print_debug_hex8(byte); + print_debug_char(' '); + } + print_debug("\r\n"); + } + device = ctrl->channel1[i]; + if (device) { + int j; + print_debug("dimm: "); + print_debug_hex8(i); + print_debug(".1: "); + print_debug_hex8(device); + for(j = 0; j < 256; j++) { + int status; + unsigned char byte; + if ((j & 0xf) == 0) { + print_debug("\r\n"); + print_debug_hex8(j); + print_debug(": "); + } + status = spd_read_byte(device, j); + if (status < 0) { + print_debug("bad device\r\n"); + break; + } + byte = status & 0xff; + print_debug_hex8(byte); + print_debug_char(' '); + } + print_debug("\r\n"); + } + } +} + +#if 0 +void dump_spd_registers(void) +{ + unsigned device; + device = SMBUS_MEM_DEVICE_START; + printk_debug("\n"); + while(device <= SMBUS_MEM_DEVICE_END) { + int status = 0; + int i; + printk_debug("dimm %02x", device); + for(i = 0; (i < 256) && (status == 0); i++) { + unsigned char byte; + if ((i % 20) == 0) { + printk_debug("\n%3d: ", i); + } + status = smbus_read_byte(device, i, &byte); + if (status != 0) { + printk_debug("bad device\n"); + continue; + } + printk_debug("%02x ", byte); + } + device += SMBUS_MEM_DEVICE_INC; + printk_debug("\n"); + } +} +#endif diff --git a/src/lib/generic_sdram.c b/src/lib/generic_sdram.c new file mode 100644 index 0000000000..cdb06cd73f --- /dev/null +++ b/src/lib/generic_sdram.c @@ -0,0 +1,67 @@ + +#ifndef RAMINIT_SYSINFO + #define RAMINIT_SYSINFO 0 +#endif + +static inline void print_debug_sdram_8(const char *strval, uint32_t val) +{ +#if CONFIG_USE_INIT + printk_debug("%s%02x\r\n", strval, val); +#else + print_debug(strval); print_debug_hex8(val); print_debug("\r\n"); +#endif +} + +void sdram_no_memory(void) +{ + print_err("No memory!!\r\n"); + while(1) { + hlt(); + } +} + +/* Setup SDRAM */ +#if RAMINIT_SYSINFO == 1 +void sdram_initialize(int controllers, const struct mem_controller *ctrl, void *sysinfo) +#else +void sdram_initialize(int controllers, const struct mem_controller *ctrl) +#endif +{ + int i; + /* Set the registers we can set once to reasonable values */ + for(i = 0; i < controllers; i++) { + print_debug_sdram_8("Ram1.",i); + + #if RAMINIT_SYSINFO == 1 + sdram_set_registers(ctrl + i , sysinfo); + #else + sdram_set_registers(ctrl + i); + #endif + } + + /* Now setup those things we can auto detect */ + for(i = 0; i < controllers; i++) { + print_debug_sdram_8("Ram2.",i); + + #if RAMINIT_SYSINFO == 1 + sdram_set_spd_registers(ctrl + i , sysinfo); + #else + sdram_set_spd_registers(ctrl + i); + #endif + + } + + /* Now that everything is setup enable the SDRAM. + * Some chipsets do the work for us while on others + * we need to it by hand. + */ + print_debug("Ram3\r\n"); + + #if RAMINIT_SYSINFO == 1 + sdram_enable(controllers, ctrl, sysinfo); + #else + sdram_enable(controllers, ctrl); + #endif + + print_debug("Ram4\r\n"); +} diff --git a/src/lib/ramtest.c b/src/lib/ramtest.c new file mode 100644 index 0000000000..9f329ef51b --- /dev/null +++ b/src/lib/ramtest.c @@ -0,0 +1,161 @@ +static void write_phys(unsigned long addr, unsigned long value) +{ +#if CONFIG_HAVE_MOVNTI + asm volatile( + "movnti %1, (%0)" + : /* outputs */ + : "r" (addr), "r" (value) /* inputs */ +#ifndef __GNUC__ + : /* clobbers */ +#endif + ); +#else + volatile unsigned long *ptr; + ptr = (void *)addr; + *ptr = value; +#endif +} + +static unsigned long read_phys(unsigned long addr) +{ + volatile unsigned long *ptr; + ptr = (void *)addr; + return *ptr; +} + +static void ram_fill(unsigned long start, unsigned long stop) +{ + unsigned long addr; + /* + * Fill. + */ +#if CONFIG_USE_PRINTK_IN_CAR + printk_debug("DRAM fill: 0x%08x-0x%08x\r\n", start, stop); +#else + print_debug("DRAM fill: "); + print_debug_hex32(start); + print_debug("-"); + print_debug_hex32(stop); + print_debug("\r\n"); +#endif + for(addr = start; addr < stop ; addr += 4) { + /* Display address being filled */ + if (!(addr & 0xfffff)) { +#if CONFIG_USE_PRINTK_IN_CAR + printk_debug("%08x \r", addr); +#else + print_debug_hex32(addr); + print_debug(" \r"); +#endif + } + write_phys(addr, addr); + }; + /* Display final address */ +#if CONFIG_USE_PRINTK_IN_CAR + printk_debug("%08x\r\nDRAM filled\r\n", addr); +#else + print_debug_hex32(addr); + print_debug("\r\nDRAM filled\r\n"); +#endif +} + +static void ram_verify(unsigned long start, unsigned long stop) +{ + unsigned long addr; + int i = 0; + /* + * Verify. + */ +#if CONFIG_USE_PRINTK_IN_CAR + printk_debug("DRAM verify: 0x%08x-0x%08x\r\n", start, stop); +#else + print_debug("DRAM verify: "); + print_debug_hex32(start); + print_debug_char('-'); + print_debug_hex32(stop); + print_debug("\r\n"); +#endif + for(addr = start; addr < stop ; addr += 4) { + unsigned long value; + /* Display address being tested */ + if (!(addr & 0xfffff)) { +#if CONFIG_USE_PRINTK_IN_CAR + printk_debug("%08x \r", addr); +#else + print_debug_hex32(addr); + print_debug(" \r"); +#endif + } + value = read_phys(addr); + if (value != addr) { + /* Display address with error */ +#if CONFIG_USE_PRINTK_IN_CAR + printk_err("Fail: @0x%08x Read value=0x%08x\r\n", addr, value); +#else + print_err("Fail: @0x"); + print_err_hex32(addr); + print_err(" Read value=0x"); + print_err_hex32(value); + print_err("\r\n"); +#endif + i++; + if(i>256) { +#if CONFIG_USE_PRINTK_IN_CAR + printk_debug("Aborting.\n\r"); +#else + print_debug("Aborting.\n\r"); +#endif + break; + } + } + } + /* Display final address */ +#if CONFIG_USE_PRINTK_IN_CAR + printk_debug("%08x", addr); +#else + print_debug_hex32(addr); +#endif + + if (i) { +#if CONFIG_USE_PRINTK_IN_CAR + printk_debug("\r\nDRAM did _NOT_ verify!\r\n"); +#else + print_debug("\r\nDRAM did _NOT_ verify!\r\n"); +#endif + die("DRAM ERROR"); + } + else { +#if CONFIG_USE_PRINTK_IN_CAR + printk_debug("\r\nDRAM range verified.\r\n"); +#else + print_debug("\r\nDRAM range verified.\r\n"); +#endif + } +} + + +void ram_check(unsigned long start, unsigned long stop) +{ + /* + * This is much more of a "Is my DRAM properly configured?" + * test than a "Is my DRAM faulty?" test. Not all bits + * are tested. -Tyson + */ +#if CONFIG_USE_PRINTK_IN_CAR + printk_debug("Testing DRAM : %08x - %08x\r\n", start, stop); +#else + print_debug("Testing DRAM : "); + print_debug_hex32(start); + print_debug("-"); + print_debug_hex32(stop); + print_debug("\r\n"); +#endif + ram_fill(start, stop); + ram_verify(start, stop); +#if CONFIG_USE_PRINTK_IN_CAR + printk_debug("Done.\r\n"); +#else + print_debug("Done.\r\n"); +#endif +} + diff --git a/src/mainboard/a-trend/atc-6220/auto.c b/src/mainboard/a-trend/atc-6220/auto.c index 1b5891e519..fa027e1127 100644 --- a/src/mainboard/a-trend/atc-6220/auto.c +++ b/src/mainboard/a-trend/atc-6220/auto.c @@ -29,7 +29,7 @@ #include #include "pc80/serial.c" #include "arch/i386/lib/console.c" -#include "ram/ramtest.c" +#include "lib/ramtest.c" #include "southbridge/intel/i82371eb/i82371eb_early_smbus.c" #include "northbridge/intel/i440bx/raminit.h" #include "lib/debug.c" diff --git a/src/mainboard/a-trend/atc-6240/auto.c b/src/mainboard/a-trend/atc-6240/auto.c index 782e307d99..756d0e0709 100644 --- a/src/mainboard/a-trend/atc-6240/auto.c +++ b/src/mainboard/a-trend/atc-6240/auto.c @@ -29,7 +29,7 @@ #include #include "pc80/serial.c" #include "arch/i386/lib/console.c" -#include "ram/ramtest.c" +#include "lib/ramtest.c" #include "southbridge/intel/i82371eb/i82371eb_early_smbus.c" #include "northbridge/intel/i440bx/raminit.h" #include "lib/debug.c" diff --git a/src/mainboard/abit/be6-ii_v2_0/auto.c b/src/mainboard/abit/be6-ii_v2_0/auto.c index fe9bce8423..70beca92ac 100644 --- a/src/mainboard/abit/be6-ii_v2_0/auto.c +++ b/src/mainboard/abit/be6-ii_v2_0/auto.c @@ -29,7 +29,7 @@ #include #include "pc80/serial.c" #include "arch/i386/lib/console.c" -#include "ram/ramtest.c" +#include "lib/ramtest.c" #include "southbridge/intel/i82371eb/i82371eb_early_smbus.c" #include "northbridge/intel/i440bx/raminit.h" #include "lib/debug.c" diff --git a/src/mainboard/advantech/pcm-5820/auto.c b/src/mainboard/advantech/pcm-5820/auto.c index 20dff7eedb..1b3e96821a 100644 --- a/src/mainboard/advantech/pcm-5820/auto.c +++ b/src/mainboard/advantech/pcm-5820/auto.c @@ -27,7 +27,7 @@ #include #include "pc80/serial.c" #include "arch/i386/lib/console.c" -#include "ram/ramtest.c" +#include "lib/ramtest.c" #include "northbridge/amd/gx1/raminit.c" #include "cpu/x86/bist.h" #include "superio/winbond/w83977f/w83977f_early_serial.c" diff --git a/src/mainboard/amd/db800/cache_as_ram_auto.c b/src/mainboard/amd/db800/cache_as_ram_auto.c index 0ea76445aa..f0e37d7306 100644 --- a/src/mainboard/amd/db800/cache_as_ram_auto.c +++ b/src/mainboard/amd/db800/cache_as_ram_auto.c @@ -27,7 +27,7 @@ #include #include "pc80/serial.c" #include "arch/i386/lib/console.c" -#include "ram/ramtest.c" +#include "lib/ramtest.c" #include "cpu/x86/bist.h" #include "cpu/x86/msr.h" #include @@ -55,7 +55,7 @@ static inline int spd_read_byte(unsigned int device, unsigned int address) #include "northbridge/amd/lx/raminit.h" #include "northbridge/amd/lx/pll_reset.c" #include "northbridge/amd/lx/raminit.c" -#include "sdram/generic_sdram.c" +#include "lib/generic_sdram.c" #include "cpu/amd/model_lx/cpureginit.c" #include "cpu/amd/model_lx/syspreinit.c" diff --git a/src/mainboard/amd/dbm690t/cache_as_ram_auto.c b/src/mainboard/amd/dbm690t/cache_as_ram_auto.c index 75ff96c338..b058b445f3 100644 --- a/src/mainboard/amd/dbm690t/cache_as_ram_auto.c +++ b/src/mainboard/amd/dbm690t/cache_as_ram_auto.c @@ -88,7 +88,7 @@ static inline int spd_read_byte(u32 device, u32 address) #include "northbridge/amd/amdk8/incoherent_ht.c" #include "northbridge/amd/amdk8/raminit_f.c" #include "northbridge/amd/amdk8/coherent_ht.c" -#include "sdram/generic_sdram.c" +#include "lib/generic_sdram.c" #include "resourcemap.c" #include "cpu/amd/dualcore/dualcore.c" diff --git a/src/mainboard/amd/norwich/cache_as_ram_auto.c b/src/mainboard/amd/norwich/cache_as_ram_auto.c index aae92deb9b..fc7e96b342 100644 --- a/src/mainboard/amd/norwich/cache_as_ram_auto.c +++ b/src/mainboard/amd/norwich/cache_as_ram_auto.c @@ -27,7 +27,7 @@ #include #include "pc80/serial.c" #include "arch/i386/lib/console.c" -#include "ram/ramtest.c" +#include "lib/ramtest.c" #include "cpu/x86/bist.h" #include "cpu/x86/msr.h" #include @@ -53,7 +53,7 @@ static inline int spd_read_byte(unsigned int device, unsigned int address) #include "northbridge/amd/lx/raminit.h" #include "northbridge/amd/lx/pll_reset.c" #include "northbridge/amd/lx/raminit.c" -#include "sdram/generic_sdram.c" +#include "lib/generic_sdram.c" #include "cpu/amd/model_lx/cpureginit.c" #include "cpu/amd/model_lx/syspreinit.c" diff --git a/src/mainboard/amd/pistachio/cache_as_ram_auto.c b/src/mainboard/amd/pistachio/cache_as_ram_auto.c index bbe96ce978..4615901fe7 100644 --- a/src/mainboard/amd/pistachio/cache_as_ram_auto.c +++ b/src/mainboard/amd/pistachio/cache_as_ram_auto.c @@ -82,7 +82,7 @@ static inline int spd_read_byte(u32 device, u32 address) #include "northbridge/amd/amdk8/incoherent_ht.c" #include "northbridge/amd/amdk8/raminit_f.c" #include "northbridge/amd/amdk8/coherent_ht.c" -#include "sdram/generic_sdram.c" +#include "lib/generic_sdram.c" #include "resourcemap.c" #include "cpu/amd/dualcore/dualcore.c" diff --git a/src/mainboard/amd/rumba/auto.c b/src/mainboard/amd/rumba/auto.c index e1326ff622..e8f590d566 100644 --- a/src/mainboard/amd/rumba/auto.c +++ b/src/mainboard/amd/rumba/auto.c @@ -8,7 +8,7 @@ #include #include "pc80/serial.c" #include "arch/i386/lib/console.c" -#include "ram/ramtest.c" +#include "lib/ramtest.c" #include "superio/winbond/w83627hf/w83627hf_early_serial.c" #include "cpu/x86/bist.h" #include "cpu/x86/msr.h" @@ -93,7 +93,7 @@ static void sdram_set_spd_registers(const struct mem_controller *ctrl) } #include "northbridge/amd/gx2/raminit.c" -#include "sdram/generic_sdram.c" +#include "lib/generic_sdram.c" #define PLLMSRhi 0x00001490 #define PLLMSRlo 0x02000030 diff --git a/src/mainboard/amd/serengeti_cheetah/cache_as_ram_auto.c b/src/mainboard/amd/serengeti_cheetah/cache_as_ram_auto.c index fb1be8dd28..7d28715e37 100644 --- a/src/mainboard/amd/serengeti_cheetah/cache_as_ram_auto.c +++ b/src/mainboard/amd/serengeti_cheetah/cache_as_ram_auto.c @@ -126,7 +126,7 @@ static inline int spd_read_byte(unsigned device, unsigned address) #include "northbridge/amd/amdk8/raminit_f.c" -#include "sdram/generic_sdram.c" +#include "lib/generic_sdram.c" /* tyan does not want the default */ #include "resourcemap.c" diff --git a/src/mainboard/amd/serengeti_cheetah_fam10/cache_as_ram_auto.c b/src/mainboard/amd/serengeti_cheetah_fam10/cache_as_ram_auto.c index 4e484553f7..abb28917c1 100644 --- a/src/mainboard/amd/serengeti_cheetah_fam10/cache_as_ram_auto.c +++ b/src/mainboard/amd/serengeti_cheetah_fam10/cache_as_ram_auto.c @@ -63,7 +63,7 @@ static void post_code(u8 value) { #if (CONFIG_USE_FAILOVER_IMAGE == 0) #include "arch/i386/lib/console.c" #include "pc80/serial.c" -#include "ram/ramtest.c" +#include "lib/ramtest.c" #include #include "southbridge/amd/amd8111/amd8111_early_smbus.c" #include "northbridge/amd/amdfam10/raminit.h" diff --git a/src/mainboard/arima/hdama/cache_as_ram_auto.c b/src/mainboard/arima/hdama/cache_as_ram_auto.c index a9a8a79333..993c58b8ce 100644 --- a/src/mainboard/arima/hdama/cache_as_ram_auto.c +++ b/src/mainboard/arima/hdama/cache_as_ram_auto.c @@ -12,7 +12,7 @@ #include "pc80/mc146818rtc_early.c" #include "pc80/serial.c" #include "arch/i386/lib/console.c" -#include "ram/ramtest.c" +#include "lib/ramtest.c" #include #include "northbridge/amd/amdk8/incoherent_ht.c" @@ -78,7 +78,7 @@ static inline int spd_read_byte(unsigned device, unsigned address) #include "northbridge/amd/amdk8/raminit.c" #include "northbridge/amd/amdk8/resourcemap.c" #include "northbridge/amd/amdk8/coherent_ht.c" -#include "sdram/generic_sdram.c" +#include "lib/generic_sdram.c" #if CONFIG_LOGICAL_CPUS==1 #define SET_NB_CFG_54 1 diff --git a/src/mainboard/artecgroup/dbe61/cache_as_ram_auto.c b/src/mainboard/artecgroup/dbe61/cache_as_ram_auto.c index adfe71b336..4679ab44f3 100644 --- a/src/mainboard/artecgroup/dbe61/cache_as_ram_auto.c +++ b/src/mainboard/artecgroup/dbe61/cache_as_ram_auto.c @@ -29,7 +29,7 @@ #include #include "pc80/serial.c" #include "arch/i386/lib/console.c" -#include "ram/ramtest.c" +#include "lib/ramtest.c" #include "cpu/x86/bist.h" #include "cpu/x86/msr.h" #include @@ -72,7 +72,7 @@ static int spd_read_byte(unsigned device, unsigned address) #include "northbridge/amd/lx/raminit.h" #include "northbridge/amd/lx/pll_reset.c" #include "northbridge/amd/lx/raminit.c" -#include "sdram/generic_sdram.c" +#include "lib/generic_sdram.c" #include "cpu/amd/model_lx/cpureginit.c" #include "cpu/amd/model_lx/syspreinit.c" diff --git a/src/mainboard/asi/mb_5blgp/auto.c b/src/mainboard/asi/mb_5blgp/auto.c index 60c8dd7c1a..616f7fa2cd 100644 --- a/src/mainboard/asi/mb_5blgp/auto.c +++ b/src/mainboard/asi/mb_5blgp/auto.c @@ -27,7 +27,7 @@ #include #include "pc80/serial.c" #include "arch/i386/lib/console.c" -#include "ram/ramtest.c" +#include "lib/ramtest.c" #include "northbridge/amd/gx1/raminit.c" #include "cpu/x86/bist.h" #include "superio/nsc/pc87351/pc87351_early_serial.c" diff --git a/src/mainboard/asi/mb_5blmp/auto.c b/src/mainboard/asi/mb_5blmp/auto.c index a98d640acc..df9e09cbeb 100644 --- a/src/mainboard/asi/mb_5blmp/auto.c +++ b/src/mainboard/asi/mb_5blmp/auto.c @@ -28,7 +28,7 @@ #include #include "pc80/serial.c" #include "arch/i386/lib/console.c" -#include "ram/ramtest.c" +#include "lib/ramtest.c" #include "northbridge/amd/gx1/raminit.c" #include "superio/nsc/pc87351/pc87351_early_serial.c" #include "cpu/x86/bist.h" diff --git a/src/mainboard/asus/a8n_e/cache_as_ram_auto.c b/src/mainboard/asus/a8n_e/cache_as_ram_auto.c index a45d8d7966..021a226427 100644 --- a/src/mainboard/asus/a8n_e/cache_as_ram_auto.c +++ b/src/mainboard/asus/a8n_e/cache_as_ram_auto.c @@ -58,7 +58,7 @@ #include #include "pc80/serial.c" #include "arch/i386/lib/console.c" -#include "ram/ramtest.c" +#include "lib/ramtest.c" #include "northbridge/amd/amdk8/incoherent_ht.c" #include "southbridge/nvidia/ck804/ck804_early_smbus.c" #include "northbridge/amd/amdk8/raminit.h" @@ -92,7 +92,7 @@ static inline int spd_read_byte(unsigned device, unsigned address) } #include "northbridge/amd/amdk8/raminit.c" -#include "sdram/generic_sdram.c" +#include "lib/generic_sdram.c" #include "southbridge/nvidia/ck804/ck804_early_setup_ss.h" #include "southbridge/nvidia/ck804/ck804_early_setup.c" #include "cpu/amd/car/copy_and_run.c" diff --git a/src/mainboard/asus/a8v-e_se/cache_as_ram_auto.c b/src/mainboard/asus/a8v-e_se/cache_as_ram_auto.c index b76d011910..6f54ecfcc7 100644 --- a/src/mainboard/asus/a8v-e_se/cache_as_ram_auto.c +++ b/src/mainboard/asus/a8v-e_se/cache_as_ram_auto.c @@ -113,7 +113,7 @@ void soft_reset(void) #include "northbridge/amd/amdk8/raminit.c" #include "northbridge/amd/amdk8/coherent_ht.c" #include "northbridge/amd/amdk8/incoherent_ht.c" -#include "sdram/generic_sdram.c" +#include "lib/generic_sdram.c" #include "cpu/amd/dualcore/dualcore.c" #include "southbridge/via/k8t890/k8t890_early_car.c" #include "cpu/amd/car/copy_and_run.c" diff --git a/src/mainboard/asus/m2v-mx_se/cache_as_ram_auto.c b/src/mainboard/asus/m2v-mx_se/cache_as_ram_auto.c index e5d18e1c94..5a7f74ba37 100644 --- a/src/mainboard/asus/m2v-mx_se/cache_as_ram_auto.c +++ b/src/mainboard/asus/m2v-mx_se/cache_as_ram_auto.c @@ -100,7 +100,7 @@ void activate_spd_rom(const struct mem_controller *ctrl) #include "northbridge/amd/amdk8/raminit_f.c" #include "northbridge/amd/amdk8/coherent_ht.c" #include "northbridge/amd/amdk8/incoherent_ht.c" -#include "sdram/generic_sdram.c" +#include "lib/generic_sdram.c" #include "cpu/amd/dualcore/dualcore.c" #include "cpu/amd/car/copy_and_run.c" #include "cpu/amd/car/post_cache_as_ram.c" diff --git a/src/mainboard/asus/mew-am/auto.c b/src/mainboard/asus/mew-am/auto.c index 05a163d779..71d4046c8d 100644 --- a/src/mainboard/asus/mew-am/auto.c +++ b/src/mainboard/asus/mew-am/auto.c @@ -29,7 +29,7 @@ #include #include "pc80/serial.c" #include "arch/i386/lib/console.c" -#include "ram/ramtest.c" +#include "lib/ramtest.c" #include "southbridge/intel/i82801xx/i82801xx_early_smbus.c" #include "northbridge/intel/i82810/raminit.h" #include "lib/debug.c" diff --git a/src/mainboard/asus/mew-vm/auto.c b/src/mainboard/asus/mew-vm/auto.c index f53083f2a5..2a585e764b 100644 --- a/src/mainboard/asus/mew-vm/auto.c +++ b/src/mainboard/asus/mew-vm/auto.c @@ -29,7 +29,7 @@ #include #include "pc80/serial.c" #include "arch/i386/lib/console.c" -#include "ram/ramtest.c" +#include "lib/ramtest.c" #include "superio/smsc/lpc47b272/lpc47b272_early_serial.c" #include "northbridge/intel/i82810/raminit.h" #include "cpu/x86/mtrr/earlymtrr.c" diff --git a/src/mainboard/asus/p2b-d/auto.c b/src/mainboard/asus/p2b-d/auto.c index 747ba77b35..4857cd540f 100644 --- a/src/mainboard/asus/p2b-d/auto.c +++ b/src/mainboard/asus/p2b-d/auto.c @@ -30,7 +30,7 @@ #include #include "pc80/serial.c" #include "arch/i386/lib/console.c" -#include "ram/ramtest.c" +#include "lib/ramtest.c" #include "southbridge/intel/i82371eb/i82371eb_early_smbus.c" #include "northbridge/intel/i440bx/raminit.h" #include "lib/debug.c" diff --git a/src/mainboard/asus/p2b-ds/auto.c b/src/mainboard/asus/p2b-ds/auto.c index aaa7ae94e6..141f444684 100644 --- a/src/mainboard/asus/p2b-ds/auto.c +++ b/src/mainboard/asus/p2b-ds/auto.c @@ -30,7 +30,7 @@ #include #include "pc80/serial.c" #include "arch/i386/lib/console.c" -#include "ram/ramtest.c" +#include "lib/ramtest.c" #include "southbridge/intel/i82371eb/i82371eb_early_smbus.c" #include "northbridge/intel/i440bx/raminit.h" #include "lib/debug.c" diff --git a/src/mainboard/asus/p2b-f/auto.c b/src/mainboard/asus/p2b-f/auto.c index 191c9ffd4c..86b0759949 100644 --- a/src/mainboard/asus/p2b-f/auto.c +++ b/src/mainboard/asus/p2b-f/auto.c @@ -29,7 +29,7 @@ #include #include "pc80/serial.c" #include "arch/i386/lib/console.c" -#include "ram/ramtest.c" +#include "lib/ramtest.c" #include "southbridge/intel/i82371eb/i82371eb_early_smbus.c" #include "northbridge/intel/i440bx/raminit.h" #include "lib/debug.c" diff --git a/src/mainboard/asus/p2b/auto.c b/src/mainboard/asus/p2b/auto.c index 1b5891e519..fa027e1127 100644 --- a/src/mainboard/asus/p2b/auto.c +++ b/src/mainboard/asus/p2b/auto.c @@ -29,7 +29,7 @@ #include #include "pc80/serial.c" #include "arch/i386/lib/console.c" -#include "ram/ramtest.c" +#include "lib/ramtest.c" #include "southbridge/intel/i82371eb/i82371eb_early_smbus.c" #include "northbridge/intel/i440bx/raminit.h" #include "lib/debug.c" diff --git a/src/mainboard/asus/p3b-f/auto.c b/src/mainboard/asus/p3b-f/auto.c index e300bf6794..c9c64fc8e5 100644 --- a/src/mainboard/asus/p3b-f/auto.c +++ b/src/mainboard/asus/p3b-f/auto.c @@ -29,7 +29,7 @@ #include #include "pc80/serial.c" #include "arch/i386/lib/console.c" -#include "ram/ramtest.c" +#include "lib/ramtest.c" #include "southbridge/intel/i82371eb/i82371eb_early_smbus.c" #include "northbridge/intel/i440bx/raminit.h" #include "lib/debug.c" diff --git a/src/mainboard/axus/tc320/auto.c b/src/mainboard/axus/tc320/auto.c index ad80e5ce70..31af3b905b 100644 --- a/src/mainboard/axus/tc320/auto.c +++ b/src/mainboard/axus/tc320/auto.c @@ -28,7 +28,7 @@ #include #include "pc80/serial.c" #include "arch/i386/lib/console.c" -#include "ram/ramtest.c" +#include "lib/ramtest.c" #include "northbridge/amd/gx1/raminit.c" #include "superio/nsc/pc97317/pc97317_early_serial.c" #include "cpu/x86/bist.h" diff --git a/src/mainboard/azza/pt-6ibd/auto.c b/src/mainboard/azza/pt-6ibd/auto.c index 24359a1038..65a7fcc1f9 100644 --- a/src/mainboard/azza/pt-6ibd/auto.c +++ b/src/mainboard/azza/pt-6ibd/auto.c @@ -29,7 +29,7 @@ #include #include "pc80/serial.c" #include "arch/i386/lib/console.c" -#include "ram/ramtest.c" +#include "lib/ramtest.c" #include "southbridge/intel/i82371eb/i82371eb_early_smbus.c" #include "northbridge/intel/i440bx/raminit.h" #include "lib/debug.c" diff --git a/src/mainboard/bcom/winnet100/auto.c b/src/mainboard/bcom/winnet100/auto.c index 51d847b976..5abba9ce3a 100644 --- a/src/mainboard/bcom/winnet100/auto.c +++ b/src/mainboard/bcom/winnet100/auto.c @@ -28,7 +28,7 @@ #include #include "pc80/serial.c" #include "arch/i386/lib/console.c" -#include "ram/ramtest.c" +#include "lib/ramtest.c" #include "northbridge/amd/gx1/raminit.c" #include "superio/nsc/pc97317/pc97317_early_serial.c" #include "cpu/x86/bist.h" diff --git a/src/mainboard/bcom/winnetp680/auto.c b/src/mainboard/bcom/winnetp680/auto.c index 01135f8b5c..6b41549184 100644 --- a/src/mainboard/bcom/winnetp680/auto.c +++ b/src/mainboard/bcom/winnetp680/auto.c @@ -30,7 +30,7 @@ #include #include "pc80/serial.c" #include "arch/i386/lib/console.c" -#include "ram/ramtest.c" +#include "lib/ramtest.c" #include "northbridge/via/cn700/raminit.h" #include "cpu/x86/mtrr/earlymtrr.c" #include "cpu/x86/bist.h" diff --git a/src/mainboard/biostar/m6tba/auto.c b/src/mainboard/biostar/m6tba/auto.c index 5a6244900e..4e018bd5b6 100644 --- a/src/mainboard/biostar/m6tba/auto.c +++ b/src/mainboard/biostar/m6tba/auto.c @@ -29,7 +29,7 @@ #include #include "pc80/serial.c" #include "arch/i386/lib/console.c" -#include "ram/ramtest.c" +#include "lib/ramtest.c" #include "southbridge/intel/i82371eb/i82371eb_early_smbus.c" #include "northbridge/intel/i440bx/raminit.h" #include "lib/debug.c" diff --git a/src/mainboard/broadcom/blast/cache_as_ram_auto.c b/src/mainboard/broadcom/blast/cache_as_ram_auto.c index f8eb8c8535..5ac6f4be9f 100644 --- a/src/mainboard/broadcom/blast/cache_as_ram_auto.c +++ b/src/mainboard/broadcom/blast/cache_as_ram_auto.c @@ -21,7 +21,7 @@ #include "pc80/mc146818rtc_early.c" #include "pc80/serial.c" #include "arch/i386/lib/console.c" -#include "ram/ramtest.c" +#include "lib/ramtest.c" #if 0 static void post_code(uint8_t value) { @@ -89,7 +89,7 @@ static inline int spd_read_byte(unsigned device, unsigned address) #include "northbridge/amd/amdk8/raminit.c" #include "northbridge/amd/amdk8/coherent_ht.c" -#include "sdram/generic_sdram.c" +#include "lib/generic_sdram.c" /* tyan does not want the default */ #include "resourcemap.c" diff --git a/src/mainboard/compaq/deskpro_en_sff_p600/auto.c b/src/mainboard/compaq/deskpro_en_sff_p600/auto.c index 424f6f698b..238231e8c5 100644 --- a/src/mainboard/compaq/deskpro_en_sff_p600/auto.c +++ b/src/mainboard/compaq/deskpro_en_sff_p600/auto.c @@ -29,7 +29,7 @@ #include #include "pc80/serial.c" #include "arch/i386/lib/console.c" -#include "ram/ramtest.c" +#include "lib/ramtest.c" #include "southbridge/intel/i82371eb/i82371eb_early_smbus.c" #include "northbridge/intel/i440bx/raminit.h" #include "lib/debug.c" diff --git a/src/mainboard/dell/s1850/auto.c b/src/mainboard/dell/s1850/auto.c index 0e07300856..f884f4ba3c 100644 --- a/src/mainboard/dell/s1850/auto.c +++ b/src/mainboard/dell/s1850/auto.c @@ -10,7 +10,7 @@ #include "pc80/mc146818rtc_early.c" #include "pc80/serial.c" #include "arch/i386/lib/console.c" -#include "ram/ramtest.c" +#include "lib/ramtest.c" #include "southbridge/intel/i82801er/i82801er_early_smbus.c" #include "northbridge/intel/e7520/raminit.h" #include "superio/winbond/w83627hf/w83627hf.h" @@ -71,7 +71,7 @@ static inline int spd_read_byte(unsigned device, unsigned address) } #include "northbridge/intel/e7520/raminit.c" -#include "sdram/generic_sdram.c" +#include "lib/generic_sdram.c" /* IPMI garbage. This is all test stuff, if it really works we'll move it somewhere diff --git a/src/mainboard/digitallogic/adl855pc/auto.c b/src/mainboard/digitallogic/adl855pc/auto.c index 61351ba5a9..ad75c37cce 100644 --- a/src/mainboard/digitallogic/adl855pc/auto.c +++ b/src/mainboard/digitallogic/adl855pc/auto.c @@ -14,7 +14,7 @@ #include "pc80/mc146818rtc_early.c" #include "pc80/serial.c" #include "arch/i386/lib/console.c" -#include "ram/ramtest.c" +#include "lib/ramtest.c" #include "southbridge/intel/i82801dbm/i82801dbm_early_smbus.c" #include "northbridge/intel/i855pm/raminit.h" @@ -59,7 +59,7 @@ static inline int spd_read_byte(unsigned device, unsigned address) #include "northbridge/intel/i855pm/raminit.c" #include "northbridge/intel/i855pm/reset_test.c" -#include "sdram/generic_sdram.c" +#include "lib/generic_sdram.c" static void main(unsigned long bist) { diff --git a/src/mainboard/digitallogic/msm586seg/auto.c b/src/mainboard/digitallogic/msm586seg/auto.c index 1917fd097e..aeddc24fd7 100644 --- a/src/mainboard/digitallogic/msm586seg/auto.c +++ b/src/mainboard/digitallogic/msm586seg/auto.c @@ -9,7 +9,7 @@ #include "pc80/mc146818rtc_early.c" #include "pc80/serial.c" #include "arch/i386/lib/console.c" -#include "ram/ramtest.c" +#include "lib/ramtest.c" #include "cpu/x86/bist.h" //#include "lib/delay.c" @@ -74,7 +74,7 @@ static inline int spd_read_byte(unsigned device, unsigned address) // return smbus_read_byte(device, address); } -//#include "sdram/generic_sdram.c" +//#include "lib/generic_sdram.c" static inline void dumpmem(void){ int i, j; diff --git a/src/mainboard/digitallogic/msm800sev/auto.c b/src/mainboard/digitallogic/msm800sev/auto.c index 79c059577e..b5082596eb 100644 --- a/src/mainboard/digitallogic/msm800sev/auto.c +++ b/src/mainboard/digitallogic/msm800sev/auto.c @@ -8,7 +8,7 @@ #include #include "pc80/serial.c" #include "arch/i386/lib/console.c" -#include "ram/ramtest.c" +#include "lib/ramtest.c" //#include "superio/winbond/w83627hf/w83627hf_early_serial.c" #include "cpu/x86/bist.h" #include "cpu/x86/msr.h" @@ -82,7 +82,7 @@ static void sdram_set_spd_registers(const struct mem_controller *ctrl) } #include "northbridge/amd/lx/raminit.c" -#include "sdram/generic_sdram.c" +#include "lib/generic_sdram.c" /* CPU and GLIU mult/div */ #define PLLMSRhi 0x0000039C diff --git a/src/mainboard/digitallogic/msm800sev/cache_as_ram_auto.c b/src/mainboard/digitallogic/msm800sev/cache_as_ram_auto.c index 454031e782..4282449945 100644 --- a/src/mainboard/digitallogic/msm800sev/cache_as_ram_auto.c +++ b/src/mainboard/digitallogic/msm800sev/cache_as_ram_auto.c @@ -8,7 +8,7 @@ #include #include "pc80/serial.c" #include "arch/i386/lib/console.c" -#include "ram/ramtest.c" +#include "lib/ramtest.c" #include "cpu/x86/bist.h" #include "cpu/x86/msr.h" #include @@ -35,7 +35,7 @@ static inline int spd_read_byte(unsigned device, unsigned address) #include "northbridge/amd/lx/raminit.h" #include "northbridge/amd/lx/pll_reset.c" #include "northbridge/amd/lx/raminit.c" -#include "sdram/generic_sdram.c" +#include "lib/generic_sdram.c" #include "cpu/amd/model_lx/cpureginit.c" #include "cpu/amd/model_lx/syspreinit.c" diff --git a/src/mainboard/eaglelion/5bcm/auto.c b/src/mainboard/eaglelion/5bcm/auto.c index 096cebe2f7..4d34ab1190 100644 --- a/src/mainboard/eaglelion/5bcm/auto.c +++ b/src/mainboard/eaglelion/5bcm/auto.c @@ -9,7 +9,7 @@ #include #include "pc80/serial.c" #include "arch/i386/lib/console.c" -#include "ram/ramtest.c" +#include "lib/ramtest.c" //#include "southbridge/intel/i440bx/i440bx_early_smbus.c" #include "superio/nsc/pc97317/pc97317_early_serial.c" //#include "northbridge/intel/i440bx/raminit.h" diff --git a/src/mainboard/gigabyte/ga-6bxc/auto.c b/src/mainboard/gigabyte/ga-6bxc/auto.c index 9947d20e97..79662ad577 100644 --- a/src/mainboard/gigabyte/ga-6bxc/auto.c +++ b/src/mainboard/gigabyte/ga-6bxc/auto.c @@ -29,7 +29,7 @@ #include #include "pc80/serial.c" #include "arch/i386/lib/console.c" -#include "ram/ramtest.c" +#include "lib/ramtest.c" #include "southbridge/intel/i82371eb/i82371eb_early_smbus.c" #include "northbridge/intel/i440bx/raminit.h" #include "lib/debug.c" diff --git a/src/mainboard/gigabyte/ga_2761gxdk/cache_as_ram_auto.c b/src/mainboard/gigabyte/ga_2761gxdk/cache_as_ram_auto.c index e44f4335b4..e81dc4c210 100644 --- a/src/mainboard/gigabyte/ga_2761gxdk/cache_as_ram_auto.c +++ b/src/mainboard/gigabyte/ga_2761gxdk/cache_as_ram_auto.c @@ -65,7 +65,7 @@ #include "southbridge/sis/sis966/sis966_enable_usbdebug_direct.c" #include "pc80/usbdebug_direct_serial.c" #endif -#include "ram/ramtest.c" +#include "lib/ramtest.c" #include @@ -121,7 +121,7 @@ static inline int spd_read_byte(unsigned device, unsigned address) #include "northbridge/amd/amdk8/raminit_f.c" -#include "sdram/generic_sdram.c" +#include "lib/generic_sdram.c" #include "resourcemap.c" diff --git a/src/mainboard/gigabyte/m57sli/cache_as_ram_auto.c b/src/mainboard/gigabyte/m57sli/cache_as_ram_auto.c index ab604c02b1..812878892a 100644 --- a/src/mainboard/gigabyte/m57sli/cache_as_ram_auto.c +++ b/src/mainboard/gigabyte/m57sli/cache_as_ram_auto.c @@ -63,7 +63,7 @@ #include "southbridge/nvidia/mcp55/mcp55_enable_usbdebug_direct.c" #include "pc80/usbdebug_direct_serial.c" #endif -#include "ram/ramtest.c" +#include "lib/ramtest.c" #include @@ -119,7 +119,7 @@ static inline int spd_read_byte(unsigned device, unsigned address) #include "northbridge/amd/amdk8/raminit_f.c" -#include "sdram/generic_sdram.c" +#include "lib/generic_sdram.c" #include "resourcemap.c" diff --git a/src/mainboard/hp/dl145_g3/cache_as_ram_auto.c b/src/mainboard/hp/dl145_g3/cache_as_ram_auto.c index c3aeca615e..f786d9fdec 100644 --- a/src/mainboard/hp/dl145_g3/cache_as_ram_auto.c +++ b/src/mainboard/hp/dl145_g3/cache_as_ram_auto.c @@ -65,7 +65,7 @@ #if CONFIG_USE_FAILOVER_IMAGE==0 #include "pc80/serial.c" #include "arch/i386/lib/console.c" -#include "ram/ramtest.c" +#include "lib/ramtest.c" #include @@ -128,7 +128,7 @@ static inline int spd_read_byte(unsigned device, unsigned address) #include "northbridge/amd/amdk8/raminit_f.c" -#include "sdram/generic_sdram.c" +#include "lib/generic_sdram.c" //#include "resourcemap.c" diff --git a/src/mainboard/ibm/e325/cache_as_ram_auto.c b/src/mainboard/ibm/e325/cache_as_ram_auto.c index a6d32b64a0..1021a6061e 100644 --- a/src/mainboard/ibm/e325/cache_as_ram_auto.c +++ b/src/mainboard/ibm/e325/cache_as_ram_auto.c @@ -13,7 +13,7 @@ #include "pc80/mc146818rtc_early.c" #include "pc80/serial.c" #include "arch/i386/lib/console.c" -#include "ram/ramtest.c" +#include "lib/ramtest.c" #include #include "northbridge/amd/amdk8/incoherent_ht.c" @@ -75,7 +75,7 @@ static inline int spd_read_byte(unsigned device, unsigned address) #include "northbridge/amd/amdk8/raminit.c" #include "resourcemap.c" #include "northbridge/amd/amdk8/coherent_ht.c" -#include "sdram/generic_sdram.c" +#include "lib/generic_sdram.c" #if CONFIG_LOGICAL_CPUS==1 #define SET_NB_CFG_54 1 diff --git a/src/mainboard/ibm/e326/cache_as_ram_auto.c b/src/mainboard/ibm/e326/cache_as_ram_auto.c index b036c62f11..c6794a9902 100644 --- a/src/mainboard/ibm/e326/cache_as_ram_auto.c +++ b/src/mainboard/ibm/e326/cache_as_ram_auto.c @@ -13,7 +13,7 @@ #include "pc80/mc146818rtc_early.c" #include "pc80/serial.c" #include "arch/i386/lib/console.c" -#include "ram/ramtest.c" +#include "lib/ramtest.c" #include #include "northbridge/amd/amdk8/incoherent_ht.c" @@ -75,7 +75,7 @@ static inline int spd_read_byte(unsigned device, unsigned address) #include "northbridge/amd/amdk8/raminit.c" #include "resourcemap.c" #include "northbridge/amd/amdk8/coherent_ht.c" -#include "sdram/generic_sdram.c" +#include "lib/generic_sdram.c" #if CONFIG_LOGICAL_CPUS==1 #define SET_NB_CFG_54 1 diff --git a/src/mainboard/iei/juki-511p/auto.c b/src/mainboard/iei/juki-511p/auto.c index 8486e82d55..5fafe01a84 100644 --- a/src/mainboard/iei/juki-511p/auto.c +++ b/src/mainboard/iei/juki-511p/auto.c @@ -28,7 +28,7 @@ #include #include "pc80/serial.c" #include "arch/i386/lib/console.c" -#include "ram/ramtest.c" +#include "lib/ramtest.c" #include "superio/winbond/w83977f/w83977f_early_serial.c" #include "cpu/x86/bist.h" #include "pc80/udelay_io.c" diff --git a/src/mainboard/iei/nova4899r/auto.c b/src/mainboard/iei/nova4899r/auto.c index 6b198f5337..bcae6732a6 100644 --- a/src/mainboard/iei/nova4899r/auto.c +++ b/src/mainboard/iei/nova4899r/auto.c @@ -28,7 +28,7 @@ #include #include "pc80/serial.c" #include "arch/i386/lib/console.c" -#include "ram/ramtest.c" +#include "lib/ramtest.c" #include "superio/winbond/w83977tf/w83977tf_early_serial.c" #include "cpu/x86/bist.h" diff --git a/src/mainboard/iei/pcisa-lx-800-r10/cache_as_ram_auto.c b/src/mainboard/iei/pcisa-lx-800-r10/cache_as_ram_auto.c index cccb4a7509..d1c438ba35 100644 --- a/src/mainboard/iei/pcisa-lx-800-r10/cache_as_ram_auto.c +++ b/src/mainboard/iei/pcisa-lx-800-r10/cache_as_ram_auto.c @@ -27,7 +27,7 @@ #include #include "pc80/serial.c" #include "arch/i386/lib/console.c" -#include "ram/ramtest.c" +#include "lib/ramtest.c" #include "cpu/x86/bist.h" #include "cpu/x86/msr.h" #include @@ -60,7 +60,7 @@ static inline int spd_read_byte(unsigned int device, unsigned int address) #include "northbridge/amd/lx/raminit.h" #include "northbridge/amd/lx/pll_reset.c" #include "northbridge/amd/lx/raminit.c" -#include "sdram/generic_sdram.c" +#include "lib/generic_sdram.c" #include "cpu/amd/model_lx/cpureginit.c" #include "cpu/amd/model_lx/syspreinit.c" diff --git a/src/mainboard/intel/eagleheights/auto.c b/src/mainboard/intel/eagleheights/auto.c index b21677ef05..f28e1e7bbb 100644 --- a/src/mainboard/intel/eagleheights/auto.c +++ b/src/mainboard/intel/eagleheights/auto.c @@ -38,7 +38,7 @@ #include "arch/i386/lib/console.c" #include -#include "ram/ramtest.c" +#include "lib/ramtest.c" #include "southbridge/intel/i3100/i3100_early_smbus.c" #include "southbridge/intel/i3100/i3100_early_lpc.c" #include "reset.c" @@ -117,7 +117,7 @@ static inline int spd_read_byte(u16 device, u8 address) #include "cpu/x86/mtrr/earlymtrr.c" #include "northbridge/intel/i3100/memory_initialized.c" #include "northbridge/intel/i3100/raminit.c" -#include "sdram/generic_sdram.c" +#include "lib/generic_sdram.c" #include "northbridge/intel/i3100/reset_test.c" #include "debug.c" diff --git a/src/mainboard/intel/jarrell/auto.c b/src/mainboard/intel/jarrell/auto.c index 9745f761f8..84a5c60ce3 100644 --- a/src/mainboard/intel/jarrell/auto.c +++ b/src/mainboard/intel/jarrell/auto.c @@ -10,7 +10,7 @@ #include "pc80/mc146818rtc_early.c" #include "pc80/serial.c" #include "arch/i386/lib/console.c" -#include "ram/ramtest.c" +#include "lib/ramtest.c" #include "southbridge/intel/i82801er/i82801er_early_smbus.c" #include "northbridge/intel/e7520/raminit.h" #include "superio/nsc/pc87427/pc87427.h" @@ -49,7 +49,7 @@ static inline int spd_read_byte(unsigned device, unsigned address) } #include "northbridge/intel/e7520/raminit.c" -#include "sdram/generic_sdram.c" +#include "lib/generic_sdram.c" #include "debug.c" diff --git a/src/mainboard/intel/mtarvon/auto.c b/src/mainboard/intel/mtarvon/auto.c index 59c4e2fbc1..193df34188 100644 --- a/src/mainboard/intel/mtarvon/auto.c +++ b/src/mainboard/intel/mtarvon/auto.c @@ -30,7 +30,7 @@ #include "pc80/mc146818rtc_early.c" #include "pc80/serial.c" #include "arch/i386/lib/console.c" -#include "ram/ramtest.c" +#include "lib/ramtest.c" #include "southbridge/intel/i3100/i3100_early_smbus.c" #include "southbridge/intel/i3100/i3100_early_lpc.c" #include "northbridge/intel/i3100/raminit.h" @@ -57,7 +57,7 @@ static inline int spd_read_byte(u16 device, u8 address) } #include "northbridge/intel/i3100/raminit.c" -#include "sdram/generic_sdram.c" +#include "lib/generic_sdram.c" #include "../jarrell/debug.c" diff --git a/src/mainboard/intel/truxton/auto.c b/src/mainboard/intel/truxton/auto.c index 8176774fb3..8067a421ce 100644 --- a/src/mainboard/intel/truxton/auto.c +++ b/src/mainboard/intel/truxton/auto.c @@ -31,7 +31,7 @@ #include "pc80/serial.c" #include "pc80/udelay_io.c" #include "arch/i386/lib/console.c" -#include "ram/ramtest.c" +#include "lib/ramtest.c" #include "southbridge/intel/i3100/i3100_early_smbus.c" #include "southbridge/intel/i3100/i3100_early_lpc.c" #include "northbridge/intel/i3100/raminit_ep80579.h" @@ -57,7 +57,7 @@ static inline int spd_read_byte(u16 device, u8 address) } #include "northbridge/intel/i3100/raminit_ep80579.c" -#include "sdram/generic_sdram.c" +#include "lib/generic_sdram.c" #include "../../intel/jarrell/debug.c" /* #define TRUXTON_DEBUG */ diff --git a/src/mainboard/intel/xe7501devkit/auto.c b/src/mainboard/intel/xe7501devkit/auto.c index fc845a2ee9..8e2c271f2b 100644 --- a/src/mainboard/intel/xe7501devkit/auto.c +++ b/src/mainboard/intel/xe7501devkit/auto.c @@ -12,7 +12,7 @@ #include "pc80/mc146818rtc_early.c" #include "pc80/serial.c" #include "arch/i386/lib/console.c" -#include "ram/ramtest.c" +#include "lib/ramtest.c" #include "southbridge/intel/i82801ca/i82801ca_early_smbus.c" #include "northbridge/intel/e7501/raminit.h" #include "cpu/x86/lapic/boot_cpu.c" @@ -41,7 +41,7 @@ static inline int spd_read_byte(unsigned device, unsigned address) #include "northbridge/intel/e7501/raminit.c" #include "northbridge/intel/e7501/reset_test.c" -#include "sdram/generic_sdram.c" +#include "lib/generic_sdram.c" // This function MUST appear last (ROMCC limitation) diff --git a/src/mainboard/iwill/dk8_htx/cache_as_ram_auto.c b/src/mainboard/iwill/dk8_htx/cache_as_ram_auto.c index 72c1b86b63..f4213c1ec3 100644 --- a/src/mainboard/iwill/dk8_htx/cache_as_ram_auto.c +++ b/src/mainboard/iwill/dk8_htx/cache_as_ram_auto.c @@ -106,8 +106,8 @@ static inline int spd_read_byte(unsigned device, unsigned address) #include "northbridge/amd/amdk8/raminit.c" -#include "sdram/generic_sdram.c" -#include "ram/ramtest.c" +#include "lib/generic_sdram.c" +#include "lib/ramtest.c" /* tyan does not want the default */ #include "resourcemap.c" diff --git a/src/mainboard/iwill/dk8s2/cache_as_ram_auto.c b/src/mainboard/iwill/dk8s2/cache_as_ram_auto.c index 51617ab0ce..e702d0e5fa 100644 --- a/src/mainboard/iwill/dk8s2/cache_as_ram_auto.c +++ b/src/mainboard/iwill/dk8s2/cache_as_ram_auto.c @@ -106,8 +106,8 @@ static inline int spd_read_byte(unsigned device, unsigned address) #include "northbridge/amd/amdk8/raminit.c" -#include "sdram/generic_sdram.c" -#include "ram/ramtest.c" +#include "lib/generic_sdram.c" +#include "lib/ramtest.c" /* tyan does not want the default */ #include "northbridge/amd/amdk8/resourcemap.c" diff --git a/src/mainboard/iwill/dk8x/cache_as_ram_auto.c b/src/mainboard/iwill/dk8x/cache_as_ram_auto.c index 51617ab0ce..e702d0e5fa 100644 --- a/src/mainboard/iwill/dk8x/cache_as_ram_auto.c +++ b/src/mainboard/iwill/dk8x/cache_as_ram_auto.c @@ -106,8 +106,8 @@ static inline int spd_read_byte(unsigned device, unsigned address) #include "northbridge/amd/amdk8/raminit.c" -#include "sdram/generic_sdram.c" -#include "ram/ramtest.c" +#include "lib/generic_sdram.c" +#include "lib/ramtest.c" /* tyan does not want the default */ #include "northbridge/amd/amdk8/resourcemap.c" diff --git a/src/mainboard/jetway/j7f24/auto.c b/src/mainboard/jetway/j7f24/auto.c index 59697259cf..4f7d6e55f5 100644 --- a/src/mainboard/jetway/j7f24/auto.c +++ b/src/mainboard/jetway/j7f24/auto.c @@ -30,7 +30,7 @@ #include #include "pc80/serial.c" #include "arch/i386/lib/console.c" -#include "ram/ramtest.c" +#include "lib/ramtest.c" #include "northbridge/via/cn700/raminit.h" #include "cpu/x86/mtrr/earlymtrr.c" #include "cpu/x86/bist.h" diff --git a/src/mainboard/kontron/986lcd-m/auto.c b/src/mainboard/kontron/986lcd-m/auto.c index 0b401f9595..d83f0fec2a 100644 --- a/src/mainboard/kontron/986lcd-m/auto.c +++ b/src/mainboard/kontron/986lcd-m/auto.c @@ -45,7 +45,7 @@ #include "pc80/usbdebug_direct_serial.c" #endif -#include "ram/ramtest.c" +#include "lib/ramtest.c" #include "southbridge/intel/i82801gx/i82801gx_early_smbus.c" #include "reset.c" #include "superio/winbond/w83627thg/w83627thg_early_serial.c" diff --git a/src/mainboard/lippert/frontrunner/auto.c b/src/mainboard/lippert/frontrunner/auto.c index 3bcad1f714..3c267bbc07 100644 --- a/src/mainboard/lippert/frontrunner/auto.c +++ b/src/mainboard/lippert/frontrunner/auto.c @@ -8,7 +8,7 @@ #include #include "pc80/serial.c" #include "arch/i386/lib/console.c" -#include "ram/ramtest.c" +#include "lib/ramtest.c" #include "superio/winbond/w83627hf/w83627hf_early_serial.c" #include "cpu/x86/bist.h" #include "cpu/x86/msr.h" @@ -40,7 +40,7 @@ static void sdram_set_spd_registers(const struct mem_controller *ctrl) } #include "northbridge/amd/gx2/raminit.c" -#include "sdram/generic_sdram.c" +#include "lib/generic_sdram.c" #define PLLMSRhi 0x00000226 #define PLLMSRlo 0x00000008 diff --git a/src/mainboard/lippert/roadrunner-lx/cache_as_ram_auto.c b/src/mainboard/lippert/roadrunner-lx/cache_as_ram_auto.c index 6a07a05e44..47645cee30 100644 --- a/src/mainboard/lippert/roadrunner-lx/cache_as_ram_auto.c +++ b/src/mainboard/lippert/roadrunner-lx/cache_as_ram_auto.c @@ -31,7 +31,7 @@ #include #include "pc80/serial.c" #include "arch/i386/lib/console.c" -#include "ram/ramtest.c" +#include "lib/ramtest.c" #include "cpu/x86/bist.h" #include "cpu/x86/msr.h" #include @@ -61,7 +61,7 @@ static inline int spd_read_byte(unsigned int device, unsigned int address) #include "northbridge/amd/lx/raminit.h" #include "northbridge/amd/lx/pll_reset.c" #include "northbridge/amd/lx/raminit.c" -#include "sdram/generic_sdram.c" +#include "lib/generic_sdram.c" #include "cpu/amd/model_lx/cpureginit.c" #include "cpu/amd/model_lx/syspreinit.c" diff --git a/src/mainboard/lippert/spacerunner-lx/cache_as_ram_auto.c b/src/mainboard/lippert/spacerunner-lx/cache_as_ram_auto.c index af26262387..0e3e2de553 100644 --- a/src/mainboard/lippert/spacerunner-lx/cache_as_ram_auto.c +++ b/src/mainboard/lippert/spacerunner-lx/cache_as_ram_auto.c @@ -32,7 +32,7 @@ #include #include "pc80/serial.c" #include "arch/i386/lib/console.c" -#include "ram/ramtest.c" +#include "lib/ramtest.c" #include "cpu/x86/bist.h" #include "cpu/x86/msr.h" #include @@ -123,7 +123,7 @@ static int smc_send_config(unsigned char config_data) #include "northbridge/amd/lx/raminit.h" #include "northbridge/amd/lx/pll_reset.c" #include "northbridge/amd/lx/raminit.c" -#include "sdram/generic_sdram.c" +#include "lib/generic_sdram.c" #include "cpu/amd/model_lx/cpureginit.c" #include "cpu/amd/model_lx/syspreinit.c" diff --git a/src/mainboard/mitac/6513wu/auto.c b/src/mainboard/mitac/6513wu/auto.c index 55cc3fe2ac..3b6deaf263 100644 --- a/src/mainboard/mitac/6513wu/auto.c +++ b/src/mainboard/mitac/6513wu/auto.c @@ -29,7 +29,7 @@ #include #include "pc80/serial.c" #include "arch/i386/lib/console.c" -#include "ram/ramtest.c" +#include "lib/ramtest.c" #include "southbridge/intel/i82801xx/i82801xx_early_smbus.c" #include "northbridge/intel/i82810/raminit.h" #include "lib/debug.c" diff --git a/src/mainboard/msi/ms6119/auto.c b/src/mainboard/msi/ms6119/auto.c index e5dd2055be..899b3bc601 100644 --- a/src/mainboard/msi/ms6119/auto.c +++ b/src/mainboard/msi/ms6119/auto.c @@ -29,7 +29,7 @@ #include #include "pc80/serial.c" #include "arch/i386/lib/console.c" -#include "ram/ramtest.c" +#include "lib/ramtest.c" #include "southbridge/intel/i82371eb/i82371eb_early_smbus.c" #include "northbridge/intel/i440bx/raminit.h" #include "lib/debug.c" diff --git a/src/mainboard/msi/ms6147/auto.c b/src/mainboard/msi/ms6147/auto.c index a9a95a8689..30398bef72 100644 --- a/src/mainboard/msi/ms6147/auto.c +++ b/src/mainboard/msi/ms6147/auto.c @@ -29,7 +29,7 @@ #include #include "pc80/serial.c" #include "arch/i386/lib/console.c" -#include "ram/ramtest.c" +#include "lib/ramtest.c" #include "southbridge/intel/i82371eb/i82371eb_early_smbus.c" #include "northbridge/intel/i440bx/raminit.h" #include "lib/debug.c" diff --git a/src/mainboard/msi/ms6178/auto.c b/src/mainboard/msi/ms6178/auto.c index 4f2e49b42b..ed5ec59ec4 100644 --- a/src/mainboard/msi/ms6178/auto.c +++ b/src/mainboard/msi/ms6178/auto.c @@ -29,7 +29,7 @@ #include #include "pc80/serial.c" #include "arch/i386/lib/console.c" -#include "ram/ramtest.c" +#include "lib/ramtest.c" #include "superio/winbond/w83627hf/w83627hf_early_serial.c" #include "northbridge/intel/i82810/raminit.h" #include "cpu/x86/mtrr/earlymtrr.c" diff --git a/src/mainboard/msi/ms7135/cache_as_ram_auto.c b/src/mainboard/msi/ms7135/cache_as_ram_auto.c index b8a22a97c5..4b5ab60dcc 100644 --- a/src/mainboard/msi/ms7135/cache_as_ram_auto.c +++ b/src/mainboard/msi/ms7135/cache_as_ram_auto.c @@ -60,7 +60,7 @@ #include #include "pc80/serial.c" #include "arch/i386/lib/console.c" -#include "ram/ramtest.c" +#include "lib/ramtest.c" #include "northbridge/amd/amdk8/incoherent_ht.c" #include "southbridge/nvidia/ck804/ck804_early_smbus.c" #include "northbridge/amd/amdk8/raminit.h" @@ -94,7 +94,7 @@ static inline int spd_read_byte(unsigned device, unsigned address) } #include "northbridge/amd/amdk8/raminit.c" -#include "sdram/generic_sdram.c" +#include "lib/generic_sdram.c" #include "southbridge/nvidia/ck804/ck804_early_setup_ss.h" #include "southbridge/nvidia/ck804/ck804_early_setup_car.c" #include "cpu/amd/car/copy_and_run.c" diff --git a/src/mainboard/msi/ms7260/cache_as_ram_auto.c b/src/mainboard/msi/ms7260/cache_as_ram_auto.c index 8089b577e0..6458a65bde 100644 --- a/src/mainboard/msi/ms7260/cache_as_ram_auto.c +++ b/src/mainboard/msi/ms7260/cache_as_ram_auto.c @@ -68,7 +68,7 @@ #include "southbridge/nvidia/mcp55/mcp55_enable_usbdebug_direct.c" #include "pc80/usbdebug_direct_serial.c" #endif -#include "ram/ramtest.c" +#include "lib/ramtest.c" #include #include "southbridge/nvidia/mcp55/mcp55_early_smbus.c" #include "northbridge/amd/amdk8/raminit.h" @@ -107,7 +107,7 @@ static inline int spd_read_byte(unsigned int device, unsigned int address) #include "northbridge/amd/amdk8/coherent_ht.c" #include "northbridge/amd/amdk8/incoherent_ht.c" #include "northbridge/amd/amdk8/raminit_f.c" -#include "sdram/generic_sdram.c" +#include "lib/generic_sdram.c" #include "resourcemap.c" #include "cpu/amd/dualcore/dualcore.c" diff --git a/src/mainboard/msi/ms9185/cache_as_ram_auto.c b/src/mainboard/msi/ms9185/cache_as_ram_auto.c index aaedd6394b..b95d55a91a 100644 --- a/src/mainboard/msi/ms9185/cache_as_ram_auto.c +++ b/src/mainboard/msi/ms9185/cache_as_ram_auto.c @@ -130,7 +130,7 @@ static inline int spd_read_byte(unsigned device, unsigned address) #include "northbridge/amd/amdk8/raminit_f.c" -#include "sdram/generic_sdram.c" +#include "lib/generic_sdram.c" /* msi does not want the default */ #include "resourcemap.c" diff --git a/src/mainboard/msi/ms9282/cache_as_ram_auto.c b/src/mainboard/msi/ms9282/cache_as_ram_auto.c index 7fb3aba1c7..55f2a33273 100644 --- a/src/mainboard/msi/ms9282/cache_as_ram_auto.c +++ b/src/mainboard/msi/ms9282/cache_as_ram_auto.c @@ -111,7 +111,7 @@ static inline int spd_read_byte(unsigned device, unsigned address) #include "northbridge/amd/amdk8/raminit_f.c" #include "northbridge/amd/amdk8/coherent_ht.c" #include "northbridge/amd/amdk8/incoherent_ht.c" -#include "sdram/generic_sdram.c" +#include "lib/generic_sdram.c" /* msi does not want the default */ #include "resourcemap.c" diff --git a/src/mainboard/nec/powermate2000/auto.c b/src/mainboard/nec/powermate2000/auto.c index 507bbbc746..89247e3f12 100644 --- a/src/mainboard/nec/powermate2000/auto.c +++ b/src/mainboard/nec/powermate2000/auto.c @@ -29,7 +29,7 @@ #include #include "pc80/serial.c" #include "arch/i386/lib/console.c" -#include "ram/ramtest.c" +#include "lib/ramtest.c" #include "superio/smsc/smscsuperio/smscsuperio_early_serial.c" #include "northbridge/intel/i82810/raminit.h" #include "cpu/x86/mtrr/earlymtrr.c" diff --git a/src/mainboard/newisys/khepri/cache_as_ram_auto.c b/src/mainboard/newisys/khepri/cache_as_ram_auto.c index 2affa7fbb5..136925f52f 100644 --- a/src/mainboard/newisys/khepri/cache_as_ram_auto.c +++ b/src/mainboard/newisys/khepri/cache_as_ram_auto.c @@ -17,7 +17,7 @@ #include "pc80/mc146818rtc_early.c" #include "pc80/serial.c" #include "arch/i386/lib/console.c" -#include "ram/ramtest.c" +#include "lib/ramtest.c" #if 0 static void post_code(uint8_t value) { @@ -90,7 +90,7 @@ static inline int spd_read_byte(unsigned device, unsigned address) #include "northbridge/amd/amdk8/raminit.c" #include "northbridge/amd/amdk8/coherent_ht.c" -#include "sdram/generic_sdram.c" +#include "lib/generic_sdram.c" /* newisys khepri does not want the default */ #include "resourcemap.c" diff --git a/src/mainboard/nvidia/l1_2pvv/cache_as_ram_auto.c b/src/mainboard/nvidia/l1_2pvv/cache_as_ram_auto.c index a6a586a1b3..9962aefec6 100644 --- a/src/mainboard/nvidia/l1_2pvv/cache_as_ram_auto.c +++ b/src/mainboard/nvidia/l1_2pvv/cache_as_ram_auto.c @@ -63,7 +63,7 @@ #include "southbridge/nvidia/mcp55/mcp55_enable_usbdebug_direct.c" #include "pc80/usbdebug_direct_serial.c" #endif -#include "ram/ramtest.c" +#include "lib/ramtest.c" #include @@ -118,7 +118,7 @@ static inline int spd_read_byte(unsigned device, unsigned address) #include "northbridge/amd/amdk8/raminit_f.c" -#include "sdram/generic_sdram.c" +#include "lib/generic_sdram.c" #include "resourcemap.c" diff --git a/src/mainboard/olpc/btest/auto.c b/src/mainboard/olpc/btest/auto.c index f0cd85d042..ba0e4187ed 100644 --- a/src/mainboard/olpc/btest/auto.c +++ b/src/mainboard/olpc/btest/auto.c @@ -8,7 +8,7 @@ #include #include "pc80/serial.c" #include "arch/i386/lib/console.c" -#include "ram/ramtest.c" +#include "lib/ramtest.c" #include "superio/winbond/w83627hf/w83627hf_early_serial.c" #include "cpu/x86/bist.h" #include "cpu/x86/msr.h" @@ -129,7 +129,7 @@ static void sdram_set_spd_registers(const struct mem_controller *ctrl) } #include "northbridge/amd/gx2/raminit.c" -#include "sdram/generic_sdram.c" +#include "lib/generic_sdram.c" #define PLLMSRhi 0x00001490 #define PLLMSRlo 0x02000030 diff --git a/src/mainboard/olpc/rev_a/auto.c b/src/mainboard/olpc/rev_a/auto.c index f0cd85d042..ba0e4187ed 100644 --- a/src/mainboard/olpc/rev_a/auto.c +++ b/src/mainboard/olpc/rev_a/auto.c @@ -8,7 +8,7 @@ #include #include "pc80/serial.c" #include "arch/i386/lib/console.c" -#include "ram/ramtest.c" +#include "lib/ramtest.c" #include "superio/winbond/w83627hf/w83627hf_early_serial.c" #include "cpu/x86/bist.h" #include "cpu/x86/msr.h" @@ -129,7 +129,7 @@ static void sdram_set_spd_registers(const struct mem_controller *ctrl) } #include "northbridge/amd/gx2/raminit.c" -#include "sdram/generic_sdram.c" +#include "lib/generic_sdram.c" #define PLLMSRhi 0x00001490 #define PLLMSRlo 0x02000030 diff --git a/src/mainboard/pcengines/alix1c/cache_as_ram_auto.c b/src/mainboard/pcengines/alix1c/cache_as_ram_auto.c index 472ea10c94..5d96118394 100644 --- a/src/mainboard/pcengines/alix1c/cache_as_ram_auto.c +++ b/src/mainboard/pcengines/alix1c/cache_as_ram_auto.c @@ -28,7 +28,7 @@ #include #include "pc80/serial.c" #include "arch/i386/lib/console.c" -#include "ram/ramtest.c" +#include "lib/ramtest.c" #include "cpu/x86/bist.h" #include "cpu/x86/msr.h" #include @@ -115,7 +115,7 @@ static u8 spd_read_byte(u8 device, u8 address) #include "northbridge/amd/lx/raminit.h" #include "northbridge/amd/lx/pll_reset.c" #include "northbridge/amd/lx/raminit.c" -#include "sdram/generic_sdram.c" +#include "lib/generic_sdram.c" #include "cpu/amd/model_lx/cpureginit.c" #include "cpu/amd/model_lx/syspreinit.c" diff --git a/src/mainboard/rca/rm4100/auto.c b/src/mainboard/rca/rm4100/auto.c index 147c49fe3d..994096c184 100644 --- a/src/mainboard/rca/rm4100/auto.c +++ b/src/mainboard/rca/rm4100/auto.c @@ -30,7 +30,7 @@ #include "pc80/serial.c" #include "pc80/udelay_io.c" #include "arch/i386/lib/console.c" -#include "ram/ramtest.c" +#include "lib/ramtest.c" #include "superio/smsc/smscsuperio/smscsuperio_early_serial.c" #include "northbridge/intel/i82830/raminit.h" #include "northbridge/intel/i82830/memory_initialized.c" @@ -69,7 +69,7 @@ static inline int spd_read_byte(unsigned device, unsigned address) } #include "northbridge/intel/i82830/raminit.c" -#include "sdram/generic_sdram.c" +#include "lib/generic_sdram.c" /** * The AC'97 Audio Controller I/O space registers are read only by default diff --git a/src/mainboard/soyo/sy-6ba-plus-iii/auto.c b/src/mainboard/soyo/sy-6ba-plus-iii/auto.c index 36e8cd439d..81241ac553 100644 --- a/src/mainboard/soyo/sy-6ba-plus-iii/auto.c +++ b/src/mainboard/soyo/sy-6ba-plus-iii/auto.c @@ -29,7 +29,7 @@ #include #include "pc80/serial.c" #include "arch/i386/lib/console.c" -#include "ram/ramtest.c" +#include "lib/ramtest.c" #include "southbridge/intel/i82371eb/i82371eb_early_smbus.c" #include "northbridge/intel/i440bx/raminit.h" #include "lib/debug.c" diff --git a/src/mainboard/sunw/ultra40/cache_as_ram_auto.c b/src/mainboard/sunw/ultra40/cache_as_ram_auto.c index 1514fdaf3f..18af542809 100644 --- a/src/mainboard/sunw/ultra40/cache_as_ram_auto.c +++ b/src/mainboard/sunw/ultra40/cache_as_ram_auto.c @@ -24,7 +24,7 @@ #include "pc80/mc146818rtc_early.c" #include "pc80/serial.c" #include "arch/i386/lib/console.c" -#include "ram/ramtest.c" +#include "lib/ramtest.c" #include #include "northbridge/amd/amdk8/incoherent_ht.c" @@ -83,7 +83,7 @@ static inline int spd_read_byte(unsigned device, unsigned address) #include "northbridge/amd/amdk8/raminit.c" #include "northbridge/amd/amdk8/coherent_ht.c" -#include "sdram/generic_sdram.c" +#include "lib/generic_sdram.c" /* tyan does not want the default */ #include "resourcemap.c" diff --git a/src/mainboard/supermicro/h8dme/cache_as_ram_auto.c b/src/mainboard/supermicro/h8dme/cache_as_ram_auto.c index 606556ba73..18435a61f2 100644 --- a/src/mainboard/supermicro/h8dme/cache_as_ram_auto.c +++ b/src/mainboard/supermicro/h8dme/cache_as_ram_auto.c @@ -56,7 +56,7 @@ #if CONFIG_USE_FAILOVER_IMAGE==0 #include "pc80/serial.c" #include "arch/i386/lib/console.c" -#include "ram/ramtest.c" +#include "lib/ramtest.c" #include @@ -169,7 +169,7 @@ static inline int spd_read_byte(unsigned device, unsigned address) #include "northbridge/amd/amdk8/raminit_f.c" -#include "sdram/generic_sdram.c" +#include "lib/generic_sdram.c" #include "resourcemap.c" diff --git a/src/mainboard/supermicro/h8dmr/cache_as_ram_auto.c b/src/mainboard/supermicro/h8dmr/cache_as_ram_auto.c index 34a3bb56eb..3a9b0ca375 100644 --- a/src/mainboard/supermicro/h8dmr/cache_as_ram_auto.c +++ b/src/mainboard/supermicro/h8dmr/cache_as_ram_auto.c @@ -60,7 +60,7 @@ #if CONFIG_USE_FAILOVER_IMAGE==0 #include "pc80/serial.c" #include "arch/i386/lib/console.c" -#include "ram/ramtest.c" +#include "lib/ramtest.c" #include @@ -116,7 +116,7 @@ static inline int spd_read_byte(unsigned device, unsigned address) #include "northbridge/amd/amdk8/raminit_f.c" -#include "sdram/generic_sdram.c" +#include "lib/generic_sdram.c" #include "resourcemap.c" diff --git a/src/mainboard/supermicro/x6dai_g/auto.c b/src/mainboard/supermicro/x6dai_g/auto.c index 701fcd6484..50984e5536 100644 --- a/src/mainboard/supermicro/x6dai_g/auto.c +++ b/src/mainboard/supermicro/x6dai_g/auto.c @@ -10,7 +10,7 @@ #include "pc80/mc146818rtc_early.c" #include "pc80/serial.c" #include "arch/i386/lib/console.c" -#include "ram/ramtest.c" +#include "lib/ramtest.c" #include "southbridge/intel/esb6300/esb6300_early_smbus.c" #include "northbridge/intel/e7525/raminit.h" #include "superio/winbond/w83627hf/w83627hf.h" @@ -52,7 +52,7 @@ static inline int spd_read_byte(unsigned device, unsigned address) } #include "northbridge/intel/e7525/raminit.c" -#include "sdram/generic_sdram.c" +#include "lib/generic_sdram.c" static void main(unsigned long bist) diff --git a/src/mainboard/supermicro/x6dhe_g/auto.c b/src/mainboard/supermicro/x6dhe_g/auto.c index ef99677af7..a5c702ba70 100644 --- a/src/mainboard/supermicro/x6dhe_g/auto.c +++ b/src/mainboard/supermicro/x6dhe_g/auto.c @@ -10,7 +10,7 @@ #include "pc80/mc146818rtc_early.c" #include "pc80/serial.c" #include "arch/i386/lib/console.c" -#include "ram/ramtest.c" +#include "lib/ramtest.c" #include "southbridge/intel/esb6300/esb6300_early_smbus.c" #include "northbridge/intel/e7520/raminit.h" #include "superio/winbond/w83627hf/w83627hf.h" @@ -70,7 +70,7 @@ static inline int spd_read_byte(unsigned device, unsigned address) } #include "northbridge/intel/e7520/raminit.c" -#include "sdram/generic_sdram.c" +#include "lib/generic_sdram.c" static void main(unsigned long bist) diff --git a/src/mainboard/supermicro/x6dhe_g2/auto.c b/src/mainboard/supermicro/x6dhe_g2/auto.c index 4a3029f9aa..3c84fd5c14 100644 --- a/src/mainboard/supermicro/x6dhe_g2/auto.c +++ b/src/mainboard/supermicro/x6dhe_g2/auto.c @@ -10,7 +10,7 @@ #include "pc80/mc146818rtc_early.c" #include "pc80/serial.c" #include "arch/i386/lib/console.c" -#include "ram/ramtest.c" +#include "lib/ramtest.c" #include "southbridge/intel/i82801er/i82801er_early_smbus.c" #include "northbridge/intel/e7520/raminit.h" #include "superio/nsc/pc87427/pc87427.h" @@ -70,7 +70,7 @@ static inline int spd_read_byte(unsigned device, unsigned address) } #include "northbridge/intel/e7520/raminit.c" -#include "sdram/generic_sdram.c" +#include "lib/generic_sdram.c" static void main(unsigned long bist) diff --git a/src/mainboard/supermicro/x6dhe_g2/auto.updated.c b/src/mainboard/supermicro/x6dhe_g2/auto.updated.c index 8de5a2723b..6e0fab7904 100644 --- a/src/mainboard/supermicro/x6dhe_g2/auto.updated.c +++ b/src/mainboard/supermicro/x6dhe_g2/auto.updated.c @@ -10,7 +10,7 @@ #include "pc80/mc146818rtc_early.c" #include "pc80/serial.c" #include "arch/i386/lib/console.c" -#include "ram/ramtest.c" +#include "lib/ramtest.c" #include "southbridge/intel/esb6300/esb6300_early_smbus.c" #include "northbridge/intel/e7520/raminit.h" #include "superio/winbond/w83627hf/w83627hf.h" @@ -70,7 +70,7 @@ static inline int spd_read_byte(unsigned device, unsigned address) } #include "northbridge/intel/e7520/raminit.c" -#include "sdram/generic_sdram.c" +#include "lib/generic_sdram.c" static void main(unsigned long bist) diff --git a/src/mainboard/supermicro/x6dhr_ig/auto.c b/src/mainboard/supermicro/x6dhr_ig/auto.c index 722157b454..d4e9992144 100644 --- a/src/mainboard/supermicro/x6dhr_ig/auto.c +++ b/src/mainboard/supermicro/x6dhr_ig/auto.c @@ -10,7 +10,7 @@ #include "pc80/mc146818rtc_early.c" #include "pc80/serial.c" #include "arch/i386/lib/console.c" -#include "ram/ramtest.c" +#include "lib/ramtest.c" #include "southbridge/intel/i82801er/i82801er_early_smbus.c" #include "northbridge/intel/e7520/raminit.h" #include "superio/winbond/w83627hf/w83627hf.h" @@ -71,7 +71,7 @@ static inline int spd_read_byte(unsigned device, unsigned address) } #include "northbridge/intel/e7520/raminit.c" -#include "sdram/generic_sdram.c" +#include "lib/generic_sdram.c" static void main(unsigned long bist) diff --git a/src/mainboard/supermicro/x6dhr_ig2/auto.c b/src/mainboard/supermicro/x6dhr_ig2/auto.c index 97eaca3a63..2ed8bd5f7f 100644 --- a/src/mainboard/supermicro/x6dhr_ig2/auto.c +++ b/src/mainboard/supermicro/x6dhr_ig2/auto.c @@ -10,7 +10,7 @@ #include "pc80/mc146818rtc_early.c" #include "pc80/serial.c" #include "arch/i386/lib/console.c" -#include "ram/ramtest.c" +#include "lib/ramtest.c" #include "southbridge/intel/i82801er/i82801er_early_smbus.c" #include "northbridge/intel/e7520/raminit.h" #include "superio/winbond/w83627hf/w83627hf.h" @@ -71,7 +71,7 @@ static inline int spd_read_byte(unsigned device, unsigned address) } #include "northbridge/intel/e7520/raminit.c" -#include "sdram/generic_sdram.c" +#include "lib/generic_sdram.c" static void main(unsigned long bist) diff --git a/src/mainboard/technexion/tim8690/cache_as_ram_auto.c b/src/mainboard/technexion/tim8690/cache_as_ram_auto.c index 3f5ac57fa2..26407076bf 100644 --- a/src/mainboard/technexion/tim8690/cache_as_ram_auto.c +++ b/src/mainboard/technexion/tim8690/cache_as_ram_auto.c @@ -88,7 +88,7 @@ static inline int spd_read_byte(u32 device, u32 address) #include "northbridge/amd/amdk8/incoherent_ht.c" #include "northbridge/amd/amdk8/raminit_f.c" #include "northbridge/amd/amdk8/coherent_ht.c" -#include "sdram/generic_sdram.c" +#include "lib/generic_sdram.c" #include "resourcemap.c" #include "cpu/amd/dualcore/dualcore.c" diff --git a/src/mainboard/technologic/ts5300/auto.c b/src/mainboard/technologic/ts5300/auto.c index 53f022dbf3..ff57d0a062 100644 --- a/src/mainboard/technologic/ts5300/auto.c +++ b/src/mainboard/technologic/ts5300/auto.c @@ -15,7 +15,7 @@ #include "pc80/mc146818rtc_early.c" #include "pc80/serial.c" #include "arch/i386/lib/console.c" -#include "ram/ramtest.c" +#include "lib/ramtest.c" #include "cpu/x86/bist.h" #define TS5300_LED_OFF outb((inb(0x77)&0xfe), 0x77) diff --git a/src/mainboard/televideo/tc7020/auto.c b/src/mainboard/televideo/tc7020/auto.c index 51d847b976..5abba9ce3a 100644 --- a/src/mainboard/televideo/tc7020/auto.c +++ b/src/mainboard/televideo/tc7020/auto.c @@ -28,7 +28,7 @@ #include #include "pc80/serial.c" #include "arch/i386/lib/console.c" -#include "ram/ramtest.c" +#include "lib/ramtest.c" #include "northbridge/amd/gx1/raminit.c" #include "superio/nsc/pc97317/pc97317_early_serial.c" #include "cpu/x86/bist.h" diff --git a/src/mainboard/thomson/ip1000/auto.c b/src/mainboard/thomson/ip1000/auto.c index 9c31db5bcd..622fb4a4cc 100644 --- a/src/mainboard/thomson/ip1000/auto.c +++ b/src/mainboard/thomson/ip1000/auto.c @@ -30,7 +30,7 @@ #include "pc80/serial.c" #include "pc80/udelay_io.c" #include "arch/i386/lib/console.c" -#include "ram/ramtest.c" +#include "lib/ramtest.c" #include "superio/smsc/smscsuperio/smscsuperio_early_serial.c" #include "northbridge/intel/i82830/raminit.h" #include "northbridge/intel/i82830/memory_initialized.c" @@ -69,7 +69,7 @@ static inline int spd_read_byte(unsigned device, unsigned address) } #include "northbridge/intel/i82830/raminit.c" -#include "sdram/generic_sdram.c" +#include "lib/generic_sdram.c" /** * The AC'97 Audio Controller I/O space registers are read only by default diff --git a/src/mainboard/tyan/s1846/auto.c b/src/mainboard/tyan/s1846/auto.c index 5720e6709d..68eca0eeda 100644 --- a/src/mainboard/tyan/s1846/auto.c +++ b/src/mainboard/tyan/s1846/auto.c @@ -29,7 +29,7 @@ #include #include "pc80/serial.c" #include "arch/i386/lib/console.c" -#include "ram/ramtest.c" +#include "lib/ramtest.c" #include "southbridge/intel/i82371eb/i82371eb_early_smbus.c" #include "northbridge/intel/i440bx/raminit.h" #include "lib/debug.c" diff --git a/src/mainboard/tyan/s2735/cache_as_ram_auto.c b/src/mainboard/tyan/s2735/cache_as_ram_auto.c index 427b070bdb..556a9858f7 100644 --- a/src/mainboard/tyan/s2735/cache_as_ram_auto.c +++ b/src/mainboard/tyan/s2735/cache_as_ram_auto.c @@ -12,7 +12,7 @@ #include "pc80/mc146818rtc_early.c" #include "pc80/serial.c" #include "arch/i386/lib/console.c" -#include "ram/ramtest.c" +#include "lib/ramtest.c" #if 0 static void post_code(uint8_t value) { @@ -74,7 +74,7 @@ static inline int spd_read_byte(unsigned device, unsigned address) #include "northbridge/intel/e7501/raminit.c" #include "northbridge/intel/e7501/reset_test.c" -#include "sdram/generic_sdram.c" +#include "lib/generic_sdram.c" #include "cpu/x86/car/copy_and_run.c" diff --git a/src/mainboard/tyan/s2850/cache_as_ram_auto.c b/src/mainboard/tyan/s2850/cache_as_ram_auto.c index 378c05a723..871e2bac6a 100644 --- a/src/mainboard/tyan/s2850/cache_as_ram_auto.c +++ b/src/mainboard/tyan/s2850/cache_as_ram_auto.c @@ -13,7 +13,7 @@ #include "pc80/mc146818rtc_early.c" #include "pc80/serial.c" #include "arch/i386/lib/console.c" -#include "ram/ramtest.c" +#include "lib/ramtest.c" #if 0 static void post_code(uint8_t value) { @@ -80,7 +80,7 @@ static inline int spd_read_byte(unsigned device, unsigned address) #include "northbridge/amd/amdk8/raminit.c" #include "northbridge/amd/amdk8/resourcemap.c" #include "northbridge/amd/amdk8/coherent_ht.c" -#include "sdram/generic_sdram.c" +#include "lib/generic_sdram.c" #if CONFIG_LOGICAL_CPUS==1 #define SET_NB_CFG_54 1 diff --git a/src/mainboard/tyan/s2875/cache_as_ram_auto.c b/src/mainboard/tyan/s2875/cache_as_ram_auto.c index 1912beeeb8..56fbdae186 100644 --- a/src/mainboard/tyan/s2875/cache_as_ram_auto.c +++ b/src/mainboard/tyan/s2875/cache_as_ram_auto.c @@ -13,7 +13,7 @@ #include "pc80/mc146818rtc_early.c" #include "pc80/serial.c" #include "arch/i386/lib/console.c" -#include "ram/ramtest.c" +#include "lib/ramtest.c" #include #include "northbridge/amd/amdk8/incoherent_ht.c" @@ -70,7 +70,7 @@ static inline int spd_read_byte(unsigned device, unsigned address) #include "northbridge/amd/amdk8/raminit.c" #include "northbridge/amd/amdk8/coherent_ht.c" -#include "sdram/generic_sdram.c" +#include "lib/generic_sdram.c" #include "northbridge/amd/amdk8/resourcemap.c" #if CONFIG_LOGICAL_CPUS==1 diff --git a/src/mainboard/tyan/s2880/cache_as_ram_auto.c b/src/mainboard/tyan/s2880/cache_as_ram_auto.c index bfb89116c6..db520eb360 100644 --- a/src/mainboard/tyan/s2880/cache_as_ram_auto.c +++ b/src/mainboard/tyan/s2880/cache_as_ram_auto.c @@ -13,7 +13,7 @@ #include "pc80/mc146818rtc_early.c" #include "pc80/serial.c" #include "arch/i386/lib/console.c" -#include "ram/ramtest.c" +#include "lib/ramtest.c" #include @@ -72,7 +72,7 @@ static inline int spd_read_byte(unsigned device, unsigned address) #include "northbridge/amd/amdk8/raminit.c" #include "northbridge/amd/amdk8/resourcemap.c" #include "northbridge/amd/amdk8/coherent_ht.c" -#include "sdram/generic_sdram.c" +#include "lib/generic_sdram.c" #if CONFIG_LOGICAL_CPUS==1 #define SET_NB_CFG_54 1 diff --git a/src/mainboard/tyan/s2881/cache_as_ram_auto.c b/src/mainboard/tyan/s2881/cache_as_ram_auto.c index 9beb7afaeb..57a17601d5 100644 --- a/src/mainboard/tyan/s2881/cache_as_ram_auto.c +++ b/src/mainboard/tyan/s2881/cache_as_ram_auto.c @@ -18,7 +18,7 @@ #include "pc80/mc146818rtc_early.c" #include "pc80/serial.c" #include "arch/i386/lib/console.c" -#include "ram/ramtest.c" +#include "lib/ramtest.c" #if 0 static void post_code(uint8_t value) { @@ -87,7 +87,7 @@ static inline int spd_read_byte(unsigned device, unsigned address) #include "northbridge/amd/amdk8/raminit.c" #include "resourcemap.c" #include "northbridge/amd/amdk8/coherent_ht.c" -#include "sdram/generic_sdram.c" +#include "lib/generic_sdram.c" #include "cpu/amd/dualcore/dualcore.c" diff --git a/src/mainboard/tyan/s2882/cache_as_ram_auto.c b/src/mainboard/tyan/s2882/cache_as_ram_auto.c index 62d9a69d10..1fd98ff5bf 100644 --- a/src/mainboard/tyan/s2882/cache_as_ram_auto.c +++ b/src/mainboard/tyan/s2882/cache_as_ram_auto.c @@ -13,7 +13,7 @@ #include "pc80/mc146818rtc_early.c" #include "pc80/serial.c" #include "arch/i386/lib/console.c" -#include "ram/ramtest.c" +#include "lib/ramtest.c" #include #include "northbridge/amd/amdk8/incoherent_ht.c" @@ -71,7 +71,7 @@ static inline int spd_read_byte(unsigned device, unsigned address) #include "northbridge/amd/amdk8/raminit.c" #include "northbridge/amd/amdk8/resourcemap.c" #include "northbridge/amd/amdk8/coherent_ht.c" -#include "sdram/generic_sdram.c" +#include "lib/generic_sdram.c" #if CONFIG_LOGICAL_CPUS==1 #define SET_NB_CFG_54 1 diff --git a/src/mainboard/tyan/s2885/cache_as_ram_auto.c b/src/mainboard/tyan/s2885/cache_as_ram_auto.c index c2f97df8ae..9b653578c6 100644 --- a/src/mainboard/tyan/s2885/cache_as_ram_auto.c +++ b/src/mainboard/tyan/s2885/cache_as_ram_auto.c @@ -12,7 +12,7 @@ #include "pc80/mc146818rtc_early.c" #include "pc80/serial.c" #include "arch/i386/lib/console.c" -#include "ram/ramtest.c" +#include "lib/ramtest.c" #if 0 static void post_code(uint8_t value) { @@ -81,7 +81,7 @@ static inline int spd_read_byte(unsigned device, unsigned address) #include "northbridge/amd/amdk8/raminit.c" #include "northbridge/amd/amdk8/coherent_ht.c" -#include "sdram/generic_sdram.c" +#include "lib/generic_sdram.c" /* tyan does not want the default */ #include "resourcemap.c" diff --git a/src/mainboard/tyan/s2891/cache_as_ram_auto.c b/src/mainboard/tyan/s2891/cache_as_ram_auto.c index fd6c1c5236..54ba04dc2e 100644 --- a/src/mainboard/tyan/s2891/cache_as_ram_auto.c +++ b/src/mainboard/tyan/s2891/cache_as_ram_auto.c @@ -19,7 +19,7 @@ #include "pc80/mc146818rtc_early.c" #include "pc80/serial.c" #include "arch/i386/lib/console.c" -#include "ram/ramtest.c" +#include "lib/ramtest.c" #include @@ -60,7 +60,7 @@ static inline int spd_read_byte(unsigned device, unsigned address) #include "northbridge/amd/amdk8/raminit.c" #include "northbridge/amd/amdk8/coherent_ht.c" -#include "sdram/generic_sdram.c" +#include "lib/generic_sdram.c" /* tyan does not want the default */ #include "resourcemap.c" diff --git a/src/mainboard/tyan/s2892/cache_as_ram_auto.c b/src/mainboard/tyan/s2892/cache_as_ram_auto.c index 97f0660096..3d72b75a3f 100644 --- a/src/mainboard/tyan/s2892/cache_as_ram_auto.c +++ b/src/mainboard/tyan/s2892/cache_as_ram_auto.c @@ -12,7 +12,7 @@ #include "pc80/mc146818rtc_early.c" #include "pc80/serial.c" #include "arch/i386/lib/console.c" -#include "ram/ramtest.c" +#include "lib/ramtest.c" #include @@ -56,7 +56,7 @@ static inline int spd_read_byte(unsigned device, unsigned address) #include "northbridge/amd/amdk8/raminit.c" #include "northbridge/amd/amdk8/coherent_ht.c" -#include "sdram/generic_sdram.c" +#include "lib/generic_sdram.c" /* tyan does not want the default */ #include "resourcemap.c" diff --git a/src/mainboard/tyan/s2895/cache_as_ram_auto.c b/src/mainboard/tyan/s2895/cache_as_ram_auto.c index 2da764f24e..74109cda7f 100644 --- a/src/mainboard/tyan/s2895/cache_as_ram_auto.c +++ b/src/mainboard/tyan/s2895/cache_as_ram_auto.c @@ -24,7 +24,7 @@ #if CONFIG_USE_FAILOVER_IMAGE==0 #include "pc80/serial.c" #include "arch/i386/lib/console.c" -#include "ram/ramtest.c" +#include "lib/ramtest.c" #include @@ -87,7 +87,7 @@ static inline int spd_read_byte(unsigned device, unsigned address) #include "northbridge/amd/amdk8/raminit.c" #include "northbridge/amd/amdk8/coherent_ht.c" -#include "sdram/generic_sdram.c" +#include "lib/generic_sdram.c" /* tyan does not want the default */ #include "resourcemap.c" diff --git a/src/mainboard/tyan/s2912/cache_as_ram_auto.c b/src/mainboard/tyan/s2912/cache_as_ram_auto.c index 5be6d82e9b..c27e74b2c1 100644 --- a/src/mainboard/tyan/s2912/cache_as_ram_auto.c +++ b/src/mainboard/tyan/s2912/cache_as_ram_auto.c @@ -63,7 +63,7 @@ #include "southbridge/nvidia/mcp55/mcp55_enable_usbdebug_direct.c" #include "pc80/usbdebug_direct_serial.c" #endif -#include "ram/ramtest.c" +#include "lib/ramtest.c" #include @@ -118,7 +118,7 @@ static inline int spd_read_byte(unsigned device, unsigned address) #include "northbridge/amd/amdk8/raminit_f.c" -#include "sdram/generic_sdram.c" +#include "lib/generic_sdram.c" #include "resourcemap.c" diff --git a/src/mainboard/tyan/s2912_fam10/cache_as_ram_auto.c b/src/mainboard/tyan/s2912_fam10/cache_as_ram_auto.c index ffdf04a92b..f085a699b5 100644 --- a/src/mainboard/tyan/s2912_fam10/cache_as_ram_auto.c +++ b/src/mainboard/tyan/s2912_fam10/cache_as_ram_auto.c @@ -60,7 +60,7 @@ static void post_code(u8 value) { #include "southbridge/nvidia/mcp55/mcp55_enable_usbdebug_direct.c" #include "pc80/usbdebug_direct_serial.c" #endif -#include "ram/ramtest.c" +#include "lib/ramtest.c" #include diff --git a/src/mainboard/tyan/s4880/cache_as_ram_auto.c b/src/mainboard/tyan/s4880/cache_as_ram_auto.c index 0f403ab6ba..61085a8d57 100644 --- a/src/mainboard/tyan/s4880/cache_as_ram_auto.c +++ b/src/mainboard/tyan/s4880/cache_as_ram_auto.c @@ -13,7 +13,7 @@ #include "pc80/mc146818rtc_early.c" #include "pc80/serial.c" #include "arch/i386/lib/console.c" -#include "ram/ramtest.c" +#include "lib/ramtest.c" #include #include "northbridge/amd/amdk8/incoherent_ht.c" @@ -85,7 +85,7 @@ static inline int spd_read_byte(unsigned device, unsigned address) #include "northbridge/amd/amdk8/raminit.c" #include "northbridge/amd/amdk8/coherent_ht.c" -#include "sdram/generic_sdram.c" +#include "lib/generic_sdram.c" /* tyan does not want the default */ #include "resourcemap.c" diff --git a/src/mainboard/tyan/s4882/cache_as_ram_auto.c b/src/mainboard/tyan/s4882/cache_as_ram_auto.c index b45e1dc467..88637b6dd4 100644 --- a/src/mainboard/tyan/s4882/cache_as_ram_auto.c +++ b/src/mainboard/tyan/s4882/cache_as_ram_auto.c @@ -12,7 +12,7 @@ #include "pc80/mc146818rtc_early.c" #include "pc80/serial.c" #include "arch/i386/lib/console.c" -#include "ram/ramtest.c" +#include "lib/ramtest.c" #include #include "northbridge/amd/amdk8/incoherent_ht.c" @@ -93,7 +93,7 @@ static inline int spd_read_byte(unsigned device, unsigned address) #include "northbridge/amd/amdk8/raminit.c" #include "northbridge/amd/amdk8/coherent_ht.c" -#include "sdram/generic_sdram.c" +#include "lib/generic_sdram.c" /* tyan does not want the default */ #include "resourcemap.c" diff --git a/src/mainboard/via/epia-cn/auto.c b/src/mainboard/via/epia-cn/auto.c index 62a3b2646e..7657dc5a2d 100644 --- a/src/mainboard/via/epia-cn/auto.c +++ b/src/mainboard/via/epia-cn/auto.c @@ -30,7 +30,7 @@ #include #include "pc80/serial.c" #include "arch/i386/lib/console.c" -#include "ram/ramtest.c" +#include "lib/ramtest.c" #include "northbridge/via/cn700/raminit.h" #include "cpu/x86/mtrr/earlymtrr.c" #include "cpu/x86/bist.h" diff --git a/src/mainboard/via/epia-m/auto.c b/src/mainboard/via/epia-m/auto.c index 04ef1a74e7..8fdfce3399 100644 --- a/src/mainboard/via/epia-m/auto.c +++ b/src/mainboard/via/epia-m/auto.c @@ -13,7 +13,7 @@ #include #include "pc80/serial.c" #include "arch/i386/lib/console.c" -#include "ram/ramtest.c" +#include "lib/ramtest.c" #include "northbridge/via/vt8623/raminit.h" #include "cpu/x86/mtrr/earlymtrr.c" #include "cpu/x86/bist.h" diff --git a/src/mainboard/via/epia-m700/cache_as_ram_auto.c b/src/mainboard/via/epia-m700/cache_as_ram_auto.c index daa4be85bf..9c6036af8c 100644 --- a/src/mainboard/via/epia-m700/cache_as_ram_auto.c +++ b/src/mainboard/via/epia-m700/cache_as_ram_auto.c @@ -36,7 +36,7 @@ #include #include "pc80/serial.c" #include "arch/i386/lib/console.c" -#include "ram/ramtest.c" +#include "lib/ramtest.c" #include "northbridge/via/vx800/vx800.h" #include "cpu/x86/mtrr/earlymtrr.c" #include "cpu/x86/bist.h" diff --git a/src/mainboard/via/epia-n/auto.c b/src/mainboard/via/epia-n/auto.c index d914ee2dbc..9910eef031 100644 --- a/src/mainboard/via/epia-n/auto.c +++ b/src/mainboard/via/epia-n/auto.c @@ -30,7 +30,7 @@ #include #include "pc80/serial.c" #include "arch/i386/lib/console.c" -#include "ram/ramtest.c" +#include "lib/ramtest.c" #include "northbridge/via/cn400/raminit.h" #include "cpu/x86/mtrr/earlymtrr.c" #include "cpu/x86/bist.h" diff --git a/src/mainboard/via/epia/auto.c b/src/mainboard/via/epia/auto.c index fadf5b5363..d10fec9563 100644 --- a/src/mainboard/via/epia/auto.c +++ b/src/mainboard/via/epia/auto.c @@ -9,7 +9,7 @@ #include #include "pc80/serial.c" #include "arch/i386/lib/console.c" -#include "ram/ramtest.c" +#include "lib/ramtest.c" #include "northbridge/via/vt8601/raminit.h" #include "cpu/x86/mtrr/earlymtrr.c" #include "cpu/x86/bist.h" @@ -37,7 +37,7 @@ static inline int spd_read_byte(unsigned device, unsigned address) #include "northbridge/via/vt8601/raminit.c" /* - #include "sdram/generic_sdram.c" + #include "lib/generic_sdram.c" */ static void enable_mainboard_devices(void) diff --git a/src/mainboard/via/pc2500e/auto.c b/src/mainboard/via/pc2500e/auto.c index f11dacd778..270a09db17 100644 --- a/src/mainboard/via/pc2500e/auto.c +++ b/src/mainboard/via/pc2500e/auto.c @@ -31,7 +31,7 @@ #include "pc80/mc146818rtc_early.c" #include "pc80/serial.c" #include "arch/i386/lib/console.c" -#include "ram/ramtest.c" +#include "lib/ramtest.c" #include "northbridge/via/cn700/raminit.h" #include "cpu/x86/mtrr/earlymtrr.c" #include "cpu/x86/bist.h" diff --git a/src/mainboard/via/vt8454c/auto.c b/src/mainboard/via/vt8454c/auto.c index a77943c9e1..17cfc5f1b9 100644 --- a/src/mainboard/via/vt8454c/auto.c +++ b/src/mainboard/via/vt8454c/auto.c @@ -30,7 +30,7 @@ #include #include "pc80/serial.c" #include "arch/i386/lib/console.c" -#include "ram/ramtest.c" +#include "lib/ramtest.c" #include "northbridge/via/cx700/raminit.h" #include "cpu/x86/mtrr/earlymtrr.c" #include "cpu/x86/bist.h" diff --git a/src/northbridge/amd/amdk8/raminit_test.c b/src/northbridge/amd/amdk8/raminit_test.c index 9e0db166cd..bfe1103207 100644 --- a/src/northbridge/amd/amdk8/raminit_test.c +++ b/src/northbridge/amd/amdk8/raminit_test.c @@ -305,7 +305,7 @@ static void coherent_ht_mainboard(unsigned cpus) } #include "raminit.c" -#include "../../../sdram/generic_sdram.c" +#include "../../../lib/generic_sdram.c" #define FIRST_CPU 1 #define SECOND_CPU 1 diff --git a/src/northbridge/intel/e7520/raminit_test.c b/src/northbridge/intel/e7520/raminit_test.c index 4716a29430..49665af403 100644 --- a/src/northbridge/intel/e7520/raminit_test.c +++ b/src/northbridge/intel/e7520/raminit_test.c @@ -305,7 +305,7 @@ static void coherent_ht_mainboard(unsigned cpus) } #include "raminit.c" -#include "../../../sdram/generic_sdram.c" +#include "../../../lib/generic_sdram.c" #define FIRST_CPU 1 #define SECOND_CPU 1 diff --git a/src/northbridge/intel/e7525/raminit_test.c b/src/northbridge/intel/e7525/raminit_test.c index 0fdb5848cc..7774f9e79f 100644 --- a/src/northbridge/intel/e7525/raminit_test.c +++ b/src/northbridge/intel/e7525/raminit_test.c @@ -276,7 +276,7 @@ static int spd_read_byte(unsigned device, unsigned address) } #include "raminit.c" -#include "../../../sdram/generic_sdram.c" +#include "../../../lib/generic_sdram.c" #define FIRST_CPU 1 #define SECOND_CPU 1 diff --git a/src/northbridge/via/vx800/examples/cache_as_ram_auto.c b/src/northbridge/via/vx800/examples/cache_as_ram_auto.c index 1580d48acb..30204432a3 100644 --- a/src/northbridge/via/vx800/examples/cache_as_ram_auto.c +++ b/src/northbridge/via/vx800/examples/cache_as_ram_auto.c @@ -32,7 +32,7 @@ #include #include "pc80/serial.c" #include "arch/i386/lib/console.c" -#include "ram/ramtest.c" +#include "lib/ramtest.c" #include "northbridge/via/vx800/vx800.h" #include "cpu/x86/mtrr/earlymtrr.c" #include "cpu/x86/bist.h" diff --git a/src/ram/ramtest.c b/src/ram/ramtest.c deleted file mode 100644 index 9f329ef51b..0000000000 --- a/src/ram/ramtest.c +++ /dev/null @@ -1,161 +0,0 @@ -static void write_phys(unsigned long addr, unsigned long value) -{ -#if CONFIG_HAVE_MOVNTI - asm volatile( - "movnti %1, (%0)" - : /* outputs */ - : "r" (addr), "r" (value) /* inputs */ -#ifndef __GNUC__ - : /* clobbers */ -#endif - ); -#else - volatile unsigned long *ptr; - ptr = (void *)addr; - *ptr = value; -#endif -} - -static unsigned long read_phys(unsigned long addr) -{ - volatile unsigned long *ptr; - ptr = (void *)addr; - return *ptr; -} - -static void ram_fill(unsigned long start, unsigned long stop) -{ - unsigned long addr; - /* - * Fill. - */ -#if CONFIG_USE_PRINTK_IN_CAR - printk_debug("DRAM fill: 0x%08x-0x%08x\r\n", start, stop); -#else - print_debug("DRAM fill: "); - print_debug_hex32(start); - print_debug("-"); - print_debug_hex32(stop); - print_debug("\r\n"); -#endif - for(addr = start; addr < stop ; addr += 4) { - /* Display address being filled */ - if (!(addr & 0xfffff)) { -#if CONFIG_USE_PRINTK_IN_CAR - printk_debug("%08x \r", addr); -#else - print_debug_hex32(addr); - print_debug(" \r"); -#endif - } - write_phys(addr, addr); - }; - /* Display final address */ -#if CONFIG_USE_PRINTK_IN_CAR - printk_debug("%08x\r\nDRAM filled\r\n", addr); -#else - print_debug_hex32(addr); - print_debug("\r\nDRAM filled\r\n"); -#endif -} - -static void ram_verify(unsigned long start, unsigned long stop) -{ - unsigned long addr; - int i = 0; - /* - * Verify. - */ -#if CONFIG_USE_PRINTK_IN_CAR - printk_debug("DRAM verify: 0x%08x-0x%08x\r\n", start, stop); -#else - print_debug("DRAM verify: "); - print_debug_hex32(start); - print_debug_char('-'); - print_debug_hex32(stop); - print_debug("\r\n"); -#endif - for(addr = start; addr < stop ; addr += 4) { - unsigned long value; - /* Display address being tested */ - if (!(addr & 0xfffff)) { -#if CONFIG_USE_PRINTK_IN_CAR - printk_debug("%08x \r", addr); -#else - print_debug_hex32(addr); - print_debug(" \r"); -#endif - } - value = read_phys(addr); - if (value != addr) { - /* Display address with error */ -#if CONFIG_USE_PRINTK_IN_CAR - printk_err("Fail: @0x%08x Read value=0x%08x\r\n", addr, value); -#else - print_err("Fail: @0x"); - print_err_hex32(addr); - print_err(" Read value=0x"); - print_err_hex32(value); - print_err("\r\n"); -#endif - i++; - if(i>256) { -#if CONFIG_USE_PRINTK_IN_CAR - printk_debug("Aborting.\n\r"); -#else - print_debug("Aborting.\n\r"); -#endif - break; - } - } - } - /* Display final address */ -#if CONFIG_USE_PRINTK_IN_CAR - printk_debug("%08x", addr); -#else - print_debug_hex32(addr); -#endif - - if (i) { -#if CONFIG_USE_PRINTK_IN_CAR - printk_debug("\r\nDRAM did _NOT_ verify!\r\n"); -#else - print_debug("\r\nDRAM did _NOT_ verify!\r\n"); -#endif - die("DRAM ERROR"); - } - else { -#if CONFIG_USE_PRINTK_IN_CAR - printk_debug("\r\nDRAM range verified.\r\n"); -#else - print_debug("\r\nDRAM range verified.\r\n"); -#endif - } -} - - -void ram_check(unsigned long start, unsigned long stop) -{ - /* - * This is much more of a "Is my DRAM properly configured?" - * test than a "Is my DRAM faulty?" test. Not all bits - * are tested. -Tyson - */ -#if CONFIG_USE_PRINTK_IN_CAR - printk_debug("Testing DRAM : %08x - %08x\r\n", start, stop); -#else - print_debug("Testing DRAM : "); - print_debug_hex32(start); - print_debug("-"); - print_debug_hex32(stop); - print_debug("\r\n"); -#endif - ram_fill(start, stop); - ram_verify(start, stop); -#if CONFIG_USE_PRINTK_IN_CAR - printk_debug("Done.\r\n"); -#else - print_debug("Done.\r\n"); -#endif -} - diff --git a/src/sdram/generic_dump_spd.c b/src/sdram/generic_dump_spd.c deleted file mode 100644 index 2a71353b60..0000000000 --- a/src/sdram/generic_dump_spd.c +++ /dev/null @@ -1,93 +0,0 @@ -/* - * This code is derived from the Opteron boards' debug.c. - * It should go away either there or here, depending what fits better. - */ - -static void dump_spd_registers(const struct mem_controller *ctrl) -{ - int i; - print_debug("\r\n"); - for(i = 0; i < 4; i++) { - unsigned device; - device = ctrl->channel0[i]; - if (device) { - int j; - print_debug("dimm: "); - print_debug_hex8(i); - print_debug(".0: "); - print_debug_hex8(device); - for(j = 0; j < 256; j++) { - int status; - unsigned char byte; - if ((j & 0xf) == 0) { - print_debug("\r\n"); - print_debug_hex8(j); - print_debug(": "); - } - status = spd_read_byte(device, j); - if (status < 0) { - print_debug("bad device\r\n"); - break; - } - byte = status & 0xff; - print_debug_hex8(byte); - print_debug_char(' '); - } - print_debug("\r\n"); - } - device = ctrl->channel1[i]; - if (device) { - int j; - print_debug("dimm: "); - print_debug_hex8(i); - print_debug(".1: "); - print_debug_hex8(device); - for(j = 0; j < 256; j++) { - int status; - unsigned char byte; - if ((j & 0xf) == 0) { - print_debug("\r\n"); - print_debug_hex8(j); - print_debug(": "); - } - status = spd_read_byte(device, j); - if (status < 0) { - print_debug("bad device\r\n"); - break; - } - byte = status & 0xff; - print_debug_hex8(byte); - print_debug_char(' '); - } - print_debug("\r\n"); - } - } -} - -#if 0 -void dump_spd_registers(void) -{ - unsigned device; - device = SMBUS_MEM_DEVICE_START; - printk_debug("\n"); - while(device <= SMBUS_MEM_DEVICE_END) { - int status = 0; - int i; - printk_debug("dimm %02x", device); - for(i = 0; (i < 256) && (status == 0); i++) { - unsigned char byte; - if ((i % 20) == 0) { - printk_debug("\n%3d: ", i); - } - status = smbus_read_byte(device, i, &byte); - if (status != 0) { - printk_debug("bad device\n"); - continue; - } - printk_debug("%02x ", byte); - } - device += SMBUS_MEM_DEVICE_INC; - printk_debug("\n"); - } -} -#endif diff --git a/src/sdram/generic_sdram.c b/src/sdram/generic_sdram.c deleted file mode 100644 index cdb06cd73f..0000000000 --- a/src/sdram/generic_sdram.c +++ /dev/null @@ -1,67 +0,0 @@ - -#ifndef RAMINIT_SYSINFO - #define RAMINIT_SYSINFO 0 -#endif - -static inline void print_debug_sdram_8(const char *strval, uint32_t val) -{ -#if CONFIG_USE_INIT - printk_debug("%s%02x\r\n", strval, val); -#else - print_debug(strval); print_debug_hex8(val); print_debug("\r\n"); -#endif -} - -void sdram_no_memory(void) -{ - print_err("No memory!!\r\n"); - while(1) { - hlt(); - } -} - -/* Setup SDRAM */ -#if RAMINIT_SYSINFO == 1 -void sdram_initialize(int controllers, const struct mem_controller *ctrl, void *sysinfo) -#else -void sdram_initialize(int controllers, const struct mem_controller *ctrl) -#endif -{ - int i; - /* Set the registers we can set once to reasonable values */ - for(i = 0; i < controllers; i++) { - print_debug_sdram_8("Ram1.",i); - - #if RAMINIT_SYSINFO == 1 - sdram_set_registers(ctrl + i , sysinfo); - #else - sdram_set_registers(ctrl + i); - #endif - } - - /* Now setup those things we can auto detect */ - for(i = 0; i < controllers; i++) { - print_debug_sdram_8("Ram2.",i); - - #if RAMINIT_SYSINFO == 1 - sdram_set_spd_registers(ctrl + i , sysinfo); - #else - sdram_set_spd_registers(ctrl + i); - #endif - - } - - /* Now that everything is setup enable the SDRAM. - * Some chipsets do the work for us while on others - * we need to it by hand. - */ - print_debug("Ram3\r\n"); - - #if RAMINIT_SYSINFO == 1 - sdram_enable(controllers, ctrl, sysinfo); - #else - sdram_enable(controllers, ctrl); - #endif - - print_debug("Ram4\r\n"); -} -- cgit v1.2.3