From 6fbd87439119d3c1d99adfbcf0265f2f9c53723e Mon Sep 17 00:00:00 2001 From: Joel Kitching Date: Thu, 23 Aug 2018 14:56:25 +0800 Subject: chromeos/gnvs: remove function and naming cleanup - Remove unused acpi_get_chromeos_acpi_info (see CB:28190) - Make function naming in gnvs.h consistent (start with "chromeos_") BUG=b:112288216 TEST=compile and run on eve Change-Id: I5b0066bc311b0ea995fa30bca1cd9235dc9b7d1b Signed-off-by: Joel Kitching Reviewed-on: https://review.coreboot.org/28406 Tested-by: build bot (Jenkins) Reviewed-by: Aaron Durbin Reviewed-by: Paul Menzel Reviewed-by: Furquan Shaikh --- src/soc/amd/stoneyridge/acpi.c | 2 +- src/soc/intel/apollolake/acpi.c | 2 +- src/soc/intel/baytrail/acpi.c | 2 +- src/soc/intel/braswell/acpi.c | 2 +- src/soc/intel/broadwell/acpi.c | 2 +- src/soc/intel/cannonlake/acpi.c | 2 +- src/soc/intel/skylake/acpi.c | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) (limited to 'src/soc') diff --git a/src/soc/amd/stoneyridge/acpi.c b/src/soc/amd/stoneyridge/acpi.c index 4094c388d9..3881042eb7 100644 --- a/src/soc/amd/stoneyridge/acpi.c +++ b/src/soc/amd/stoneyridge/acpi.c @@ -273,7 +273,7 @@ static void acpi_create_gnvs(struct global_nvs_t *gnvs) if (IS_ENABLED(CONFIG_CHROMEOS)) { /* Initialize Verified Boot data */ - chromeos_init_vboot(&gnvs->chromeos); + chromeos_init_chromeos_acpi(&gnvs->chromeos); gnvs->chromeos.vbt2 = ACTIVE_ECFW_RO; } diff --git a/src/soc/intel/apollolake/acpi.c b/src/soc/intel/apollolake/acpi.c index 5e42091965..bf93ef40a8 100644 --- a/src/soc/intel/apollolake/acpi.c +++ b/src/soc/intel/apollolake/acpi.c @@ -96,7 +96,7 @@ void acpi_create_gnvs(struct global_nvs_t *gnvs) if (IS_ENABLED(CONFIG_CHROMEOS)) { /* Initialize Verified Boot data */ - chromeos_init_vboot(&gnvs->chromeos); + chromeos_init_chromeos_acpi(&gnvs->chromeos); gnvs->chromeos.vbt2 = ACTIVE_ECFW_RO; } diff --git a/src/soc/intel/baytrail/acpi.c b/src/soc/intel/baytrail/acpi.c index a43e6b6911..cdf3abfed5 100644 --- a/src/soc/intel/baytrail/acpi.c +++ b/src/soc/intel/baytrail/acpi.c @@ -92,7 +92,7 @@ void acpi_init_gnvs(global_nvs_t *gnvs) #if IS_ENABLED(CONFIG_CHROMEOS) /* Initialize Verified Boot data */ - chromeos_init_vboot(&(gnvs->chromeos)); + chromeos_init_chromeos_acpi(&(gnvs->chromeos)); #if IS_ENABLED(CONFIG_EC_GOOGLE_CHROMEEC) gnvs->chromeos.vbt2 = google_ec_running_ro() ? ACTIVE_ECFW_RO : ACTIVE_ECFW_RW; diff --git a/src/soc/intel/braswell/acpi.c b/src/soc/intel/braswell/acpi.c index ebca9fa2bb..0a683fba6b 100644 --- a/src/soc/intel/braswell/acpi.c +++ b/src/soc/intel/braswell/acpi.c @@ -100,7 +100,7 @@ void acpi_init_gnvs(global_nvs_t *gnvs) #if IS_ENABLED(CONFIG_CHROMEOS) /* Initialize Verified Boot data */ - chromeos_init_vboot(&(gnvs->chromeos)); + chromeos_init_chromeos_acpi(&(gnvs->chromeos)); #if IS_ENABLED(CONFIG_EC_GOOGLE_CHROMEEC) gnvs->chromeos.vbt2 = google_ec_running_ro() ? ACTIVE_ECFW_RO : ACTIVE_ECFW_RW; diff --git a/src/soc/intel/broadwell/acpi.c b/src/soc/intel/broadwell/acpi.c index d826d43322..2d9d0b7050 100644 --- a/src/soc/intel/broadwell/acpi.c +++ b/src/soc/intel/broadwell/acpi.c @@ -177,7 +177,7 @@ void acpi_init_gnvs(global_nvs_t *gnvs) #if IS_ENABLED(CONFIG_CHROMEOS) /* Initialize Verified Boot data */ - chromeos_init_vboot(&(gnvs->chromeos)); + chromeos_init_chromeos_acpi(&(gnvs->chromeos)); #if IS_ENABLED(CONFIG_EC_GOOGLE_CHROMEEC) gnvs->chromeos.vbt2 = google_ec_running_ro() ? ACTIVE_ECFW_RO : ACTIVE_ECFW_RW; diff --git a/src/soc/intel/cannonlake/acpi.c b/src/soc/intel/cannonlake/acpi.c index 97d5ce7aa6..155756c02c 100644 --- a/src/soc/intel/cannonlake/acpi.c +++ b/src/soc/intel/cannonlake/acpi.c @@ -214,7 +214,7 @@ void acpi_create_gnvs(struct global_nvs_t *gnvs) if (IS_ENABLED(CONFIG_CHROMEOS)) { /* Initialize Verified Boot data */ - chromeos_init_vboot(&(gnvs->chromeos)); + chromeos_init_chromeos_acpi(&(gnvs->chromeos)); if (IS_ENABLED(CONFIG_EC_GOOGLE_CHROMEEC)) { gnvs->chromeos.vbt2 = google_ec_running_ro() ? ACTIVE_ECFW_RO : ACTIVE_ECFW_RW; diff --git a/src/soc/intel/skylake/acpi.c b/src/soc/intel/skylake/acpi.c index 44096cd369..d2ec7e7185 100644 --- a/src/soc/intel/skylake/acpi.c +++ b/src/soc/intel/skylake/acpi.c @@ -192,7 +192,7 @@ static void acpi_create_gnvs(global_nvs_t *gnvs) #if IS_ENABLED(CONFIG_CHROMEOS) /* Initialize Verified Boot data */ - chromeos_init_vboot(&(gnvs->chromeos)); + chromeos_init_chromeos_acpi(&(gnvs->chromeos)); #if IS_ENABLED(CONFIG_EC_GOOGLE_CHROMEEC) gnvs->chromeos.vbt2 = google_ec_running_ro() ? ACTIVE_ECFW_RO : ACTIVE_ECFW_RW; -- cgit v1.2.3