diff options
| author | Daisuke Nojiri <dnojiri@chromium.org> | 2017-08-24 18:15:19 -0700 |
|---|---|---|
| committer | chrome-bot <chrome-bot@chromium.org> | 2017-08-29 19:37:05 -0700 |
| commit | 3dc0eae365305c84947fff5d1976e74d950b04e3 (patch) | |
| tree | 83989b68c1ea28041199c6e0e5f0f2e5babaced0 /common/main.c | |
| parent | ff87bfac4e4883dff6076887f28358e2ea51b11e (diff) | |
| download | chrome-ec-3dc0eae365305c84947fff5d1976e74d950b04e3.tar.gz | |
EFS: Rename CONFIG_VBOOT_EC to _EFS
This patch renames CONFIG_VBOOT_ET to CONFIG_VBOOT_EFS. It also
adds the macro to config.h.
BUG=none
BRANCH=none
TEST=make buidlall
Change-Id: I7cb9f4c73da635b36119db74bac6fe26e77a07d2
Signed-off-by: Daisuke Nojiri <dnojiri@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/639955
Reviewed-by: Randall Spangler <rspangler@chromium.org>
Diffstat (limited to 'common/main.c')
| -rw-r--r-- | common/main.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/common/main.c b/common/main.c index b2eb2eebe4..8a1c1dabb1 100644 --- a/common/main.c +++ b/common/main.c @@ -170,8 +170,8 @@ test_mockable __keep int main(void) button_init(); #endif -#ifndef CONFIG_VBOOT_EC -#if 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. * @@ -192,8 +192,7 @@ test_mockable __keep int main(void) rwsig_jump_now(); } } -#endif -#endif /* !CONFIG_VBOOT_EC */ +#endif /* !CONFIG_VBOOT_EFS && CONFIG_RWSIG && !HAS_TASK_RWSIG */ /* * Print the init time. Not completely accurate because it can't take |