From 9a446bdf0700d578e4504adf19aebc0ecc4be491 Mon Sep 17 00:00:00 2001 From: xuxinxiong Date: Fri, 19 Feb 2021 13:54:13 +0800 Subject: mb/google/trogdor: Add new configs homestar New boards introduced to trogodor family. BUG=b:180668002 BRANCH=none TEST=make Signed-off-by: xuxinxiong Change-Id: If0f9b6c89198a882acae7191d08b166eb8c1dd71 Reviewed-on: https://review.coreboot.org/c/coreboot/+/51004 Tested-by: build bot (Jenkins) Reviewed-by: Julius Werner --- Documentation/security/vboot/list_vboot.md | 1 + src/mainboard/google/trogdor/Kconfig | 1 + src/mainboard/google/trogdor/Kconfig.name | 4 ++++ src/mainboard/google/trogdor/board.h | 5 +++-- 4 files changed, 9 insertions(+), 2 deletions(-) diff --git a/Documentation/security/vboot/list_vboot.md b/Documentation/security/vboot/list_vboot.md index b94901b55c..6372a4aaae 100644 --- a/Documentation/security/vboot/list_vboot.md +++ b/Documentation/security/vboot/list_vboot.md @@ -154,6 +154,7 @@ - Stout (Lenovo Thinkpad X131e Chromebook) - Bubs - Coachz +- Homestar - Lazor - Pompom - Trogdor diff --git a/src/mainboard/google/trogdor/Kconfig b/src/mainboard/google/trogdor/Kconfig index dd9c4a6b35..0e1c0a3d92 100644 --- a/src/mainboard/google/trogdor/Kconfig +++ b/src/mainboard/google/trogdor/Kconfig @@ -58,6 +58,7 @@ config MAINBOARD_PART_NUMBER string default "Bubs" if BOARD_GOOGLE_BUBS default "Coachz" if BOARD_GOOGLE_COACHZ + default "Homestar" if BOARD_GOOGLE_HOMESTAR default "Lazor" if BOARD_GOOGLE_LAZOR default "Pompom" if BOARD_GOOGLE_POMPOM default "Trogdor" if BOARD_GOOGLE_TROGDOR diff --git a/src/mainboard/google/trogdor/Kconfig.name b/src/mainboard/google/trogdor/Kconfig.name index 174c795d87..ae5731542c 100644 --- a/src/mainboard/google/trogdor/Kconfig.name +++ b/src/mainboard/google/trogdor/Kconfig.name @@ -10,6 +10,10 @@ config BOARD_GOOGLE_COACHZ bool "-> Coachz" select BOARD_GOOGLE_TROGDOR_COMMON +config BOARD_GOOGLE_HOMESTAR + bool "-> Homestar" + select BOARD_GOOGLE_TROGDOR_COMMON + config BOARD_GOOGLE_LAZOR bool "-> Lazor" select BOARD_GOOGLE_TROGDOR_COMMON diff --git a/src/mainboard/google/trogdor/board.h b/src/mainboard/google/trogdor/board.h index 4dc5010e34..fb0852bcd2 100644 --- a/src/mainboard/google/trogdor/board.h +++ b/src/mainboard/google/trogdor/board.h @@ -18,8 +18,9 @@ #define GPIO_BACKLIGHT_ENABLE GPIO(12) #define GPIO_EDP_BRIDGE_ENABLE (CONFIG(TROGDOR_REV0) ? GPIO(14) : GPIO(104)) #define GPIO_EN_PP3300_DX_EDP (CONFIG(TROGDOR_REV0) ? GPIO(106) : \ - (CONFIG(BOARD_GOOGLE_COACHZ) ? (board_id() == 0 ? GPIO(52) : \ - GPIO(67)) : GPIO(30))) + (CONFIG(BOARD_GOOGLE_COACHZ) && board_id() == 0 ? GPIO(52) : \ + (CONFIG(BOARD_GOOGLE_LAZOR) || CONFIG(BOARD_GOOGLE_POMPOM) ? GPIO(30) : \ + GPIO(67)))) /* Fingerprint-specific GPIOs. Only for fingerprint-enabled devices (e.g. CoachZ). */ #if CONFIG(TROGDOR_HAS_FINGERPRINT) -- cgit v1.2.3