diff options
| author | Jun Lin <CHLin56@nuvoton.com> | 2021-04-01 18:22:43 +0800 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2021-04-02 17:19:54 +0000 |
| commit | 651debfcc8ca9bdd02ac1583cf114cbaf5ad9b27 (patch) | |
| tree | fc9884fe7f16e894de41e5b2702c00cea2f3dba5 /zephyr/shim/chip | |
| parent | 3e7a2daf2127b2d18b142b307e19560f1a0fa692 (diff) | |
| download | chrome-ec-651debfcc8ca9bdd02ac1583cf114cbaf5ad9b27.tar.gz | |
zephyr: shim: SHI: fix bug
This is the follow-up CL to fix the bug addressed in the comment of the
CL:2786888
BUG=b:182600858
BRANCH=none
TEST=pass zmake build
Signed-off-by: Jun Lin <CHLin56@nuvoton.com>
Change-Id: Id1923f3dc0ac357cbcac876a5e68f304024867ba
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2799336
Tested-by: CH Lin <chlin56@nuvoton.com>
Reviewed-by: Jack Rosenthal <jrosenth@chromium.org>
Reviewed-by: Keith Short <keithshort@chromium.org>
Commit-Queue: Keith Short <keithshort@chromium.org>
Diffstat (limited to 'zephyr/shim/chip')
| -rw-r--r-- | zephyr/shim/chip/npcx/shi.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/zephyr/shim/chip/npcx/shi.c b/zephyr/shim/chip/npcx/shi.c index d47f8d2ae7..2f48b3a95e 100644 --- a/zephyr/shim/chip/npcx/shi.c +++ b/zephyr/shim/chip/npcx/shi.c @@ -40,8 +40,8 @@ DECLARE_HOOK(HOOK_CHIPSET_RESUME, shi_enable, HOOK_PRIO_DEFAULT); static void shi_reenable_on_sysjump(void) { - if (IS_ENABLED(CONFIG_CROS_SHI_NPCX_DEBUG) && system_jumped_late() && - chipset_in_state(CHIPSET_STATE_ON)) { + if (IS_ENABLED(CONFIG_CROS_SHI_NPCX_DEBUG) || + (system_jumped_late() && chipset_in_state(CHIPSET_STATE_ON))) { shi_enable(); } } |