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 <adurbin@chromium.org>
Reviewed-on: https://review.coreboot.org/17651
Reviewed-by: Furquan Shaikh <furquan@google.com>
Tested-by: build bot (Jenkins)
This commit is contained in:
Aaron Durbin 2016-11-29 23:20:07 -06:00
parent b4afe3c197
commit d0a648e18a
2 changed files with 6 additions and 5 deletions

View File

@ -41,8 +41,9 @@ static void mainboard_init(void *chip_info)
mainboard_ec_init(); mainboard_ec_init();
} }
void __attribute__((weak)) variant_nhlt_oem_strings(const char **oem_id, void __attribute__((weak)) variant_nhlt_oem_overrides(const char **oem_id,
const char **oem_table_id) const char **oem_table_id,
uint32_t *oem_revision)
{ {
} }
@ -64,7 +65,7 @@ static unsigned long mainboard_write_acpi_tables(
return start_addr; return start_addr;
variant_nhlt_init(nhlt); 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, end_addr = nhlt_soc_serialize_oem_overrides(nhlt, start_addr,
oem_id, oem_table_id, oem_revision); oem_id, oem_table_id, oem_revision);

View File

@ -42,8 +42,8 @@ const struct cros_gpio *variant_cros_gpios(size_t *num);
/* Seed the NHLT tables with the board specific information. */ /* Seed the NHLT tables with the board specific information. */
struct nhlt; struct nhlt;
void variant_nhlt_oem_strings(const char **oem_id, void variant_nhlt_oem_overrides(const char **oem_id,
const char **oem_table_id); const char **oem_table_id, uint32_t *oem_revision);
void variant_nhlt_init(struct nhlt *nhlt); void variant_nhlt_init(struct nhlt *nhlt);
#endif /* BASEBOARD_VARIANTS_H */ #endif /* BASEBOARD_VARIANTS_H */