12 files changed, 15 insertions, 23 deletions

diff --git a/src/arch/x86/smbios.c b/src/arch/x86/smbios.c
index 103b4aef7e..fc3a0a7f6b 100644
--- a/src/arch/x86/smbios.c
+++ b/src/arch/x86/smbios.c
@@ -367,7 +367,8 @@ static int smbios_write_type0(unsigned long *current, int handle)
 
 #if IS_ENABLED(CONFIG_HAVE_ACPI_TABLES)
 	/* SMBIOS offsets start at 1 rather than 0 */
-	acpi_get_chromeos_acpi()->vbt10 = (u32)t->eos + (version_offset - 1);
+	chromeos_get_chromeos_acpi()->vbt10 =
+		(u32)t->eos + (version_offset - 1);
 #endif
 #endif /* CONFIG_CHROMEOS */
 
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;
diff --git a/src/southbridge/intel/bd82x6x/lpc.c b/src/southbridge/intel/bd82x6x/lpc.c
index d9e72b43ad..271b5b06cc 100644
--- a/src/southbridge/intel/bd82x6x/lpc.c
+++ b/src/southbridge/intel/bd82x6x/lpc.c
@@ -739,7 +739,7 @@ static void southbridge_inject_dsdt(struct device *dev)
 		memcpy(gnvs->did, gfx->did, sizeof(gnvs->did));
 
 #if IS_ENABLED(CONFIG_CHROMEOS)
-		chromeos_init_vboot(&(gnvs->chromeos));
+		chromeos_init_chromeos_acpi(&(gnvs->chromeos));
 #endif
 
 		/* And tell SMI about it */
diff --git a/src/southbridge/intel/lynxpoint/lpc.c b/src/southbridge/intel/lynxpoint/lpc.c
index 8f695cd8b1..5b09fedff4 100644
--- a/src/southbridge/intel/lynxpoint/lpc.c
+++ b/src/southbridge/intel/lynxpoint/lpc.c
@@ -770,7 +770,7 @@ static void southbridge_inject_dsdt(struct device *dev)
 		gnvs->pcnt = dev_count_cpu();
 
 #if IS_ENABLED(CONFIG_CHROMEOS)
-		chromeos_init_vboot(&(gnvs->chromeos));
+		chromeos_init_chromeos_acpi(&(gnvs->chromeos));
 #endif
 
 		/* Update the mem console pointer. */
diff --git a/src/vendorcode/google/chromeos/gnvs.c b/src/vendorcode/google/chromeos/gnvs.c
index 70aa899042..f21eb0963c 100644
--- a/src/vendorcode/google/chromeos/gnvs.c
+++ b/src/vendorcode/google/chromeos/gnvs.c
@@ -30,7 +30,7 @@
 static chromeos_acpi_t *chromeos_acpi;
 static u32 me_hash_saved[8];
 
-void chromeos_init_vboot(chromeos_acpi_t *init)
+void chromeos_init_chromeos_acpi(chromeos_acpi_t *init)
 {
 	chromeos_acpi = init;
 
@@ -59,14 +59,7 @@ void chromeos_set_me_hash(u32 *hash, int len)
 		memcpy(me_hash_saved, hash, len*sizeof(u32));
 }
 
-void acpi_get_chromeos_acpi_info(uint64_t *chromeos_acpi_addr,
-				 uint32_t *chromeos_acpi_size)
-{
-	*chromeos_acpi_addr = (intptr_t)chromeos_acpi;
-	*chromeos_acpi_size = sizeof(*chromeos_acpi);
-}
-
-chromeos_acpi_t *acpi_get_chromeos_acpi(void)
+chromeos_acpi_t *chromeos_get_chromeos_acpi(void)
 {
 	return chromeos_acpi;
 }
diff --git a/src/vendorcode/google/chromeos/gnvs.h b/src/vendorcode/google/chromeos/gnvs.h
index 62fa08c5f2..77c2f0aab8 100644
--- a/src/vendorcode/google/chromeos/gnvs.h
+++ b/src/vendorcode/google/chromeos/gnvs.h
@@ -73,10 +73,8 @@ typedef struct {
 	u8	pad[314];	// dc6-eff
 } __packed chromeos_acpi_t;
 
-void chromeos_init_vboot(chromeos_acpi_t *init);
+void chromeos_init_chromeos_acpi(chromeos_acpi_t *init);
 void chromeos_set_me_hash(u32*, int);
-void acpi_get_chromeos_acpi_info(uint64_t *chromeos_acpi_addr,
-				 uint32_t *chromeos_acpi_size);
-chromeos_acpi_t *acpi_get_chromeos_acpi(void);
+chromeos_acpi_t *chromeos_get_chromeos_acpi(void);
 
 #endif