summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAngel Pons <th3fanbus@gmail.com>2019-07-12 15:46:43 +0200
committerPatrick Georgi <pgeorgi@google.com>2019-07-16 15:02:30 +0000
commit7ed704d73d4027f33b5445b12a56af45dab2e989 (patch)
treeeaa3289e63b474355f790893042b7066be94c85e
parentd472c4f01e4cb7e35e5e964ef3b8761b59e35ebe (diff)
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 <th3fanbus@gmail.com> Reviewed-on: https://review.coreboot.org/c/coreboot/+/34287 Reviewed-by: Aaron Durbin <adurbin@chromium.org> Reviewed-by: Subrata Banik <subrata.banik@intel.com> Reviewed-by: Lean Sheng Tan <lean.sheng.tan@intel.com> Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
-rw-r--r--src/soc/intel/cannonlake/Kconfig3
-rw-r--r--src/soc/intel/icelake/Kconfig3
2 files changed, 2 insertions, 4 deletions
diff --git a/src/soc/intel/cannonlake/Kconfig b/src/soc/intel/cannonlake/Kconfig
index 4235b7a0ce..f859cd5af8 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 a2261a0457..5dca44bfb4 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.