diff options
Diffstat (limited to 'src/mainboard/google/veyron_jerry')
| -rw-r--r-- | src/mainboard/google/veyron_jerry/bootblock.c | 6 | ||||
| -rw-r--r-- | src/mainboard/google/veyron_jerry/mainboard.c | 1 |
2 files changed, 3 insertions, 4 deletions
diff --git a/src/mainboard/google/veyron_jerry/bootblock.c b/src/mainboard/google/veyron_jerry/bootblock.c index 90ad744980..acf81bc0cb 100644 --- a/src/mainboard/google/veyron_jerry/bootblock.c +++ b/src/mainboard/google/veyron_jerry/bootblock.c @@ -58,10 +58,8 @@ void bootblock_mainboard_init(void) udelay(100);/* Must wait for voltage to stabilize,2mV/us */ rkclk_configure_cpu(); - if (rkclk_was_watchdog_reset()) { - printk(BIOS_INFO, "Last reset was watchdog... rebooting via GPIO!\n"); - hard_reset(); - } + if (rkclk_was_watchdog_reset()) + reboot_from_watchdog(); /* i2c1 for tpm */ writel(IOMUX_I2C1, &rk3288_grf->iomux_i2c1); diff --git a/src/mainboard/google/veyron_jerry/mainboard.c b/src/mainboard/google/veyron_jerry/mainboard.c index 00060a7679..1fc823c5fe 100644 --- a/src/mainboard/google/veyron_jerry/mainboard.c +++ b/src/mainboard/google/veyron_jerry/mainboard.c @@ -123,6 +123,7 @@ static void mainboard_init(device_t dev) configure_vop(); elog_init(); + elog_add_watchdog_reset(); elog_add_boot_reason(); } |