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 /chip/mec1322 | |
| 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 'chip/mec1322')
| -rw-r--r-- | chip/mec1322/lfw/ec_lfw.c | 12 | ||||
| -rw-r--r-- | chip/mec1322/system.c | 8 |
2 files changed, 9 insertions, 11 deletions
diff --git a/chip/mec1322/lfw/ec_lfw.c b/chip/mec1322/lfw/ec_lfw.c index 7dacfc3077..39f4e378ae 100644 --- a/chip/mec1322/lfw/ec_lfw.c +++ b/chip/mec1322/lfw/ec_lfw.c @@ -218,11 +218,10 @@ void system_init(void) MEC1322_PWR_RST_STS_VCC1; if (rst_sts || wdt_sts) - MEC1322_VBAT_RAM(MEC1322_IMAGETYPE_IDX) - = SYSTEM_IMAGE_RO; + MEC1322_VBAT_RAM(MEC1322_IMAGETYPE_IDX) = EC_IMAGE_RO; } -enum system_image_copy_t system_get_image_copy(void) +enum ec_image system_get_image_copy(void) { return MEC1322_VBAT_RAM(MEC1322_IMAGETYPE_IDX); } @@ -260,20 +259,19 @@ void lfw_main() uart_puts("\n"); switch (system_get_image_copy()) { - case SYSTEM_IMAGE_RW: + case EC_IMAGE_RW: uart_puts("lfw-RW load\n"); init_addr = CONFIG_RW_MEM_OFF + CONFIG_PROGRAM_MEMORY_BASE; spi_image_load(CONFIG_EC_WRITABLE_STORAGE_OFF + CONFIG_RW_STORAGE_OFF); break; - case SYSTEM_IMAGE_RO: + case EC_IMAGE_RO: uart_puts("lfw-RO load\n"); spi_image_load(CONFIG_EC_PROTECTED_STORAGE_OFF + CONFIG_RO_STORAGE_OFF); /* fall through */ default: - MEC1322_VBAT_RAM(MEC1322_IMAGETYPE_IDX) = - SYSTEM_IMAGE_RO; + MEC1322_VBAT_RAM(MEC1322_IMAGETYPE_IDX) = EC_IMAGE_RO; init_addr = CONFIG_RO_MEM_OFF + CONFIG_PROGRAM_MEMORY_BASE; } diff --git a/chip/mec1322/system.c b/chip/mec1322/system.c index 6dac6abfc6..9104bc17b1 100644 --- a/chip/mec1322/system.c +++ b/chip/mec1322/system.c @@ -373,7 +373,7 @@ void htimer_interrupt(void) } DECLARE_IRQ(MEC1322_IRQ_HTIMER, htimer_interrupt, 1); -enum system_image_copy_t system_get_shrspi_image_copy(void) +enum ec_image system_get_shrspi_image_copy(void) { return MEC1322_VBAT_RAM(MEC1322_IMAGETYPE_IDX); } @@ -386,8 +386,8 @@ uint32_t system_get_lfw_address(void) return *(lfw_vector + 1); } -void system_set_image_copy(enum system_image_copy_t copy) +void system_set_image_copy(enum ec_image copy) { - MEC1322_VBAT_RAM(MEC1322_IMAGETYPE_IDX) = (copy == SYSTEM_IMAGE_RW) ? - SYSTEM_IMAGE_RW : SYSTEM_IMAGE_RO; + MEC1322_VBAT_RAM(MEC1322_IMAGETYPE_IDX) = (copy == EC_IMAGE_RW) ? + EC_IMAGE_RW : EC_IMAGE_RO; } |