diff options
| author | Mary Ruthven <mruthven@chromium.org> | 2021-11-09 17:23:07 -0600 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2021-11-18 04:51:45 +0000 |
| commit | 67691dada3300afea7371eec5b7dbdf47347bc5b (patch) | |
| tree | 1dad4281508aed8bf9b6c47d93ada9f0173922a9 | |
| parent | 0c491fb217c697cc28068fe37e01578e08d4e779 (diff) | |
| download | chrome-ec-67691dada3300afea7371eec5b7dbdf47347bc5b.tar.gz | |
Revert "Enable PD communication in RO for external display"
This reverts commit 044cc724967fbb424dd4f686a67abce5a67cfdec.
BUG=b:200823466
TEST=make buildall -j
Change-Id: I438ad62ee159d98f47c3d25f5713cb27a3c8991e
Signed-off-by: Mary Ruthven <mruthven@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3273436
Reviewed-by: Vadim Sukhomlinov <sukhomlinov@chromium.org>
| -rw-r--r-- | common/main.c | 12 | ||||
| -rw-r--r-- | include/vboot.h | 12 |
2 files changed, 2 insertions, 22 deletions
diff --git a/common/main.c b/common/main.c index b735e4e2d7..85b70680ed 100644 --- a/common/main.c +++ b/common/main.c @@ -27,7 +27,6 @@ #include "timer.h" #include "uart.h" #include "util.h" -#include "vboot.h" #include "watchdog.h" /* Console output macros */ @@ -167,15 +166,8 @@ test_mockable __keep int main(void) button_init(); #endif /* defined(CONFIG_DEDICATED_RECOVERY_BUTTON | CONFIG_VOLUME_BUTTONS) */ -#if defined(CONFIG_VBOOT_EFS) - /* - * For RO, it behaves as follows: - * In recovery, it enables PD communication and returns. - * In normal boot, it verifies and jumps to RW. - * For RW, it returns immediately. - */ - vboot_main(); -#elif defined(CONFIG_RWSIG) && !defined(HAS_TASK_RWSIG) +#if !defined(CONFIG_VBOOT_EFS) && \ + defined(CONFIG_RWSIG) && !defined(HAS_TASK_RWSIG) /* * Check the RW firmware signature and jump to it if it is good. * diff --git a/include/vboot.h b/include/vboot.h index a9eb8692ae..a50f68b31c 100644 --- a/include/vboot.h +++ b/include/vboot.h @@ -129,16 +129,4 @@ int vboot_is_padding_valid(const uint8_t *data, uint32_t start, uint32_t end); int vboot_verify(const uint8_t *data, int len, const struct rsa_public_key *key, const uint8_t *sig); -/** - * Entry point of EC EFS - */ -void vboot_main(void); - -/** - * Get if vboot requires PD comm to be enabled or not - * - * @return 1: need PD communication. 0: PD communication is not needed. - */ -int vboot_need_pd_comm(void); - #endif /* __CROS_EC_INCLUDE_VBOOT_H */ |