<p>Joel Kitching has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/28406">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">chromeos/gnvs: remove function and naming cleanup<br><br>- Remove unused acpi_get_chromeos_acpi_info (see CL:28190)<br>- Make function naming in gnvs.h consistent (start with "chromeos_")<br><br>BUG=b:112288216<br>TEST=compile and run on eve<br><br>Change-Id: I5b0066bc311b0ea995fa30bca1cd9235dc9b7d1b<br>Signed-off-by: Joel Kitching <kitching@google.com><br>---<br>M src/arch/x86/smbios.c<br>M src/soc/amd/stoneyridge/acpi.c<br>M src/soc/intel/apollolake/acpi.c<br>M src/soc/intel/baytrail/acpi.c<br>M src/soc/intel/braswell/acpi.c<br>M src/soc/intel/broadwell/acpi.c<br>M src/soc/intel/cannonlake/acpi.c<br>M src/soc/intel/skylake/acpi.c<br>M src/southbridge/intel/bd82x6x/lpc.c<br>M src/southbridge/intel/lynxpoint/lpc.c<br>M src/vendorcode/google/chromeos/gnvs.c<br>M src/vendorcode/google/chromeos/gnvs.h<br>12 files changed, 15 insertions(+), 23 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://review.coreboot.org:29418/coreboot refs/changes/06/28406/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/arch/x86/smbios.c b/src/arch/x86/smbios.c</span><br><span>index 103b4ae..fc3a0a7 100644</span><br><span>--- a/src/arch/x86/smbios.c</span><br><span>+++ b/src/arch/x86/smbios.c</span><br><span>@@ -367,7 +367,8 @@</span><br><span> </span><br><span> #if IS_ENABLED(CONFIG_HAVE_ACPI_TABLES)</span><br><span> /* SMBIOS offsets start at 1 rather than 0 */</span><br><span style="color: hsl(0, 100%, 40%);">- acpi_get_chromeos_acpi()->vbt10 = (u32)t->eos + (version_offset - 1);</span><br><span style="color: hsl(120, 100%, 40%);">+ chromeos_get_chromeos_acpi()->vbt10 =</span><br><span style="color: hsl(120, 100%, 40%);">+ (u32)t->eos + (version_offset - 1);</span><br><span> #endif</span><br><span> #endif /* CONFIG_CHROMEOS */</span><br><span> </span><br><span>diff --git a/src/soc/amd/stoneyridge/acpi.c b/src/soc/amd/stoneyridge/acpi.c</span><br><span>index 4094c38..3881042 100644</span><br><span>--- a/src/soc/amd/stoneyridge/acpi.c</span><br><span>+++ b/src/soc/amd/stoneyridge/acpi.c</span><br><span>@@ -273,7 +273,7 @@</span><br><span> </span><br><span> if (IS_ENABLED(CONFIG_CHROMEOS)) {</span><br><span> /* Initialize Verified Boot data */</span><br><span style="color: hsl(0, 100%, 40%);">- chromeos_init_vboot(&gnvs->chromeos);</span><br><span style="color: hsl(120, 100%, 40%);">+ chromeos_init_chromeos_acpi(&gnvs->chromeos);</span><br><span> gnvs->chromeos.vbt2 = ACTIVE_ECFW_RO;</span><br><span> }</span><br><span> </span><br><span>diff --git a/src/soc/intel/apollolake/acpi.c b/src/soc/intel/apollolake/acpi.c</span><br><span>index 5e42091..bf93ef4 100644</span><br><span>--- a/src/soc/intel/apollolake/acpi.c</span><br><span>+++ b/src/soc/intel/apollolake/acpi.c</span><br><span>@@ -96,7 +96,7 @@</span><br><span> </span><br><span> if (IS_ENABLED(CONFIG_CHROMEOS)) {</span><br><span> /* Initialize Verified Boot data */</span><br><span style="color: hsl(0, 100%, 40%);">- chromeos_init_vboot(&gnvs->chromeos);</span><br><span style="color: hsl(120, 100%, 40%);">+ chromeos_init_chromeos_acpi(&gnvs->chromeos);</span><br><span> gnvs->chromeos.vbt2 = ACTIVE_ECFW_RO;</span><br><span> }</span><br><span> </span><br><span>diff --git a/src/soc/intel/baytrail/acpi.c b/src/soc/intel/baytrail/acpi.c</span><br><span>index a43e6b6..cdf3abf 100644</span><br><span>--- a/src/soc/intel/baytrail/acpi.c</span><br><span>+++ b/src/soc/intel/baytrail/acpi.c</span><br><span>@@ -92,7 +92,7 @@</span><br><span> </span><br><span> #if IS_ENABLED(CONFIG_CHROMEOS)</span><br><span> /* Initialize Verified Boot data */</span><br><span style="color: hsl(0, 100%, 40%);">- chromeos_init_vboot(&(gnvs->chromeos));</span><br><span style="color: hsl(120, 100%, 40%);">+ chromeos_init_chromeos_acpi(&(gnvs->chromeos));</span><br><span> #if IS_ENABLED(CONFIG_EC_GOOGLE_CHROMEEC)</span><br><span> gnvs->chromeos.vbt2 = google_ec_running_ro() ?</span><br><span> ACTIVE_ECFW_RO : ACTIVE_ECFW_RW;</span><br><span>diff --git a/src/soc/intel/braswell/acpi.c b/src/soc/intel/braswell/acpi.c</span><br><span>index ebca9fa..0a683fb 100644</span><br><span>--- a/src/soc/intel/braswell/acpi.c</span><br><span>+++ b/src/soc/intel/braswell/acpi.c</span><br><span>@@ -100,7 +100,7 @@</span><br><span> </span><br><span> #if IS_ENABLED(CONFIG_CHROMEOS)</span><br><span> /* Initialize Verified Boot data */</span><br><span style="color: hsl(0, 100%, 40%);">- chromeos_init_vboot(&(gnvs->chromeos));</span><br><span style="color: hsl(120, 100%, 40%);">+ chromeos_init_chromeos_acpi(&(gnvs->chromeos));</span><br><span> #if IS_ENABLED(CONFIG_EC_GOOGLE_CHROMEEC)</span><br><span> gnvs->chromeos.vbt2 = google_ec_running_ro() ?</span><br><span> ACTIVE_ECFW_RO : ACTIVE_ECFW_RW;</span><br><span>diff --git a/src/soc/intel/broadwell/acpi.c b/src/soc/intel/broadwell/acpi.c</span><br><span>index d826d43..2d9d0b7 100644</span><br><span>--- a/src/soc/intel/broadwell/acpi.c</span><br><span>+++ b/src/soc/intel/broadwell/acpi.c</span><br><span>@@ -177,7 +177,7 @@</span><br><span> </span><br><span> #if IS_ENABLED(CONFIG_CHROMEOS)</span><br><span> /* Initialize Verified Boot data */</span><br><span style="color: hsl(0, 100%, 40%);">- chromeos_init_vboot(&(gnvs->chromeos));</span><br><span style="color: hsl(120, 100%, 40%);">+ chromeos_init_chromeos_acpi(&(gnvs->chromeos));</span><br><span> #if IS_ENABLED(CONFIG_EC_GOOGLE_CHROMEEC)</span><br><span> gnvs->chromeos.vbt2 = google_ec_running_ro() ?</span><br><span> ACTIVE_ECFW_RO : ACTIVE_ECFW_RW;</span><br><span>diff --git a/src/soc/intel/cannonlake/acpi.c b/src/soc/intel/cannonlake/acpi.c</span><br><span>index 97d5ce7..155756c 100644</span><br><span>--- a/src/soc/intel/cannonlake/acpi.c</span><br><span>+++ b/src/soc/intel/cannonlake/acpi.c</span><br><span>@@ -214,7 +214,7 @@</span><br><span> </span><br><span> if (IS_ENABLED(CONFIG_CHROMEOS)) {</span><br><span> /* Initialize Verified Boot data */</span><br><span style="color: hsl(0, 100%, 40%);">- chromeos_init_vboot(&(gnvs->chromeos));</span><br><span style="color: hsl(120, 100%, 40%);">+ chromeos_init_chromeos_acpi(&(gnvs->chromeos));</span><br><span> if (IS_ENABLED(CONFIG_EC_GOOGLE_CHROMEEC)) {</span><br><span> gnvs->chromeos.vbt2 = google_ec_running_ro() ?</span><br><span> ACTIVE_ECFW_RO : ACTIVE_ECFW_RW;</span><br><span>diff --git a/src/soc/intel/skylake/acpi.c b/src/soc/intel/skylake/acpi.c</span><br><span>index 44096cd..d2ec7e7 100644</span><br><span>--- a/src/soc/intel/skylake/acpi.c</span><br><span>+++ b/src/soc/intel/skylake/acpi.c</span><br><span>@@ -192,7 +192,7 @@</span><br><span> </span><br><span> #if IS_ENABLED(CONFIG_CHROMEOS)</span><br><span> /* Initialize Verified Boot data */</span><br><span style="color: hsl(0, 100%, 40%);">- chromeos_init_vboot(&(gnvs->chromeos));</span><br><span style="color: hsl(120, 100%, 40%);">+ chromeos_init_chromeos_acpi(&(gnvs->chromeos));</span><br><span> #if IS_ENABLED(CONFIG_EC_GOOGLE_CHROMEEC)</span><br><span> gnvs->chromeos.vbt2 = google_ec_running_ro() ?</span><br><span> ACTIVE_ECFW_RO : ACTIVE_ECFW_RW;</span><br><span>diff --git a/src/southbridge/intel/bd82x6x/lpc.c b/src/southbridge/intel/bd82x6x/lpc.c</span><br><span>index d9e72b4..271b5b0 100644</span><br><span>--- a/src/southbridge/intel/bd82x6x/lpc.c</span><br><span>+++ b/src/southbridge/intel/bd82x6x/lpc.c</span><br><span>@@ -739,7 +739,7 @@</span><br><span> memcpy(gnvs->did, gfx->did, sizeof(gnvs->did));</span><br><span> </span><br><span> #if IS_ENABLED(CONFIG_CHROMEOS)</span><br><span style="color: hsl(0, 100%, 40%);">- chromeos_init_vboot(&(gnvs->chromeos));</span><br><span style="color: hsl(120, 100%, 40%);">+ chromeos_init_chromeos_acpi(&(gnvs->chromeos));</span><br><span> #endif</span><br><span> </span><br><span> /* And tell SMI about it */</span><br><span>diff --git a/src/southbridge/intel/lynxpoint/lpc.c b/src/southbridge/intel/lynxpoint/lpc.c</span><br><span>index 8f695cd..5b09fed 100644</span><br><span>--- a/src/southbridge/intel/lynxpoint/lpc.c</span><br><span>+++ b/src/southbridge/intel/lynxpoint/lpc.c</span><br><span>@@ -770,7 +770,7 @@</span><br><span> gnvs->pcnt = dev_count_cpu();</span><br><span> </span><br><span> #if IS_ENABLED(CONFIG_CHROMEOS)</span><br><span style="color: hsl(0, 100%, 40%);">- chromeos_init_vboot(&(gnvs->chromeos));</span><br><span style="color: hsl(120, 100%, 40%);">+ chromeos_init_chromeos_acpi(&(gnvs->chromeos));</span><br><span> #endif</span><br><span> </span><br><span> /* Update the mem console pointer. */</span><br><span>diff --git a/src/vendorcode/google/chromeos/gnvs.c b/src/vendorcode/google/chromeos/gnvs.c</span><br><span>index 70aa899..f21eb09 100644</span><br><span>--- a/src/vendorcode/google/chromeos/gnvs.c</span><br><span>+++ b/src/vendorcode/google/chromeos/gnvs.c</span><br><span>@@ -30,7 +30,7 @@</span><br><span> static chromeos_acpi_t *chromeos_acpi;</span><br><span> static u32 me_hash_saved[8];</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-void chromeos_init_vboot(chromeos_acpi_t *init)</span><br><span style="color: hsl(120, 100%, 40%);">+void chromeos_init_chromeos_acpi(chromeos_acpi_t *init)</span><br><span> {</span><br><span> chromeos_acpi = init;</span><br><span> </span><br><span>@@ -59,14 +59,7 @@</span><br><span> memcpy(me_hash_saved, hash, len*sizeof(u32));</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-void acpi_get_chromeos_acpi_info(uint64_t *chromeos_acpi_addr,</span><br><span style="color: hsl(0, 100%, 40%);">- uint32_t *chromeos_acpi_size)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- *chromeos_acpi_addr = (intptr_t)chromeos_acpi;</span><br><span style="color: hsl(0, 100%, 40%);">- *chromeos_acpi_size = sizeof(*chromeos_acpi);</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-chromeos_acpi_t *acpi_get_chromeos_acpi(void)</span><br><span style="color: hsl(120, 100%, 40%);">+chromeos_acpi_t *chromeos_get_chromeos_acpi(void)</span><br><span> {</span><br><span> return chromeos_acpi;</span><br><span> }</span><br><span>diff --git a/src/vendorcode/google/chromeos/gnvs.h b/src/vendorcode/google/chromeos/gnvs.h</span><br><span>index 62fa08c..77c2f0a 100644</span><br><span>--- a/src/vendorcode/google/chromeos/gnvs.h</span><br><span>+++ b/src/vendorcode/google/chromeos/gnvs.h</span><br><span>@@ -73,10 +73,8 @@</span><br><span> u8 pad[314]; // dc6-eff</span><br><span> } __packed chromeos_acpi_t;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-void chromeos_init_vboot(chromeos_acpi_t *init);</span><br><span style="color: hsl(120, 100%, 40%);">+void chromeos_init_chromeos_acpi(chromeos_acpi_t *init);</span><br><span> void chromeos_set_me_hash(u32*, int);</span><br><span style="color: hsl(0, 100%, 40%);">-void acpi_get_chromeos_acpi_info(uint64_t *chromeos_acpi_addr,</span><br><span style="color: hsl(0, 100%, 40%);">- uint32_t *chromeos_acpi_size);</span><br><span style="color: hsl(0, 100%, 40%);">-chromeos_acpi_t *acpi_get_chromeos_acpi(void);</span><br><span style="color: hsl(120, 100%, 40%);">+chromeos_acpi_t *chromeos_get_chromeos_acpi(void);</span><br><span> </span><br><span> #endif</span><br><span></span><br></pre><p>To view, visit <a href="https://review.coreboot.org/28406">change 28406</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://review.coreboot.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://review.coreboot.org/28406"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: coreboot </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: I5b0066bc311b0ea995fa30bca1cd9235dc9b7d1b </div>
<div style="display:none"> Gerrit-Change-Number: 28406 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Joel Kitching <kitching@google.com> </div>