diff options
| author | Shawn Nematbakhsh <shawnn@chromium.org> | 2015-05-11 10:16:41 -0700 |
|---|---|---|
| committer | ChromeOS Commit Bot <chromeos-commit-bot@chromium.org> | 2015-05-12 20:54:37 +0000 |
| commit | 39bd18b890bb708e79e9ba50dd3b5bf3d35e9ff1 (patch) | |
| tree | 69b9331013e942bcbae05c10f863ad0ae9bc4f3b /common/flash.c | |
| parent | 3a36c29e6756231f2fb1fdd26447d519cbd5b26a (diff) | |
| download | chrome-ec-39bd18b890bb708e79e9ba50dd3b5bf3d35e9ff1.tar.gz | |
cleanup: Rename image geometry CONFIGs
Rename image geometry configs with a uniform naming scheme to make their
purposes more clear.
CONFIG_RO_MEM_OFF (was CONFIG_FW_RO_OFF) - RO image offset in program memory
CONFIG_RO_STORAGE_OFF (was CONFIG_RO_SPI_OFF) - RO image offset on storage
CONFIG_RO_SIZE (was CONFIG_FW_RO_SIZE) - Size of RO image
CONFIG_RW_MEM_OFF (was CONFIG_FW_RW_OFF) - RW image offset in program memory
CONFIG_RW_STORAGE_OFF (was CONFIG_RW_SPI_OFF) - RW image offset on storage
CONFIG_RW_SIZE (was CONFIG_FW_RW_SIZE) - Size of RW image
CONFIG_WP_OFF (was CONFIG_FW_WP_RO_OFF) - Offset of WP region on storage
CONFIG_WP_SIZE (was CONFIG_FW_WP_RO_SIZE) - Size of WP region on storage
BUG=chrome-os-partner:39741,chrome-os-partner:23796
TEST=Set date / version strings to constants then `make buildall -j`.
Verify that each ec.bin image is identical pre- and post-change.
BRANCH=None
Signed-off-by: Shawn Nematbakhsh <shawnn@chromium.org>
Change-Id: I6ea0a4e456dae71c266fa917a309b9f6fa4b50cd
Reviewed-on: https://chromium-review.googlesource.com/270189
Reviewed-by: Anton Staaf <robotboy@chromium.org>
Diffstat (limited to 'common/flash.c')
| -rw-r--r-- | common/flash.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/common/flash.c b/common/flash.c index add0c1f12a..302dae0f08 100644 --- a/common/flash.c +++ b/common/flash.c @@ -203,7 +203,7 @@ static const uintptr_t get_pstate_addr(void) /* Always use the pstate data in RO, even if we're RW */ if (system_get_image_copy() == SYSTEM_IMAGE_RW) - addr += CONFIG_FW_RO_OFF - CONFIG_FW_RW_OFF; + addr += CONFIG_RO_MEM_OFF - CONFIG_RW_MEM_OFF; return addr; } @@ -879,16 +879,16 @@ static int flash_command_region_info(struct host_cmd_handler_args *args) switch (p->region) { case EC_FLASH_REGION_RO: - r->offset = CONFIG_FW_RO_OFF; - r->size = CONFIG_FW_RO_SIZE; + r->offset = CONFIG_RO_MEM_OFF; + r->size = CONFIG_RO_SIZE; break; case EC_FLASH_REGION_RW: - r->offset = CONFIG_FW_RW_OFF; - r->size = CONFIG_FW_RW_SIZE; + r->offset = CONFIG_RW_MEM_OFF; + r->size = CONFIG_RW_SIZE; break; case EC_FLASH_REGION_WP_RO: - r->offset = CONFIG_FW_WP_RO_OFF; - r->size = CONFIG_FW_WP_RO_SIZE; + r->offset = CONFIG_WP_OFF; + r->size = CONFIG_WP_SIZE; break; default: return EC_RES_INVALID_PARAM; |