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 /chip/host | |
| 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 'chip/host')
| -rw-r--r-- | chip/host/config_chip.h | 14 | ||||
| -rw-r--r-- | chip/host/system.c | 4 |
2 files changed, 9 insertions, 9 deletions
diff --git a/chip/host/config_chip.h b/chip/host/config_chip.h index a83fa778cf..df84143883 100644 --- a/chip/host/config_chip.h +++ b/chip/host/config_chip.h @@ -26,18 +26,18 @@ extern char __host_flash[CONFIG_FLASH_PHYSICAL_SIZE]; /* Size of one firmware image in flash */ #define CONFIG_FW_IMAGE_SIZE (64 * 1024) -#define CONFIG_FW_RO_OFF 0 -#define CONFIG_FW_RO_SIZE (CONFIG_FW_IMAGE_SIZE - CONFIG_FW_PSTATE_SIZE) -#define CONFIG_FW_RW_OFF CONFIG_FW_IMAGE_SIZE -#define CONFIG_FW_RW_SIZE CONFIG_FW_IMAGE_SIZE -#define CONFIG_FW_WP_RO_OFF CONFIG_FW_RO_OFF -#define CONFIG_FW_WP_RO_SIZE CONFIG_FW_IMAGE_SIZE +#define CONFIG_RO_MEM_OFF 0 +#define CONFIG_RO_SIZE (CONFIG_FW_IMAGE_SIZE - CONFIG_FW_PSTATE_SIZE) +#define CONFIG_RW_MEM_OFF CONFIG_FW_IMAGE_SIZE +#define CONFIG_RW_SIZE CONFIG_FW_IMAGE_SIZE +#define CONFIG_WP_OFF CONFIG_RO_MEM_OFF +#define CONFIG_WP_SIZE CONFIG_FW_IMAGE_SIZE /* * Put this after RO to give RW more space and make RO write protect region * contiguous. */ -#define CONFIG_FW_PSTATE_OFF CONFIG_FW_RO_SIZE +#define CONFIG_FW_PSTATE_OFF CONFIG_RO_SIZE #define CONFIG_FW_PSTATE_SIZE CONFIG_FLASH_BANK_SIZE /* Maximum number of deferrable functions */ diff --git a/chip/host/system.c b/chip/host/system.c index 6e1d1c36bf..e9de6b1214 100644 --- a/chip/host/system.c +++ b/chip/host/system.c @@ -261,8 +261,8 @@ void system_pre_init(void) system_set_reset_flags(load_reset_flags()); } - *(uintptr_t *)(__host_flash + CONFIG_FW_RO_OFF + 4) = + *(uintptr_t *)(__host_flash + CONFIG_RO_MEM_OFF + 4) = (uintptr_t)__ro_jump_resetvec; - *(uintptr_t *)(__host_flash + CONFIG_FW_RW_OFF + 4) = + *(uintptr_t *)(__host_flash + CONFIG_RW_MEM_OFF + 4) = (uintptr_t)__rw_jump_resetvec; } |