summaryrefslogtreecommitdiff
path: root/src/mainboard/roda
diff options
context:
space:
mode:
authorStefan Reinauer <stepan@coresystems.de>2010-05-14 19:09:20 +0000
committerStefan Reinauer <stepan@openbios.org>2010-05-14 19:09:20 +0000
commitbf264e940e3c97b3924a2361b7149f8533f400b4 (patch)
treeb7296417cb77d61c15585b89c3dca866c8fb05b3 /src/mainboard/roda
parentcbac4981be1e485a2bab731338694d13cb768296 (diff)
downloadcoreboot-bf264e940e3c97b3924a2361b7149f8533f400b4.tar.xz
i945:
* fix some potential compiler issues with newer gccs * add some more comments * make 32bit accesses for feature test functions * make some objects drivers because they contain a pci_driver struct. Signed-off-by: Stefan Reinauer <stepan@coresystems.de> Acked-by: Stefan Reinauer <stepan@coresystems.de> git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5552 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
Diffstat (limited to 'src/mainboard/roda')
-rw-r--r--src/mainboard/roda/rk886ex/Makefile.inc2
-rw-r--r--src/mainboard/roda/rk886ex/cmos.layout3
-rw-r--r--src/mainboard/roda/rk886ex/romstage.c9
3 files changed, 10 insertions, 4 deletions
diff --git a/src/mainboard/roda/rk886ex/Makefile.inc b/src/mainboard/roda/rk886ex/Makefile.inc
index cf0241dd5d..f92043d7ab 100644
--- a/src/mainboard/roda/rk886ex/Makefile.inc
+++ b/src/mainboard/roda/rk886ex/Makefile.inc
@@ -19,6 +19,6 @@
obj-y += m3885.o
obj-y += ec.o
-obj-y += rtl8168.o
+driver-y += rtl8168.o
smmobj-$(CONFIG_HAVE_SMI_HANDLER) += mainboard_smi.o
diff --git a/src/mainboard/roda/rk886ex/cmos.layout b/src/mainboard/roda/rk886ex/cmos.layout
index b5ae473ac6..4dc9112061 100644
--- a/src/mainboard/roda/rk886ex/cmos.layout
+++ b/src/mainboard/roda/rk886ex/cmos.layout
@@ -91,7 +91,8 @@ entries
# coreboot config options: bootloader
416 512 s 0 boot_devices
-#928 80 r 0 unused
+928 8 h 0 boot_default
+#936 48 r 0 unused
# coreboot config options: check sums
984 16 h 0 check_sum
diff --git a/src/mainboard/roda/rk886ex/romstage.c b/src/mainboard/roda/rk886ex/romstage.c
index df985d4210..803aaee89b 100644
--- a/src/mainboard/roda/rk886ex/romstage.c
+++ b/src/mainboard/roda/rk886ex/romstage.c
@@ -281,6 +281,10 @@ void main(unsigned long bist)
}
ich7_enable_lpc();
+
+ /* Force PCIRST# */
+ pci_write_config16(PCI_DEV(0, 0x1e, 0), BCTRL, SBR);
+
early_superio_config();
/* Set up the console */
@@ -297,8 +301,9 @@ void main(unsigned long bist)
report_bist_failure(bist);
if (MCHBAR16(SSKPD) == 0xCAFE) {
- printk(BIOS_DEBUG, "soft reset detected.\n");
- boot_mode = 1;
+ printk(BIOS_DEBUG, "soft reset detected, rebooting properly\n");
+ outb(0x6, 0xcf9);
+ while (1) asm("hlt");
}
/* Perform some early chipset initialization required