diff options
| -rw-r--r-- | include/config.h | 9 | ||||
| -rw-r--r-- | power/common.c | 3 |
2 files changed, 1 insertions, 11 deletions
diff --git a/include/config.h b/include/config.h index b121148f88..e9119374b4 100644 --- a/include/config.h +++ b/include/config.h @@ -2112,15 +2112,6 @@ #undef CONFIG_HIBERNATE_WAKEUP_PINS /* - * Boot after waking up from hibernation. - * - * Note enabling this will allow boards to be charged by PD power but create - * the inconsistent behavior between hibernation and S5 (chromium:1073960). - * Enable EFS2 to get both PD charging and the consistency. - */ -#undef CONFIG_BOOT_ON_HIBERNATE_WAKE - -/* * If defined, chip hibernation is used. Your board needs to define wake-up * signals. Undefine this to use board hibernation capability. */ diff --git a/power/common.c b/power/common.c index 94f2623487..6c25463bcd 100644 --- a/power/common.c +++ b/power/common.c @@ -343,8 +343,7 @@ static enum power_state power_common_state(enum power_state state) &target, now)) { case CRITICAL_SHUTDOWN_HIBERNATE: CPRINTS("Hibernate due to G3 idle"); - if (!IS_ENABLED( - CONFIG_BOOT_ON_HIBERNATE_WAKE)) { + if (IS_ENABLED(CONFIG_VBOOT_EFS2)) { uint32_t reset_flags; reset_flags = chip_read_reset_flags() | EC_RESET_FLAG_AP_OFF; |