From 7ed704d73d4027f33b5445b12a56af45dab2e989 Mon Sep 17 00:00:00 2001 From: Angel Pons Date: Fri, 12 Jul 2019 15:46:43 +0200 Subject: soc/intel/{cnl,icl}: Always use CAR NEM enhanced by default The FSP_CAR option has additional configuration options whose default values result in boot failures. Since default values should always boot, default to the open-source CAR NEM Enhanced implementation instead. This also allows us to get rid of an unnecessary vendor-specific special case. Change-Id: I30b1808f91701c07dce6f1de08c213150e8a675a Signed-off-by: Angel Pons Reviewed-on: https://review.coreboot.org/c/coreboot/+/34287 Reviewed-by: Aaron Durbin Reviewed-by: Subrata Banik Reviewed-by: Lean Sheng Tan Tested-by: build bot (Jenkins) --- src/soc/intel/cannonlake/Kconfig | 3 +-- src/soc/intel/icelake/Kconfig | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/soc/intel/cannonlake/Kconfig b/src/soc/intel/cannonlake/Kconfig index 4235b7a0ceee..f859cd5af83d 100644 --- a/src/soc/intel/cannonlake/Kconfig +++ b/src/soc/intel/cannonlake/Kconfig @@ -269,8 +269,7 @@ config MB_HAS_ACTIVE_HIGH_SD_PWR_ENABLE choice prompt "Cache-as-ram implementation" - default USE_CANNONLAKE_CAR_NEM_ENHANCED if MAINBOARD_HAS_CHROMEOS - default USE_CANNONLAKE_FSP_CAR + default USE_CANNONLAKE_CAR_NEM_ENHANCED help This option allows you to select how cache-as-ram (CAR) is set up. diff --git a/src/soc/intel/icelake/Kconfig b/src/soc/intel/icelake/Kconfig index a2261a04577f..5dca44bfb4fd 100644 --- a/src/soc/intel/icelake/Kconfig +++ b/src/soc/intel/icelake/Kconfig @@ -172,8 +172,7 @@ config CBFS_SIZE choice prompt "Cache-as-ram implementation" - default USE_ICELAKE_CAR_NEM_ENHANCED if MAINBOARD_HAS_CHROMEOS - default USE_ICELAKE_FSP_CAR + default USE_ICELAKE_CAR_NEM_ENHANCED help This option allows you to select how cache-as-ram (CAR) is set up. -- cgit v1.2.3