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/npcx/config_chip.h | |
| 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/npcx/config_chip.h')
| -rw-r--r-- | chip/npcx/config_chip.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/chip/npcx/config_chip.h b/chip/npcx/config_chip.h index 560be8e6c9..272c5eebed 100644 --- a/chip/npcx/config_chip.h +++ b/chip/npcx/config_chip.h @@ -76,15 +76,16 @@ /* RO firmware offset of flash */ #define CONFIG_RO_MEM_OFF 0 +#define CONFIG_RO_STORAGE_OFF 0 #define CONFIG_RO_SIZE CONFIG_FW_IMAGE_SIZE #define CONFIG_FLASH_SIZE CONFIG_FLASH_PHYSICAL_SIZE /* RW firmware is one firmware image offset from the start */ #define CONFIG_RW_MEM_OFF CONFIG_FW_IMAGE_SIZE +#define CONFIG_RW_STORAGE_OFF CONFIG_FW_IMAGE_SIZE #define CONFIG_RW_SIZE CONFIG_FW_IMAGE_SIZE -/* TODO(crosbug.com/p/23796): why 2 sets of configs with the same numbers? */ -#define CONFIG_WP_OFF CONFIG_RO_MEM_OFF +#define CONFIG_WP_OFF CONFIG_RO_STORAGE_OFF #define CONFIG_WP_SIZE CONFIG_RO_SIZE /* |