GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

util/ifdtool: Add APL to IFDv2 platforms 

Initially APL was considered as IFDv2 platform irrespective being
added into ifd_2_platforms[], hence commit hash 621ed4c had migrated
APL into IFDv1 which break its FLMSTR1/FLMSTR2/FLMSTR3 Read/Write
access. This change adds APL into the list of IFDv2 platforms to fix
booting issue on the LeafHill board.

Change-Id: Ied59ddb2fe05b421266a6b119fd6eab17b8beedc
Signed-off-by: Subrata Banik <subrata.banik@intel.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/56300
Reviewed-by: Tim Wawrzynczak <twawrzynczak@chromium.org>
Reviewed-by: Furquan Shaikh <furquan@google.com>
Reviewed-by: Rick Lee <rick.lee@intel.com>
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
This commit is contained in:
Subrata Banik 2021-07-14 13:52:03 +05:30
parent e0d9bf7731
commit 6da003c910
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
util/ifdtool/ifdtool.c
View File

@ -190,8 +190,6 @@ static enum ich_chipset ifd1_guess_chipset(char *image, int size)
return CHIPSET_ICH10; return CHIPSET_ICH10;
else if (isl <= 16) else if (isl <= 16)
return CHIPSET_5_SERIES_IBEX_PEAK; return CHIPSET_5_SERIES_IBEX_PEAK;
else if (isl == 0x13)
return CHIPSET_N_J_SERIES_APOLLO_LAKE;
printf("Peculiar firmware descriptor, assuming Ibex Peak compatibility.\n"); printf("Peculiar firmware descriptor, assuming Ibex Peak compatibility.\n");
return CHIPSET_5_SERIES_IBEX_PEAK; return CHIPSET_5_SERIES_IBEX_PEAK;
} else if (iccriba < 0x31 && (fdb->flmap2 & 0xff) < 0x30) { } else if (iccriba < 0x31 && (fdb->flmap2 & 0xff) < 0x30) {
@ -212,6 +210,8 @@ static enum ich_chipset ifd1_guess_chipset(char *image, int size)
static enum ich_chipset ifd2_platform_to_chipset(const int pindex) static enum ich_chipset ifd2_platform_to_chipset(const int pindex)
{ {
switch (pindex) { switch (pindex) {
case PLATFORM_APL:
return CHIPSET_N_J_SERIES_APOLLO_LAKE;
case PLATFORM_GLK: case PLATFORM_GLK:
return CHIPSET_N_J_SERIES_GEMINI_LAKE; return CHIPSET_N_J_SERIES_GEMINI_LAKE;
case PLATFORM_JSL: case PLATFORM_JSL:
@ -243,6 +243,7 @@ static enum ich_chipset ifd2_platform_to_chipset(const int pindex)
static int is_platform_ifd_2(void) static int is_platform_ifd_2(void)
{ {
static const int ifd_2_platforms[] = { static const int ifd_2_platforms[] = {
PLATFORM_APL,
PLATFORM_GLK, PLATFORM_GLK,
PLATFORM_CNL, PLATFORM_CNL,
PLATFORM_LBG, PLATFORM_LBG,