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/vendorcode/google/chromeos/gnvs.c | 11 ++--------- src/vendorcode/google/chromeos/gnvs.h | 6 ++---- 2 files changed, 4 insertions(+), 13 deletions(-) (limited to 'src/vendorcode/google/chromeos') 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 -- cgit v1.2.3