Joel Kitching has uploaded this change for review. ( https://review.coreboot.org/28406
Change subject: chromeos/gnvs: remove function and naming cleanup ......................................................................
chromeos/gnvs: remove function and naming cleanup
- Remove unused acpi_get_chromeos_acpi_info (see CL: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 kitching@google.com --- M src/arch/x86/smbios.c M src/soc/amd/stoneyridge/acpi.c M src/soc/intel/apollolake/acpi.c M src/soc/intel/baytrail/acpi.c M src/soc/intel/braswell/acpi.c M src/soc/intel/broadwell/acpi.c M src/soc/intel/cannonlake/acpi.c M src/soc/intel/skylake/acpi.c M src/southbridge/intel/bd82x6x/lpc.c M src/southbridge/intel/lynxpoint/lpc.c M src/vendorcode/google/chromeos/gnvs.c M src/vendorcode/google/chromeos/gnvs.h 12 files changed, 15 insertions(+), 23 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/06/28406/1
diff --git a/src/arch/x86/smbios.c b/src/arch/x86/smbios.c index 103b4ae..fc3a0a7 100644 --- a/src/arch/x86/smbios.c +++ b/src/arch/x86/smbios.c @@ -367,7 +367,8 @@
#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 4094c38..3881042 100644 --- a/src/soc/amd/stoneyridge/acpi.c +++ b/src/soc/amd/stoneyridge/acpi.c @@ -273,7 +273,7 @@
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 5e42091..bf93ef4 100644 --- a/src/soc/intel/apollolake/acpi.c +++ b/src/soc/intel/apollolake/acpi.c @@ -96,7 +96,7 @@
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 a43e6b6..cdf3abf 100644 --- a/src/soc/intel/baytrail/acpi.c +++ b/src/soc/intel/baytrail/acpi.c @@ -92,7 +92,7 @@
#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 ebca9fa..0a683fb 100644 --- a/src/soc/intel/braswell/acpi.c +++ b/src/soc/intel/braswell/acpi.c @@ -100,7 +100,7 @@
#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 d826d43..2d9d0b7 100644 --- a/src/soc/intel/broadwell/acpi.c +++ b/src/soc/intel/broadwell/acpi.c @@ -177,7 +177,7 @@
#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 97d5ce7..155756c 100644 --- a/src/soc/intel/cannonlake/acpi.c +++ b/src/soc/intel/cannonlake/acpi.c @@ -214,7 +214,7 @@
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 44096cd..d2ec7e7 100644 --- a/src/soc/intel/skylake/acpi.c +++ b/src/soc/intel/skylake/acpi.c @@ -192,7 +192,7 @@
#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 d9e72b4..271b5b0 100644 --- a/src/southbridge/intel/bd82x6x/lpc.c +++ b/src/southbridge/intel/bd82x6x/lpc.c @@ -739,7 +739,7 @@ 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 8f695cd..5b09fed 100644 --- a/src/southbridge/intel/lynxpoint/lpc.c +++ b/src/southbridge/intel/lynxpoint/lpc.c @@ -770,7 +770,7 @@ 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 70aa899..f21eb09 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 @@ 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 62fa08c..77c2f0a 100644 --- a/src/vendorcode/google/chromeos/gnvs.h +++ b/src/vendorcode/google/chromeos/gnvs.h @@ -73,10 +73,8 @@ 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