Wonkyu Kim has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/61695 )
Change subject: util/ifdtool: remove adl and tgl from ifd tool ......................................................................
util/ifdtool: remove adl and tgl from ifd tool
Use ifd2 instead of adl and tgl
Signed-off-by: Wonkyu Kim wonkyu.kim@intel.com Change-Id: Ieac60876b9ed384dce7e524e736fbdcb7d2cfba5 --- M src/soc/intel/alderlake/Kconfig M src/soc/intel/tigerlake/Kconfig M util/ifdtool/ifdtool.c M util/ifdtool/ifdtool.h 4 files changed, 2 insertions(+), 16 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/95/61695/1
diff --git a/src/soc/intel/alderlake/Kconfig b/src/soc/intel/alderlake/Kconfig index 863150e..50076e0 100644 --- a/src/soc/intel/alderlake/Kconfig +++ b/src/soc/intel/alderlake/Kconfig @@ -166,7 +166,7 @@
config IFD_CHIPSET string - default "adl" + default "ifd2"
config IED_REGION_SIZE hex diff --git a/src/soc/intel/tigerlake/Kconfig b/src/soc/intel/tigerlake/Kconfig index 7a8b01b..1313c5e 100644 --- a/src/soc/intel/tigerlake/Kconfig +++ b/src/soc/intel/tigerlake/Kconfig @@ -130,7 +130,7 @@
config IFD_CHIPSET string - default "tgl" + default "ifd2"
config IED_REGION_SIZE hex diff --git a/util/ifdtool/ifdtool.c b/util/ifdtool/ifdtool.c index 20c4ed4..e05944d 100644 --- a/util/ifdtool/ifdtool.c +++ b/util/ifdtool/ifdtool.c @@ -229,8 +229,6 @@ return CHIPSET_100_200_SERIES_SUNRISE_POINT; case PLATFORM_CNL: return CHIPSET_300_SERIES_CANNON_POINT; - case PLATFORM_TGL: - case PLATFORM_ADL: case PLATFORM_IFD2: return CHIPSET_500_600_SERIES_TIGER_ALDER_POINT; case PLATFORM_ICL: @@ -256,10 +254,8 @@ PLATFORM_CNL, PLATFORM_LBG, PLATFORM_ICL, - PLATFORM_TGL, PLATFORM_JSL, PLATFORM_EHL, - PLATFORM_ADL, PLATFORM_SKLKBL, PLATFORM_IFD2, }; @@ -1183,10 +1179,8 @@ case PLATFORM_CNL: case PLATFORM_ICL: case PLATFORM_SKLKBL: - case PLATFORM_TGL: case PLATFORM_JSL: case PLATFORM_EHL: - case PLATFORM_ADL: case PLATFORM_IFD2: /* CPU/BIOS can read descriptor and BIOS. */ fmba->flmstr1 |= (1 << REGION_DESC) << rd_shift; @@ -1638,7 +1632,6 @@ " -M | --altmedisable <0|1> Set the MeDisable and AltMeDisable (or HAP for skylake or newer platform)\n" " bits to disable ME\n" " -p | --platform Add platform-specific quirks\n" - " adl - Alder Lake\n" " aplk - Apollo Lake\n" " cnl - Cannon Lake\n" " lbg - Lewisburg PCH\n" @@ -1648,7 +1641,6 @@ " ifd2 - IFDv2 Platform\n" " jsl - Jasper Lake\n" " sklkbl - Sky Lake/Kaby Lake\n" - " tgl - Tiger Lake\n" " -S | --setpchstrap Write a PCH strap\n" " -V | --newvalue The new value to write into PCH strap specified by -S\n" " -v | --version: print the version\n" @@ -1909,10 +1901,6 @@ platform = PLATFORM_JSL; } else if (!strcmp(optarg, "sklkbl")) { platform = PLATFORM_SKLKBL; - } else if (!strcmp(optarg, "tgl")) { - platform = PLATFORM_TGL; - } else if (!strcmp(optarg, "adl")) { - platform = PLATFORM_ADL; } else if (!strcmp(optarg, "ifd2")) { platform = PLATFORM_IFD2; } else { diff --git a/util/ifdtool/ifdtool.h b/util/ifdtool/ifdtool.h index 15e207d..8ab85f8 100644 --- a/util/ifdtool/ifdtool.h +++ b/util/ifdtool/ifdtool.h @@ -56,8 +56,6 @@ PLATFORM_ICL, PLATFORM_JSL, PLATFORM_SKLKBL, - PLATFORM_TGL, - PLATFORM_ADL, PLATFORM_IFD2, };