commit 6660d7acb7ebcb6ff1f1909a9671a3d5b43bfcae
author Shreesh Chhabbi <shreesh.chhabbi@intel.corp-partner.google.com> Wed Sep 16 11:39:01 2020 -0700
committer Commit Bot <commit-bot@chromium.org> Fri Sep 18 02:18:46 2020 +0000
tree 29d11fd8dd9e21c125a1290e2113602a17614eee
parent b5dbccd1c24d9ce13e224f9c966346ee51680d7a

UPSTREAM: mb/volteer: Select USE_CAR_NEM_ENHANCED_V2 for Tigerlake QS based
platforms

BUG=b:145958015
TEST= Build Volteer coreboot and boot on Volteer Proto 2 and Delbin.

Change-Id: I8c2fe521d2a24ab8ab00ed75b6991e6652bb50be
Signed-off-by: Tim Wawrzynczak <twawrzynczak@chromium.org>
Original-Commit-Id: I0ff896424ab23dba43075c44eb9b2c2c480ccbfb
Cq-Depend:chrome-internal:3249528
Original-Change-Id: I0ff896424ab23dba43075c44eb9b2c2c480ccbfb
Original-Signed-off-by: Shreesh Chhabbi <shreesh.chhabbi@intel.corp-partner.google.com>
Original-Reviewed-on: https://review.coreboot.org/c/coreboot/+/45456
Original-Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Original-Reviewed-by: Tim Wawrzynczak <twawrzynczak@chromium.org>
Original-Reviewed-by: Nick Vaccaro <nvaccaro@google.com>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/coreboot/+/2416779

src/mainboard/google/volteer/Kconfig.name

diff --git a/src/mainboard/google/volteer/Kconfig.name b/src/mainboard/google/volteer/Kconfig.name
index db9d486..10a9411 100644
--- a/src/mainboard/google/volteer/Kconfig.name
+++ b/src/mainboard/google/volteer/Kconfig.name
@@ -4,11 +4,13 @@
 	bool "-> Delbin"
 	select BOARD_GOOGLE_BASEBOARD_VOLTEER
 	select SOC_INTEL_CSE_LITE_SKU
+	select USE_CAR_NEM_ENHANCED_V2
 
 config BOARD_GOOGLE_ELDRID
 	bool "-> Eldrid"
 	select BOARD_GOOGLE_BASEBOARD_VOLTEER
 	select SOC_INTEL_CSE_LITE_SKU
+	select USE_CAR_NEM_ENHANCED_V2
 
 config BOARD_GOOGLE_HALVOR
 	bool "-> Halvor"
@@ -29,6 +31,7 @@
 	bool "-> Terrador"
 	select BOARD_GOOGLE_BASEBOARD_VOLTEER
 	select SOC_INTEL_CSE_LITE_SKU
+	select USE_CAR_NEM_ENHANCED_V2
 
 config BOARD_GOOGLE_TODOR
 	bool "-> Todor"
@@ -51,8 +54,10 @@
 	select BOARD_GOOGLE_BASEBOARD_VOLTEER
 	select VARIANT_HAS_MIPI_CAMERA
 	select SOC_INTEL_CSE_LITE_SKU
+	select USE_CAR_NEM_ENHANCED_V2
 
 config BOARD_GOOGLE_VOXEL
 	bool "-> Voxel"
 	select BOARD_GOOGLE_BASEBOARD_VOLTEER
 	select SOC_INTEL_CSE_LITE_SKU
+	select USE_CAR_NEM_ENHANCED_V2

src/soc/intel/tigerlake/Kconfig

diff --git a/src/soc/intel/tigerlake/Kconfig b/src/soc/intel/tigerlake/Kconfig
index d92d496..a722144 100644
--- a/src/soc/intel/tigerlake/Kconfig
+++ b/src/soc/intel/tigerlake/Kconfig
@@ -25,7 +25,7 @@
 	select INTEL_DESCRIPTOR_MODE_CAPABLE
 	select HAVE_SMI_HANDLER
 	select IDT_IN_EVERY_STAGE
-	select USE_CAR_NEM_ENHANCED_V2
+	select INTEL_CAR_NEM
 	select INTEL_GMA_ACPI
 	select INTEL_GMA_ADD_VBT if RUN_FSP_GOP
 	select IOAPIC