<p>David Wu has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/29314">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Kalista: Change the variant name from kalista to karma<br><br>According to the CL:1298319, the baseboard name is kalista<br>and the board name is karma.<br><br>BUG=none<br>BRANCH=master<br>TEST=emerge-kalista coreboot chromeos-bootimage<br><br>Change-Id: Idea295cc14249721a6dc0fc4e2ef6470d43e16eb<br>Signed-off-by: David Wu <David_Wu@quanta.corp-partner.google.com><br>---<br>M src/mainboard/google/fizz/Kconfig<br>M src/mainboard/google/fizz/Kconfig.name<br>R src/mainboard/google/fizz/variants/karma/Makefile.inc<br>R src/mainboard/google/fizz/variants/karma/data.vbt<br>R src/mainboard/google/fizz/variants/karma/gpio.c<br>R src/mainboard/google/fizz/variants/karma/include/variant/acpi/dptf.asl<br>R src/mainboard/google/fizz/variants/karma/include/variant/ec.h<br>R src/mainboard/google/fizz/variants/karma/include/variant/gpio.h<br>R src/mainboard/google/fizz/variants/karma/nhlt.c<br>R src/mainboard/google/fizz/variants/karma/overridetree.cb<br>10 files changed, 10 insertions(+), 10 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://review.coreboot.org:29418/coreboot refs/changes/14/29314/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/mainboard/google/fizz/Kconfig b/src/mainboard/google/fizz/Kconfig</span><br><span>index 1763f19..4d08eda 100644</span><br><span>--- a/src/mainboard/google/fizz/Kconfig</span><br><span>+++ b/src/mainboard/google/fizz/Kconfig</span><br><span>@@ -2,8 +2,8 @@</span><br><span> config BOARD_GOOGLE_BASEBOARD_FIZZ</span><br><span> def_bool n</span><br><span> select BOARD_ROMSIZE_KB_16384</span><br><span style="color: hsl(0, 100%, 40%);">- select DRIVERS_GENERIC_MAX98357A if BOARD_GOOGLE_KALISTA</span><br><span style="color: hsl(0, 100%, 40%);">- select DRIVERS_I2C_DA7219 if BOARD_GOOGLE_KALISTA</span><br><span style="color: hsl(120, 100%, 40%);">+ select DRIVERS_GENERIC_MAX98357A if BOARD_GOOGLE_KARMA</span><br><span style="color: hsl(120, 100%, 40%);">+ select DRIVERS_I2C_DA7219 if BOARD_GOOGLE_KARMA</span><br><span> select DRIVERS_I2C_GENERIC</span><br><span> select DRIVERS_SPI_ACPI</span><br><span> select DRIVERS_USB_ACPI</span><br><span>@@ -49,7 +49,7 @@</span><br><span> string</span><br><span> depends on CHROMEOS</span><br><span> default "FIZZ TEST 5997" if BOARD_GOOGLE_FIZZ</span><br><span style="color: hsl(0, 100%, 40%);">- default "KALISTA TEST 0932" if BOARD_GOOGLE_KALISTA</span><br><span style="color: hsl(120, 100%, 40%);">+ default "KARMA TEST 5022" if BOARD_GOOGLE_KARMA</span><br><span> </span><br><span> config MAINBOARD_DIR</span><br><span> string</span><br><span>@@ -58,12 +58,12 @@</span><br><span> config MAINBOARD_PART_NUMBER</span><br><span> string</span><br><span> default "Fizz" if BOARD_GOOGLE_FIZZ</span><br><span style="color: hsl(0, 100%, 40%);">- default "Kalista" if BOARD_GOOGLE_KALISTA</span><br><span style="color: hsl(120, 100%, 40%);">+ default "Karma" if BOARD_GOOGLE_KARMA</span><br><span> </span><br><span> config MAINBOARD_FAMILY</span><br><span> string</span><br><span> default "Google_Fizz" if BOARD_GOOGLE_FIZZ</span><br><span style="color: hsl(0, 100%, 40%);">- default "Google_Kalista" if BOARD_GOOGLE_KALISTA</span><br><span style="color: hsl(120, 100%, 40%);">+ default "Google_Kalista" if BOARD_GOOGLE_KARMA</span><br><span> </span><br><span> config MAX_CPUS</span><br><span> int</span><br><span>@@ -84,14 +84,14 @@</span><br><span> config VARIANT_DIR</span><br><span> string</span><br><span> default "fizz" if BOARD_GOOGLE_FIZZ</span><br><span style="color: hsl(0, 100%, 40%);">- default "kalista" if BOARD_GOOGLE_KALISTA</span><br><span style="color: hsl(120, 100%, 40%);">+ default "karma" if BOARD_GOOGLE_KARMA</span><br><span> </span><br><span> config INCLUDE_NHLT_BLOBS</span><br><span> bool "Include blobs for audio."</span><br><span> select NHLT_RT5663</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-config INCLUDE_NHLT_BLOBS_KALISTA</span><br><span style="color: hsl(0, 100%, 40%);">- bool "Include blobs for kalista audio."</span><br><span style="color: hsl(120, 100%, 40%);">+config INCLUDE_NHLT_BLOBS_KARMA</span><br><span style="color: hsl(120, 100%, 40%);">+ bool "Include blobs for karma audio."</span><br><span> select NHLT_DA7219</span><br><span> select NHLT_DMIC_4CH</span><br><span> select NHLT_MAX98357</span><br><span>diff --git a/src/mainboard/google/fizz/Kconfig.name b/src/mainboard/google/fizz/Kconfig.name</span><br><span>index 2911b21..d7343f9 100644</span><br><span>--- a/src/mainboard/google/fizz/Kconfig.name</span><br><span>+++ b/src/mainboard/google/fizz/Kconfig.name</span><br><span>@@ -2,6 +2,6 @@</span><br><span> bool "Fizz"</span><br><span> select BOARD_GOOGLE_BASEBOARD_FIZZ</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-config BOARD_GOOGLE_KALISTA</span><br><span style="color: hsl(0, 100%, 40%);">- bool "Kalista"</span><br><span style="color: hsl(120, 100%, 40%);">+config BOARD_GOOGLE_KARMA</span><br><span style="color: hsl(120, 100%, 40%);">+ bool "Karma"</span><br><span> select BOARD_GOOGLE_BASEBOARD_FIZZ</span><br><span>diff --git a/src/mainboard/google/fizz/variants/kalista/Makefile.inc b/src/mainboard/google/fizz/variants/karma/Makefile.inc</span><br><span>similarity index 100%</span><br><span>rename from src/mainboard/google/fizz/variants/kalista/Makefile.inc</span><br><span>rename to src/mainboard/google/fizz/variants/karma/Makefile.inc</span><br><span>diff --git a/src/mainboard/google/fizz/variants/kalista/data.vbt b/src/mainboard/google/fizz/variants/karma/data.vbt</span><br><span>similarity index 100%</span><br><span>rename from src/mainboard/google/fizz/variants/kalista/data.vbt</span><br><span>rename to src/mainboard/google/fizz/variants/karma/data.vbt</span><br><span>Binary files differ</span><br><span>diff --git a/src/mainboard/google/fizz/variants/kalista/gpio.c b/src/mainboard/google/fizz/variants/karma/gpio.c</span><br><span>similarity index 100%</span><br><span>rename from src/mainboard/google/fizz/variants/kalista/gpio.c</span><br><span>rename to src/mainboard/google/fizz/variants/karma/gpio.c</span><br><span>diff --git a/src/mainboard/google/fizz/variants/kalista/include/variant/acpi/dptf.asl b/src/mainboard/google/fizz/variants/karma/include/variant/acpi/dptf.asl</span><br><span>similarity index 100%</span><br><span>rename from src/mainboard/google/fizz/variants/kalista/include/variant/acpi/dptf.asl</span><br><span>rename to src/mainboard/google/fizz/variants/karma/include/variant/acpi/dptf.asl</span><br><span>diff --git a/src/mainboard/google/fizz/variants/kalista/include/variant/ec.h b/src/mainboard/google/fizz/variants/karma/include/variant/ec.h</span><br><span>similarity index 100%</span><br><span>rename from src/mainboard/google/fizz/variants/kalista/include/variant/ec.h</span><br><span>rename to src/mainboard/google/fizz/variants/karma/include/variant/ec.h</span><br><span>diff --git a/src/mainboard/google/fizz/variants/kalista/include/variant/gpio.h b/src/mainboard/google/fizz/variants/karma/include/variant/gpio.h</span><br><span>similarity index 100%</span><br><span>rename from src/mainboard/google/fizz/variants/kalista/include/variant/gpio.h</span><br><span>rename to src/mainboard/google/fizz/variants/karma/include/variant/gpio.h</span><br><span>diff --git a/src/mainboard/google/fizz/variants/kalista/nhlt.c b/src/mainboard/google/fizz/variants/karma/nhlt.c</span><br><span>similarity index 100%</span><br><span>rename from src/mainboard/google/fizz/variants/kalista/nhlt.c</span><br><span>rename to src/mainboard/google/fizz/variants/karma/nhlt.c</span><br><span>diff --git a/src/mainboard/google/fizz/variants/kalista/overridetree.cb b/src/mainboard/google/fizz/variants/karma/overridetree.cb</span><br><span>similarity index 100%</span><br><span>rename from src/mainboard/google/fizz/variants/kalista/overridetree.cb</span><br><span>rename to src/mainboard/google/fizz/variants/karma/overridetree.cb</span><br><span></span><br></pre><p>To view, visit <a href="https://review.coreboot.org/29314">change 29314</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/29314"/><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: Idea295cc14249721a6dc0fc4e2ef6470d43e16eb </div>
<div style="display:none"> Gerrit-Change-Number: 29314 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: David Wu <david_wu@quanta.corp-partner.google.com> </div>