diff options
| author | wuyang5 <wuyang5@huaqin.corp-partner.google.com> | 2023-10-23 11:23:36 +0800 |
|---|---|---|
| committer | Yu-Ping Wu <yupingso@google.com> | 2023-10-30 07:28:07 +0000 |
| commit | b621e08ed492a45deafc3fb1f7a25baea58885c6 (patch) | |
| tree | 2a62a3e65da2fccc3af683f9b6877df22fcb4693 /src/mainboard | |
| parent | 66df100930d9259238a402db3fe368b65647a41b (diff) | |
mb/google/corsola: Add new board 'Chinchou'
Add a new Krabby follower 'Chinchou'.
BUG=b:307161347
TEST=make # select Chinchou
Change-Id: Ic90f85621598ab253d3ec9fe44aa076712248223
Signed-off-by: wuyang5 <wuyang5@huaqin.corp-partner.google.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/78596
Reviewed-by: Yidi Lin <yidilin@google.com>
Reviewed-by: Yu-Ping Wu <yupingso@google.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Diffstat (limited to 'src/mainboard')
| -rw-r--r-- | src/mainboard/google/corsola/Kconfig | 15 | ||||
| -rw-r--r-- | src/mainboard/google/corsola/Kconfig.name | 3 | ||||
| -rw-r--r-- | src/mainboard/google/corsola/display.c | 21 |
3 files changed, 27 insertions, 12 deletions
diff --git a/src/mainboard/google/corsola/Kconfig b/src/mainboard/google/corsola/Kconfig index 69b2f1fbbb..c082e6fab6 100644 --- a/src/mainboard/google/corsola/Kconfig +++ b/src/mainboard/google/corsola/Kconfig @@ -21,8 +21,6 @@ config BOARD_GOOGLE_CORSOLA_COMMON select MAINBOARD_HAS_TPM2 if VBOOT select MAINBOARD_HAS_NATIVE_VGA_INIT select HAVE_LINEAR_FRAMEBUFFER - select DRIVER_ANALOGIX_ANX7625 - select DRIVER_PARADE_PS8640 select RTC config BOARD_GOOGLE_KINGLER_COMMON @@ -39,24 +37,36 @@ config BOARD_GOOGLE_STARYU_COMMON config BOARD_GOOGLE_KINGLER select BOARD_GOOGLE_KINGLER_COMMON + select DRIVER_ANALOGIX_ANX7625 config BOARD_GOOGLE_PONYTA select BOARD_GOOGLE_KINGLER_COMMON + select DRIVER_ANALOGIX_ANX7625 config BOARD_GOOGLE_STEELIX select BOARD_GOOGLE_KINGLER_COMMON + select DRIVER_ANALOGIX_ANX7625 + select DRIVER_PARADE_PS8640 config BOARD_GOOGLE_VOLTORB select BOARD_GOOGLE_KINGLER_COMMON + select DRIVER_ANALOGIX_ANX7625 config BOARD_GOOGLE_KRABBY select BOARD_GOOGLE_KRABBY_COMMON + select DRIVER_PARADE_PS8640 + +config BOARD_GOOGLE_CHINCHOU + select BOARD_GOOGLE_KRABBY_COMMON + select DRIVER_ANALOGIX_ANX7625 config BOARD_GOOGLE_TENTACRUEL select BOARD_GOOGLE_KRABBY_COMMON + select DRIVER_PARADE_PS8640 config BOARD_GOOGLE_MAGIKARP select BOARD_GOOGLE_KRABBY_COMMON + select DRIVER_PARADE_PS8640 config BOARD_GOOGLE_STARMIE select BOARD_GOOGLE_STARYU_COMMON @@ -83,6 +93,7 @@ config MAINBOARD_PART_NUMBER default "Voltorb" if BOARD_GOOGLE_VOLTORB default "Starmie" if BOARD_GOOGLE_STARMIE default "Ponyta" if BOARD_GOOGLE_PONYTA + default "Chinchou" if BOARD_GOOGLE_CHINCHOU config BOOT_DEVICE_SPI_FLASH_BUS int diff --git a/src/mainboard/google/corsola/Kconfig.name b/src/mainboard/google/corsola/Kconfig.name index cdd7c354a5..b716e55fe9 100644 --- a/src/mainboard/google/corsola/Kconfig.name +++ b/src/mainboard/google/corsola/Kconfig.name @@ -23,6 +23,9 @@ config BOARD_GOOGLE_TENTACRUEL config BOARD_GOOGLE_MAGIKARP bool "-> Magikarp" +config BOARD_GOOGLE_CHINCHOU + bool "-> Chinchou" + comment "Staryu" config BOARD_GOOGLE_STARMIE diff --git a/src/mainboard/google/corsola/display.c b/src/mainboard/google/corsola/display.c index 79f6b81d53..c7a6578a00 100644 --- a/src/mainboard/google/corsola/display.c +++ b/src/mainboard/google/corsola/display.c @@ -63,17 +63,18 @@ struct panel_description *get_panel_from_cbfs(struct panel_description *desc) static struct panel_description *get_active_panel(void) { - if (CONFIG(BOARD_GOOGLE_KINGLER_COMMON)) - if (CONFIG(BOARD_GOOGLE_STEELIX) && board_id() < 2) - return get_ps8640_description(); - else - return get_anx7625_description(); - else if (CONFIG(BOARD_GOOGLE_KRABBY_COMMON)) + /* Board-specific exceptions */ + if (CONFIG(BOARD_GOOGLE_STEELIX) && board_id() < 2) /* Early builds use PS8640 */ return get_ps8640_description(); - else if (CONFIG(BOARD_GOOGLE_STARYU_COMMON)) - return get_panel_description(); - else - return NULL; + + if (CONFIG(DRIVER_ANALOGIX_ANX7625)) + return get_anx7625_description(); + + if (CONFIG(DRIVER_PARADE_PS8640)) + return get_ps8640_description(); + + /* MIPI panels */ + return get_panel_description(); } int configure_display(void) |