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/rwsig.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/rwsig.c')
| -rw-r--r-- | common/rwsig.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/common/rwsig.c b/common/rwsig.c index 6b90c6cd87..e3224c1df8 100644 --- a/common/rwsig.c +++ b/common/rwsig.c @@ -25,12 +25,12 @@ const struct rsa_public_key pkey __attribute__((section(".rsa_pubkey"))) = #include "gen_pub_key.h" /* The RSA signature is stored at the end of the RW firmware */ -static const void *rw_sig = (void *)CONFIG_FLASH_BASE + CONFIG_FW_RW_OFF - + CONFIG_FW_RW_SIZE - RSANUMBYTES; +static const void *rw_sig = (void *)CONFIG_FLASH_BASE + CONFIG_RW_MEM_OFF + + CONFIG_RW_SIZE - RSANUMBYTES; /* RW firmware reset vector */ static uint32_t * const rw_rst = - (uint32_t *)(CONFIG_FLASH_BASE+CONFIG_FW_RW_OFF+4); + (uint32_t *)(CONFIG_FLASH_BASE+CONFIG_RW_MEM_OFF+4); void check_rw_signature(void) { @@ -58,8 +58,8 @@ void check_rw_signature(void) /* SHA-256 Hash of the RW firmware */ SHA256_init(&ctx); - SHA256_update(&ctx, (void *)CONFIG_FLASH_BASE + CONFIG_FW_RW_OFF, - CONFIG_FW_RW_SIZE - RSANUMBYTES); + SHA256_update(&ctx, (void *)CONFIG_FLASH_BASE + CONFIG_RW_MEM_OFF, + CONFIG_RW_SIZE - RSANUMBYTES); hash = SHA256_final(&ctx); good = rsa_verify(&pkey, (void *)rw_sig, (void *)hash, rsa_workbuf); |