[PATCH 58/67] upl: Drop acpi_nvs_size

[Simon Glass]

This was removed from the spec in favour of reserved-memory nodes. Drop
the field and its uses.

Future work will address the new implementation of ACPI NVS.

Signed-off-by: Simon Glass <sjg at chromium.org>
---

 boot/upl_read.c  | 3 ---
 boot/upl_write.c | 3 ---
 include/upl.h    | 3 ---
 test/boot/upl.c  | 2 --
 4 files changed, 11 deletions(-)

diff --git a/boot/upl_read.c b/boot/upl_read.c
index 99f7a83ff0a..4f07204546e 100644
--- a/boot/upl_read.c
+++ b/boot/upl_read.c
@@ -261,9 +261,6 @@ static int decode_upl_params(struct upl *upl, ofnode options)
 	ret = read_uint(node, UPLP_ADDR_WIDTH, &upl->addr_width);
 	if (ret)
 		return log_msg_ret("add", ret);
-	ret = read_uint(node, UPLP_ACPI_NVS_SIZE, &upl->acpi_nvs_size);
-	if (ret)
-		return log_msg_ret("nvs", ret);
 
 	return 0;
 }
diff --git a/boot/upl_write.c b/boot/upl_write.c
index 773c03ad1c6..79613a0f463 100644
--- a/boot/upl_write.c
+++ b/boot/upl_write.c
@@ -237,9 +237,6 @@ static int add_upl_params(const struct upl *upl, ofnode options)
 					   UPLBM_COUNT, upl->bootmode);
 	if (!ret)
 		ret = ofnode_write_u32(node, UPLP_ADDR_WIDTH, upl->addr_width);
-	if (!ret)
-		ret = ofnode_write_u32(node, UPLP_ACPI_NVS_SIZE,
-				       upl->acpi_nvs_size);
 	if (ret)
 		return log_msg_ret("cnf", ret);
 
diff --git a/include/upl.h b/include/upl.h
index 19fa78b108e..0d76595cc48 100644
--- a/include/upl.h
+++ b/include/upl.h
@@ -28,7 +28,6 @@ struct unit_test_state;
 #define UPLP_ACPI		"acpi"
 #define UPLP_BOOTMODE		"bootmode"
 #define UPLP_ADDR_WIDTH		"addr-width"
-#define UPLP_ACPI_NVS_SIZE	"acpi-nvs-size"
 
 #define UPLPATH_UPL_IMAGES	"/options/upl-images"
 #define UPLN_UPL_IMAGES		"upl-images"
@@ -253,7 +252,6 @@ struct upl_graphics {
  * @fit: Address and size of FIT image that was loaded
  * @conf_offset: Offset in FIT of the configuration that was selected
  * @addr_width: Adress-bus width of machine, e.g. 46 for 46 bits
- * @acpi_nvs_size: Size of the ACPI non-volatile-storage area in bytes
  * @image: Information about each image (struct upl_image)
  * @mem: Information about physical-memory regions (struct upl_mem)
  * @menmap: Information about logical-memory regions (struct upl_memmap)
@@ -269,7 +267,6 @@ struct upl {
 	struct memregion fit;
 	uint conf_offset;
 	uint addr_width;
-	uint acpi_nvs_size;
 
 	struct alist image;
 	struct alist mem;
diff --git a/test/boot/upl.c b/test/boot/upl.c
index 264aab3038c..7171f16e42e 100644
--- a/test/boot/upl.c
+++ b/test/boot/upl.c
@@ -50,7 +50,6 @@ int upl_get_test_data(struct unit_test_state *uts, struct upl *upl)
 	upl->fit.size = 0xabc;
 	upl->conf_offset = 0x234;
 	upl->addr_width = 46;
-	upl->acpi_nvs_size = 0x100;
 
 	/* image[0] */
 	img.reg.base = 0x1;
@@ -301,7 +300,6 @@ static int compare_upl(struct unit_test_state *uts, struct upl *base,
 	ut_asserteq(base->fit.size, cmp->fit.size);
 	ut_asserteq(base->conf_offset, cmp->conf_offset);
 	ut_asserteq(base->addr_width, cmp->addr_width);
-	ut_asserteq(base->acpi_nvs_size, cmp->acpi_nvs_size);
 
 	ut_asserteq(base->image.count, cmp->image.count);
 	for (i = 0; i < base->image.count; i++)
-- 
2.43.0