From e9173303e7f06c8ceefc8134b6bbfe5257704017 Mon Sep 17 00:00:00 2001 From: Stefan Reinauer Date: Tue, 28 Feb 2012 14:15:36 -0800 Subject: Don't ever return from cold_reboot() function cold_reboot() should wait until the reset kicks in, instead of returning and continuing in an undefined code path. Without this patch, vboot_twostop will return, and secure_boot() will start printing an error message, which results in a sporadic # on the screen when pressing space or ESC on the dev screen in order to go to recovery mode. BUG=chrome-os-partner:7683 TEST=boot to dev screen on lumpy, press ESC or space. Observe there is no # character printed before going to recovery mode. Signed-off-by: Stefan Reinauer Change-Id: Ic2ee570032686e48603f0fb3b1ec9cbfae9451bc Reviewed-on: https://gerrit.chromium.org/gerrit/17007 Tested-by: Stefan Reinauer Reviewed-by: Duncan Laurie Commit-Ready: Stefan Reinauer --- board/chromebook-x86/chromeos/power_management.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/board/chromebook-x86/chromeos/power_management.c b/board/chromebook-x86/chromeos/power_management.c index dc060ade947..2910f3a0a16 100644 --- a/board/chromebook-x86/chromeos/power_management.c +++ b/board/chromebook-x86/chromeos/power_management.c @@ -59,6 +59,9 @@ void cold_reboot(void) printf("Rebooting...\n"); outb(SYS_RST, RST_CNT); outb(SYS_RST | RST_CPU, RST_CNT); + + for (;;) + asm("hlt"); } /* Power down the machine by using the power management sleep control -- cgit v1.2.3