mb/google/geralt: Create variant Ciri

Create the variant Ciri and enable MAX98390 AMP for it. The panel
related support will be added in the follow up CLs.

BUG=b:308968270
TEST=emerge-geralt coreboot
BRANCH=None

Change-Id: I7bbe9ed5e722a70bab1c799a61ce38d2ad58ab25
Signed-off-by: Ruihai Zhou <zhouruihai@huaqin.corp-partner.google.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/78954
Reviewed-by: Yidi Lin <yidilin@google.com>
Reviewed-by: cong yang <yangcong5@huaqin.corp-partner.google.com>
Reviewed-by: Yu-Ping Wu <yupingso@google.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Martin L Roth <gaumless@gmail.com>
This commit is contained in:
Ruihai Zhou 2023-11-03 13:08:30 +08:00 committed by Yu-Ping Wu
parent 45b1b7bf4d
commit e6411c0a55
2 changed files with 8 additions and 1 deletions

View File

@ -7,6 +7,9 @@ config BOARD_GOOGLE_GERALT_COMMON
config BOARD_GOOGLE_GERALT config BOARD_GOOGLE_GERALT
select BOARD_GOOGLE_GERALT_COMMON select BOARD_GOOGLE_GERALT_COMMON
config BOARD_GOOGLE_CIRI
select BOARD_GOOGLE_GERALT_COMMON
if BOARD_GOOGLE_GERALT_COMMON if BOARD_GOOGLE_GERALT_COMMON
config VBOOT config VBOOT
@ -45,6 +48,7 @@ config MAINBOARD_DIR
config MAINBOARD_PART_NUMBER config MAINBOARD_PART_NUMBER
string string
default "Geralt" if BOARD_GOOGLE_GERALT default "Geralt" if BOARD_GOOGLE_GERALT
default "Ciri" if BOARD_GOOGLE_CIRI
config BOOT_DEVICE_SPI_FLASH_BUS config BOOT_DEVICE_SPI_FLASH_BUS
int int
@ -68,7 +72,7 @@ config SDCARD_INIT
choice choice
prompt "Speaker AMP for Geralt" prompt "Speaker AMP for Geralt"
default USE_MAX98390 if BOARD_GOOGLE_GERALT default USE_MAX98390 if BOARD_GOOGLE_GERALT || BOARD_GOOGLE_CIRI
config USE_MAX98390 config USE_MAX98390
bool "MAX98390" bool "MAX98390"

View File

@ -2,3 +2,6 @@ comment "Geralt"
config BOARD_GOOGLE_GERALT config BOARD_GOOGLE_GERALT
bool "-> Geralt" bool "-> Geralt"
config BOARD_GOOGLE_CIRI
bool "-> Ciri"