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 /core | |
| 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 'core')
| -rw-r--r-- | core/cortex-m/ec.lds.S | 4 | ||||
| -rw-r--r-- | core/cortex-m/mpu.c | 6 | ||||
| -rw-r--r-- | core/cortex-m0/ec.lds.S | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/core/cortex-m/ec.lds.S b/core/cortex-m/ec.lds.S index 5cbc18d527..c637612bf7 100644 --- a/core/cortex-m/ec.lds.S +++ b/core/cortex-m/ec.lds.S @@ -5,10 +5,10 @@ #include "config.h" #include "rsa.h" -#define FW_OFF_(section) CONFIG_FW_##section##_OFF +#define FW_OFF_(section) CONFIG_##section##_MEM_OFF #define FW_OFF(section) (CONFIG_FLASH_BASE + FW_OFF_(section)) -#define FW_SIZE_(section) CONFIG_FW_##section##_SIZE +#define FW_SIZE_(section) CONFIG_##section##_SIZE #define FW_SIZE(section) FW_SIZE_(section) diff --git a/core/cortex-m/mpu.c b/core/cortex-m/mpu.c index 9082f545c3..8cdf4c9194 100644 --- a/core/cortex-m/mpu.c +++ b/core/cortex-m/mpu.c @@ -140,14 +140,14 @@ int mpu_protect_ram(void) int mpu_lock_ro_flash(void) { - return mpu_lock_region(REGION_FLASH_MEMORY, CONFIG_FW_RO_OFF, + return mpu_lock_region(REGION_FLASH_MEMORY, CONFIG_RO_MEM_OFF, CONFIG_FW_IMAGE_SIZE, MPU_ATTR_FLASH_MEMORY); } int mpu_lock_rw_flash(void) { - return mpu_lock_region(REGION_FLASH_MEMORY, CONFIG_FW_RW_OFF, - CONFIG_FW_RW_SIZE, MPU_ATTR_FLASH_MEMORY); + return mpu_lock_region(REGION_FLASH_MEMORY, CONFIG_RW_MEM_OFF, + CONFIG_RW_SIZE, MPU_ATTR_FLASH_MEMORY); } int mpu_pre_init(void) diff --git a/core/cortex-m0/ec.lds.S b/core/cortex-m0/ec.lds.S index 69b06530cf..a61add0276 100644 --- a/core/cortex-m0/ec.lds.S +++ b/core/cortex-m0/ec.lds.S @@ -5,10 +5,10 @@ #include "config.h" #include "rsa.h" -#define FW_OFF_(section) CONFIG_FW_##section##_OFF +#define FW_OFF_(section) CONFIG_##section##_MEM_OFF #define FW_OFF(section) (CONFIG_FLASH_BASE + FW_OFF_(section)) -#define FW_SIZE_(section) CONFIG_FW_##section##_SIZE +#define FW_SIZE_(section) CONFIG_##section##_SIZE #define FW_SIZE(section) FW_SIZE_(section) |