diff options
| author | Firas Sammoura <fsammoura@google.com> | 2022-06-17 16:40:54 +0000 |
|---|---|---|
| committer | Firas Sammoura <fsammoura@google.com> | 2022-06-17 16:40:54 +0000 |
| commit | e5fb0b9ba488614b5684e640530f00821ab7b943 (patch) | |
| tree | 9a15b4a98d7987870a1805a33883d0cf9123fc05 /zephyr/shim/src/chipset_api.c | |
| parent | ad46fafb27c419bd416bfecc76df6c6426a99b32 (diff) | |
| parent | a46d3f3feaac0d69012f61b66f652bff991d05a7 (diff) | |
| download | chrome-ec-e5fb0b9ba488614b5684e640530f00821ab7b943.tar.gz | |
Merge remote-tracking branch cros/main into firmware-fpmcu-bloonchipper-release
Generated by: ./util/update_release_branch.py --board bloonchipper --relevant_paths_file ./util/fingerprint-relevant-paths.txt firmware-fpmcu-bloonchipper-release
Relevant changes:
git log --oneline ad46fafb27..a46d3f3fea -- board/hatch_fp
board/bloonchipper common/fpsensor docs/fingerprint driver/fingerprint
util/getversion.sh
981fb88cf8 docs/fingerprint: Resolve contradictory FPMCU factory flashing instructions
38ef6b7306 tree: Files should end with single newline
60032a8828 docs/fingerprint: Clean up formatting in fingerprint-factory-quick-guide.md
f49eb6f894 docs/fingerprint: Run mdformat
64aa5fc7bb docs/fingerprint: Add links to info on fuzz testing
8bd99cc434 fpsensor: Use correct return type
2b2d7a991d fpsensor: Use correct return type
BRANCH=None
BUG=b:234772776 b:234181908 b:172020503 b:234181908
TEST=`make -j buildall`
Cq-Include-Trybots: chromeos/cq:cq-orchestrator
Signed-off-by: Firas Sammoura <fsammoura@google.com>
Change-Id: I18b58de542c8b439d0f9327a7d4f0ec897da080f
Diffstat (limited to 'zephyr/shim/src/chipset_api.c')
| -rw-r--r-- | zephyr/shim/src/chipset_api.c | 32 |
1 files changed, 0 insertions, 32 deletions
diff --git a/zephyr/shim/src/chipset_api.c b/zephyr/shim/src/chipset_api.c index 2804de8e78..3bfa420980 100644 --- a/zephyr/shim/src/chipset_api.c +++ b/zephyr/shim/src/chipset_api.c @@ -7,7 +7,6 @@ #include "common.h" -#if defined(CONFIG_AP_PWRSEQ) #include "ap_power/ap_power_interface.h" #include "chipset_state_check.h" @@ -45,34 +44,3 @@ void init_reset_log(void) { ap_power_init_reset_log(); } - -#else - -#if !defined(HAS_TASK_CHIPSET) -#include "chipset.h" - -/* When no chipset is present, assume it is always off. */ -int chipset_in_state(int state_mask) -{ - return state_mask & CHIPSET_STATE_ANY_OFF; -} -int chipset_in_or_transitioning_to_state(int state_mask) -{ - return state_mask & CHIPSET_STATE_ANY_OFF; -} -void chipset_exit_hard_off(void) { } -void chipset_throttle_cpu(int throttle) { } -void chipset_force_shutdown(enum chipset_shutdown_reason reason) { } -void chipset_reset(enum chipset_shutdown_reason reason) { } -void power_interrupt(enum gpio_signal signal) { } -void chipset_handle_espi_reset_assert(void) { } -void chipset_handle_reboot(void) { } -void chipset_reset_request_interrupt(enum gpio_signal signal) { } -void chipset_warm_reset_interrupt(enum gpio_signal signal) { } -void chipset_ap_rst_interrupt(enum gpio_signal signal) { } -void chipset_power_good_interrupt(enum gpio_signal signal) { } -void chipset_watchdog_interrupt(enum gpio_signal signal) { } -void init_reset_log(void) { } - -#endif /* !defined(HAS_TASK_CHIPSET) */ -#endif /*defined(CONFIG_AP_PWRSEQ) */ |