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>
diff --git a/util/ifdtool/ifdtool.c b/util/ifdtool/ifdtool.c
index b91c90c..ca5d3b8 100644
--- a/util/ifdtool/ifdtool.c
+++ b/util/ifdtool/ifdtool.c
@@ -190,8 +190,6 @@
return CHIPSET_ICH10;
else if (isl <= 16)
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");
return CHIPSET_5_SERIES_IBEX_PEAK;
} else if (iccriba < 0x31 && (fdb->flmap2 & 0xff) < 0x30) {
@@ -212,6 +210,8 @@
static enum ich_chipset ifd2_platform_to_chipset(const int pindex)
{
switch (pindex) {
+ case PLATFORM_APL:
+ return CHIPSET_N_J_SERIES_APOLLO_LAKE;
case PLATFORM_GLK:
return CHIPSET_N_J_SERIES_GEMINI_LAKE;
case PLATFORM_JSL:
@@ -243,6 +243,7 @@
static int is_platform_ifd_2(void)
{
static const int ifd_2_platforms[] = {
+ PLATFORM_APL,
PLATFORM_GLK,
PLATFORM_CNL,
PLATFORM_LBG,