summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Wu <david_wu@quanta.corp-partner.google.com>2018-10-29 09:34:58 +0800
committerAaron Durbin <adurbin@chromium.org>2018-11-01 13:26:06 +0000
commiteb38fa7e9588222c6fe1e14a6fcea1b62e83a27d (patch)
treee6b112412c7208921a68b7d3f8ead342475e9bcc
parent9e4fa330ef657ac035859c537403d9c80c55a83b (diff)
mb/google/fizz/variants/karma: Rename kalista to karma
Change the variant name from kalista to karma. According to the CL:1298319, the baseboard name is kalista and the board name is karma. BUG=none BRANCH=master TEST=emerge-kalista coreboot chromeos-bootimage Change-Id: Idea295cc14249721a6dc0fc4e2ef6470d43e16eb Signed-off-by: David Wu <David_Wu@quanta.corp-partner.google.com> Reviewed-on: https://review.coreboot.org/29314 Reviewed-by: Zhuohao Lee <zhuohao@chromium.org> Reviewed-by: Aaron Durbin <adurbin@chromium.org> Reviewed-by: Furquan Shaikh <furquan@google.com> Reviewed-by: David Wu <david_wu@quanta.corp-partner.google.com> Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
-rw-r--r--src/mainboard/google/fizz/Kconfig16
-rw-r--r--src/mainboard/google/fizz/Kconfig.name4
-rw-r--r--src/mainboard/google/fizz/variants/karma/Makefile.inc (renamed from src/mainboard/google/fizz/variants/kalista/Makefile.inc)0
-rw-r--r--src/mainboard/google/fizz/variants/karma/data.vbt (renamed from src/mainboard/google/fizz/variants/kalista/data.vbt)bin4608 -> 4608 bytes
-rw-r--r--src/mainboard/google/fizz/variants/karma/gpio.c (renamed from src/mainboard/google/fizz/variants/kalista/gpio.c)0
-rw-r--r--src/mainboard/google/fizz/variants/karma/include/variant/acpi/dptf.asl (renamed from src/mainboard/google/fizz/variants/kalista/include/variant/acpi/dptf.asl)0
-rw-r--r--src/mainboard/google/fizz/variants/karma/include/variant/ec.h (renamed from src/mainboard/google/fizz/variants/kalista/include/variant/ec.h)0
-rw-r--r--src/mainboard/google/fizz/variants/karma/include/variant/gpio.h (renamed from src/mainboard/google/fizz/variants/kalista/include/variant/gpio.h)0
-rw-r--r--src/mainboard/google/fizz/variants/karma/nhlt.c (renamed from src/mainboard/google/fizz/variants/kalista/nhlt.c)0
-rw-r--r--src/mainboard/google/fizz/variants/karma/overridetree.cb (renamed from src/mainboard/google/fizz/variants/kalista/overridetree.cb)0
10 files changed, 10 insertions, 10 deletions
diff --git a/src/mainboard/google/fizz/Kconfig b/src/mainboard/google/fizz/Kconfig
index 1763f19a3a..4d08edac67 100644
--- a/src/mainboard/google/fizz/Kconfig
+++ b/src/mainboard/google/fizz/Kconfig
@@ -2,8 +2,8 @@
config BOARD_GOOGLE_BASEBOARD_FIZZ
def_bool n
select BOARD_ROMSIZE_KB_16384
- select DRIVERS_GENERIC_MAX98357A if BOARD_GOOGLE_KALISTA
- select DRIVERS_I2C_DA7219 if BOARD_GOOGLE_KALISTA
+ select DRIVERS_GENERIC_MAX98357A if BOARD_GOOGLE_KARMA
+ select DRIVERS_I2C_DA7219 if BOARD_GOOGLE_KARMA
select DRIVERS_I2C_GENERIC
select DRIVERS_SPI_ACPI
select DRIVERS_USB_ACPI
@@ -49,7 +49,7 @@ config GBB_HWID
string
depends on CHROMEOS
default "FIZZ TEST 5997" if BOARD_GOOGLE_FIZZ
- default "KALISTA TEST 0932" if BOARD_GOOGLE_KALISTA
+ default "KARMA TEST 5022" if BOARD_GOOGLE_KARMA
config MAINBOARD_DIR
string
@@ -58,12 +58,12 @@ config MAINBOARD_DIR
config MAINBOARD_PART_NUMBER
string
default "Fizz" if BOARD_GOOGLE_FIZZ
- default "Kalista" if BOARD_GOOGLE_KALISTA
+ default "Karma" if BOARD_GOOGLE_KARMA
config MAINBOARD_FAMILY
string
default "Google_Fizz" if BOARD_GOOGLE_FIZZ
- default "Google_Kalista" if BOARD_GOOGLE_KALISTA
+ default "Google_Kalista" if BOARD_GOOGLE_KARMA
config MAX_CPUS
int
@@ -84,14 +84,14 @@ config TPM_TIS_ACPI_INTERRUPT
config VARIANT_DIR
string
default "fizz" if BOARD_GOOGLE_FIZZ
- default "kalista" if BOARD_GOOGLE_KALISTA
+ default "karma" if BOARD_GOOGLE_KARMA
config INCLUDE_NHLT_BLOBS
bool "Include blobs for audio."
select NHLT_RT5663
-config INCLUDE_NHLT_BLOBS_KALISTA
- bool "Include blobs for kalista audio."
+config INCLUDE_NHLT_BLOBS_KARMA
+ bool "Include blobs for karma audio."
select NHLT_DA7219
select NHLT_DMIC_4CH
select NHLT_MAX98357
diff --git a/src/mainboard/google/fizz/Kconfig.name b/src/mainboard/google/fizz/Kconfig.name
index 2911b21ab5..d7343f9a04 100644
--- a/src/mainboard/google/fizz/Kconfig.name
+++ b/src/mainboard/google/fizz/Kconfig.name
@@ -2,6 +2,6 @@ config BOARD_GOOGLE_FIZZ
bool "Fizz"
select BOARD_GOOGLE_BASEBOARD_FIZZ
-config BOARD_GOOGLE_KALISTA
- bool "Kalista"
+config BOARD_GOOGLE_KARMA
+ bool "Karma"
select BOARD_GOOGLE_BASEBOARD_FIZZ
diff --git a/src/mainboard/google/fizz/variants/kalista/Makefile.inc b/src/mainboard/google/fizz/variants/karma/Makefile.inc
index 0ad298b5f4..0ad298b5f4 100644
--- a/src/mainboard/google/fizz/variants/kalista/Makefile.inc
+++ b/src/mainboard/google/fizz/variants/karma/Makefile.inc
diff --git a/src/mainboard/google/fizz/variants/kalista/data.vbt b/src/mainboard/google/fizz/variants/karma/data.vbt
index dbbf475f21..dbbf475f21 100644
--- a/src/mainboard/google/fizz/variants/kalista/data.vbt
+++ b/src/mainboard/google/fizz/variants/karma/data.vbt
Binary files differ
diff --git a/src/mainboard/google/fizz/variants/kalista/gpio.c b/src/mainboard/google/fizz/variants/karma/gpio.c
index 89a0fb38d9..89a0fb38d9 100644
--- a/src/mainboard/google/fizz/variants/kalista/gpio.c
+++ b/src/mainboard/google/fizz/variants/karma/gpio.c
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
index b170c39c66..b170c39c66 100644
--- a/src/mainboard/google/fizz/variants/kalista/include/variant/acpi/dptf.asl
+++ b/src/mainboard/google/fizz/variants/karma/include/variant/acpi/dptf.asl
diff --git a/src/mainboard/google/fizz/variants/kalista/include/variant/ec.h b/src/mainboard/google/fizz/variants/karma/include/variant/ec.h
index 0e96db8ddb..0e96db8ddb 100644
--- a/src/mainboard/google/fizz/variants/kalista/include/variant/ec.h
+++ b/src/mainboard/google/fizz/variants/karma/include/variant/ec.h
diff --git a/src/mainboard/google/fizz/variants/kalista/include/variant/gpio.h b/src/mainboard/google/fizz/variants/karma/include/variant/gpio.h
index 20482b06f4..20482b06f4 100644
--- a/src/mainboard/google/fizz/variants/kalista/include/variant/gpio.h
+++ b/src/mainboard/google/fizz/variants/karma/include/variant/gpio.h
diff --git a/src/mainboard/google/fizz/variants/kalista/nhlt.c b/src/mainboard/google/fizz/variants/karma/nhlt.c
index df04167874..df04167874 100644
--- a/src/mainboard/google/fizz/variants/kalista/nhlt.c
+++ b/src/mainboard/google/fizz/variants/karma/nhlt.c
diff --git a/src/mainboard/google/fizz/variants/kalista/overridetree.cb b/src/mainboard/google/fizz/variants/karma/overridetree.cb
index 7552c71b88..7552c71b88 100644
--- a/src/mainboard/google/fizz/variants/kalista/overridetree.cb
+++ b/src/mainboard/google/fizz/variants/karma/overridetree.cb