diff options
| author | Mary Ruthven <mruthven@chromium.org> | 2021-11-09 19:52:31 -0600 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2021-11-18 04:53:12 +0000 |
| commit | a9033feb7025646e29e02c20b9f20c02ddcb38e0 (patch) | |
| tree | 4b9ca459c747d9843973f4b8d84f1a383415e040 /common | |
| parent | 6ca7a0b7f0055333ef09945d0dedb7cc8ea9ef50 (diff) | |
| download | chrome-ec-a9033feb7025646e29e02c20b9f20c02ddcb38e0.tar.gz | |
Revert "EFS: Rename CONFIG_VBOOT_EC to _EFS"
This reverts commit 3dc0eae365305c84947fff5d1976e74d950b04e3.
BUG=b:200823466
TEST=make buildall -j
Change-Id: Icf59ad506c2392d3fc743321f696506c19243f2c
Signed-off-by: Mary Ruthven <mruthven@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3273454
Reviewed-by: Vadim Sukhomlinov <sukhomlinov@chromium.org>
Diffstat (limited to 'common')
| -rw-r--r-- | common/main.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/common/main.c b/common/main.c index e6bdc49cc5..0e9d0afa9e 100644 --- a/common/main.c +++ b/common/main.c @@ -156,8 +156,8 @@ test_mockable __keep int main(void) button_init(); #endif /* defined(CONFIG_DEDICATED_RECOVERY_BUTTON | CONFIG_VOLUME_BUTTONS) */ -#if !defined(CONFIG_VBOOT_EFS) && \ - defined(CONFIG_RWSIG) && !defined(HAS_TASK_RWSIG) +#ifndef CONFIG_VBOOT_EC +#if defined(CONFIG_RWSIG) && !defined(HAS_TASK_RWSIG) /* * Check the RW firmware signature and jump to it if it is good. * @@ -178,7 +178,8 @@ test_mockable __keep int main(void) rwsig_jump_now(); } } -#endif /* !CONFIG_VBOOT_EFS && CONFIG_RWSIG && !HAS_TASK_RWSIG */ +#endif +#endif /* !CONFIG_VBOOT_EC */ /* * Print the init time. Not completely accurate because it can't take |