diff options
| author | Diana Z <dzigterman@chromium.org> | 2022-11-09 17:56:43 +0000 |
|---|---|---|
| committer | Chromeos LUCI <chromeos-scoped@luci-project-accounts.iam.gserviceaccount.com> | 2022-11-09 19:40:31 +0000 |
| commit | e25163f03927764caa20c7751964a683c597355f (patch) | |
| tree | 2d5a286d9c193d33b55ad8d369e4750570caa91b /zephyr/shim | |
| parent | e8dbeb2cd4b075b3d26c2ea7a4f853ebee5ac093 (diff) | |
| download | chrome-ec-e25163f03927764caa20c7751964a683c597355f.tar.gz | |
Revert "hibernate: Add hibernate support to ap power code"
This reverts commit 16c8fce71986d50d9e10ea089d9d9352818129ad.
Reason for revert: Breaks hibernation on PSL boards (undefines CONFIG_HIBERNATE, which disables hibernate in common/system.c)
BUG=b:258093781
Original change's description:
> hibernate: Add hibernate support to ap power code
>
> Add hibernate support to the AP power sequence code.
>
> The smart discharge system isn't supported yet.
>
> The system will hibernate after a delay when the AP is in G3
> and there is no external power connected.
>
> v2: add tests
>
> BUG=b:246643307
> TEST=Run on nivviks with short delay
> BRANCH=none
>
> Signed-off-by: Andrew McRae <amcrae@google.com>
> Cq-Depend: chromium:3985352
> Change-Id: Ib7bb62c3d650a607343a6ea243645346f4b2a797
> Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3983631
> Reviewed-by: Peter Marheine <pmarheine@chromium.org>
> Code-Coverage: Zoss <zoss-cl-coverage@prod.google.com>
Bug: b:246643307
Change-Id: Ia33273d4ebd1903b628cd163a5e3b35882badf14
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/4017054
Auto-Submit: Diana Z <dzigterman@chromium.org>
Reviewed-by: Keith Short <keithshort@chromium.org>
Code-Coverage: Zoss <zoss-cl-coverage@prod.google.com>
Tested-by: Diana Z <dzigterman@chromium.org>
Commit-Queue: Diana Z <dzigterman@chromium.org>
Diffstat (limited to 'zephyr/shim')
| -rw-r--r-- | zephyr/shim/include/config_chip.h | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/zephyr/shim/include/config_chip.h b/zephyr/shim/include/config_chip.h index 3ecfd5baf7..d2b5bbf577 100644 --- a/zephyr/shim/include/config_chip.h +++ b/zephyr/shim/include/config_chip.h @@ -2434,15 +2434,6 @@ extern char mock_jump_data[sizeof(struct jump_data) + 256]; #define CONFIG_HIBERNATE_PSL #endif -#undef CONFIG_HIBERNATE -#ifdef CONFIG_PLATFORM_EC_HIBERNATE -#define CONFIG_HIBERNATE -#ifdef CONFIG_PLATFORM_EC_HIBERNATE_DELAY_SEC -#undef CONFIG_HIBERNATE_DELAY_SEC -#define CONFIG_HIBERNATE_DELAY_SEC CONFIG_PLATFORM_EC_HIBERNATE_DELAY_SEC -#endif -#endif - #undef CONFIG_BATTERY_DEVICE_CHEMISTRY #ifdef CONFIG_PLATFORM_EC_USE_BATTERY_DEVICE_CHEMISTRY #define CONFIG_BATTERY_DEVICE_CHEMISTRY \ |