Patch set updated for coreboot: mainboard/google/reef: allow variants to modify nhlt oem revision

[Aaron Durbin]

Aaron Durbin ([e-mail]) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/17651

-gerrit

commit fd75adb561b95efdfe852e17f9eb25a2a9e0fe3e
Author: Aaron Durbin 
Date:   Tue Nov 29 23:20:07 2016 -0600

mainboard/google/reef: allow variants to modify nhlt oem revision

In order to mirror the full flexibility of the NHLT library that
    allows a caller to set the OEM revision field in the ACPI header
    modify the variant callback to override the value.

Change-Id: I16e539b350a50e3c163be1439c8637b82e53a759
    Signed-off-by: Aaron Durbin 
---
 src/mainboard/google/reef/mainboard.c                              | 7 ++++---
 .../google/reef/variants/baseboard/include/baseboard/variants.h    | 4 ++--
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/mainboard/google/reef/mainboard.c b/src/mainboard/google/reef/mainboard.c
index 44858d4..4425c01 100644
--- a/src/mainboard/google/reef/mainboard.c
+++ b/src/mainboard/google/reef/mainboard.c
@@ -41,8 +41,9 @@ static void mainboard_init(void *chip_info)
    mainboard_ec_init();
 }

-void __attribute__((weak)) variant_nhlt_oem_strings(const char **oem_id,
-						const char **oem_table_id)
+void __attribute__((weak)) variant_nhlt_oem_overrides(const char **oem_id,
+						const char **oem_table_id,
+						uint32_t *oem_revision)
 {
 }

@@ -64,7 +65,7 @@ static unsigned long mainboard_write_acpi_tables(
    	return start_addr;

variant_nhlt_init(nhlt);
-	variant_nhlt_oem_strings(&oem_id, &oem_table_id);
+	variant_nhlt_oem_overrides(&oem_id, &oem_table_id, &oem_revision);

end_addr = nhlt_soc_serialize_oem_overrides(nhlt, start_addr,
    		oem_id, oem_table_id, oem_revision);
diff --git a/src/mainboard/google/reef/variants/baseboard/include/baseboard/variants.h b/src/mainboard/google/reef/variants/baseboard/include/baseboard/variants.h
index 31ee3d0..65a32b3 100644
--- a/src/mainboard/google/reef/variants/baseboard/include/baseboard/variants.h
+++ b/src/mainboard/google/reef/variants/baseboard/include/baseboard/variants.h
@@ -42,8 +42,8 @@ const struct cros_gpio *variant_cros_gpios(size_t *num);

/* Seed the NHLT tables with the board specific information. */
 struct nhlt;
-void variant_nhlt_oem_strings(const char **oem_id,
-			const char **oem_table_id);
+void variant_nhlt_oem_overrides(const char **oem_id,
+			const char **oem_table_id, uint32_t *oem_revision);
 void variant_nhlt_init(struct nhlt *nhlt);

#endif /* BASEBOARD_VARIANTS_H */