diff options
| author | Randall Spangler <rspangler@chromium.org> | 2012-03-23 09:13:40 -0700 |
|---|---|---|
| committer | Randall Spangler <rspangler@chromium.org> | 2012-03-23 09:13:40 -0700 |
| commit | 43686b0588707d9abf8702cb0a1d531cfd8f8462 (patch) | |
| tree | a7718514d56a1f221e18ba0509240089bf8b05ac | |
| parent | e4e7f5bdf7ea64ed1ae370a31653b1132205478e (diff) | |
| download | chrome-ec-43686b0588707d9abf8702cb0a1d531cfd8f8462.tar.gz | |
Fix sysjump to RO
Signed-off-by: Randall Spangler <rspangler@chromium.org>
BUG=chrome-os-partner:8613
TEST=sysjump A, then sysjump RO
Change-Id: Id9b3c867fa01893542812373f4469534b4be9918
| -rw-r--r-- | common/vboot.c | 5 |
1 files changed, 5 insertions, 0 deletions
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. */ |