lib/kbl: move KBL check from IS_SKYLAKE() to IS_GEN9()

Remove the KBL check from IS_SKYLAKE() following the kernel definition.
Then, add the KBL check to IS_GEN9().

The idea is to avoid confusion.  On the kernel side, the mix of SKY
and KBL was nacked so the platforms are split.

Signed-off-by: Wayne Boyer <wayne.boyer@intel.com>
Signed-off-by: Thomas Wood <thomas.wood@intel.com>
This commit is contained in:
Wayne Boyer 2015-11-13 13:40:23 -08:00 committed by Thomas Wood
parent b088e30575
commit 526a63ec6b

View File

@ -443,8 +443,7 @@ void intel_check_pch(void);
IS_KBL_GT2(devid) || \
IS_KBL_GT3(devid))
#define IS_SKYLAKE(devid) (IS_KABYLAKE(devid) || \
IS_SKL_GT1(devid) || \
#define IS_SKYLAKE(devid) (IS_SKL_GT1(devid) || \
IS_SKL_GT2(devid) || \
IS_SKL_GT3(devid) || \
IS_SKL_GT4(devid))
@ -453,7 +452,9 @@ void intel_check_pch(void);
(devid) == PCI_CHIP_BROXTON_1 || \
(devid) == PCI_CHIP_BROXTON_2)
#define IS_GEN9(devid) (IS_SKYLAKE(devid) || IS_BROXTON(devid))
#define IS_GEN9(devid) (IS_KABYLAKE(devid) || \
IS_SKYLAKE(devid) || \
IS_BROXTON(devid))
#define IS_965(devid) (IS_GEN4(devid) || \
IS_GEN5(devid) || \