summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/cpu/intel/socket_mPGA479M/Kconfig1
-rw-r--r--src/mainboard/digitallogic/adl855pc/Kconfig14
-rw-r--r--src/mainboard/digitallogic/adl855pc/romstage.c38
3 files changed, 21 insertions, 32 deletions
diff --git a/src/cpu/intel/socket_mPGA479M/Kconfig b/src/cpu/intel/socket_mPGA479M/Kconfig
index e46884014c..4ee8e1b215 100644
--- a/src/cpu/intel/socket_mPGA479M/Kconfig
+++ b/src/cpu/intel/socket_mPGA479M/Kconfig
@@ -1,6 +1,7 @@
config CPU_INTEL_SOCKET_MPGA479M
bool
select CPU_INTEL_MODEL_69X
+ select CPU_INTEL_MODEL_6BX
select CPU_INTEL_MODEL_6DX
select MMX
select SSE
diff --git a/src/mainboard/digitallogic/adl855pc/Kconfig b/src/mainboard/digitallogic/adl855pc/Kconfig
index c44cbe41a5..78da8f1b1b 100644
--- a/src/mainboard/digitallogic/adl855pc/Kconfig
+++ b/src/mainboard/digitallogic/adl855pc/Kconfig
@@ -5,10 +5,12 @@ config BOARD_DIGITALLOGIC_ADL855PC
select NORTHBRIDGE_INTEL_I855
select SOUTHBRIDGE_INTEL_I82801DX
select SUPERIO_WINBOND_W83627HF
- select ROMCC
select HAVE_PIRQ_TABLE
select HAVE_HARD_RESET
select BOARD_ROMSIZE_KB_1024
+ select USE_PRINTK_IN_CAR
+ select USE_DCACHE_RAM
+ select TINY_BOOTBLOCK
config MAINBOARD_DIR
string
@@ -20,6 +22,16 @@ config MAINBOARD_PART_NUMBER
default "smartModule855"
depends on BOARD_DIGITALLOGIC_ADL855PC
+config DCACHE_RAM_BASE
+ hex
+ default 0xffdf8000
+ depends on BOARD_DIGITALLOGIC_ADL855PC
+
+config DCACHE_RAM_SIZE
+ hex
+ default 0x8000
+ depends on BOARD_DIGITALLOGIC_ADL855PC
+
config IRQ_SLOT_COUNT
int
default 5
diff --git a/src/mainboard/digitallogic/adl855pc/romstage.c b/src/mainboard/digitallogic/adl855pc/romstage.c
index 59e21388e8..2e1a96c91b 100644
--- a/src/mainboard/digitallogic/adl855pc/romstage.c
+++ b/src/mainboard/digitallogic/adl855pc/romstage.c
@@ -57,7 +57,10 @@ static inline int spd_read_byte(unsigned device, unsigned address)
#include "northbridge/intel/i855/reset_test.c"
#include "lib/generic_sdram.c"
-static void main(unsigned long bist)
+
+#include "cpu/intel/model_6bx/cache_as_ram_disable.c"
+
+void real_main(unsigned long bist)
{
static const struct mem_controller memctrl[] = {
{
@@ -67,7 +70,6 @@ static void main(unsigned long bist)
};
if (bist == 0) {
- early_mtrr_init();
#if 0
enable_lapic();
init_timer();
@@ -80,7 +82,6 @@ static void main(unsigned long bist)
/* Halt if there was a built in self test failure */
report_bist_failure(bist);
-
#if 0
print_pci_devices();
@@ -89,50 +90,25 @@ static void main(unsigned long bist)
if(!bios_reset_detected()) {
enable_smbus();
#if 0
- dump_spd_registers(&memctrl[0]);
- // dump_smbus_registers();
+ dump_spd_registers(&memctrl[0]);
+ dump_smbus_registers();
#endif
-
memreset_setup();
sdram_initialize(ARRAY_SIZE(memctrl), memctrl);
}
-#if 0
- else {
- /* clear memory 1meg */
- __asm__ volatile(
- "1: \n\t"
- "movl %0, %%fs:(%1)\n\t"
- "addl $4,%1\n\t"
- "subl $4,%2\n\t"
- "jnz 1b\n\t"
- :
- : "a" (0), "D" (0), "c" (1024*1024)
- );
-
- }
-#endif
#if 0
dump_pci_devices();
-#endif
-#if 0
dump_pci_device(PCI_DEV(0, 0, 0));
-#endif
-/*
-#if 0
+ // Check all of memory
ram_check(0x00000000, msr.lo+(msr.hi<<32));
-#else
-#if 0
// Check 16MB of memory @ 0
ram_check(0x00000000, 0x01000000);
-#else
// Check 16MB of memory @ 2GB
ram_check(0x80000000, 0x81000000);
#endif
-#endif
-*/
}