mb/google/brya: Add new skolas baseboard

This commit adds the skolas baseboard, which is basically the brya
baseboard, but using an Intel Raptor Lake-P SoC instead of an Alder
Lake SoC.

This commit also adds the skolas baseboard variant skolas4es.

Since this baseboard is identical to the brya baseboard with the
exception of the SoC used, the new baseboard and the new baseboard's
first variant will be a copy of the current brya baseboard and brya0
variant.

For now, the skolas baseboard and skolas4es variant will continue to
use ADL-P.  This allows for two benefits:
  1. software to be proven out on existing hardware prior to RPL SoC
	support landing, and
  2. allows us not to have to wait for RPL SoC changes prior to getting
	the mainboard changes in place

Once the RPL SoC code has merged, I will update the skolas baseboard and
skolas4es variant to use RPL instead of ADL.

BUG=b:229134437
TEST=util/abuild/abuild -p none -t google/brya -x -a -c max

Change-Id: Iec100306dca2320eaf2432797f3acc31db2543d3
Signed-off-by: Nick Vaccaro <nvaccaro@google.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/63891
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Subrata Banik <subratabanik@google.com>

1 files changed, 15 insertions, 1 deletions

diff --git a/src/mainboard/google/brya/Kconfig b/src/mainboard/google/brya/Kconfig
index cd45164fc7..1f3b3d5b53 100644
--- a/src/mainboard/google/brya/Kconfig
+++ b/src/mainboard/google/brya/Kconfig
@@ -73,6 +73,15 @@ config BOARD_GOOGLE_BASEBOARD_NISSA
 	select TPM_GOOGLE_TI50
 	select SOC_INTEL_COMMON_MMC_OVERRIDE
 
+config BOARD_GOOGLE_BASEBOARD_SKOLAS
+	def_bool n
+	select BOARD_GOOGLE_BRYA_COMMON
+	select HAVE_SLP_S0_GATE
+	select MEMORY_SOLDERDOWN if !BOARD_GOOGLE_BANSHEE
+	select SOC_INTEL_ALDERLAKE_PCH_P
+	select SYSTEM_TYPE_LAPTOP
+	select TPM_GOOGLE_CR50
+
 if BOARD_GOOGLE_BRYA_COMMON
 
 config BASEBOARD_DIR
@@ -80,6 +89,7 @@ config BASEBOARD_DIR
 	default "brya" if BOARD_GOOGLE_BASEBOARD_BRYA
 	default "brask" if BOARD_GOOGLE_BASEBOARD_BRASK
 	default "nissa" if BOARD_GOOGLE_BASEBOARD_NISSA
+	default "skolas" if BOARD_GOOGLE_BASEBOARD_SKOLAS
 
 config CHROMEOS
 	select EC_GOOGLE_CHROMEEC_SWITCHES
@@ -127,6 +137,7 @@ config DRIVER_TPM_I2C_BUS
 	default 0x1 if BOARD_GOOGLE_OSIRIS
 	default 0x1 if BOARD_GOOGLE_MITHRAX
 	default 0x1 if BOARD_GOOGLE_KULDAX
+	default 0x3 if BOARD_GOOGLE_SKOLAS4ES
 
 config DRIVER_TPM_I2C_ADDR
 	hex
@@ -153,6 +164,7 @@ config MAINBOARD_FAMILY
 	default "Google_Brya" if BOARD_GOOGLE_BASEBOARD_BRYA
 	default "Google_Brask" if BOARD_GOOGLE_BASEBOARD_BRASK
 	default "Google_Nissa" if BOARD_GOOGLE_BASEBOARD_NISSA
+	default "Google_Skolas" if BOARD_GOOGLE_BASEBOARD_SKOLAS
 
 config MAINBOARD_PART_NUMBER
 	default "Brya" if BOARD_GOOGLE_BRYA0
@@ -184,6 +196,7 @@ config MAINBOARD_PART_NUMBER
 	default "Osiris" if BOARD_GOOGLE_OSIRIS
 	default "Mithrax" if BOARD_GOOGLE_MITHRAX
 	default "Kuldax" if BOARD_GOOGLE_KULDAX
+	default "Skolas4ES" if BOARD_GOOGLE_SKOLAS4ES
 
 config VARIANT_DIR
 	default "brya0" if BOARD_GOOGLE_BRYA0
@@ -215,6 +228,7 @@ config VARIANT_DIR
 	default "osiris" if BOARD_GOOGLE_OSIRIS
 	default "mithrax" if BOARD_GOOGLE_MITHRAX
 	default "kuldax" if BOARD_GOOGLE_KULDAX
+	default "skolas4es" if BOARD_GOOGLE_SKOLAS4ES
 
 config VBOOT
 	select VBOOT_EARLY_EC_SYNC if !BOARD_GOOGLE_BASEBOARD_NISSA
@@ -245,7 +259,7 @@ config USE_PM_ACPI_TIMER
 
 choice
 	prompt "Cache as RAM (CAR) setup configuration to use"
-	default USE_ADL_NEM if BOARD_GOOGLE_BRYA4ES || BOARD_GOOGLE_PRIMUS4ES || BOARD_GOOGLE_GIMBLE4ES || BOARD_GOOGLE_REDRIX4ES || BOARD_GOOGLE_TAEKO4ES || BOARD_GOOGLE_ANAHERA4ES || BOARD_GOOGLE_TANIKS || BOARD_GOOGLE_NIVVIKS || BOARD_GOOGLE_NEREID || BOARD_GOOGLE_CRAASK
+	default USE_ADL_NEM if BOARD_GOOGLE_BRYA4ES || BOARD_GOOGLE_PRIMUS4ES || BOARD_GOOGLE_GIMBLE4ES || BOARD_GOOGLE_REDRIX4ES || BOARD_GOOGLE_TAEKO4ES || BOARD_GOOGLE_ANAHERA4ES || BOARD_GOOGLE_TANIKS || BOARD_GOOGLE_NIVVIKS || BOARD_GOOGLE_NEREID || BOARD_GOOGLE_CRAASK || BOARD_GOOGLE_SKOLAS4ES
 	default USE_ADL_ENEM
 
 config USE_ADL_ENEM