From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: intel.com, ip: 192.55.52.43, mailfrom: chasel.chiu@intel.com) Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by groups.io with SMTP; Fri, 14 Jun 2019 01:25:43 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by fmsmga105.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 14 Jun 2019 01:25:43 -0700 X-ExtLoop1: 1 Received: from cchiu4-mobl1.gar.corp.intel.com ([10.5.240.27]) by FMSMGA003.fm.intel.com with ESMTP; 14 Jun 2019 01:25:42 -0700 From: "Chiu, Chasel" To: devel@edk2.groups.io Cc: Michael Kubacki , Nate DeSimone , Liming Gao Subject: [PATCH] KabylakeOpenBoardPkg: Remove PeiMain for Dispatch mode. Date: Fri, 14 Jun 2019 16:24:49 +0800 Message-Id: <20190614082449.17680-1-chasel.chiu@intel.com> X-Mailer: git-send-email 2.13.3.windows.1 REF: https://bugzilla.tianocore.org/show_bug.cgi?id=1916 In Dispatch mode PeiMain from FSP Binary will be launched so the one from boot loader can be removed. Test: Verified the PeiMain is removed in Dispatch mode and included in API mode. Cc: Michael Kubacki Cc: Nate DeSimone Cc: Liming Gao Signed-off-by: Chasel Chiu --- Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/OpenBoardPkg.fdf | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/OpenBoardPkg.fdf b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/OpenBoardPkg.fdf index 007cb4b28f..abafd8e44d 100644 --- a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/OpenBoardPkg.fdf +++ b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/OpenBoardPkg.fdf @@ -226,7 +226,13 @@ READ_LOCK_STATUS = TRUE FvNameGuid = FC8FE6B5-CD9B-411E-BD8F-31824D0CDE3D INF UefiCpuPkg/SecCore/SecCore.inf +!if (gMinPlatformPkgTokenSpaceGuid.PcdFspWrapperBootMode == FALSE) || (gIntelFsp2WrapperTokenSpaceGuid.PcdFspModeSelection == 1) +# +# PeiMain is needed only for FSP API mode or EDK2 build, +# in FSP dispatch mode the one inside FSP Binary is launched. +# INF MdeModulePkg/Core/Pei/PeiMain.inf +!endif !include $(PLATFORM_PACKAGE)/Include/Fdf/CorePreMemoryInclude.fdf INF $(PLATFORM_PACKAGE)/PlatformInit/ReportFv/ReportFvPei.inf -- 2.13.3.windows.1