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>

4 files changed, 23 insertions, 23 deletions

diff --git a/chip/mec1322/config_chip.h b/chip/mec1322/config_chip.h
index 3accdfdf63..ffdf0e56d4 100644
--- a/chip/mec1322/config_chip.h
+++ b/chip/mec1322/config_chip.h
@@ -110,20 +110,20 @@
 #endif
 
 /* RO/RW firmware must be after Loader code */
-#define CONFIG_FW_RO_OFF		CONFIG_FW_LOADER_SIZE
+#define CONFIG_RO_MEM_OFF		CONFIG_FW_LOADER_SIZE
 
-#define CONFIG_FW_RO_SIZE		CONFIG_FW_IMAGE_SIZE
+#define CONFIG_RO_SIZE			CONFIG_FW_IMAGE_SIZE
 #define CONFIG_FLASH_SIZE		CONFIG_FLASH_PHYSICAL_SIZE
 
 #define  CONFIG_FW_INCLUDE_RO
-#define CONFIG_FW_RW_OFF		CONFIG_FW_RO_OFF
-#define CONFIG_FW_RW_SIZE		CONFIG_FW_RO_SIZE
+#define CONFIG_RW_MEM_OFF		CONFIG_RO_MEM_OFF
+#define CONFIG_RW_SIZE			CONFIG_RO_SIZE
 
 /* Write protect Loader and RO Image */
-#define CONFIG_FW_WP_RO_OFF		CONFIG_FW_LOADER_OFF
+#define CONFIG_WP_OFF			CONFIG_FW_LOADER_OFF
 /* Write protect 128k section of 256k physical flash
 which contains Loader and RO Images */
-#define CONFIG_FW_WP_RO_SIZE		(CONFIG_FLASH_PHYSICAL_SIZE >> 1)
+#define CONFIG_WP_SIZE			(CONFIG_FLASH_PHYSICAL_SIZE >> 1)
 /****************************************************************************/
 /* SPI Flash Memory Mapping */
 
@@ -132,12 +132,12 @@ which contains Loader and RO Images */
 #define CONFIG_FLASH_BASE_SPI	(CONFIG_SPI_FLASH_SIZE - (0x40000))
 
 #define CONFIG_RO_WP_SPI_OFF		0x20000
-#define CONFIG_RO_SPI_OFF		0x20000
-#define CONFIG_RW_SPI_OFF		0
+#define CONFIG_RO_STORAGE_OFF		0x20000
+#define CONFIG_RW_STORAGE_OFF		0
 #define CONFIG_RO_IMAGE_FLASHADDR	(CONFIG_FLASH_BASE_SPI +	\
-						CONFIG_RO_SPI_OFF)
+						CONFIG_RO_STORAGE_OFF)
 #define CONFIG_RW_IMAGE_FLASHADDR	(CONFIG_FLASH_BASE_SPI +	\
-						CONFIG_RW_SPI_OFF)
+						CONFIG_RW_STORAGE_OFF)
 /* Memory Lcation shared between lfw and RO/RWimage */
 #define SHARED_RAM_LFW_RORW		(CONFIG_MEC_SRAM_BASE_START + \
 						(CONFIG_LOADER_IMAGE_SIZE - 4))
diff --git a/chip/mec1322/flash.c b/chip/mec1322/flash.c
index e9c752e917..78beb72429 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_FW_RO_OFF;
-		size = CONFIG_FW_RO_SIZE;
+		offset = CONFIG_RO_MEM_OFF;
+		size = CONFIG_RO_SIZE;
 	}
 
 	spi_enable(1);
@@ -145,10 +145,10 @@ uint32_t flash_physical_get_protect_flags(void)
 	uint32_t flags = 0;
 
 	spi_enable(1);
-	if (spi_flash_check_protect(CONFIG_FW_RO_OFF, CONFIG_FW_RO_SIZE)) {
+	if (spi_flash_check_protect(CONFIG_RO_MEM_OFF, CONFIG_RO_SIZE)) {
 		flags |= EC_FLASH_PROTECT_RO_AT_BOOT | EC_FLASH_PROTECT_RO_NOW;
-		if (spi_flash_check_protect(CONFIG_FW_RW_OFF,
-					    CONFIG_FW_RW_SIZE))
+		if (spi_flash_check_protect(CONFIG_RW_MEM_OFF,
+					    CONFIG_RW_SIZE))
 			flags |= EC_FLASH_PROTECT_ALL_NOW;
 	}
 	spi_enable(0);
@@ -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_FW_RO_OFF;
-		size = CONFIG_FW_RO_SIZE;
+		offset = CONFIG_RO_MEM_OFF;
+		size = CONFIG_RO_SIZE;
 		break;
 	case FLASH_WP_ALL:
 		offset = 0;
diff --git a/chip/mec1322/lfw/ec_lfw.c b/chip/mec1322/lfw/ec_lfw.c
index 0d953e6ae9..2ceaa35644 100644
--- a/chip/mec1322/lfw/ec_lfw.c
+++ b/chip/mec1322/lfw/ec_lfw.c
@@ -87,14 +87,14 @@ static int spi_flash_readloc(uint8_t *buf_usr,
 
 int spi_rwimage_load(void)
 {
-	uint8_t *buf = (uint8_t *) (CONFIG_FW_RW_OFF + CONFIG_FLASH_BASE);
+	uint8_t *buf = (uint8_t *) (CONFIG_RW_MEM_OFF + CONFIG_FLASH_BASE);
 	uint32_t i;
 
-	memset((void *)buf, 0xFF, (CONFIG_FW_RW_SIZE - 4));
+	memset((void *)buf, 0xFF, (CONFIG_RW_SIZE - 4));
 
 	spi_enable(1);
 
-	for (i = 0; i < CONFIG_FW_RW_SIZE; i += SPI_CHUNK_SIZE)
+	for (i = 0; i < CONFIG_RW_SIZE; i += SPI_CHUNK_SIZE)
 		spi_flash_readloc(&buf[i],
 					CONFIG_RW_IMAGE_FLASHADDR + i,
 					SPI_CHUNK_SIZE);
@@ -226,11 +226,11 @@ void lfw_main()
 
 	switch (*image_type) {
 	case SYSTEM_IMAGE_RW:
-		init_addr = CONFIG_FW_RW_OFF + CONFIG_FLASH_BASE;
+		init_addr = CONFIG_RW_MEM_OFF + CONFIG_FLASH_BASE;
 		spi_rwimage_load();
 	case SYSTEM_IMAGE_RO:
 	default:
-		init_addr = CONFIG_FW_RO_OFF + CONFIG_FLASH_BASE;
+		init_addr = CONFIG_RO_MEM_OFF + CONFIG_FLASH_BASE;
 	}
 
 	jump_to_image(*(uintptr_t *)(init_addr + 4));
diff --git a/chip/mec1322/system.c b/chip/mec1322/system.c
index b94e93ff07..2460dc51b2 100644
--- a/chip/mec1322/system.c
+++ b/chip/mec1322/system.c
@@ -379,5 +379,5 @@ enum system_image_copy_t system_get_shrspi_image_copy(void)
 /* TODO(crosbug.com/p/37510): Implement bootloader */
 uint32_t system_get_lfw_address(uint32_t flash_addr)
 {
-	return CONFIG_FW_RO_OFF;
+	return CONFIG_RO_MEM_OFF;
 }