cros: Deprecate ddr_type in vboot data
BUG=none
BRANCH=none
CQ-DEPEND=CL:263982
TEST=emerge-peach_pit chromeos-u-boot still works
Change-Id: I8904750379af4eac2a2d8346aad1610c216a5f31
Signed-off-by: David Hendricks <dhendrix@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/264001
Reviewed-by: Randall Spangler <rspangler@chromium.org>
diff --git a/cros/include/vboot.h b/cros/include/vboot.h
index 485a9e4..1bf901b 100644
--- a/cros/include/vboot.h
+++ b/cros/include/vboot.h
@@ -134,7 +134,6 @@
* of bytes in the section containing the firmware, but may be smaller if
* the vblock indicates that not all of that data was signed.
* @active_ec_firmware: Indicates if the EC is in RO/RW (ACTIVE_EC_FIRMWARE_..)
- * @ddr_type: Name of the DDR memory type we have
* @readonly_firmware_id: Firmware ID read from RO firmware
* @firmware_id: Firmware ID of selected RO/RW firmware
* @hardware_id: Hardware ID
@@ -170,7 +169,6 @@
struct vboot_persist *persist;
uint32_t fw_size;
uint8_t active_ec_firmware;
- const char *ddr_type;
char readonly_firmware_id[ID_LEN];
char firmware_id[ID_LEN];
char hardware_id[ID_LEN];
diff --git a/cros/lib/crossystem_data.c b/cros/lib/crossystem_data.c
index ea62863..71c69a3 100644
--- a/cros/lib/crossystem_data.c
+++ b/cros/lib/crossystem_data.c
@@ -142,7 +142,6 @@
#ifdef CONFIG_OF_LIBFDT
static int process_cdata(crossystem_data_t *cdata, void *fdt)
{
- const char *ddr_type;
int gpio_prop[3];
int nodeoffset;
int err;
@@ -247,12 +246,6 @@
CALL(set_array_prop("vboot-shared-data", vb_shared_data));
- ddr_type = cros_fdt_get_mem_type();
- if (ddr_type) {
- CALL(fdt_setprop(fdt, nodeoffset, "ddr-type", ddr_type,
- strlen(ddr_type)));
- }
-
#undef set_scalar_prop
#undef set_array_prop
#undef set_conststring_prop
diff --git a/cros/lib/readonly.c b/cros/lib/readonly.c
index 59ffbbc..66e9d24 100644
--- a/cros/lib/readonly.c
+++ b/cros/lib/readonly.c
@@ -146,7 +146,6 @@
vboot->nvcontext_size = VBNV_BLOCK_SIZE;
vboot->active_ec_firmware = ACTIVE_EC_FIRMWARE_RO;
- vboot->ddr_type = cros_fdt_get_mem_type();
return 0;
diff --git a/cros/lib/vboot_fdt.c b/cros/lib/vboot_fdt.c
index 90e6f89..ee0d091 100644
--- a/cros/lib/vboot_fdt.c
+++ b/cros/lib/vboot_fdt.c
@@ -122,8 +122,6 @@
(unsigned)sizeof(vboot->vb_shared_data), len);
}
- vboot->ddr_type = fdt_getprop(blob, node, "ddr-type", NULL);
-
return 0;
}
@@ -199,9 +197,6 @@
CALL(set_array_prop("vboot-shared-data", vb_shared_data));
- if (vboot->ddr_type)
- CALL(set_conststring_prop("ddr-type", vboot->ddr_type));
-
#undef set_scalar_prop
#undef set_array_prop
#undef set_conststring_prop
