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>

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.
 

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.