From 69007ecc68e54d469ca0ebe1a2a09e4a5f6b04e6 Mon Sep 17 00:00:00 2001 From: Angel Pons Date: Tue, 27 Apr 2021 22:28:42 +0200 Subject: [PATCH] drivers/intel/gma/Kconfig: Simplify CFL/WHL/CML conditions Change-Id: Id56761b2a57754b8f8d726a4bd2674ffa6fd1159 Signed-off-by: Angel Pons Reviewed-on: https://review.coreboot.org/c/coreboot/+/52715 Tested-by: build bot (Jenkins) Reviewed-by: Felix Singer Reviewed-by: Nico Huber --- src/drivers/intel/gma/Kconfig | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/drivers/intel/gma/Kconfig b/src/drivers/intel/gma/Kconfig index bc96846213..56afedfcc8 100644 --- a/src/drivers/intel/gma/Kconfig +++ b/src/drivers/intel/gma/Kconfig @@ -86,8 +86,7 @@ config GFX_GMA || NORTHBRIDGE_INTEL_IRONLAKE || NORTHBRIDGE_INTEL_SANDYBRIDGE \ || NORTHBRIDGE_INTEL_HASWELL || SOC_INTEL_BROADWELL \ || SOC_INTEL_COMMON_SKYLAKE_BASE || SOC_INTEL_APOLLOLAKE \ - || SOC_INTEL_COFFEELAKE \ - || SOC_INTEL_WHISKEYLAKE || SOC_INTEL_COMETLAKE + || SOC_INTEL_CANNONLAKE_BASE depends on MAINBOARD_USE_LIBGFXINIT || INTEL_GMA_LIBGFXINIT_EDID select RAMSTAGE_LIBHWBASE @@ -113,9 +112,7 @@ config GFX_GMA_DYN_CPU config GFX_GMA_GENERATION string default "Broxton" if SOC_INTEL_APOLLOLAKE - default "Skylake" if SOC_INTEL_COMMON_SKYLAKE_BASE || \ - SOC_INTEL_COFFEELAKE || SOC_INTEL_WHISKEYLAKE || \ - SOC_INTEL_COMETLAKE + default "Skylake" if SOC_INTEL_COMMON_SKYLAKE_BASE || SOC_INTEL_CANNONLAKE_BASE default "Haswell" if NORTHBRIDGE_INTEL_HASWELL || SOC_INTEL_BROADWELL default "Ironlake" if NORTHBRIDGE_INTEL_IRONLAKE || NORTHBRIDGE_INTEL_SANDYBRIDGE default "G45" if NORTHBRIDGE_INTEL_GM45 || NORTHBRIDGE_INTEL_X4X