mb/google/brya: Allow respective variant to choose NEM config

This patch introduces a new config named `DEFAULT_ADL_NEM` and
allows respective brya variants with Alder Lake ESx samples to
choose NEM over eNEM as eNEM was fuse disabled till ESx.

TEST=The boot flow related to eNEM and NEM behaviour remains the
same with and without this patch.

Signed-off-by: Subrata Banik <subratabanik@google.com>
Change-Id: Ibbd492a3d210739120c7ad16415cb7912f5b70ec
Reviewed-on: https://review.coreboot.org/c/coreboot/+/71743
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Reka Norman <rekanorman@chromium.org>
Reviewed-by: Eric Lai <eric_lai@quanta.corp-partner.google.com>

2 files changed, 16 insertions, 1 deletions

diff --git a/src/mainboard/google/brya/Kconfig b/src/mainboard/google/brya/Kconfig
index 5429d595cd..78f0ad58f3 100644
--- a/src/mainboard/google/brya/Kconfig
+++ b/src/mainboard/google/brya/Kconfig
@@ -299,9 +299,15 @@ config USE_PM_ACPI_TIMER
 	default y if BOARD_GOOGLE_PRIMUS4ES
 	default n
 
+config DEFAULT_ADL_NEM
+	bool
+	help
+	  Brya variants with Alder Lake ESx silicon to choose this config
+	  as eNEM was fuse disable till ESx silicon revision.
+
 choice
 	prompt "Cache as RAM (CAR) setup configuration to use"
-	default USE_ADL_NEM if BOARD_GOOGLE_PRIMUS4ES || BOARD_GOOGLE_GIMBLE4ES || BOARD_GOOGLE_REDRIX4ES || BOARD_GOOGLE_TAEKO4ES || BOARD_GOOGLE_ANAHERA4ES || BOARD_GOOGLE_TANIKS || BOARD_GOOGLE_SKOLAS || BOARD_GOOGLE_SKOLAS4ES || BOARD_GOOGLE_ZYDRON
+	default USE_ADL_NEM if DEFAULT_ADL_NEM
 	default USE_ADL_ENEM
 
 config USE_ADL_ENEM
diff --git a/src/mainboard/google/brya/Kconfig.name b/src/mainboard/google/brya/Kconfig.name
index 37610f3291..4b7a04577c 100644
--- a/src/mainboard/google/brya/Kconfig.name
+++ b/src/mainboard/google/brya/Kconfig.name
@@ -23,6 +23,7 @@ config BOARD_GOOGLE_ANAHERA
 config BOARD_GOOGLE_ANAHERA4ES
 	bool "->  Anahera4ES"
 	select BOARD_GOOGLE_BASEBOARD_BRYA
+	select DEFAULT_ADL_NEM
 	select DRIVERS_GENESYSLOGIC_GL9763E
 	select DRIVERS_GENESYSLOGIC_GL9750
 	select DRIVERS_GFX_GENERIC
@@ -66,6 +67,7 @@ config BOARD_GOOGLE_GIMBLE4ES
 	select BOARD_GOOGLE_BASEBOARD_BRYA
 	select CHROMEOS_DSM_CALIB if CHROMEOS
 	select CHROMEOS_DSM_PARAM_FILE_NAME if CHROMEOS
+	select DEFAULT_ADL_NEM
 	select DRIVERS_GENESYSLOGIC_GL9750
 	select DRIVERS_I2C_MAX98390
 
@@ -108,6 +110,7 @@ config BOARD_GOOGLE_PRIMUS
 config BOARD_GOOGLE_PRIMUS4ES
 	bool "->  Primus4ES"
 	select BOARD_GOOGLE_BASEBOARD_BRYA
+	select DEFAULT_ADL_NEM
 	select DRIVERS_GENESYSLOGIC_GL9755
 	select HAVE_PCIE_WWAN
 	select HAVE_WWAN_POWER_SEQUENCE
@@ -129,6 +132,7 @@ config BOARD_GOOGLE_REDRIX4ES
 	select BOARD_GOOGLE_BASEBOARD_BRYA
 	select CHROMEOS_DSM_CALIB if CHROMEOS
 	select CHROMEOS_DSM_PARAM_FILE_NAME if CHROMEOS
+	select DEFAULT_ADL_NEM
 	select DRIVERS_GENESYSLOGIC_GL9755
 	select DRIVERS_GFX_GENERIC
 	select DRIVERS_I2C_MAX98390
@@ -139,6 +143,7 @@ config BOARD_GOOGLE_REDRIX4ES
 config BOARD_GOOGLE_SKOLAS
 	bool "->  Skolas"
 	select BOARD_GOOGLE_BASEBOARD_SKOLAS
+	select DEFAULT_ADL_NEM
 	select DRIVERS_GENESYSLOGIC_GL9755
 	select DRIVERS_INTEL_MIPI_CAMERA
 	select DRIVERS_I2C_SX9324
@@ -148,6 +153,7 @@ config BOARD_GOOGLE_SKOLAS
 config BOARD_GOOGLE_SKOLAS4ES
 	bool "->  Skolas4ES"
 	select BOARD_GOOGLE_BASEBOARD_SKOLAS
+	select DEFAULT_ADL_NEM
 	select DRIVERS_GENESYSLOGIC_GL9755
 	select DRIVERS_INTEL_MIPI_CAMERA
 	select DRIVERS_I2C_SX9324
@@ -166,6 +172,7 @@ config BOARD_GOOGLE_TAEKO
 config BOARD_GOOGLE_TAEKO4ES
 	bool "->  Taeko4ES"
 	select BOARD_GOOGLE_BASEBOARD_BRYA
+	select DEFAULT_ADL_NEM
 	select DRIVERS_GENERIC_BAYHUB_LV2
 	select DRIVERS_GENESYSLOGIC_GL9750
 	select DRIVERS_GENESYSLOGIC_GL9763E
@@ -174,6 +181,7 @@ config BOARD_GOOGLE_TAEKO4ES
 config BOARD_GOOGLE_TANIKS
 	bool "->  Taniks"
 	select BOARD_GOOGLE_BASEBOARD_BRYA
+	select DEFAULT_ADL_NEM
 	select DRIVERS_GENERIC_BAYHUB_LV2
 	select DRIVERS_GENESYSLOGIC_GL9750
 	select DRIVERS_GENESYSLOGIC_GL9763E
@@ -297,6 +305,7 @@ config BOARD_GOOGLE_LISBON
 config BOARD_GOOGLE_ZYDRON
 	bool "->  Zydron"
 	select BOARD_GOOGLE_BASEBOARD_SKOLAS
+	select DEFAULT_ADL_NEM
 	select DRIVERS_I2C_MAX98373
 	select DRIVERS_I2C_NAU8825
 	select DRIVERS_INTEL_MIPI_CAMERA