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/firmware_image.lds.S | |
| 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/firmware_image.lds.S')
| -rw-r--r-- | common/firmware_image.lds.S | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/common/firmware_image.lds.S b/common/firmware_image.lds.S index e17e25546a..af6aa927b5 100644 --- a/common/firmware_image.lds.S +++ b/common/firmware_image.lds.S @@ -14,17 +14,17 @@ MEMORY SECTIONS { . = ALIGN(CONFIG_FLASH_BANK_SIZE); - .image.RO : AT(CONFIG_FLASH_BASE + CONFIG_FW_RO_OFF) { + .image.RO : AT(CONFIG_FLASH_BASE + CONFIG_RO_MEM_OFF) { *(.image.RO) } > FLASH =0xff . = ALIGN(CONFIG_FLASH_BANK_SIZE); -#if (CONFIG_FW_RO_OFF == CONFIG_FW_RW_OFF) +#if (CONFIG_RO_MEM_OFF == CONFIG_RW_MEM_OFF) /* This is applicable to ECs in which RO and RW execution is mapped to the same location but we still have to generate an ec.bin with RO and RW images at different Flash offset */ - .image.RW : AT(CONFIG_FLASH_BASE + CONFIG_FW_RO_OFF + CONFIG_FW_RO_SIZE) { + .image.RW : AT(CONFIG_FLASH_BASE + CONFIG_RO_MEM_OFF + CONFIG_RO_SIZE) { #else - .image.RW : AT(CONFIG_FLASH_BASE + CONFIG_FW_RW_OFF) { + .image.RW : AT(CONFIG_FLASH_BASE + CONFIG_RW_MEM_OFF) { #endif *(.image.RW) } > FLASH =0xff |