Furquan Shaikh has uploaded this change for review.

View Change

util/cbfstool: Rename IS_TOP_ALIGNED_ADDRESS to IS_HOST_SPACE_ADDRESS

This change renames the macro `IS_TOP_ALIGNED_ADDRESS` to
`IS_HOST_SPACE_ADDRESS` to make it clear that the macro checks if
given address is an address in the host space as opposed to the SPI
flash space.

Change-Id: I84bb505df62ac41f1d364a662be145603c0bd5fa
Signed-off-by: Furquan Shaikh <furquan@google.com>
---
M util/cbfstool/cbfs_image.c
M util/cbfstool/cbfstool.c
M util/cbfstool/common.h
3 files changed, 9 insertions(+), 4 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/30/47830/1

diff --git a/util/cbfstool/cbfs_image.c b/util/cbfstool/cbfs_image.c
index 3f1bf43..da65960 100644
--- a/util/cbfstool/cbfs_image.c
+++ b/util/cbfstool/cbfs_image.c
@@ -731,7 +731,7 @@
 	assert(image);
 	assert(buffer);
 	assert(buffer->data);
-	assert(!IS_TOP_ALIGNED_ADDRESS(content_offset));
+	assert(!IS_HOST_SPACE_ADDRESS(content_offset));
 
 	const char *name = header->filename;
 
diff --git a/util/cbfstool/cbfstool.c b/util/cbfstool/cbfstool.c
index c719b8f..061ff82 100644
--- a/util/cbfstool/cbfstool.c
+++ b/util/cbfstool/cbfstool.c
@@ -563,7 +563,7 @@
 			return -1;
 	}
 
-	if (IS_TOP_ALIGNED_ADDRESS(offset))
+	if (IS_HOST_SPACE_ADDRESS(offset))
 		offset = convert_to_from_absolute_top_aligned(param.image_region,
 							      -offset);
 	if (cbfs_add_entry(&image, &buffer, offset, header, len_align) != 0) {
@@ -646,7 +646,7 @@
 	 * passed in by the caller.
 	 */
 	if (param.stage_xip) {
-		if (!IS_TOP_ALIGNED_ADDRESS(address))
+		if (!IS_HOST_SPACE_ADDRESS(address))
 			address = -convert_to_from_absolute_top_aligned(
 					param.image_region, address);
 	} else {
diff --git a/util/cbfstool/common.h b/util/cbfstool/common.h
index 7dbc1f5..9f62e77 100644
--- a/util/cbfstool/common.h
+++ b/util/cbfstool/common.h
@@ -15,7 +15,12 @@
 /* Endianness */
 #include "swab.h"
 
-#define IS_TOP_ALIGNED_ADDRESS(x)	((uint32_t)(x) > 0x80000000)
+/*
+ * There are two address spaces that this tool deals with - SPI flash address space and host
+ * address space. This macros checks if the address is greater than 2GiB under the assumption
+ * that the low MMIO lives in the top half of the 4G address space of the host.
+ */
+#define IS_HOST_SPACE_ADDRESS(addr)	((uint32_t)(addr) > 0x80000000)
 
 #define unused __attribute__((unused))
 

To view, visit change 47830. To unsubscribe, or for help writing mail filters, visit settings.