diff options
| author | Shawn Nematbakhsh <shawnn@chromium.org> | 2015-05-11 14:23:31 -0700 |
|---|---|---|
| committer | ChromeOS Commit Bot <chromeos-commit-bot@chromium.org> | 2015-05-15 06:42:30 +0000 |
| commit | e3dce49334a2b44e337744bc719a27c63261f35e (patch) | |
| tree | 3ee485350fafffaf53206036a3a19184068feeb5 /chip/mec1322/flash.c | |
| parent | cba37a13d2342e4c81b0be3c84010baf3d846162 (diff) | |
| download | chrome-ec-e3dce49334a2b44e337744bc719a27c63261f35e.tar.gz | |
cleanup: Use appropriate image geometry CONFIGs
- Use CONFIG_*_MEM when dealing with images in program memory.
- Use CONFIG_*_STORAGE when dealing with images on storage.
- Use CONFIG_WP when dealing with the entire WP RO region.
BUG=chrome-os-partner:39741,chrome-os-partner:23796
TEST=Manual on Cyan with subsequent commit. Verify that FMAP matches
actual layout of image. Verify flashrom succeeds flashing + verifying EC
image using host command interface.
BRANCH=None
Change-Id: Iadc02daa89fe3bf07b083ed0f7be2e60702a1867
Signed-off-by: Shawn Nematbakhsh <shawnn@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/270269
Diffstat (limited to 'chip/mec1322/flash.c')
| -rw-r--r-- | chip/mec1322/flash.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/chip/mec1322/flash.c b/chip/mec1322/flash.c index 78beb72429..92a7dacb33 100644 --- a/chip/mec1322/flash.c +++ b/chip/mec1322/flash.c @@ -123,8 +123,8 @@ int flash_physical_protect_now(int all) offset = 0; size = CONFIG_FLASH_PHYSICAL_SIZE; } else { - offset = CONFIG_RO_MEM_OFF; - size = CONFIG_RO_SIZE; + offset = CONFIG_WP_OFF; + size = CONFIG_WP_SIZE; } spi_enable(1); @@ -145,9 +145,9 @@ uint32_t flash_physical_get_protect_flags(void) uint32_t flags = 0; spi_enable(1); - if (spi_flash_check_protect(CONFIG_RO_MEM_OFF, CONFIG_RO_SIZE)) { + if (spi_flash_check_protect(CONFIG_RO_STORAGE_OFF, CONFIG_RO_SIZE)) { flags |= EC_FLASH_PROTECT_RO_AT_BOOT | EC_FLASH_PROTECT_RO_NOW; - if (spi_flash_check_protect(CONFIG_RW_MEM_OFF, + if (spi_flash_check_protect(CONFIG_RW_STORAGE_OFF, CONFIG_RW_SIZE)) flags |= EC_FLASH_PROTECT_ALL_NOW; } @@ -206,8 +206,8 @@ int flash_physical_protect_at_boot(enum flash_wp_range range) offset = size = 0; break; case FLASH_WP_RO: - offset = CONFIG_RO_MEM_OFF; - size = CONFIG_RO_SIZE; + offset = CONFIG_WP_OFF; + size = CONFIG_WP_SIZE; break; case FLASH_WP_ALL: offset = 0; |