diff options
| author | Tom Hughes <tomhughes@chromium.org> | 2020-01-31 14:37:08 -0800 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2020-02-28 03:43:09 +0000 |
| commit | 78d1ed61d6b7d3e3af631f4c9b17af340e6f7c05 (patch) | |
| tree | fa625607d9f0012b06268a4a3bb203c6356bd8f8 /power | |
| parent | c9f2a4db18e0c38a2cf1934a2d69043922866d3b (diff) | |
| download | chrome-ec-78d1ed61d6b7d3e3af631f4c9b17af340e6f7c05.tar.gz | |
common/system: Unify ec_current_image and system_image_copy_t
"enum ec_current_image" is exposed in ec_commands.h (and used by non-EC
code, such as biod).
We also have an "enum system_image_copy_t" that is the exact same thing
(though has a few more definitions).
A followup CL (I714b6bd8c0d7192386404c25a831e38438fa5238) adds the
"sysinfo" host command, so we want to be able to expose all the
potential image variants. Rather than maintain two enums that can
potentially get out of sync, unify the code to use a single enum. We
choose to keep the "enum ec_current_image", since external code depends
on it.
To verify that this change results in no changes to the generated
binaries:
./util/compare_build.sh --board all
BRANCH=none
BUG=b:146447208
TEST=./util/compare_build.sh --board=all
Change-Id: I13776bc3fd6e6ad635980476a35571c52b1767ac
Signed-off-by: Tom Hughes <tomhughes@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2036599
Reviewed-by: Daisuke Nojiri <dnojiri@chromium.org>
Reviewed-by: Namyoon Woo <namyoon@chromium.org>
Diffstat (limited to 'power')
| -rw-r--r-- | power/mt8183.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/power/mt8183.c b/power/mt8183.c index 08789f09f2..7efbd15e44 100644 --- a/power/mt8183.c +++ b/power/mt8183.c @@ -385,7 +385,7 @@ enum power_state power_handle_state(enum power_state state) } /* If EC is in RW, or has already booted once, reboot to RO. */ - if (system_get_image_copy() != SYSTEM_IMAGE_RO || booted) { + if (system_get_image_copy() != EC_IMAGE_RO || booted) { /* * TODO(b:109850749): How quickly does the EC come back * up? Would IN_PGOOD_PMIC be ready by the time we are |