From 43686b0588707d9abf8702cb0a1d531cfd8f8462 Mon Sep 17 00:00:00 2001 From: Randall Spangler Date: Fri, 23 Mar 2012 09:13:40 -0700 Subject: Fix sysjump to RO Signed-off-by: Randall Spangler BUG=chrome-os-partner:8613 TEST=sysjump A, then sysjump RO Change-Id: Id9b3c867fa01893542812373f4469534b4be9918 --- common/vboot.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/common/vboot.c b/common/vboot.c index 07b7f03e25..390b5b6e76 100644 --- a/common/vboot.c +++ b/common/vboot.c @@ -26,6 +26,11 @@ static void jump_to_other_image(void) return; } + /* Don't jump if we're in RO becuase we jumped there (this keeps us + * from jumping to RO only to jump right back). */ + if (system_get_reset_cause() == SYSTEM_RESET_SOFT_WARM) + return; + #if !defined(BOARD_daisy) && !defined(BOARD_discovery) /* TODO: (crosbug.com/p/8572) Daisy and discovery don't define a GPIO * for the recovery signal from servo, so can't check it. */ -- cgit v1.2.1