diff options
Diffstat (limited to 'src/mainboard/roda')
| -rw-r--r-- | src/mainboard/roda/rk886ex/Makefile.inc | 2 | ||||
| -rw-r--r-- | src/mainboard/roda/rk886ex/cmos.layout | 3 | ||||
| -rw-r--r-- | src/mainboard/roda/rk886ex/romstage.c | 9 |
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 |