util/ifdtool: Add sklkbl to IFDv2 platforms

Currently ifdtool breaks the descriptor because it treats it as IFDv1.
This change adds it to the list of IFDv2 platforms.
Fixes boot for X11SSH-LN4F.

Fixes: 8c082e5fef ("util/ifdtool: Use -p platform name to detect IFDv2 platform and chipset")
Change-Id: I3f92b090e929336b5c18b442d1504ee1000f5594
Signed-off-by: Jan Tatje <jan@jnt.io>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/56070
Reviewed-by: Subrata Banik <subrata.banik@intel.com>
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
This commit is contained in:
Jan Tatje 2021-07-05 08:03:07 +02:00 committed by Patrick Georgi
parent 88eb167868
commit b7eec4a844
1 changed files with 4 additions and 2 deletions

View File

@ -205,9 +205,8 @@ static enum ich_chipset ifd1_guess_chipset(char *image, int size)
return CHIPSET_9_SERIES_WILDCAT_POINT; return CHIPSET_9_SERIES_WILDCAT_POINT;
} else if (nm == 6) { } else if (nm == 6) {
return CHIPSET_C620_SERIES_LEWISBURG; return CHIPSET_C620_SERIES_LEWISBURG;
} else {
return CHIPSET_100_200_SERIES_SUNRISE_POINT;
} }
return CHIPSET_PCH_UNKNOWN;
} }
static enum ich_chipset ifd2_platform_to_chipset(const int pindex) static enum ich_chipset ifd2_platform_to_chipset(const int pindex)
@ -219,6 +218,8 @@ static enum ich_chipset ifd2_platform_to_chipset(const int pindex)
return CHIPSET_N_SERIES_JASPER_LAKE; return CHIPSET_N_SERIES_JASPER_LAKE;
case PLATFORM_EHL: case PLATFORM_EHL:
return CHIPSET_x6000_SERIES_ELKHART_LAKE; return CHIPSET_x6000_SERIES_ELKHART_LAKE;
case PLATFORM_SKLKBL:
return CHIPSET_100_200_SERIES_SUNRISE_POINT;
case PLATFORM_CNL: case PLATFORM_CNL:
return CHIPSET_300_SERIES_CANNON_POINT; return CHIPSET_300_SERIES_CANNON_POINT;
case PLATFORM_TGL: case PLATFORM_TGL:
@ -250,6 +251,7 @@ static int is_platform_ifd_2(void)
PLATFORM_JSL, PLATFORM_JSL,
PLATFORM_EHL, PLATFORM_EHL,
PLATFORM_ADL, PLATFORM_ADL,
PLATFORM_SKLKBL,
}; };
unsigned int i; unsigned int i;