From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: intel.com, ip: 134.134.136.31, mailfrom: zailiang.sun@intel.com) Received: from mga06.intel.com (mga06.intel.com [134.134.136.31]) by groups.io with SMTP; Sun, 30 Jun 2019 21:06:59 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga003.jf.intel.com ([10.7.209.27]) by orsmga104.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 30 Jun 2019 21:06:58 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.63,437,1557212400"; d="scan'208";a="165692474" Received: from fmsmsx107.amr.corp.intel.com ([10.18.124.205]) by orsmga003.jf.intel.com with ESMTP; 30 Jun 2019 21:06:57 -0700 Received: from fmsmsx607.amr.corp.intel.com (10.18.126.87) by fmsmsx107.amr.corp.intel.com (10.18.124.205) with Microsoft SMTP Server (TLS) id 14.3.439.0; Sun, 30 Jun 2019 21:06:57 -0700 Received: from fmsmsx607.amr.corp.intel.com (10.18.126.87) by fmsmsx607.amr.corp.intel.com (10.18.126.87) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1713.5; Sun, 30 Jun 2019 21:06:53 -0700 Received: from shsmsx152.ccr.corp.intel.com (10.239.6.52) by fmsmsx607.amr.corp.intel.com (10.18.126.87) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256) id 15.1.1713.5 via Frontend Transport; Sun, 30 Jun 2019 21:06:53 -0700 Received: from shsmsx104.ccr.corp.intel.com ([169.254.5.110]) by SHSMSX152.ccr.corp.intel.com ([169.254.6.22]) with mapi id 14.03.0439.000; Mon, 1 Jul 2019 12:06:51 +0800 From: "Sun, Zailiang" To: "Kinney, Michael D" , "devel@edk2.groups.io" CC: "Qian, Yi" Subject: Re: [edk2-platforms Patch 02/14] Vlv2TbltDevicePkg: Reduce Intel Framework dependencies Thread-Topic: [edk2-platforms Patch 02/14] Vlv2TbltDevicePkg: Reduce Intel Framework dependencies Thread-Index: AQHVL7iJaVzD55xMAU2+1qHEYfUvdKa1JVYQ Date: Mon, 1 Jul 2019 04:06:50 +0000 Message-ID: <7CB7EF03E15B5D48981329A508747A9850C904BB@SHSMSX104.ccr.corp.intel.com> References: <20190701025553.18596-1-michael.d.kinney@intel.com> <20190701025553.18596-3-michael.d.kinney@intel.com> In-Reply-To: <20190701025553.18596-3-michael.d.kinney@intel.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.239.127.40] MIME-Version: 1.0 Return-Path: zailiang.sun@intel.com Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Reviewed-By: Zailiang Sun -----Original Message----- From: Kinney, Michael D=20 Sent: Monday, July 01, 2019 10:56 AM To: devel@edk2.groups.io Cc: Sun, Zailiang ; Qian, Yi Subject: [edk2-platforms Patch 02/14] Vlv2TbltDevicePkg: Reduce Intel Frame= work dependencies * Use BaseSerialPortLib16550 from MdeModulePkg. * Remove unused DxeSmmDriverEntryPoint library instance mapping from the IntelFrameworkPkg. * Remove all references to PS/2 Keyboard/Mouse that are not available on MinnowMax. * Remove VgaClassDxe module from IntelFrameworkModulePkg that is not used. * Remove DatahubStatusCodeHandlerDxe module from the IntelFrameworkModulePkg that is not used. * Remove LegacyRegionDxe module from the IntelFrameworkModulePkg The Legacy Region Protocol produced by this module is not used. * Remove VLV2 specific Metronome module that uses the CPU I/O Protocol defined in the IntelFrameworkPkg. Instead, use the Metronome module from the MdeModulePkg that produces the Metronome Arch Protocol from a TimerLib instance. * Remove use of MpCpu.inf from DSC/FDF file. * Update DSC/FDF/source files to assume MINNOW2_FSP_BUILD is FALSE. * Update DSC/FDF/source files to assume FTPM_ENABLE is FALSE. * Remove TXT binary * Use PcAtChisetPkg HpetDxe module instead of the VLV2 specific SmartTimer module that has an IntelFramework dependency. * Remove SEC_ENABLE define and dependent modules. * Remove IdeBusDxe module from DSC files. IdeBusDxe is listed in DSC file, but not the FDF file, so it is not used. This removes an IntelFrameworkModulkePkg dependency. * Remove commented out SDIO and PiSmmCommunicationPei modules * Remove unused Intel Framework S3Lib * Remove use of PCD from the IntelFrameworkModulePkg PcdEbdaReservedMemorySize. * Remove EdkCompatibilityPkg related [BuildOptions] sections * Remove unused DEFINES from DSC/FDF * Remove unused references to Ppi/Cache.h from Vlv2SocBinPkg.dec * Remove unused references to gPeiCachePpiGuid from Vlv2SocBinPkg.dec * Remove unused references to gEfiHtBistHobGuid from Vlv2SocBinPkg.dec * Remove unused references to gEfiCpuTokenSpaceGuid PCDs from Vlv2SocBinPkg.dec * Remove unused IntelPchLegacyInterrupt module * Remove CpuIoDxe module from IntelFrameworkModulePkg * Remove duplicate declaration of gEfiAcpiSupportProtocolGuid from Vlv2Tblt2DevicePkg * Remove duplicate declaration of PcdShellFile from Vlv2Tblt2DevicePkg * Remove unused gEfiAcpiTableProtocolGuid from AcpiPlatform.inf * Add E7006X3 UNDI module to FDF files * Remove gEfiSimpleNetworkProtocolGuid dependency. If gEfiSimpleNetworkProtocolGuid is not produced, still allow all SMBIOS records to be produced. The MAC address from Simple Network Protocol is being used as a system serial number. If Simple Network Protocol is not available, then default to a serial number of 0. * Remove unused dependency on IntelFspWrapperPkg * Remove Intel Framework S3 support. * Remove use of the gEfiSmmPeiSmramMemoryReserveGuid GUIDed HOB. * Remove production of unused gEfiFindFvPpiGuid. * Update IA32 only builds to use a unique BUILD_OUTPUT directory Cc: Zailiang Sun Cc: Yi Qian Signed-off-by: Michael D Kinney --- .../AcpiPlatform/AcpiPlatform.c | 33 +- .../AcpiPlatform/AcpiPlatform.h | 8 +- .../AcpiPlatform/AcpiPlatform.inf | 5 - .../Intel/Vlv2TbltDevicePkg/Build_IFWI.bat | 33 -- .../Include/Library/EfiRegTableLib.h | 11 +- .../Library/EfiRegTableLib/EfiRegTableLib.inf | 12 +- .../MultiPlatformLib/MultiPlatformLib.h | 7 +- .../MultiPlatformLib/MultiPlatformLib.inf | 9 +- .../Library/PlatformBdsLib/BdsPlatform.c | 6 - .../MonoStatusCode/MonoStatusCode.h | 47 +- .../MonoStatusCode/MonoStatusCode.inf | 9 +- .../PciPlatform/PciPlatform.inf | 8 +- .../PlatformCpuInfoDxe/PlatformCpuInfoDxe.h | 17 +- .../PlatformCpuInfoDxe/PlatformCpuInfoDxe.inf | 8 +- .../PlatformDxe/Configuration.h | 8 +- .../Vlv2TbltDevicePkg/PlatformDxe/Platform.c | 524 +---------------- .../PlatformDxe/PlatformDxe.h | 515 +---------------- .../PlatformDxe/PlatformDxe.inf | 20 +- .../PlatformGopPolicy/PlatformGopPolicy.inf | 12 +- .../PlatformInitPei/MemoryCallback.c | 8 +- .../PlatformInitPei/PlatformEarlyInit.c | 209 +------ .../PlatformInitPei/PlatformEarlyInit.h | 21 +- .../PlatformInitPei/PlatformInitPei.inf | 29 +- .../PlatformPei/CommonHeader.h | 11 +- .../PlatformPei/MemoryCallback.c | 8 +- .../Vlv2TbltDevicePkg/PlatformPei/Platform.c | 16 +- .../PlatformPei/PlatformPei.inf | 11 +- .../Intel/Vlv2TbltDevicePkg/PlatformPkg.dec | 16 +- .../Intel/Vlv2TbltDevicePkg/PlatformPkg.fdf | 254 +++------ .../Vlv2TbltDevicePkg/PlatformPkgConfig.dsc | 21 +- .../Vlv2TbltDevicePkg/PlatformPkgGcc.fdf | 234 +++----- .../Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc | 532 ++++------------- .../Vlv2TbltDevicePkg/PlatformPkgIA32.dsc | 533 ++++------------- .../Vlv2TbltDevicePkg/PlatformPkgX64.dsc | 534 ++++-------------- .../PlatformSetupDxe/PlatformSetupDxe.h | 28 +- .../PlatformSetupDxe/PlatformSetupDxe.inf | 14 +- .../PlatformSetupDxe/SetupInfoRecords.c | 43 +- .../Vlv2TbltDevicePkg/PlatformSmm/Platform.c | 83 +-- .../PlatformSmm/PlatformSmm.inf | 17 +- .../Vlv2TbltDevicePkg/PlatformSmm/S3Save.c | 53 +- .../PlatformSmm/SmmPlatform.h | 7 +- .../Vlv2TbltDevicePkg/PpmPolicy/PpmPolicy.inf | 6 +- .../MiscBaseBoardManufacturerFunction.c | 8 +- .../SmBiosMiscDxe/MiscOemType0x94Function.c | 42 +- .../MiscSystemManufacturerFunction.c | 10 +- .../SmBiosMiscDxe/SmBiosMiscDxe.inf | 15 +- .../VlvPlatformInitDxe/IgdOpRegion.c | 11 +- .../VlvPlatformInitDxe/IgdOpRegion.h | 27 +- .../VlvPlatformInitDxe/VlvPlatformInitDxe.inf | 8 +- Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.bat | 39 +- 50 files changed, 599 insertions(+), 3541 deletions(-) diff --git a/Platform/Intel/Vlv2TbltDevicePkg/AcpiPlatform/AcpiPlatform.c b= /Platform/Intel/Vlv2TbltDevicePkg/AcpiPlatform/AcpiPlatform.c index 5c03f66edb..1f4d575b73 100644 --- a/Platform/Intel/Vlv2TbltDevicePkg/AcpiPlatform/AcpiPlatform.c +++ b/Platform/Intel/Vlv2TbltDevicePkg/AcpiPlatform/AcpiPlatform.c @@ -638,7 +638,6 @@ OnReadyToBoot ( EFI_STATUS Status; EFI_ACPI_TABLE_VERSION TableVersion; EFI_ACPI_SUPPORT_PROTOCOL *AcpiSupport; - EFI_ACPI_S3_SAVE_PROTOCOL *AcpiS3Save; SYSTEM_CONFIGURATION SetupVarBuffer; UINTN VariableSize; EFI_PLATFORM_CPU_INFO *PlatformCpuInfoPtr =3D NULL; @@ -722,15 +721,6 @@ OnReadyToBoot ( TableVersion ); ASSERT_EFI_ERROR (Status); - - // - // S3 script save. - // - Status =3D gBS->LocateProtocol (&gEfiAcpiS3SaveProtocolGuid, NULL, (VOID= **) &AcpiS3Save); - if (!EFI_ERROR (Status)) { - AcpiS3Save->S3Save (AcpiS3Save, NULL); - } - } =20 VOID @@ -1261,12 +1251,23 @@ AcpiPlatformEntryPoint ( } } =20 - Status =3D EfiCreateEventReadyToBootEx ( - TPL_NOTIFY, - OnReadyToBoot, - NULL, - &Event - ); + // + // Publish ACPI 1.0 or 2.0 Tables. + // +// Status =3D AcpiSupport->PublishTables ( +// AcpiSupport, +// TableVersion +// ); +// ASSERT_EFI_ERROR (Status); + +// Status =3D EfiCreateEventReadyToBootEx ( +// TPL_NOTIFY, +// OnReadyToBoot, +// NULL, +// &Event +// ); + Event =3D NULL; + OnReadyToBoot (Event, NULL); =20 // // Finished. diff --git a/Platform/Intel/Vlv2TbltDevicePkg/AcpiPlatform/AcpiPlatform.h b= /Platform/Intel/Vlv2TbltDevicePkg/AcpiPlatform/AcpiPlatform.h index 598756846a..f45590ea24 100644 --- a/Platform/Intel/Vlv2TbltDevicePkg/AcpiPlatform/AcpiPlatform.h +++ b/Platform/Intel/Vlv2TbltDevicePkg/AcpiPlatform/AcpiPlatform.h @@ -1,12 +1,9 @@ /*++ =20 - Copyright (c) 2004 - 2014, Intel Corporation. All rights reserved.
- = =20 + Copyright (c) 2004 - 2019, Intel Corporation. All rights reserved.
+ SPDX-License-Identifier: BSD-2-Clause-Patent =20 - = =20 - - Module Name: =20 AcpiPlatform.h @@ -26,7 +23,6 @@ Abstract: // // Statements that include other header files. // -#include #include #include #include diff --git a/Platform/Intel/Vlv2TbltDevicePkg/AcpiPlatform/AcpiPlatform.inf= b/Platform/Intel/Vlv2TbltDevicePkg/AcpiPlatform/AcpiPlatform.inf index c59920db03..817ad58a81 100644 --- a/Platform/Intel/Vlv2TbltDevicePkg/AcpiPlatform/AcpiPlatform.inf +++ b/Platform/Intel/Vlv2TbltDevicePkg/AcpiPlatform/AcpiPlatform.inf @@ -37,7 +37,6 @@ [Packages] IntelFrameworkPkg/IntelFrameworkPkg.dec MdeModulePkg/MdeModulePkg.dec Vlv2DeviceRefCodePkg/Vlv2DeviceRefCodePkg.dec - IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec Vlv2TbltDevicePkg/PlatformPkg.dec =20 [LibraryClasses] @@ -63,13 +62,9 @@ [Guids] gEfiVlv2VariableGuid =20 [Protocols] - gEfiAcpiTableProtocolGuid # PROTOCOL ALWAYS_CONSUMED gEnhancedSpeedstepProtocolGuid gEfiPlatformCpuProtocolGuid gEfiAcpiSupportProtocolGuid - gEfiAcpiS3SaveProtocolGuid - gEfiCpuIoProtocolGuid - gEfiPs2PolicyProtocolGuid gEfiFirmwareVolume2ProtocolGuid gEfiMpServiceProtocolGuid gEfiGlobalNvsAreaProtocolGuid diff --git a/Platform/Intel/Vlv2TbltDevicePkg/Build_IFWI.bat b/Platform/Int= el/Vlv2TbltDevicePkg/Build_IFWI.bat index 887206703a..44759c617f 100644 --- a/Platform/Intel/Vlv2TbltDevicePkg/Build_IFWI.bat +++ b/Platform/Intel/Vlv2TbltDevicePkg/Build_IFWI.bat @@ -114,7 +114,6 @@ if /i "%~1"=3D=3D"/yL" ( goto OptLoop ) =20 - :: Require 2 input parameters if "%~2"=3D=3D"" goto Usage =20 @@ -122,10 +121,6 @@ if "%~2"=3D=3D"" goto Usage set Platform_Type=3D%~1 set Build_Target=3D%~2 =20 -if "%~3"=3D=3D"" ( - set "IFWI_Suffix=3D " -) else set "IFWI_Suffix=3D/S %~3" - :: Build BIOS echo =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D echo Build_IFWI: Calling BIOS build Script... @@ -139,34 +134,6 @@ if %ERRORLEVEL% NEQ 0 ( ) echo. echo Finished Building BIOS. -@REM Set BIOS_ID environment variable here. -call %WORKSPACE%\Conf\BiosId.bat -echo BIOS_ID=3D%BIOS_ID% - -:: Set the Board_Id, Build_Type, Version_Major, and Version_Minor environm= ent variables -find /v "#" %WORKSPACE%\Conf\BiosId.env > ver_strings -for /f "tokens=3D1,3" %%i in (ver_strings) do set %%i=3D%%j -del /f/q ver_strings >nul -set BIOS_Name=3D%BOARD_ID%_%Arch%_%BUILD_TYPE%_%VERSION_MAJOR%_%VERSION_MI= NOR%.ROM - -:: Start Integration process -echo =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D -echo Build_IFWI: Calling IFWI Stitching Script... -pushd %PLATFORM_PATH%\%PLATFORM_PACKAGE%\Stitch - - :: IFWIStitch.bat [/nG] [/nM] [/nB] [/B BIOS.rom] [/C StitchConfig] [/S = IFWISuffix] - call IFWIStitch.bat %Stitch_Flags% /B %BIOS_Name% %IFWI_Suffix% - =20 - @echo off -popd -if %ERRORLEVEL% NEQ 0 ( - echo echo -- Error Stitching %BIOS_Nam% & echo. - set exitCode=3D1 -) -echo. -echo Build_IFWI is finished. -echo The final IFWI file is located in %ROOT_DIR%\Vlv2TbltDevicePkg\Stitch= \ -echo =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D goto Exit =20 :Usage diff --git a/Platform/Intel/Vlv2TbltDevicePkg/Include/Library/EfiRegTableLi= b.h b/Platform/Intel/Vlv2TbltDevicePkg/Include/Library/EfiRegTableLib.h index 915f8b39d9..12e44efed0 100644 --- a/Platform/Intel/Vlv2TbltDevicePkg/Include/Library/EfiRegTableLib.h +++ b/Platform/Intel/Vlv2TbltDevicePkg/Include/Library/EfiRegTableLib.h @@ -1,12 +1,9 @@ /*++ =20 - Copyright (c) 2004 - 2014, Intel Corporation. All rights reserved.
- = =20 + Copyright (c) 2004 - 2019, Intel Corporation. All rights reserved.
+ SPDX-License-Identifier: BSD-2-Clause-Patent =20 - = =20 - - Module Name: =20 EfiRegTableLib.h @@ -31,10 +28,6 @@ Abstract: #include #include #include -#include -#include -#include -#include #include =20 =20 diff --git a/Platform/Intel/Vlv2TbltDevicePkg/Library/EfiRegTableLib/EfiReg= TableLib.inf b/Platform/Intel/Vlv2TbltDevicePkg/Library/EfiRegTableLib/EfiR= egTableLib.inf index 9cb8841d65..472fc4e0f6 100644 --- a/Platform/Intel/Vlv2TbltDevicePkg/Library/EfiRegTableLib/EfiRegTableLi= b.inf +++ b/Platform/Intel/Vlv2TbltDevicePkg/Library/EfiRegTableLib/EfiRegTableLi= b.inf @@ -2,12 +2,9 @@ # #/*++ # -# Copyright (c) 2014 - 2018, Intel Corporation. All rights reserved.
-# = =20 +# Copyright (c) 2014 - 2019, Intel Corporation. All rights reserved.
+# # SPDX-License-Identifier: BSD-2-Clause-Patent - -# = =20 - # # Module Name: # @@ -40,8 +37,3 @@ [Packages] MdePkg/MdePkg.dec MdeModulePkg/MdeModulePkg.dec Vlv2TbltDevicePkg/PlatformPkg.dec - IntelFrameworkPkg/IntelFrameworkPkg.dec - - -[LibraryClasses] - diff --git a/Platform/Intel/Vlv2TbltDevicePkg/Library/MultiPlatformLib/Mult= iPlatformLib.h b/Platform/Intel/Vlv2TbltDevicePkg/Library/MultiPlatformLib/= MultiPlatformLib.h index 807ca20acb..3fa9f7b129 100644 --- a/Platform/Intel/Vlv2TbltDevicePkg/Library/MultiPlatformLib/MultiPlatfo= rmLib.h +++ b/Platform/Intel/Vlv2TbltDevicePkg/Library/MultiPlatformLib/MultiPlatfo= rmLib.h @@ -3,11 +3,11 @@ =20 This file includes package header files, library classes. =20 - Copyright (c) 2013 - 2014, Intel Corporation. All rights reserved.
- = =20 + Copyright (c) 2013 - 2019, Intel Corporation. All rights reserved.
+ SPDX-License-Identifier: BSD-2-Clause-Patent =20 - = =20 + **/ =20 #ifndef _MULTIPLATFORM_LIB_H_ @@ -52,7 +52,6 @@ #include #include #include -#include #include #include #include diff --git a/Platform/Intel/Vlv2TbltDevicePkg/Library/MultiPlatformLib/Mult= iPlatformLib.inf b/Platform/Intel/Vlv2TbltDevicePkg/Library/MultiPlatformLi= b/MultiPlatformLib.inf index 758e47ca70..a4942a097c 100644 --- a/Platform/Intel/Vlv2TbltDevicePkg/Library/MultiPlatformLib/MultiPlatfo= rmLib.inf +++ b/Platform/Intel/Vlv2TbltDevicePkg/Library/MultiPlatformLib/MultiPlatfo= rmLib.inf @@ -1,11 +1,8 @@ # # -# Copyright (c) 1999 - 2014, Intel Corporation. All rights reserved -# = =20 +# Copyright (c) 1999 - 2019, Intel Corporation. All rights reserved +# # SPDX-License-Identifier: BSD-2-Clause-Patent -# = =20 -# -# # # Module Name: # @@ -59,13 +56,11 @@ [Packages] Vlv2TbltDevicePkg/PlatformPkg.dec IntelFrameworkPkg/IntelFrameworkPkg.dec Vlv2DeviceRefCodePkg/Vlv2DeviceRefCodePkg.dec - Vlv2SocBinPkg/Vlv2SocBinPkg.dec =20 [LibraryClasses] DebugLib HobLib IoLib -# PeiKscLib =20 [Ppis] gEfiPeiReadOnlyVariable2PpiGuid diff --git a/Platform/Intel/Vlv2TbltDevicePkg/Library/PlatformBdsLib/BdsPla= tform.c b/Platform/Intel/Vlv2TbltDevicePkg/Library/PlatformBdsLib/BdsPlatfo= rm.c index 4d5997d6e9..4adca1b465 100644 --- a/Platform/Intel/Vlv2TbltDevicePkg/Library/PlatformBdsLib/BdsPlatform.c +++ b/Platform/Intel/Vlv2TbltDevicePkg/Library/PlatformBdsLib/BdsPlatform.c @@ -1789,9 +1789,6 @@ PlatformBdsPolicyBehavior ( #ifdef TPM_ENABLED TcgPhysicalPresenceLibProcessRequest(); #endif - #ifdef FTPM_ENABLE - Tcg2PhysicalPresenceLibProcessRequest(NULL); - #endif =20 if (EsrtManagement !=3D NULL) { EsrtManagement->LockEsrtRepository(); @@ -1997,9 +1994,6 @@ FULL_CONFIGURATION: } #ifdef TPM_ENABLED TcgPhysicalPresenceLibProcessRequest(); - #endif - #ifdef FTPM_ENABLE - Tcg2PhysicalPresenceLibProcessRequest(NULL); #endif =20 if (EsrtManagement !=3D NULL) { diff --git a/Platform/Intel/Vlv2TbltDevicePkg/MonoStatusCode/MonoStatusCode= .h b/Platform/Intel/Vlv2TbltDevicePkg/MonoStatusCode/MonoStatusCode.h index 0b256093a6..80a84d0d21 100644 --- a/Platform/Intel/Vlv2TbltDevicePkg/MonoStatusCode/MonoStatusCode.h +++ b/Platform/Intel/Vlv2TbltDevicePkg/MonoStatusCode/MonoStatusCode.h @@ -1,11 +1,9 @@ /*++ =20 - Copyright (c) 2004 - 2014, Intel Corporation. All rights reserved.
- = =20 + Copyright (c) 2004 - 2019, Intel Corporation. All rights reserved.
+ SPDX-License-Identifier: BSD-2-Clause-Patent =20 - = =20 - Module Name: =20 MonoStatusCode.h @@ -24,41 +22,18 @@ Abstract: // // Statements that include other files. // -#include "PiPei.h" +#include =20 -#include "Pi/PiBootMode.h" - -#include "Ppi/StatusCode.h" -#include "Ppi/MemoryDiscovered.h" -#include "Ppi/FvLoadFile.h" - -#include "Library/HobLib.h" -#include "Library/DebugLib.h" -#include "Library/IoLib.h" -#include "Library/SerialPortLib.h" -#include "Protocol/StatusCode.h" - - -#ifndef _STATUS_CODE_ENABLER_H_ -#define _STATUS_CODE_ENABLER_H_ - -#ifdef EFI_DEBUG - -#define EFI_STATUS_CODE_ENABLER_HOB_GUID \ - { \ - 0x5ffc6cf3, 0x71ad, 0x46f5, 0xbd, 0x8b, 0x7e, 0x8f, 0xfe, 0x19, 0x7, 0= xd7 \ - } - -extern EFI_GUID gEfiSerialStatusCodeEnablerHobGuid; - -typedef struct _EFI_STATUS_CODE_INFO { - BOOLEAN StatusCodeDisable; -} EFI_STATUS_CODE_INFO; - -#endif -#endif +#include =20 +#include +#include =20 +#include +#include +#include +#include +#include =20 // // Platform specific function Declarations. These must be implemented in = a diff --git a/Platform/Intel/Vlv2TbltDevicePkg/MonoStatusCode/MonoStatusCode= .inf b/Platform/Intel/Vlv2TbltDevicePkg/MonoStatusCode/MonoStatusCode.inf index f1be5b8d6c..d429310ac4 100644 --- a/Platform/Intel/Vlv2TbltDevicePkg/MonoStatusCode/MonoStatusCode.inf +++ b/Platform/Intel/Vlv2TbltDevicePkg/MonoStatusCode/MonoStatusCode.inf @@ -1,9 +1,8 @@ # # -# Copyright (c) 1999 - 2014, Intel Corporation. All rights reserved -# = =20 +# Copyright (c) 1999 - 2019, Intel Corporation. All rights reserved +# # SPDX-License-Identifier: BSD-2-Clause-Patent -# = =20 # # Module Name: # @@ -34,10 +33,8 @@ [sources.common] [Packages] MdePkg/MdePkg.dec MdeModulePkg/MdeModulePkg.dec - Vlv2SocBinPkg/Vlv2SocBinPkg.dec Vlv2TbltDevicePkg/PlatformPkg.dec Vlv2DeviceRefCodePkg/Vlv2DeviceRefCodePkg.dec - IntelFrameworkPkg/IntelFrameworkPkg.dec =20 [LibraryClasses] PeimEntryPoint @@ -52,7 +49,6 @@ [LibraryClasses] [Ppis] gEfiPeiMemoryDiscoveredPpiGuid gEfiPeiStatusCodePpiGuid - gEfiPeiFvFileLoaderPpiGuid =20 [Protocols] gEfiStatusCodeRuntimeProtocolGuid @@ -62,7 +58,6 @@ [Pcd] =20 [Guids] gEfiPlatformCpuInfoGuid - gEfiHtBistHobGuid gEfiStatusCodeDataTypeStringGuid ## CONSUMES =20 [Depex] diff --git a/Platform/Intel/Vlv2TbltDevicePkg/PciPlatform/PciPlatform.inf b= /Platform/Intel/Vlv2TbltDevicePkg/PciPlatform/PciPlatform.inf index a0837917d8..18012a1d53 100644 --- a/Platform/Intel/Vlv2TbltDevicePkg/PciPlatform/PciPlatform.inf +++ b/Platform/Intel/Vlv2TbltDevicePkg/PciPlatform/PciPlatform.inf @@ -1,11 +1,8 @@ #/*++ # -# Copyright (c) 2003 - 2018, Intel Corporation. All rights reserved -# = =20 +# Copyright (c) 2003 - 2019, Intel Corporation. All rights reserved +# # SPDX-License-Identifier: BSD-2-Clause-Patent - -# = =20 - # # Module Name: # @@ -46,7 +43,6 @@ [Packages] MdeModulePkg/MdeModulePkg.dec Vlv2TbltDevicePkg/PlatformPkg.dec Vlv2DeviceRefCodePkg/Vlv2DeviceRefCodePkg.dec - IntelFrameworkPkg/IntelFrameworkPkg.dec =20 [LibraryClasses] HobLib diff --git a/Platform/Intel/Vlv2TbltDevicePkg/PlatformCpuInfoDxe/PlatformCp= uInfoDxe.h b/Platform/Intel/Vlv2TbltDevicePkg/PlatformCpuInfoDxe/PlatformCp= uInfoDxe.h index b13611f4f8..dfe3d1a0c7 100644 --- a/Platform/Intel/Vlv2TbltDevicePkg/PlatformCpuInfoDxe/PlatformCpuInfoDx= e.h +++ b/Platform/Intel/Vlv2TbltDevicePkg/PlatformCpuInfoDxe/PlatformCpuInfoDx= e.h @@ -1,12 +1,9 @@ /*++ =20 - Copyright (c) 2004 - 2014, Intel Corporation. All rights reserved.
- = =20 + Copyright (c) 2004 - 2019, Intel Corporation. All rights reserved.
+ SPDX-License-Identifier: BSD-2-Clause-Patent =20 - = =20 - - Module Name: PlatformCpuInfoDxe.h =20 @@ -18,12 +15,10 @@ Abstract: #ifndef _PLATFORM_CPU_INFO_DRIVER_H_ #define _PLATFORM_CPU_INFO_DRIVER_H_ =20 -#include "PiDxe.h" -#include "Library/HobLib.h" -#include "Guid/GlobalVariable.h" -#include "Guid/AcpiVariableCompatibility.h" -#include "Guid/PlatformCpuInfo.h" -#include "Library/UefiRuntimeServicesTableLib.h" +#include +#include +#include +#include #include =20 #endif diff --git a/Platform/Intel/Vlv2TbltDevicePkg/PlatformCpuInfoDxe/PlatformCp= uInfoDxe.inf b/Platform/Intel/Vlv2TbltDevicePkg/PlatformCpuInfoDxe/Platform= CpuInfoDxe.inf index f2ade1b105..ac9c7f1ba1 100644 --- a/Platform/Intel/Vlv2TbltDevicePkg/PlatformCpuInfoDxe/PlatformCpuInfoDx= e.inf +++ b/Platform/Intel/Vlv2TbltDevicePkg/PlatformCpuInfoDxe/PlatformCpuInfoDx= e.inf @@ -1,10 +1,8 @@ #/*++ # -# Copyright (c) 1999 - 2014, Intel Corporation. All rights reserved -# = =20 +# Copyright (c) 1999 - 2019, Intel Corporation. All rights reserved +# # SPDX-License-Identifier: BSD-2-Clause-Patent -# = =20 - # # Module Name: # @@ -36,9 +34,7 @@ [Packages] MdePkg/MdePkg.dec MdeModulePkg/MdeModulePkg.dec Vlv2TbltDevicePkg/PlatformPkg.dec - Vlv2SocBinPkg/Vlv2SocBinPkg.dec Vlv2DeviceRefCodePkg/Vlv2DeviceRefCodePkg.dec - IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec =20 [LibraryClasses] HobLib diff --git a/Platform/Intel/Vlv2TbltDevicePkg/PlatformDxe/Configuration.h b= /Platform/Intel/Vlv2TbltDevicePkg/PlatformDxe/Configuration.h index 23e03111c9..676f500530 100644 --- a/Platform/Intel/Vlv2TbltDevicePkg/PlatformDxe/Configuration.h +++ b/Platform/Intel/Vlv2TbltDevicePkg/PlatformDxe/Configuration.h @@ -1,11 +1,9 @@ /*++ =20 - Copyright (c) 2004 - 2014, Intel Corporation. All rights reserved.
- = =20 + Copyright (c) 2004 - 2019, Intel Corporation. All rights reserved.
+ SPDX-License-Identifier: BSD-2-Clause-Patent =20 - = =20 - Module Name: =20 Configuration.h @@ -89,8 +87,6 @@ Abstract: #define VAR_EQ_CONFIG_MODE_DECIMAL_NAME L"67" #define VAR_EQ_CPU_EE_NAME 0x0045 // E #define VAR_EQ_CPU_EE_DECIMAL_NAME L"69" -#define VAR_EQ_FLOPPY_MODE_NAME 0x0046 // F -#define VAR_EQ_FLOPPY_MODE_DECIMAL_NAME L"70" #define VAR_EQ_HT_MODE_NAME 0x0048 // H #define VAR_EQ_HT_MODE_DECIMAL_NAME L"72" #define VAR_EQ_AHCI_MODE_NAME 0x0049 // I diff --git a/Platform/Intel/Vlv2TbltDevicePkg/PlatformDxe/Platform.c b/Plat= form/Intel/Vlv2TbltDevicePkg/PlatformDxe/Platform.c index 2a4a0b92e1..1d90117af6 100644 --- a/Platform/Intel/Vlv2TbltDevicePkg/PlatformDxe/Platform.c +++ b/Platform/Intel/Vlv2TbltDevicePkg/PlatformDxe/Platform.c @@ -1,13 +1,9 @@ /** @file =20 - Copyright (c) 2004 - 2015, Intel Corporation. All rights reserved.
- = =20 + Copyright (c) 2004 - 2019, Intel Corporation. All rights reserved.
=20 SPDX-License-Identifier: BSD-2-Clause-Patent =20 - = =20 - - Module Name: =20 =20 @@ -23,9 +19,7 @@ Abstract: #include "PlatformDxe.h" #include "Platform.h" #include "PchCommonDefinitions.h" -#include #include -#include #include #include #include @@ -63,10 +57,8 @@ GPIO_CONF_PAD_INIT mTB_BL_GpioInitData_SC_TRI_Exit_boot_= Service[] =3D EFI_GUID mSystemHiiExportDatabase =3D EFI_HII_EXPORT_DATABASE_GUID; EFI_GUID mPlatformDriverGuid =3D EFI_PLATFORM_DRIVER_GUID; SYSTEM_CONFIGURATION mSystemConfiguration; -SYSTEM_PASSWORDS mSystemPassword; EFI_HANDLE mImageHandle; BOOLEAN mMfgMode =3D FALSE; -VOID *mDxePlatformStringPack; UINT32 mPlatformBootMode =3D PLATFORM_NORMAL_MODE; extern CHAR16 gItkDataVarName[]; =20 @@ -77,8 +69,6 @@ EFI_EVENT mReadyToBootEvent; =20 UINT8 mSmbusRsvdAddresses[] =3D PLATFORM_SMBUS_RSVD_ADDRESSES; UINT8 mNumberSmbusAddress =3D sizeof( mSmbusRsvdAddresses ) / sizeof( mSmb= usRsvdAddresses[0] ); -UINT32 mSubsystemVidDid; -UINT32 mSubsystemAudioVidDid; =20 UINTN mPciLanCount =3D 0; VOID *mPciLanInfo =3D NULL; @@ -89,9 +79,6 @@ static EFI_SPEAKER_IF_PROTOCOL mSpeakerInterface =3D { GenerateBeepTone }; =20 -EFI_USB_POLICY_PROTOCOL mUsbPolicyData =3D {0}; - - CFIO_PNP_INIT mTB_BL_GpioInitData_SC_TRI_S0ix_Exit_boot_Service[] =3D { {0x410 ,0x20038e10}, //vlv.gpio.gpscore.cfio_regs_pad_lpc_clkout1_pconf= 0 @@ -179,11 +166,6 @@ VOID UpdateDVMTSetup( ); =20 -VOID -InitPlatformUsbPolicy ( - VOID - ); - VOID InitRC6Policy( VOID @@ -427,14 +409,8 @@ SpiBiosProtectionFunction( =20 BiosFlaLower0 =3D PcdGet32(PcdFlashMicroCodeAddress)-PcdGet32(PcdFlashAr= eaBaseAddress); BiosFlaLimit0 =3D PcdGet32(PcdFlashMicroCodeSize)-1; =20 - #ifdef MINNOW2_FSP_BUILD - BiosFlaLower1 =3D PcdGet32(PcdFlashFvFspBase)-PcdGet32(PcdFlashAreaBaseA= ddress); - BiosFlaLimit1 =3D (PcdGet32(PcdFlashFvRecoveryBase)-PcdGet32(PcdFlashFvF= spBase)+PcdGet32(PcdFlashFvRecoverySize))-1; - #else BiosFlaLower1 =3D PcdGet32(PcdFlashFvMainBase)-PcdGet32(PcdFlashAreaBase= Address); BiosFlaLimit1 =3D (PcdGet32(PcdFlashFvRecoveryBase)-PcdGet32(PcdFlashFvM= ainBase)+PcdGet32(PcdFlashFvRecoverySize))-1; - #endif - =20 mPciD31F0RegBase =3D MmPciAddress (0, DEFAULT_PCI_BUS_NUMBER_PCH, @@ -611,8 +587,6 @@ TristateLpcGpioS0i3Config ( } =20 =20 -EFI_BOOT_SCRIPT_SAVE_PROTOCOL *mBootScriptSave; - /** Event Notification during exit boot service to enabel ACPI mode =20 @@ -862,8 +836,6 @@ InitializePlatform ( // // Add usb policy // - InitPlatformUsbPolicy(); - InitSioPlatformPolicy(); InitializeClockRouting(); InitializeSlotInfo(); InitTcoReset(); @@ -949,7 +921,7 @@ InitializePlatform ( ); if (!EFI_ERROR (Status)) { Status =3D gBS->RegisterProtocolNotify ( - &gExitPmAuthProtocolGuid, + &gEfiEndOfDxeEventGroupGuid, RtcEvent, &RtcCallbackReg ); @@ -1042,58 +1014,6 @@ ReadyToBootFunction ( VOID *Context ) { - EFI_STATUS Status; - EFI_ISA_ACPI_PROTOCOL *IsaAcpi; - EFI_ISA_ACPI_DEVICE_ID IsaDevice; - UINTN Size; - UINT16 State; - EFI_TPM_MP_DRIVER_PROTOCOL *TpmMpDriver; - EFI_CPU_IO_PROTOCOL *CpuIo; - UINT8 Data; - UINT8 ReceiveBuffer [64]; - UINT32 ReceiveBufferSize; - - UINT8 TpmForceClearCommand [] =3D {0x00, 0xC1, - 0x00, 0x00, 0x00, 0x0A, - 0x00, 0x00, 0x00, 0x5D}; - UINT8 TpmPhysicalPresenceCommand [] =3D {0x00, 0xC1, - 0x00, 0x00, 0x00, 0x0C, - 0x40, 0x00, 0x00, 0x0A, - 0x00, 0x00}; - UINT8 TpmPhysicalDisableCommand [] =3D {0x00, 0xC1, - 0x00, 0x00, 0x00, 0x0A, - 0x00, 0x00, 0x00, 0x70}; - UINT8 TpmPhysicalEnableCommand [] =3D {0x00, 0xC1, - 0x00, 0x00, 0x00, 0x0A, - 0x00, 0x00, 0x00, 0x6F}; - UINT8 TpmPhysicalSetDeactivatedCommand [] =3D {0x00, 0xC1, - 0x00, 0x00, 0x00, 0x0B, - 0x00, 0x00, 0x00, 0x72, - 0x00}; - UINT8 TpmSetOwnerInstallCommand [] =3D {0x00, 0xC1, - 0x00, 0x00, 0x00, 0x0B, - 0x00, 0x00, 0x00, 0x71, - 0x00}; - - Size =3D sizeof(UINT16); - Status =3D gRT->GetVariable ( - VAR_EQ_FLOPPY_MODE_DECIMAL_NAME, - &gEfiNormalSetupGuid, - NULL, - &Size, - &State - ); - - // - // Disable Floppy Controller if needed - // - Status =3D gBS->LocateProtocol (&gEfiIsaAcpiProtocolGuid, NULL, (VOID **= ) &IsaAcpi); - if (!EFI_ERROR(Status) && (State =3D=3D 0x00)) { - IsaDevice.HID =3D EISA_PNP_ID(0x604); - IsaDevice.UID =3D 0; - Status =3D IsaAcpi->EnableDevice(IsaAcpi, &IsaDevice, FALSE); - } - // // save LAN info to a variable // @@ -1111,386 +1031,6 @@ ReadyToBootFunction ( gBS->FreePool (mPciLanInfo); mPciLanInfo =3D NULL; } - =20 - - // - // Handle ACPI OS TPM requests here - // - Status =3D gBS->LocateProtocol ( - &gEfiCpuIoProtocolGuid, - NULL, - (VOID **)&CpuIo - ); - Status =3D gBS->LocateProtocol ( - &gEfiTpmMpDriverProtocolGuid, - NULL, - (VOID **)&TpmMpDriver - ); - if (!EFI_ERROR (Status)) - { - Data =3D ReadCmosBank1Byte (CpuIo, ACPI_TPM_REQUEST); - - // - // Clear pending ACPI TPM request indicator - // - WriteCmosBank1Byte (CpuIo, ACPI_TPM_REQUEST, 0x00); - if (Data !=3D 0) - { - WriteCmosBank1Byte (CpuIo, ACPI_TPM_LAST_REQUEST, Data); - - // - // Assert Physical Presence for these commands - // - TpmPhysicalPresenceCommand [11] =3D 0x20; - ReceiveBufferSize =3D sizeof(ReceiveBuffer); - Status =3D TpmMpDriver->Transmit ( - TpmMpDriver, TpmPhysicalPresenceCommand, - sizeof (TpmPhysicalPresenceCommand), - ReceiveBuffer, &ReceiveBufferSize - ); - // - // PF PhysicalPresence =3D TRUE - // - TpmPhysicalPresenceCommand [11] =3D 0x08; - ReceiveBufferSize =3D sizeof(ReceiveBuffer); - Status =3D TpmMpDriver->Transmit ( - TpmMpDriver, TpmPhysicalPresenceCommand, - sizeof (TpmPhysicalPresenceCommand), - ReceiveBuffer, - &ReceiveBufferSize - ); - if (Data =3D=3D 0x01) - { - // - // TPM_PhysicalEnable - // - ReceiveBufferSize =3D sizeof(ReceiveBuffer); - Status =3D TpmMpDriver->Transmit ( - TpmMpDriver, TpmPhysicalEnableCommand, - sizeof (TpmPhysicalEnableCommand), - ReceiveBuffer, &ReceiveBufferSize - ); - } - if (Data =3D=3D 0x02) - { - // - // TPM_PhysicalDisable - // - ReceiveBufferSize =3D sizeof(ReceiveBuffer); - Status =3D TpmMpDriver->Transmit ( - TpmMpDriver, TpmPhysicalDisableCommand, - sizeof (TpmPhysicalDisableCommand), - ReceiveBuffer, - &ReceiveBufferSize - ); - } - if (Data =3D=3D 0x03) - { - // - // TPM_PhysicalSetDeactivated=3DFALSE - // - ReceiveBufferSize =3D sizeof(ReceiveBuffer); - TpmPhysicalSetDeactivatedCommand [10] =3D 0x00; - Status =3D TpmMpDriver->Transmit ( - TpmMpDriver, - TpmPhysicalSetDeactivatedCommand, - sizeof (TpmPhysicalSetDeactivatedCommand), - ReceiveBuffer, &ReceiveBufferSize - ); - gRT->ResetSystem (EfiResetWarm, EFI_SUCCESS, 0, NULL); - } - if (Data =3D=3D 0x04) - { - // - // TPM_PhysicalSetDeactivated=3DTRUE - // - ReceiveBufferSize =3D sizeof(ReceiveBuffer); - TpmPhysicalSetDeactivatedCommand [10] =3D 0x01; - Status =3D TpmMpDriver->Transmit ( - TpmMpDriver, - TpmPhysicalSetDeactivatedCommand, - sizeof (TpmPhysicalSetDeactivatedCommand), - ReceiveBuffer, - &ReceiveBufferSize - ); - gRT->ResetSystem ( - EfiResetWarm, - EFI_SUCCESS, - 0, - NULL - ); - } - if (Data =3D=3D 0x05) - { - // - // TPM_ForceClear - // - ReceiveBufferSize =3D sizeof(ReceiveBuffer); - Status =3D TpmMpDriver->Transmit ( - TpmMpDriver, - TpmForceClearCommand, - sizeof (TpmForceClearCommand), - ReceiveBuffer, - &ReceiveBufferSize - ); - gRT->ResetSystem ( - EfiResetWarm, - EFI_SUCCESS, - 0, - NULL - ); - } - if (Data =3D=3D 0x06) - { - // - // TPM_PhysicalEnable - // - ReceiveBufferSize =3D sizeof(ReceiveBuffer); - Status =3D TpmMpDriver->Transmit ( - TpmMpDriver, - TpmPhysicalEnableCommand, - sizeof (TpmPhysicalEnableCommand), - ReceiveBuffer, - &ReceiveBufferSize - ); - // - // TPM_PhysicalSetDeactivated=3DFALSE - // - ReceiveBufferSize =3D sizeof(ReceiveBuffer); - TpmPhysicalSetDeactivatedCommand [10] =3D 0x00; - Status =3D TpmMpDriver->Transmit ( - TpmMpDriver, - TpmPhysicalSetDeactivatedCommand, - sizeof (TpmPhysicalSetDeactivatedCommand), - ReceiveBuffer, - &ReceiveBufferSize - ); - gRT->ResetSystem ( - EfiResetWarm, - EFI_SUCCESS, - 0, - NULL - ); - } - if (Data =3D=3D 0x07) - { - // - // TPM_PhysicalSetDeactivated=3DTRUE - // - ReceiveBufferSize =3D sizeof(ReceiveBuffer); - TpmPhysicalSetDeactivatedCommand [10] =3D 0x01; - Status =3D TpmMpDriver->Transmit ( - TpmMpDriver, - TpmPhysicalSetDeactivatedCommand, - sizeof (TpmPhysicalSetDeactivatedCommand), - ReceiveBuffer, - &ReceiveBufferSize - ); - // - // TPM_PhysicalDisable - // - ReceiveBufferSize =3D sizeof(ReceiveBuffer); - Status =3D TpmMpDriver->Transmit ( - TpmMpDriver, - TpmPhysicalDisableCommand, - sizeof (TpmPhysicalDisableCommand), - ReceiveBuffer, - &ReceiveBufferSize - ); - gRT->ResetSystem ( - EfiResetWarm, - EFI_SUCCESS, - 0, - NULL - ); - } - if (Data =3D=3D 0x08) - { - // - // TPM_SetOwnerInstall=3DTRUE - // - ReceiveBufferSize =3D sizeof(ReceiveBuffer); - TpmSetOwnerInstallCommand [10] =3D 0x01; - Status =3D TpmMpDriver->Transmit ( - TpmMpDriver, - TpmSetOwnerInstallCommand, - sizeof (TpmSetOwnerInstallCommand), - ReceiveBuffer, - &ReceiveBufferSize - ); - } - if (Data =3D=3D 0x09) - { - // - // TPM_SetOwnerInstall=3DFALSE - // - ReceiveBufferSize =3D sizeof(ReceiveBuffer); - TpmSetOwnerInstallCommand [10] =3D 0x00; - Status =3D TpmMpDriver->Transmit ( - TpmMpDriver, - TpmSetOwnerInstallCommand, - sizeof (TpmSetOwnerInstallCommand), - ReceiveBuffer, - &ReceiveBufferSize - ); - } - if (Data =3D=3D 0x0A) - { - // - // TPM_PhysicalEnable - // - ReceiveBufferSize =3D sizeof(ReceiveBuffer); - Status =3D TpmMpDriver->Transmit ( - TpmMpDriver, - TpmPhysicalEnableCommand, - sizeof (TpmPhysicalEnableCommand), - ReceiveBuffer, - &ReceiveBufferSize - ); - // - // TPM_PhysicalSetDeactivated=3DFALSE - // - ReceiveBufferSize =3D sizeof(ReceiveBuffer); - TpmPhysicalSetDeactivatedCommand [10] =3D 0x00; - Status =3D TpmMpDriver->Transmit ( - TpmMpDriver, - TpmPhysicalSetDeactivatedCommand, - sizeof (TpmPhysicalSetDeactivatedCommand), - ReceiveBuffer, - &ReceiveBufferSize - ); - // - // Do TPM_SetOwnerInstall=3DTRUE on next reboot - // - - WriteCmosBank1Byte (CpuIo, ACPI_TPM_REQUEST, 0xF0); - - gRT->ResetSystem ( - EfiResetWarm, - EFI_SUCCESS, - 0, - NULL - ); - } - if (Data =3D=3D 0x0B) - { - // - // TPM_SetOwnerInstall=3DFALSE - // - ReceiveBufferSize =3D sizeof(ReceiveBuffer); - TpmSetOwnerInstallCommand [10] =3D 0x00; - Status =3D TpmMpDriver->Transmit ( - TpmMpDriver, - TpmSetOwnerInstallCommand, - sizeof (TpmSetOwnerInstallCommand), - ReceiveBuffer, - &ReceiveBufferSize - ); - // - // TPM_PhysicalSetDeactivated=3DTRUE - // - ReceiveBufferSize =3D sizeof(ReceiveBuffer); - TpmPhysicalSetDeactivatedCommand [10] =3D 0x01; - Status =3D TpmMpDriver->Transmit ( - TpmMpDriver, - TpmPhysicalSetDeactivatedCommand, - sizeof (TpmPhysicalSetDeactivatedCommand), - ReceiveBuffer, - &ReceiveBufferSize - ); - // - // TPM_PhysicalDisable - // - ReceiveBufferSize =3D sizeof(ReceiveBuffer); - Status =3D TpmMpDriver->Transmit ( - TpmMpDriver, - TpmPhysicalDisableCommand, - sizeof (TpmPhysicalDisableCommand), - ReceiveBuffer, - &ReceiveBufferSize - ); - gRT->ResetSystem ( - EfiResetWarm, - EFI_SUCCESS, - 0, - NULL - ); - } - if (Data =3D=3D 0x0E) - { - // - // TPM_ForceClear - // - ReceiveBufferSize =3D sizeof(ReceiveBuffer); - Status =3D TpmMpDriver->Transmit ( - TpmMpDriver, - TpmForceClearCommand, - sizeof (TpmForceClearCommand), - ReceiveBuffer, - &ReceiveBufferSize - ); - // - // TPM_PhysicalEnable - // - ReceiveBufferSize =3D sizeof(ReceiveBuffer); - Status =3D TpmMpDriver->Transmit ( - TpmMpDriver, - TpmPhysicalEnableCommand, - sizeof (TpmPhysicalEnableCommand), - ReceiveBuffer, - &ReceiveBufferSize - ); - // - // TPM_PhysicalSetDeactivated=3DFALSE - // - ReceiveBufferSize =3D sizeof(ReceiveBuffer); - TpmPhysicalSetDeactivatedCommand [10] =3D 0x00; - Status =3D TpmMpDriver->Transmit ( - TpmMpDriver, - TpmPhysicalSetDeactivatedCommand, - sizeof (TpmPhysicalSetDeactivatedCommand), - ReceiveBuffer, - &ReceiveBufferSize - ); - gRT->ResetSystem ( - EfiResetWarm, - EFI_SUCCESS, - 0, - NULL - ); - } - if (Data =3D=3D 0xF0) - { - // - // Second part of ACPI TPM request 0x0A: OEM custom TPM_SetOwnerIn= stall=3DTRUE - // - ReceiveBufferSize =3D sizeof(ReceiveBuffer); - TpmSetOwnerInstallCommand [10] =3D 0x01; - Status =3D TpmMpDriver->Transmit ( - TpmMpDriver, - TpmSetOwnerInstallCommand, - sizeof (TpmSetOwnerInstallCommand), - ReceiveBuffer, - &ReceiveBufferSize - ); - WriteCmosBank1Byte (CpuIo, ACPI_TPM_LAST_REQUEST, 0x0A); - } - // - // Deassert Physical Presence - // - TpmPhysicalPresenceCommand [11] =3D 0x10; - ReceiveBufferSize =3D sizeof(ReceiveBuffer); - Status =3D TpmMpDriver->Transmit ( - TpmMpDriver, - TpmPhysicalPresenceCommand, - sizeof (TpmPhysicalPresenceCommand), - ReceiveBuffer, - &ReceiveBufferSize - ); - } - } - - return; } =20 /** @@ -1722,66 +1262,6 @@ UpdateDVMTSetup( } } =20 -VOID -InitPlatformUsbPolicy ( - VOID - ) - -{ - EFI_HANDLE Handle; - EFI_STATUS Status; - - Handle =3D NULL; - - mUsbPolicyData.Version =3D (UINT8)USB_POLICY_PROTO= COL_REVISION_2; - mUsbPolicyData.UsbMassStorageEmulationType =3D mSystemConfiguration.Us= bBIOSINT13DeviceEmulation; - if(mUsbPolicyData.UsbMassStorageEmulationType =3D=3D 3) { - mUsbPolicyData.UsbEmulationSize =3D mSystemConfiguration.UsbBIOSINT13D= eviceEmulationSize; - } else { - mUsbPolicyData.UsbEmulationSize =3D 0; - } - mUsbPolicyData.UsbZipEmulationType =3D mSystemConfiguration.UsbZ= ipEmulation; - mUsbPolicyData.UsbOperationMode =3D HIGH_SPEED; - - // - // Some chipset need Period smi, 0 =3D LEGACY_PERIOD_UN_SUPP - // - mUsbPolicyData.USBPeriodSupport =3D LEGACY_PERIOD_UN_SUPP; - - // - // Some platform need legacyfree, 0 =3D LEGACY_FREE_UN_SUPP - // - mUsbPolicyData.LegacyFreeSupport =3D LEGACY_FREE_UN_SUPP; - - // - // Set Code base , TIANO_CODE_BASE =3D0x01, ICBD =3D0x00 - // - mUsbPolicyData.CodeBase =3D (UINT8)ICBD_CODE_BASE; - - // - // Some chispet 's LpcAcpibase are diffrent,set by platform or chipset, - // default is Ich acpibase =3D0x040. acpitimerreg=3D0x08. - mUsbPolicyData.LpcAcpiBase =3D 0x40; - mUsbPolicyData.AcpiTimerReg =3D 0x08; - - // - // Set for reduce usb post time - // - mUsbPolicyData.UsbTimeTue =3D 0x00; - mUsbPolicyData.InternelHubExist =3D 0x00; //TigerPoint doesn't have= RMH - mUsbPolicyData.EnumWaitPortStableStall =3D 100; - - - Status =3D gBS->InstallProtocolInterface ( - &Handle, - &gUsbPolicyGuid, - EFI_NATIVE_INTERFACE, - &mUsbPolicyData - ); - ASSERT_EFI_ERROR(Status); - -} - UINT8 ReadCmosBank1Byte ( IN EFI_CPU_IO_PROTOCOL *CpuIo, diff --git a/Platform/Intel/Vlv2TbltDevicePkg/PlatformDxe/PlatformDxe.h b/P= latform/Intel/Vlv2TbltDevicePkg/PlatformDxe/PlatformDxe.h index 8f5df3257e..621fb08274 100644 --- a/Platform/Intel/Vlv2TbltDevicePkg/PlatformDxe/PlatformDxe.h +++ b/Platform/Intel/Vlv2TbltDevicePkg/PlatformDxe/PlatformDxe.h @@ -1,10 +1,8 @@ /*++ =20 - Copyright (c) 2004 - 2015, Intel Corporation. All rights reserved.
- = =20 + Copyright (c) 2004 - 2019, Intel Corporation. All rights reserved.
+ SPDX-License-Identifier: BSD-2-Clause-Patent - = =20 - =20 Module Name: =20 @@ -42,25 +40,17 @@ Abstract: #include #include #include -#include -#include -#include -#include -#include -#include -#include +#include #include #include #include #include #include #include -#include #include #include #include #include "Configuration.h" -#define _EFI_H_ //skip efi.h #include "PchAccess.h" #include "VlvAccess.h" #include "BoardIdDecode.h" @@ -86,25 +76,9 @@ Abstract: =20 #define B_RTC_DATE_ALARM_MASK 0x3F =20 -// -// Default CPU Alternate Duty Cycle (255=3D100%, 0=3D0%) -// -#define DEF_CPU_ALT_DUTY_CYCLE 0xFF - -#define MAX_ONBOARD_SATA_DEVICE 2 - -#define DXE_DEVICE_ENABLED 1 -#define DXE_DEVICE_DISABLED 0 - -#define AZALIA_MAX_LOOP_TIME 0x10000 - // // Platform driver GUID // -#define EFI_PLATFORM_DRIVER_GUID \ - { 0x056E7324, 0xA718, 0x465b, 0x9A, 0x84, 0x22, 0x8F, 0x06, 0x64, 0x2B, = 0x4F } - -#define PASSWORD_MAX_SIZE 20 #define PLATFORM_NORMAL_MODE 0x01 #define PLATFORM_SAFE_MODE 0x02 #define PLATFORM_RECOVERY_MODE 0x04 @@ -119,33 +93,10 @@ Abstract: #define EFI_CU_PLATFORM_DXE_STEP4 (EFI_OEM_SPECIFIC | 0= x00000015) #define EFI_CU_PLATFORM_DXE_INIT_DONE (EFI_OEM_SPECIFIC | 0= x00000016) =20 - -#define EFI_SECTION_STRING 0x1C -#define EFI_FORWARD_DECLARATION(x) typedef struct _##x x -#define PREFIX_BLANK 0x04 - #pragma pack(1) =20 typedef UINT64 EFI_BOARD_FEATURES; =20 -// -//BUGBUG: should remove these EDK hii definition once Hii transtion is don= e -// -typedef UINT16 STRING_REF; -typedef UINT16 EFI_FORM_LABEL; - -typedef enum { - EfiUserPassword, - EfiAdminPassword -} EFI_PASSWORD_TYPE; - -typedef struct { - CHAR16 TempPassword[PASSWORD_MAX_SIZE]; - CHAR16 EncodedPassword[PASSWORD_MAX_SIZE]; - VOID *PasswordLocation; - EFI_PASSWORD_TYPE PasswordType; -} EFI_PASSWORD_DATA; - typedef struct { CHAR8 AaNumber[7]; UINT8 BoardId; @@ -155,111 +106,11 @@ typedef struct { UINT64 AcpiOemTableId; } BOARD_ID_DECODE; =20 -typedef -EFI_STATUS -(EFIAPI *EFI_FORM_ROUTINE) ( - SYSTEM_CONFIGURATION *SetupBuffer - ); - -typedef struct{ - UINT16 DeviceNumber; - UINT16 FunctionNumber; -}PCI_DEVICE_FUNC_INFO; - -typedef struct{ - CHAR16 PortNumber[4]; - STRING_REF SataDeviceInfoStringId; -}SATA_DEVICE_STRING_INFO; - -typedef struct { - UINT16 Signature; - UINT8 Size; - UINT32 EntryPoint; - UINT8 Reserve[17]; - UINT16 PciDataOff; - UINT16 ExpansionOff; -} PNP_OPTION_ROM_HEADER; - -typedef struct { - UINT32 Signature; - UINT8 Revision; - UINT8 Length; - UINT16 NextHeader; - UINT8 Reserve; - UINT8 CheckSum; - UINT32 DeviceId; - UINT16 ManufactureStrOff; - UINT16 ProductStrOff; -} PNP_EXPANSION_HEADER; - -typedef struct { - BOOLEAN Enable; - UINT8 VerbTableNum; - UINT16 CodecSSID; - EFI_PHYSICAL_ADDRESS HDABar; - EFI_PHYSICAL_ADDRESS UpperHDABar; - UINT8 SDIPresent; - BOOLEAN Pme; - BOOLEAN LegacyFrontPanelAudio; - BOOLEAN HighDefinitionFrontPanelAudio; -} EFI_AZALIA_S3; - -// -//following structs are from R8. Remove them once R8->R9 transition is don= e -// -typedef struct { - CHAR16 *OptionString; // Passed in string to generate a token for = in a truly dynamic form creation - STRING_REF StringToken; // This is used when creating a single op-co= de without generating a StringToken (have one already) - UINT16 Value; - UINT8 Flags; - UINT16 Key; -} IFR_OPTION; - - - -typedef struct { - UINT8 Number; - UINT32 HorizontalResolution; - UINT32 VerticalResolution; -} PANEL_RESOLUTION; - #pragma pack() =20 // // Prototypes // -EFI_STATUS -EFIAPI -EfiMain ( - IN EFI_HANDLE ImageHandle, - IN EFI_SYSTEM_TABLE *SystemTable - ); - -EFI_STATUS -ProcessEventLog ( - ); - -EFI_STATUS -FindDataRecords ( - ); - -EFI_STATUS -ProcessPasswords( - ); - -VOID -MemorySetup( - ); - - -UINTN -EfiValueToString ( - IN OUT CHAR16 *Buffer, - IN INT64 Value, - IN UINTN Flags, - IN UINTN Width - ); - VOID EFIAPI ReadyToBootFunction ( @@ -267,60 +118,6 @@ ReadyToBootFunction ( VOID *Context ); =20 -VOID -InstallHiiDataAndGetSettings( - IN EFI_HII_STRING_PACK *StringPack, - // - ... // 0 or more of =3D> IN EFI_HII_IFR_PACK *IfrPack, - // Terminate list with NULL - // - ); - -EFI_STATUS -ReadOrInitSetupVariable( - IN UINTN RequiredVariableSize, - IN UINTN RequiredPasswordSize, - IN VOID *DefaultData, - IN VOID *MfgDefaultData, - OUT VOID *SetupVariableData, - OUT VOID *SystemPassword - ); - -VOID -EfiLogicalOrMem( - IN VOID *Destination, - IN VOID *Source, - IN UINTN Length - ); - -EFI_STATUS -GetStringFromToken ( - IN EFI_GUID *ProducerGuid, - IN STRING_REF Token, - OUT CHAR16 **String - ); - -UINT32 -ConvertBase2ToRaw ( - IN EFI_EXP_BASE2_DATA *Data); - -UINT32 -ConvertBase10ToRaw ( - IN EFI_EXP_BASE10_DATA *Data); - -CHAR16 * -GetStringById ( - IN STRING_REF Id, - EFI_HII_HANDLE StringPackHandle - ); - -VOID -EFIAPI -SetupDataFilter ( - IN EFI_EVENT Event, - IN VOID* Context - ); - VOID EFIAPI IdeDataFilter ( @@ -328,20 +125,6 @@ IdeDataFilter ( IN VOID* Context ); =20 -VOID -EFIAPI -UpdateAhciRaidDiskInfo ( - IN EFI_EVENT Event, - IN VOID* Context - ); - -VOID -EFIAPI -EventLogFilter ( - IN EFI_EVENT Event, - IN VOID* Context - ); - VOID SwapEntries ( IN CHAR8 *Data @@ -353,45 +136,12 @@ AsciiToUnicode ( IN CHAR16 *UnicodeString ); =20 -UINT16 -ConfigModeStateGet(); - -VOID -SetSkus(); - -VOID -CPUSetupItems(); - -EFI_STATUS -SecurityDriverCallback ( - IN EFI_FORM_CALLBACK_PROTOCOL *This, - IN UINT16 KeyValue, - IN EFI_IFR_DATA_ARRAY *Data, - OUT EFI_HII_CALLBACK_PACKET **Packet - ); - -VOID -SetPasswordState ( - ); - -VOID -EncodePassword ( - IN CHAR16 *Password - ); - VOID EFIAPI PciBusEvent ( IN EFI_EVENT Event, IN VOID* Context ); -VOID -AsfInitialize( - ); - -VOID -InitializeAsf ( - ); =20 UINT8 ReadCmosBank1Byte ( @@ -410,204 +160,6 @@ VOID InitializeBoardId ( ); =20 -EFI_STATUS -InstallBootCallbackRoutine( - ); - -EFI_STATUS -InstallConfigurationCallbackRoutine( - ); - -EFI_STATUS -InstallPerformanceCallbackRoutine( - ); - -EFI_STATUS -InstallSecurityCallbackRoutine ( - ); - -EFI_STATUS -InstallMainCallbackRoutine ( - ); - -EFI_STATUS -MemoryConfigurationUpdate ( - UINT16 *Key, - EFI_FORM_LABEL *Label, - UINT16 *OpcodeCount, - UINT8 **OpcodeData, - EFI_FORM_ROUTINE *Routine - ); - -EFI_STATUS -MemoryConfigurationCallbackRoutine ( - SYSTEM_CONFIGURATION *SetupBuffer - ); - -EFI_STATUS -MemoryConfigurationCalculateSpeed( - SYSTEM_CONFIGURATION *SetupBuffer - ); - -VOID -UpdateMemoryString( - IN STRING_REF TokenToUpdate, - IN CHAR16 *NewString - ); - -VOID -InitFeaturePolicy ( - IN EFI_PLATFORM_INFO_HOB *PlatformInfo - ); - -VOID -InitializeSetupVarHide ( - ); - -VOID -PreparePCIePCISlotInformation( - VOID - ); - - -EFI_STATUS -BootConfigurationUpdate ( - IN OUT SYSTEM_CONFIGURATION *SystemConfiguration - ); - -EFI_STATUS -InitializeBootConfiguration( - VOID - ); - -UINT16 -GetStringSize( - IN CHAR16 *ThisString - ); - -UINT16 -GetDriveCount ( - IN STRING_REF *BootMap - ); - -CHAR16 * -GetBootString ( - IN STRING_REF Id, - OUT UINTN *Length - ); - -EFI_STATUS -BootCfgCreateTwoOptionOneOf( - IN UINT16 QuestionId, - IN EFI_FORM_LABEL Label, - IN STRING_REF OptionPrompt, - IN STRING_REF OptionHelp, - IN STRING_REF OptionOneString, - IN STRING_REF OptionTwoString, - IN UINT8 OptionOneFlags, - IN UINT8 OptionTwoFlags, - IN UINT16 KeyValueOne, - IN UINT16 KeyValueTwo - ); - -EFI_STATUS -ReplaceOpcodeWithText( - IN STRING_REF OptionPrompt, - IN STRING_REF OptionHelp, - IN STRING_REF OptionOneString, - IN EFI_FORM_LABEL Label - ); - -EFI_STATUS -CreateDriveBootOrderOpcode( - IN VOID *Data, - IN STRING_REF *BootMap, - IN EFI_FORM_LABEL Label, - IN UINT16 QuestionId, - IN STRING_REF OptionOneString, - IN STRING_REF OptionTwoString - ); - -VOID -SetHyperBootCfgFlags( - IN OUT SYSTEM_CONFIGURATION *SystemConfiguration - ); - -VOID -GetHyperBootCfgFlags( - IN OUT SYSTEM_CONFIGURATION *SystemConfiguration - ); - -VOID -PrepareBootCfgForHyperBoot( - IN OUT SYSTEM_CONFIGURATION *SystemConfiguration - ); - -BOOLEAN -BootCfgChanged( - IN SYSTEM_CONFIGURATION *SystemConfiguration - ); - -EFI_STATUS -InsertOpcodeAtIndex( - IN SYSTEM_CONFIGURATION *SystemConfiguration, - IN OUT IFR_OPTION *OptionList, - IN IFR_OPTION IfrOption, - IN UINT16 OptionCount - ); - -VOID -ConfigureBootOrderStrings( - IN SYSTEM_CONFIGURATION *SystemConfiguration - ); - -VOID -InitializeAllBootStrings( - VOID - ); - -VOID -SaveUsbCfgSettings( - IN OUT SYSTEM_CONFIGURATION *SystemConfiguration - ); - -VOID -RestoreUsbCfgSettings( - IN OUT SYSTEM_CONFIGURATION *SystemConfiguration - ); - -EFI_STATUS -UpdateBootDevicePriority( - IN OUT SYSTEM_CONFIGURATION *SystemConfiguration - ); - -EFI_STATUS -DisableHyperBoot( - IN OUT SYSTEM_CONFIGURATION *SystemConfiguration - ); - -BOOLEAN -CheckForUserPassword( - VOID - ); - -EFI_STATUS -EFIAPI -HyperBootPasswordCallback( - IN OUT VOID* Data - ); - -EFI_STATUS -EFIAPI -HyperBootF9Callback ( - IN VOID* Data - ); - -EFI_STATUS -InstallHiiEvents( - VOID - ); - EFI_STATUS EFIAPI ProgramToneFrequency ( @@ -637,73 +189,13 @@ AdjustDefaultRtcTimeCallback ( IN VOID *Context ); =20 -typedef struct _GOP_DISPLAY_BRIGHTNESS_PROTOCOL GOP_DISPLAY_BRIGHTNESS_PRO= TOCOL; - -typedef -EFI_STATUS -(EFIAPI *GET_MAXIMUM_BRIGHTNESS_LEVEL) ( - IN GOP_DISPLAY_BRIGHTNESS_PROTOCOL *This, - OUT UINT32 *MaxBrightnessLevel - ); - - -typedef -EFI_STATUS -(EFIAPI *GET_CURRENT_BRIGHTNESS_LEVEL) ( - IN GOP_DISPLAY_BRIGHTNESS_PROTOCOL *This, - OUT UINT32 *MaxBrightnessLevel - ); - -typedef -EFI_STATUS -(EFIAPI *SET_BRIGHTNESS_LEVEL) ( - IN GOP_DISPLAY_BRIGHTNESS_PROTOCOL *This, - IN UINT32 BrightnessLevel - ); - -struct _GOP_DISPLAY_BRIGHTNESS_PROTOCOL { - UINT32 Revision; - GET_MAXIMUM_BRIGHTNESS_LEVEL GetMaxBrightnessLevel; - GET_CURRENT_BRIGHTNESS_LEVEL GetCurrentBrightnessLevel; - SET_BRIGHTNESS_LEVEL SetBrightnessLevel; -}; - // // Global externs // -extern UINT8 MaintenanceBin[]; -extern UINT8 MainBin[]; -extern UINT8 ConfigurationBin[]; -extern UINT8 MemoryConfigurationBin[]; -extern UINT8 PerformanceBin[]; -extern UINT8 SecurityBin[]; -extern UINT8 BootBin[]; -extern UINT8 PowerBin[]; -extern UINT8 SystemSetupBin[]; - -extern VOID *mDxePlatformStringPack; -extern EFI_HII_PROTOCOL *mHii; extern SYSTEM_CONFIGURATION mSystemConfiguration; -extern FRAMEWORK_EFI_HII_HANDLE mMaintenanceHiiHandle; -extern FRAMEWORK_EFI_HII_HANDLE mMainHiiHandle; -extern FRAMEWORK_EFI_HII_HANDLE mConfigurationHiiHandle; -extern FRAMEWORK_EFI_HII_HANDLE mPerformanceHiiHandle; -extern FRAMEWORK_EFI_HII_HANDLE mPowerHiiHandle; -extern FRAMEWORK_EFI_HII_HANDLE mBootHiiHandle; -extern FRAMEWORK_EFI_HII_HANDLE mSecurityHiiHandle; - -extern SYSTEM_PASSWORDS mSystemPassword; -extern EFI_PASSWORD_DATA mAdminPassword; -extern EFI_PASSWORD_DATA mUserPassword; =20 extern EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL *mPciRootBridgeIo; =20 -// -//extern EFI_REG_TABLE mSubsystemIdRegs[]; -// -extern UINT32 mSubsystemVidDid; -extern UINT32 mSubsystemAudioVidDid; - extern UINT8 mBoardIdIndex; extern BOOLEAN mFoundAANum; extern EFI_BOARD_FEATURES mBoardFeatures; @@ -718,5 +210,4 @@ extern BOOLEAN mMfgMode; extern UINT32 mPlatformBootMode; extern CHAR8 BoardAaNumber[]; =20 -extern EFI_GUID gEfiGlobalNvsAreaProtocolGuid; #endif diff --git a/Platform/Intel/Vlv2TbltDevicePkg/PlatformDxe/PlatformDxe.inf b= /Platform/Intel/Vlv2TbltDevicePkg/PlatformDxe/PlatformDxe.inf index 4d1949d05d..e8652f2a84 100644 --- a/Platform/Intel/Vlv2TbltDevicePkg/PlatformDxe/PlatformDxe.inf +++ b/Platform/Intel/Vlv2TbltDevicePkg/PlatformDxe/PlatformDxe.inf @@ -1,6 +1,6 @@ ## @file # -# Copyright (c) 1999 - 2016, Intel Corporation. All rights reserved +# Copyright (c) 1999 - 2019, Intel Corporation. All rights reserved # # SPDX-License-Identifier: BSD-2-Clause-Patent # @@ -50,13 +50,10 @@ [sources.common] [Packages] MdePkg/MdePkg.dec MdeModulePkg/MdeModulePkg.dec - IntelFrameworkPkg/IntelFrameworkPkg.dec - IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec Vlv2TbltDevicePkg/PlatformPkg.dec Vlv2DeviceRefCodePkg/Vlv2DeviceRefCodePkg.dec SecurityPkg/SecurityPkg.dec CryptoPkg/CryptoPkg.dec - IntelFspWrapperPkg/IntelFspWrapperPkg.dec =20 [LibraryClasses] BaseLib @@ -91,24 +88,18 @@ [Guids] gEfiEventExitBootServicesGuid gEfiVlv2VariableGuid gEfiSecureBootEnableDisableGuid + gEfiEndOfDxeEventGroupGuid =20 [Protocols] gEfiPciRootBridgeIoProtocolGuid # CONSUMES ## GUID gEfiVariableArchProtocolGuid gEfiVariableWriteArchProtocolGuid gEfiHiiConfigAccessProtocolGuid - gEfiBootScriptSaveProtocolGuid - gEfiCpuIoProtocolGuid + gEfiCpuIo2ProtocolGuid gEfiDevicePathProtocolGuid gEfiDiskInfoProtocolGuid - gEfiPs2PolicyProtocolGuid - gEfiIsaAcpiProtocolGuid - gEfiDataHubProtocolGuid gEfiPciIoProtocolGuid gDxePchPlatformPolicyProtocolGuid - gEfiTpmMpDriverProtocolGuid - gEfiLpcWpce791PolicyProtocolGuid - gUsbPolicyGuid gEfiSpeakerInterfaceProtocolGuid gDxeVlvPlatformPolicyGuid gEfiSmbiosSlotPopulationGuid @@ -121,7 +112,6 @@ [Protocols] gEfiGlobalNvsAreaProtocolGuid gEfiCpuIo2ProtocolGuid gIgdOpRegionProtocolGuid - gExitPmAuthProtocolGuid gEdkiiVariableLockProtocolGuid =20 [Pcd.common] @@ -134,15 +124,13 @@ [Pcd.common] gPlatformModuleTokenSpaceGuid.PcdFlashFvMainBase gPlatformModuleTokenSpaceGuid.PcdFlashFvRecoveryBase gPlatformModuleTokenSpaceGuid.PcdFlashFvRecoverySize - gFspWrapperTokenSpaceGuid.PcdFlashFvFspBase =20 =20 [Depex] gEfiPciRootBridgeIoProtocolGuid AND gEfiVariableArchProtocolGuid AND gEfiVariableWriteArchProtocolGuid AND - gEfiBootScriptSaveProtocolGuid AND - gEfiCpuIoProtocolGuid AND + gEfiCpuIo2ProtocolGuid AND gDxePchPlatformPolicyProtocolGuid AND gEfiGlobalNvsAreaProtocolGuid =20 diff --git a/Platform/Intel/Vlv2TbltDevicePkg/PlatformGopPolicy/PlatformGop= Policy.inf b/Platform/Intel/Vlv2TbltDevicePkg/PlatformGopPolicy/PlatformGop= Policy.inf index 948793f719..c00553e224 100644 --- a/Platform/Intel/Vlv2TbltDevicePkg/PlatformGopPolicy/PlatformGopPolicy.= inf +++ b/Platform/Intel/Vlv2TbltDevicePkg/PlatformGopPolicy/PlatformGopPolicy.= inf @@ -1,15 +1,10 @@ # # -# Copyright (c) 1999 - 2014, Intel Corporation. All rights reserved -# = =20 -# SPDX-License-Identifier: BSD-2-Clause-Patent - -# = =20 -# +# Copyright (c) 1999 - 2019, Intel Corporation. All rights reserved +# = =20 # SPDX-License-Identifier: BSD-2-Clause-Patent # ## =20 - [Defines] INF_VERSION =3D 0x00010005 BASE_NAME =3D PlatformGOPPolicy @@ -29,14 +24,13 @@ [Sources.common] =20 [Packages] MdePkg/MdePkg.dec - IntelFrameworkPkg/IntelFrameworkPkg.dec Vlv2TbltDevicePkg/PlatformPkg.dec + [LibraryClasses] BaseLib DebugLib UefiDriverEntryPoint UefiRuntimeServicesTableLib -# DxeKscLib =20 [Guids] gBmpImageGuid diff --git a/Platform/Intel/Vlv2TbltDevicePkg/PlatformInitPei/MemoryCallbac= k.c b/Platform/Intel/Vlv2TbltDevicePkg/PlatformInitPei/MemoryCallback.c index 070848ed1e..074bf7debb 100644 --- a/Platform/Intel/Vlv2TbltDevicePkg/PlatformInitPei/MemoryCallback.c +++ b/Platform/Intel/Vlv2TbltDevicePkg/PlatformInitPei/MemoryCallback.c @@ -1,11 +1,9 @@ /** @file =20 - Copyright (c) 2004 - 2014, Intel Corporation. All rights reserved.
- = =20 + Copyright (c) 2004 - 2019, Intel Corporation. All rights reserved.
+ SPDX-License-Identifier: BSD-2-Clause-Patent =20 - = =20 - Module Name: =20 MemoryCallback.c @@ -158,12 +156,10 @@ MemoryDiscoveredPpiNotifyCallback ( IoWrite16 (ACPI_BASE_ADDRESS + R_PCH_ACPI_PM1_CNT, Pm1Cnt); } =20 - #ifndef MINNOW2_FSP_BUILD // // Set PEI cache mode here // SetPeiCacheMode (PeiServices); - #endif =20 // // Pulish memory tyoe info diff --git a/Platform/Intel/Vlv2TbltDevicePkg/PlatformInitPei/PlatformEarly= Init.c b/Platform/Intel/Vlv2TbltDevicePkg/PlatformInitPei/PlatformEarlyInit= .c index a359c95920..ec636a4cd9 100644 --- a/Platform/Intel/Vlv2TbltDevicePkg/PlatformInitPei/PlatformEarlyInit.c +++ b/Platform/Intel/Vlv2TbltDevicePkg/PlatformInitPei/PlatformEarlyInit.c @@ -1,12 +1,9 @@ /** @file =20 - Copyright (c) 2004 - 2016, Intel Corporation. All rights reserved.
- = =20 + Copyright (c) 2004 - 2019, Intel Corporation. All rights reserved.
+ SPDX-License-Identifier: BSD-2-Clause-Patent =20 - = =20 - - Module Name: =20 PlatformEarlyInit.c @@ -70,10 +67,6 @@ static EFI_PEI_PPI_DESCRIPTOR mInstallSpeakerInter= facePpi =3D { static EFI_PEI_RESET_PPI mResetPpi =3D { IchReset }; =20 =20 -static EFI_PEI_FIND_FV_PPI mEfiFindFvPpi =3D { - (EFI_PEI_FIND_FV_FINDFV)FindFv -}; - static EFI_PEI_PPI_DESCRIPTOR mPpiList[] =3D { { EFI_PEI_PPI_DESCRIPTOR_PPI, @@ -81,14 +74,9 @@ static EFI_PEI_PPI_DESCRIPTOR mPpiList[] =3D { NULL }, { - EFI_PEI_PPI_DESCRIPTOR_PPI, + (EFI_PEI_PPI_DESCRIPTOR_PPI | EFI_PEI_PPI_DESCRIPTOR_TERMINATE_LIST), &gEfiPeiResetPpiGuid, &mResetPpi - }, - { - (EFI_PEI_PPI_DESCRIPTOR_PPI | EFI_PEI_PPI_DESCRIPTOR_TERMINATE_LIST), - &gEfiFindFvPpiGuid, - &mEfiFindFvPpi } }; =20 @@ -815,158 +803,6 @@ PlatformEarlyInitEntry ( EFI_PLATFORM_INFO_HOB *PlatformInfo; EFI_PEI_HOB_POINTERS Hob; EFI_PLATFORM_CPU_INFO PlatformCpuInfo; - EFI_SMRAM_HOB_DESCRIPTOR_BLOCK *DescriptorBlock; - EFI_SMRAM_HOB_DESCRIPTOR_BLOCK *NewDescriptorBlock; - UINTN Index; - UINTN MaxIndex; - UINT64 Base; - UINT64 Size; - UINT64 NewSize; - - // - // Make sure base and size of the SMRAM region is aligned - // - Hob.Raw =3D GetFirstGuidHob (&gEfiSmmPeiSmramMemoryReserveGuid); - if (Hob.Raw !=3D NULL) { - DescriptorBlock =3D GET_GUID_HOB_DATA (Hob.Raw); - DEBUG ((DEBUG_INFO, "SMM PEI SMRAM Memory Reserved HOB\n")); - for (Index =3D 0; Index < DescriptorBlock->NumberOfSmmReservedRegions;= Index++) { - DEBUG((DEBUG_INFO, " SMRAM Descriptor[%02x]: Start=3D%016lx Size= =3D%016lx State=3D%02x\n", - Index, - DescriptorBlock->Descriptor[Index].PhysicalStart, - DescriptorBlock->Descriptor[Index].PhysicalSize, - DescriptorBlock->Descriptor[Index].RegionState - )); - } - - // - // Find the largest usable range of SMRAM between 1MB and 4GB - // - for (Index =3D 0, MaxIndex =3D 0, Size =3D 0; Index < DescriptorBlock-= >NumberOfSmmReservedRegions; Index++) { - // - // Skip any SMRAM region that is already allocated, needs testing, o= r needs ECC initialization - // - if ((DescriptorBlock->Descriptor[Index].RegionState & (EFI_ALLOCATED= | EFI_NEEDS_TESTING | EFI_NEEDS_ECC_INITIALIZATION)) !=3D 0) { - continue; - } - // - // Skip any SMRAM region below 1MB - // - if (DescriptorBlock->Descriptor[Index].CpuStart < BASE_1MB) { - continue; - } - // - // Skip any SMRAM region that is above 4GB or crosses the 4GB bounda= ry - // - if ((DescriptorBlock->Descriptor[Index].CpuStart + DescriptorBlock->= Descriptor[Index].PhysicalSize) >=3D BASE_4GB) { - continue; - } - // - // Cache the largest SMRAM region index - // - if (DescriptorBlock->Descriptor[Index].PhysicalSize >=3D DescriptorB= lock->Descriptor[MaxIndex].PhysicalSize) { - MaxIndex =3D Index; - } - } - - // - // Find the extent of the contiguous SMRAM region that surrounds the l= argest usable SMRAM range - // - Base =3D DescriptorBlock->Descriptor[MaxIndex].CpuStart; - Size =3D DescriptorBlock->Descriptor[MaxIndex].PhysicalSize; - for (Index =3D 0; Index < DescriptorBlock->NumberOfSmmReservedRegions;= Index++) { - if (DescriptorBlock->Descriptor[Index].CpuStart < Base && - Base =3D=3D (DescriptorBlock->Descriptor[Index].CpuStart + Descr= iptorBlock->Descriptor[Index].PhysicalSize)) { - Base =3D DescriptorBlock->Descriptor[Index].CpuStart; - Size +=3D DescriptorBlock->Descriptor[Index].PhysicalSize; - } else if ((Base + Size) =3D=3D DescriptorBlock->Descriptor[Index].C= puStart) { - Size +=3D DescriptorBlock->Descriptor[Index].PhysicalSize; - } - } - - // - // Round SMRAM region up to nearest power of 2 that is at least 4KB - // - NewSize =3D MAX (LShiftU64 (1, HighBitSet64 (Size - 1) + 1), SIZE_4KB)= ; - if ((Base & ~(NewSize - 1)) !=3D Base) { - // - // SMRAM region Base Address has smaller alignment than SMRAM region= Size - // This is not compatible with SMRR settings - // - DEBUG((DEBUG_ERROR, "ERROR: SMRAM Region Size has larger alignment t= han SMRAM Region Base\n")); - DEBUG((DEBUG_ERROR, " SMRAM Region Base=3D%016lx Size=3D%016lx\n",= Base, NewSize)); - ASSERT (FALSE); - } else if (Size !=3D NewSize) { - // - // See if the size difference can be added to an adjacent descriptor= that is already allocated - // - for (Index =3D 0; Index < DescriptorBlock->NumberOfSmmReservedRegion= s; Index++) { - if ((DescriptorBlock->Descriptor[Index].CpuStart + DescriptorBlock= ->Descriptor[Index].PhysicalSize) =3D=3D (Base + Size)) { - if (((DescriptorBlock->Descriptor[Index].RegionState) & EFI_ALLO= CATED) !=3D 0) { - DescriptorBlock->Descriptor[Index].PhysicalSize +=3D (NewSize = - Size); - Size =3D NewSize; - break; - } - } - } - - if (Size !=3D NewSize) { - // - // Add an allocated descriptor to the SMM PEI SMRAM Memory Reserve= d HOB to accomodate the larger size. - // - Index =3D DescriptorBlock->NumberOfSmmReservedRegions; - NewDescriptorBlock =3D (EFI_SMRAM_HOB_DESCRIPTOR_BLOCK *)BuildGuid= Hob ( - &gEfiSmmPeiSmramMemoryReserveGuid, - sizeof (EFI_SMRAM_HOB_DESCRIPTOR_BLOCK) + ((Index + 1) * sizeof = (EFI_SMRAM_DESCRIPTOR)) - ); - ASSERT (NewDescriptorBlock !=3D NULL); - - // - // Copy old EFI_SMRAM_HOB_DESCRIPTOR_BLOCK to new allocated region - // - CopyMem ( - NewDescriptorBlock, - DescriptorBlock, - sizeof (EFI_SMRAM_HOB_DESCRIPTOR_BLOCK) + (Index * sizeof (EFI_S= MRAM_DESCRIPTOR)) - ); - - // - // Make sure last descriptor in NewDescriptorBlock contains last d= escriptor from DescriptorBlock - // - CopyMem ( - &NewDescriptorBlock->Descriptor[Index], - &NewDescriptorBlock->Descriptor[Index - 1], - sizeof (EFI_SMRAM_DESCRIPTOR) - ); - - // - // Fill next to last descriptor with an allocated descriptor that = aligns the total size of SMRAM - // - NewDescriptorBlock->Descriptor[Index - 1].CpuStart =3D Base += Size; - NewDescriptorBlock->Descriptor[Index - 1].PhysicalStart =3D Base += Size; - NewDescriptorBlock->Descriptor[Index - 1].PhysicalSize =3D NewSiz= e - Size; - NewDescriptorBlock->Descriptor[Index - 1].RegionState =3D Descri= ptorBlock->Descriptor[MaxIndex].RegionState | EFI_ALLOCATED; - NewDescriptorBlock->NumberOfSmmReservedRegions++; - - // - // Invalidate the original gEfiSmmPeiSmramMemoryReserveGuid HOB - // - ZeroMem (&Hob.Guid->Name, sizeof (&Hob.Guid->Name)); - } - - Hob.Raw =3D GetFirstGuidHob (&gEfiSmmPeiSmramMemoryReserveGuid); - DescriptorBlock =3D GET_GUID_HOB_DATA (Hob.Raw); - DEBUG ((DEBUG_INFO, "SMM PEI SMRAM Memory Reserved HOB - Updated\n")= ); - for (Index =3D 0; Index < DescriptorBlock->NumberOfSmmReservedRegion= s; Index++) { - DEBUG((DEBUG_INFO, " SMRAM Descriptor[%02x]: Start=3D%016lx Size= =3D%016lx State=3D%02x\n", - Index, - DescriptorBlock->Descriptor[Index].PhysicalStart, - DescriptorBlock->Descriptor[Index].PhysicalSize, - DescriptorBlock->Descriptor[Index].RegionState - )); - } - } - } =20 // // Initialize SmbusPolicy PPI @@ -1118,45 +954,6 @@ PlatformEarlyInitEntry ( return Status; } =20 -/** - - Return the mainblockcompact Fv. - - @param FvNumber Our enumeration of the firmware volumes we care about= . - - @param FvAddress Base Address of the memory containing the firmware vol= ume - - @retval EFI_SUCCESS - @retval EFI_NOT_FOUND - -**/ -EFI_STATUS -EFIAPI -FindFv ( - IN EFI_PEI_FIND_FV_PPI *This, - IN CONST EFI_PEI_SERVICES **PeiServices, - IN OUT UINT8 *FvNumber, - OUT EFI_FIRMWARE_VOLUME_HEADER **FVAddress - ) -{ - // - // At present, we only have one Fv to search - // - if (*FvNumber =3D=3D 0) { - *FvNumber =3D 1; - *FVAddress =3D (EFI_FIRMWARE_VOLUME_HEADER *)(UINTN)FixedPcdGet32 (Pcd= FlashFvMainBase); - return EFI_SUCCESS; - } - else if (*FvNumber =3D=3D 1) { - *FvNumber =3D 2; - *FVAddress =3D (EFI_FIRMWARE_VOLUME_HEADER *)(UINTN)FixedPcdGet32 (Pcd= FlashFvRecovery2Base); - return EFI_SUCCESS; - } - else { // Not the one Fv we care about - return EFI_NOT_FOUND; - } -} - EFI_STATUS EFIAPI CpuOnlyReset ( diff --git a/Platform/Intel/Vlv2TbltDevicePkg/PlatformInitPei/PlatformEarly= Init.h b/Platform/Intel/Vlv2TbltDevicePkg/PlatformInitPei/PlatformEarlyInit= .h index 29749277d7..9631d49a84 100644 --- a/Platform/Intel/Vlv2TbltDevicePkg/PlatformInitPei/PlatformEarlyInit.h +++ b/Platform/Intel/Vlv2TbltDevicePkg/PlatformInitPei/PlatformEarlyInit.h @@ -1,11 +1,9 @@ /*++ =20 - Copyright (c) 2004 - 2016, Intel Corporation. All rights reserved.
- = =20 + Copyright (c) 2004 - 2019, Intel Corporation. All rights reserved.
+ SPDX-License-Identifier: BSD-2-Clause-Patent =20 - = =20 - Module Name: =20 PlatformEarlyInit.h @@ -30,7 +28,7 @@ Abstract: #define _EFI_PLATFORM_EARLY_INIT_H_ =20 #define EFI_FORWARD_DECLARATION(x) typedef struct _##x x -#include +#include #include "PlatformBaseAddresses.h" #include "PchAccess.h" #include "VlvAccess.h" @@ -43,7 +41,6 @@ Abstract: #include #include #include -#include #include #include #include @@ -60,7 +57,6 @@ Abstract: =20 #include #include -#include #include #include #include @@ -73,12 +69,10 @@ Abstract: #include #include #include -#include #include #include #include #include -#include #include =20 #define SMC_LAN_ON 0x46 @@ -1379,15 +1373,6 @@ CheckIfJumperSetForRecovery( VOID ); =20 -EFI_STATUS -EFIAPI =20 -FindFv ( - IN EFI_PEI_FIND_FV_PPI *This, - IN CONST EFI_PEI_SERVICES **PeiServices, - IN OUT UINT8 *FvNumber, - OUT EFI_FIRMWARE_VOLUME_HEADER **FVAddress - ); - BOOLEAN IsA16Inverted ( ); diff --git a/Platform/Intel/Vlv2TbltDevicePkg/PlatformInitPei/PlatformInitP= ei.inf b/Platform/Intel/Vlv2TbltDevicePkg/PlatformInitPei/PlatformInitPei.i= nf index 54277b1e8b..eeb9a4a023 100644 --- a/Platform/Intel/Vlv2TbltDevicePkg/PlatformInitPei/PlatformInitPei.inf +++ b/Platform/Intel/Vlv2TbltDevicePkg/PlatformInitPei/PlatformInitPei.inf @@ -1,10 +1,8 @@ # # -# Copyright (c) 1999 - 2016, Intel Corporation. All rights reserved -# = =20 +# Copyright (c) 1999 - 2019, Intel Corporation. All rights reserved +# # SPDX-License-Identifier: BSD-2-Clause-Patent -# = =20 -# # # Module Name: # @@ -17,13 +15,13 @@ #--*/ =20 [defines] -INF_VERSION =3D 0x00010005 -BASE_NAME =3D PlatformEarlyInit -FILE_GUID =3D 0A5EA2E1-BE0B-44a0-A775-F429C9A018A0 -MODULE_TYPE =3D PEIM -VERSION_STRING =3D 1.0 -PI_SPECIFICATION_VERSION =3D 0x0001000A -ENTRY_POINT =3D PlatformEarlyInitEntry +INF_VERSION =3D 0x00010005 +BASE_NAME =3D PlatformEarlyInit +FILE_GUID =3D 0A5EA2E1-BE0B-44a0-A775-F429C9A018A0 +MODULE_TYPE =3D PEIM +VERSION_STRING =3D 1.0 +PI_SPECIFICATION_VERSION =3D 0x0001000A +ENTRY_POINT =3D PlatformEarlyInitEntry =20 [sources.common] BootMode.c @@ -44,19 +42,15 @@ [Packages] MdePkg/MdePkg.dec MdeModulePkg/MdeModulePkg.dec Vlv2TbltDevicePkg/PlatformPkg.dec - IntelFrameworkPkg/IntelFrameworkPkg.dec Vlv2DeviceRefCodePkg/Vlv2DeviceRefCodePkg.dec Vlv2SocBinPkg/Vlv2SocBinPkg.dec UefiCpuPkg/UefiCpuPkg.dec - Vlv2DeviceRefCodePkg/Vlv2DeviceRefCodePkg.dec - IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec =20 [LibraryClasses] PeimEntryPoint DebugLib HobLib IoLib -# PeiKscLib MultiPlatformLib PcdLib PchPlatformLib @@ -71,14 +65,12 @@ [Ppis] gEfiPeiResetPpiGuid gEfiEndOfPeiSignalPpiGuid gPeiSmbusPolicyPpiGuid - gEfiFindFvPpiGuid gPeiCapsulePpiGuid gEfiPeiBootInRecoveryModePpiGuid gEfiPeiRecoveryModulePpiGuid gEfiPeiDeviceRecoveryModulePpiGuid gPeiCachePpiGuid gEfiPeiMasterBootModePpiGuid - gEfiPeiSmbusPpiGuid gPchInitPpiGuid gPchUsbPolicyPpiGuid =20 @@ -96,7 +88,6 @@ [Guids] gEfiNormalSetupGuid gEfiMemoryTypeInformationGuid gOsSelectionVariableGuid - gEfiSmmPeiSmramMemoryReserveGuid =20 [Pcd.common] gPlatformModuleTokenSpaceGuid.PcdFlashFvMainBase @@ -111,7 +102,7 @@ [Pcd.common] =20 [Pcd] gEfiVLVTokenSpaceGuid.PcdMeasuredBootEnable - gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdBootState + gPlatformModuleTokenSpaceGuid.PcdBootState =20 [Depex] gEfiPeiReadOnlyVariable2PpiGuid AND gPeiCachePpiGuid diff --git a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPei/CommonHeader.h b/= Platform/Intel/Vlv2TbltDevicePkg/PlatformPei/CommonHeader.h index 283993b44c..a533f3918c 100644 --- a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPei/CommonHeader.h +++ b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPei/CommonHeader.h @@ -1,11 +1,9 @@ /*++ =20 - Copyright (c) 2004 - 2014, Intel Corporation. All rights reserved.
- = =20 + Copyright (c) 2004 - 2019, Intel Corporation. All rights reserved.
+ SPDX-License-Identifier: BSD-2-Clause-Patent =20 - = =20 - **/ =20 #ifndef __COMMON_HEADER_H_ @@ -13,18 +11,15 @@ =20 =20 =20 -#include +#include =20 #include #include #include -#include -#include #include #include #include #include -#include #include #include #include diff --git a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPei/MemoryCallback.c = b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPei/MemoryCallback.c index 7dcc2c3ce9..1932aa7125 100644 --- a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPei/MemoryCallback.c +++ b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPei/MemoryCallback.c @@ -1,12 +1,9 @@ /** @file =20 - Copyright (c) 2004 - 2014, Intel Corporation. All rights reserved.
- = =20 + Copyright (c) 2004 - 2019, Intel Corporation. All rights reserved.
+ SPDX-License-Identifier: BSD-2-Clause-Patent =20 - = =20 - - This file includes a memory call back function notified when MRC is done= , following action is performed in this file, 1. ICH initialization after MRC. @@ -21,7 +18,6 @@ =20 #include "CommonHeader.h" #include "Platform.h" -#include #include #include #include "VlvAccess.h" diff --git a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPei/Platform.c b/Plat= form/Intel/Vlv2TbltDevicePkg/PlatformPei/Platform.c index eba1dfff30..aa03f6ea95 100644 --- a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPei/Platform.c +++ b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPei/Platform.c @@ -1,12 +1,9 @@ /** @file =20 - Copyright (c) 2004 - 2014, Intel Corporation. All rights reserved.
- = =20 + Copyright (c) 2004 - 2019, Intel Corporation. All rights reserved.
+ SPDX-License-Identifier: BSD-2-Clause-Patent =20 - = =20 - - Module Name: =20 **/ @@ -816,15 +813,6 @@ PeiInitPlatform ( sizeof (EFI_PLATFORM_INFO_HOB) ); =20 - -#ifdef FTPM_ENABLE - Status =3D FtpmPolicyInit(PeiServices, &SystemConfiguration); - if (EFI_ERROR (Status)) { - DEBUG((EFI_D_ERROR, "fTPM init failed.\n")); - } -#endif - - // // Set the new boot mode for MRC // diff --git a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPei/PlatformPei.inf b= /Platform/Intel/Vlv2TbltDevicePkg/PlatformPei/PlatformPei.inf index c976273ce3..28a5274c40 100644 --- a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPei/PlatformPei.inf +++ b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPei/PlatformPei.inf @@ -1,9 +1,9 @@ # # -# Copyright (c) 1999 - 2018, Intel Corporation. All rights reserved -# = =20 +# Copyright (c) 1999 - 2019, Intel Corporation. All rights reserved +# # SPDX-License-Identifier: BSD-2-Clause-Patent -# = =20 +# # # This PEIM includes 3 parts, pre memory initialization, MRC # wrapper and post memory initialization. @@ -63,9 +63,7 @@ [Packages] MdePkg/MdePkg.dec MdeModulePkg/MdeModulePkg.dec Vlv2TbltDevicePkg/PlatformPkg.dec - IntelFrameworkPkg/IntelFrameworkPkg.dec Vlv2DeviceRefCodePkg/Vlv2DeviceRefCodePkg.dec - Vlv2SocBinPkg/Vlv2SocBinPkg.dec UefiCpuPkg/UefiCpuPkg.dec CryptoPkg/CryptoPkg.dec =20 @@ -89,14 +87,11 @@ [Ppis] gEfiPeiReadOnlyVariable2PpiGuid gEfiPeiResetPpiGuid gEfiEndOfPeiSignalPpiGuid - gEfiFindFvPpiGuid gPeiCapsulePpiGuid gEfiPeiBootInRecoveryModePpiGuid gEfiPeiRecoveryModulePpiGuid gEfiPeiDeviceRecoveryModulePpiGuid - gPeiCachePpiGuid gEfiPeiMasterBootModePpiGuid - gEfiPeiSmbusPpiGuid gPeiMfgMemoryTestPpiGuid gPeiSha256HashPpiGuid gVlvMmioPolicyPpiGuid diff --git a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkg.dec b/Platform/In= tel/Vlv2TbltDevicePkg/PlatformPkg.dec index 4653f63a66..9951aa4a58 100644 --- a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkg.dec +++ b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkg.dec @@ -2,14 +2,9 @@ # Platform Package # # This package provides platform specific modules. -# Copyright (c) 2009 - 2015, Intel Corporation. All rights reserved.
+# Copyright (c) 2009 - 2019, Intel Corporation. All rights reserved.
# - # SPDX-License-Identifier: BSD-2-Clause-Patent - -# - -# # #**/ =20 @@ -66,9 +61,6 @@ [Protocols] gEfiActiveBiosProtocolGuid =3D { 0xebbe2d1b, 0x1647, 0x4bda= , { 0xab, 0x9a, 0x78, 0x63, 0xe3, 0x96, 0xd4, 0x1a } } gEfiPlatformCpuProtocolGuid =3D { 0xbd26cdc9, 0xa092, 0x462a= , { 0x87, 0x7a, 0x5a, 0xb6, 0xad, 0xce, 0x48, 0x12 } } gDxePchPlatformPolicyProtocolGuid =3D { 0x4b0165a9, 0x61d6, 0x4e23= , { 0xa0, 0xb5, 0x3e, 0xc7, 0x9c, 0x2e, 0x30, 0xd5 } } - gEfiTpmMpDriverProtocolGuid =3D { 0xde161cfe, 0x1e60, 0x42a1= , { 0x8c, 0xc3, 0xee, 0x7e, 0xf0, 0x73, 0x52, 0x12 } } - gEfiLpcWpce791PolicyProtocolGuid =3D { 0xab2bee2f, 0xc1a6, 0x4399= , { 0x85, 0x3d, 0xc0, 0x7c, 0x77, 0x4f, 0xfd, 0x0d } } - gUsbPolicyGuid =3D { 0xf617b358, 0x12cf, 0x414a= , { 0xa0, 0x69, 0x60, 0x67, 0x7b, 0xda, 0x13, 0xb4 } } gEfiSpeakerInterfaceProtocolGuid =3D { 0x400b4476, 0x3081, 0x11d6= , { 0x87, 0xed, 0x00, 0x06, 0x29, 0x45, 0xc3, 0xb9 } } gDxeVlvPlatformPolicyGuid =3D { 0x5bab88ba, 0xe0e2, 0x4674= , { 0xb6, 0xad, 0xb8, 0x12, 0xf6, 0x88, 0x1c, 0xd6 } } gEfiSmbiosSlotPopulationGuid =3D { 0xef7bf7d6, 0xf8ff, 0x4a76= , { 0x82, 0x47, 0xc0, 0xd0, 0xd1, 0xcc, 0x49, 0xc0 } } @@ -80,9 +72,6 @@ [Protocols] gEfiPlatformIdeInitProtocolGuid =3D { 0x377c66a3, 0x8fe7, 0x4ee8= , { 0x85, 0xb8, 0xf1, 0xa2, 0x82, 0x56, 0x9e, 0x3b } } gEfiPciPlatformProtocolGuid =3D { 0x07d75280, 0x27d4, 0x4d69= , { 0x90, 0xd0, 0x56, 0x43, 0xe2, 0x38, 0xb3, 0x41 } } gEnhancedSpeedstepProtocolGuid =3D { 0x91a1ddcf, 0x5374, 0x4939= , { 0x89, 0x51, 0xd7, 0x29, 0x3f, 0x1a, 0x78, 0x6f } } - gEfiAcpiSupportProtocolGuid =3D { 0xdbff9d55, 0x89b7, 0x46da= , { 0xbd, 0xdf, 0x67, 0x7d, 0x3d, 0xc0, 0x24, 0x1d } } - gEfiAcpiS3SaveProtocolGuid =3D { 0x125f2de1, 0xfb85, 0x440c= , { 0xa5, 0x4c, 0x4d, 0x99, 0x35, 0x8a, 0x8d, 0x38 } } - gEfiCpuIoProtocolGuid =3D { 0xB0732526, 0x38C8, 0x4b40= , { 0x88, 0x77, 0x61, 0xC7, 0xB0, 0x6A, 0xAC, 0x45 } } gPlatformGOPPolicyGuid =3D { 0xec2e931b, 0x3281, 0x48a5= , { 0x81, 0x07, 0xdf, 0x8a, 0x8b, 0xed, 0x3c, 0x5d } } gEfiGopDisplayBrightnessProtocolGuid =3D { 0x6ff23f1d, 0x877c, 0x4b1b= , { 0x93, 0xfc, 0xf1, 0x42, 0xb2, 0xee, 0xa6, 0xa7 } } gEfiUsbKeyboardConnectGuid =3D { 0xad9c4381, 0x1ede, 0x430c= , { 0x8d, 0x42, 0x23, 0x76, 0x7c, 0x46, 0x5d, 0x52 } } @@ -130,9 +119,6 @@ [PcdsFixedAtBuild] =20 gEfiPchTokenSpaceGuid.PcdPchAcpiIoPortBaseAddress|0x400|UINT16|0x0000000= B =20 - ## FFS filename to find the shell application. - gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdShellFile|{ 0xB7, 0xD6, 0x7= A, 0xC5, 0x15, 0x05, 0xA8, 0x40, 0x9D, 0x21, 0x55, 0x16, 0x52, 0x85, 0x4E, = 0x37 }|VOID*|0x40000004 - gEfiIchTokenSpaceGuid.PcdPeiIchUhciControllerIoPortBaseAddress|0x4000|UI= NT16|0x30000017 gEfiIchTokenSpaceGuid.PcdPeiIchEhciControllerMemoryBaseAddress|0xFC00000= 0|UINT32|0x30000019 =20 diff --git a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkg.fdf b/Platform/In= tel/Vlv2TbltDevicePkg/PlatformPkg.fdf index 5827386977..87b905c95b 100644 --- a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkg.fdf +++ b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkg.fdf @@ -9,45 +9,34 @@ #**/ =20 [Defines] -DEFINE FLASH_BASE =3D 0xFFC00000 #The base address of the 4Mb FL= ASH Device. -DEFINE FLASH_SIZE =3D 0x00400000 #The flash size in bytes of the= 4Mb FLASH Device. +DEFINE FLASH_BASE =3D 0xFF800000 #The base address of the 4Mb FL= ASH Device. +DEFINE FLASH_SIZE =3D 0x00800000 #The flash size in bytes of the= 4Mb FLASH Device. DEFINE FLASH_BLOCK_SIZE =3D 0x1000 #The block size in bytes of the = 4Mb FLASH Device. -DEFINE FLASH_NUM_BLOCKS =3D 0x400 #The number of blocks in 4Mb F= LASH Device. +DEFINE FLASH_NUM_BLOCKS =3D 0x800 #The number of blocks in 4Mb F= LASH Device. DEFINE FLASH_AREA_BASE_ADDRESS =3D 0xFF8000= 00 DEFINE FLASH_AREA_SIZE =3D 0x008000= 00 =20 -DEFINE FLASH_REGION_VLVMICROCODE_OFFSET =3D 0x000000= 00 +DEFINE FLASH_REGION_VLVMICROCODE_OFFSET =3D 0x004000= 00 DEFINE FLASH_REGION_VLVMICROCODE_SIZE =3D 0x000400= 00 DEFINE FLASH_REGION_VLVMICROCODE_BASE =3D 0xFFC000= 00 =20 -DEFINE FLASH_REGION_VPD_OFFSET =3D 0x000400= 00 +DEFINE FLASH_REGION_VPD_OFFSET =3D 0x004400= 00 DEFINE FLASH_REGION_VPD_SIZE =3D 0x0003E0= 00 =20 -DEFINE FLASH_REGION_NVSTORAGE_SUBREGION_NV_FTW_WORKING_OFFSET =3D 0x0007E0= 00 +DEFINE FLASH_REGION_NVSTORAGE_SUBREGION_NV_FTW_WORKING_OFFSET =3D 0x0047E0= 00 DEFINE FLASH_REGION_NVSTORAGE_SUBREGION_NV_FTW_WORKING_SIZE =3D 0x000020= 00 =20 =20 -DEFINE FLASH_REGION_NVSTORAGE_SUBREGION_NV_FTW_SPARE_OFFSET =3D 0x000800= 00 +DEFINE FLASH_REGION_NVSTORAGE_SUBREGION_NV_FTW_SPARE_OFFSET =3D 0x004800= 00 DEFINE FLASH_REGION_NVSTORAGE_SUBREGION_NV_FTW_SPARE_SIZE =3D 0x000400= 00 =20 -!if $(MINNOW2_FSP_BUILD) =3D=3D TRUE -DEFINE FLASH_REGION_FSPBIN_OFFSET =3D 0x000C00= 00 -DEFINE FLASH_REGION_FSPBIN_SIZE =3D 0x000480= 00 -DEFINE FLASH_REGION_FSPBIN_BASE =3D 0xFFCC00= 00 - -DEFINE FLASH_REGION_AZALIABIN_OFFSET =3D 0x001080= 00 -DEFINE FLASH_REGION_AZALIABIN_SIZE =3D 0x000080= 00 -DEFINE FLASH_REGION_AZALIABIN_BASE =3D 0xFFD080= 00 - -!endif - -DEFINE FLASH_REGION_FVMAIN_OFFSET =3D 0x001100= 00 +DEFINE FLASH_REGION_FVMAIN_OFFSET =3D 0x005100= 00 DEFINE FLASH_REGION_FVMAIN_SIZE =3D 0x002100= 00 =20 -DEFINE FLASH_REGION_FV_RECOVERY2_OFFSET =3D 0x003200= 00 +DEFINE FLASH_REGION_FV_RECOVERY2_OFFSET =3D 0x007200= 00 DEFINE FLASH_REGION_FV_RECOVERY2_SIZE =3D 0x000700= 00 =20 -DEFINE FLASH_REGION_FV_RECOVERY_OFFSET =3D 0x003900= 00 +DEFINE FLASH_REGION_FV_RECOVERY_OFFSET =3D 0x007900= 00 DEFINE FLASH_REGION_FV_RECOVERY_SIZE =3D 0x000700= 00 =20 ##########################################################################= ###### @@ -79,17 +68,6 @@ [FD.Vlv] SET gUefiCpuPkgTokenSpaceGuid.PcdCpuMicrocodePatchAddress =3D $(FLASH_REGI= ON_VLVMICROCODE_BASE) + 0x60 SET gUefiCpuPkgTokenSpaceGuid.PcdCpuMicrocodePatchRegionSize =3D $(FLASH_R= EGION_VLVMICROCODE_SIZE) - 0x60 =20 -!if $(MINNOW2_FSP_BUILD) =3D=3D TRUE -# put below PCD value setting into dsc file -#SET gFspWrapperTokenSpaceGuid.PcdCpuMicrocodePatchAddress = =3D $(FLASH_REGION_VLVMICROCODE_BASE) -#SET gFspWrapperTokenSpaceGuid.PcdCpuMicrocodePatchRegionSize = =3D $(FLASH_REGION_VLVMICROCODE_SIZE) -#SET gFspWrapperTokenSpaceGuid.PcdFlashMicroCodeOffset = =3D 0x60 -#SET gFspWrapperTokenSpaceGuid.PcdFlashCodeCacheAddress = =3D $(FLASH_AREA_BASE_ADDRESS) -#SET gFspWrapperTokenSpaceGuid.PcdFlashCodeCacheSize = =3D $(FLASH_AREA_SIZE) -#SET gFspWrapperTokenSpaceGuid.PcdFlashFvFspBase = =3D $(FLASH_REGION_FSPBIN_BASE) -#SET gFspWrapperTokenSpaceGuid.PcdFlashFvFspSize = =3D $(FLASH_REGION_FSPBIN_SIZE) - -!endif ##########################################################################= ###### # # Following are lists of FD Region layout which correspond to the location= s of different @@ -106,6 +84,13 @@ [FD.Vlv] # Fv Size can be adjusted; FVMAIN_COMPACT can be reduced to 0x120000, and = FV_RECOVERY can be enlarged to 0x80000 # ##########################################################################= ###### + + # + # IFWI Header + # +0x0000|0x1000 +FILE=3DVlv2TbltDevicePkg/Stitch/IFWIHeader/IFWI_HEADER.bin + # # CPU Microcodes # @@ -173,18 +158,6 @@ [FD.Vlv] $(FLASH_REGION_NVSTORAGE_SUBREGION_NV_FTW_SPARE_OFFSET)|$(FLASH_REGION_NVS= TORAGE_SUBREGION_NV_FTW_SPARE_SIZE) gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareBase|gEfiMdeModule= PkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareSize =20 -!if $(MINNOW2_FSP_BUILD) =3D=3D TRUE - - $(FLASH_REGION_FSPBIN_OFFSET)|$(FLASH_REGION_FSPBIN_SIZE) - gFspWrapperTokenSpaceGuid.PcdFlashFvFspBase|gFspWrapperTokenSpaceGuid.Pc= dFlashFvFspSize - FILE =3D Vlv2SocBinPkg/FspBinary/FvFsp.bin - - - $(FLASH_REGION_AZALIABIN_OFFSET)|$(FLASH_REGION_AZALIABIN_SIZE) - FILE =3D Vlv2TbltDevicePkg/FspAzaliaConfigData/AzaliaConfig.bin - -!endif - # # Main Block # @@ -258,7 +231,7 @@ [FV.FVRECOVERY_COMPONENTS] READ_LOCK_CAP =3D TRUE READ_LOCK_STATUS =3D TRUE =20 -INF RuleOverride =3D BINARY $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE= )$(TARGET)/IA32/PchUsb.inf +INF RuleOverride =3D BINARY Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/IA= 32/PchUsb.inf INF MdeModulePkg/Bus/Pci/EhciPei/EhciPei.inf INF MdeModulePkg/Bus/Usb/UsbBusPei/UsbBusPei.inf INF MdeModulePkg/Bus/Usb/UsbBotPei/UsbBotPei.inf @@ -299,28 +272,22 @@ [FV.FVRECOVERY2] =20 =20 =20 -INF $(PLATFORM_PACKAGE)/PlatformInitPei/PlatformInitPei.inf +INF Vlv2TbltDevicePkg/PlatformInitPei/PlatformInitPei.inf =20 -!if $(MINNOW2_FSP_BUILD) =3D=3D FALSE -INF RuleOverride =3D BINARY $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)= $(TARGET)/IA32/PchSmbusArpDisabled.inf -INF RuleOverride =3D BINARY $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)= $(TARGET)/IA32/VlvInitPeim.inf -INF RuleOverride =3D BINARY $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)= $(TARGET)/IA32/PchInitPeim.inf -INF RuleOverride =3D BINARY $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)= $(TARGET)/IA32/PchSpiPeim.inf -INF RuleOverride =3D BINARY $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)= $(TARGET)/IA32/PeiSmmAccess.inf -INF RuleOverride =3D BINARY $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)= $(TARGET)/IA32/PeiSmmControl.inf +INF RuleOverride =3D BINARY Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/IA3= 2/PchSmbusArpDisabled.inf +INF RuleOverride =3D BINARY Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/IA3= 2/VlvInitPeim.inf +INF RuleOverride =3D BINARY Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/IA3= 2/PchInitPeim.inf +INF RuleOverride =3D BINARY Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/IA3= 2/PchSpiPeim.inf +INF RuleOverride =3D BINARY Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/IA3= 2/PeiSmmAccess.inf +INF RuleOverride =3D BINARY Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/IA3= 2/PeiSmmControl.inf INF UefiCpuPkg/Universal/Acpi/S3Resume2Pei/S3Resume2Pei.inf -INF RuleOverride =3D BINARY $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)= $(TARGET)/IA32/MpS3.inf -!endif +INF UefiCpuPkg/PiSmmCommunication/PiSmmCommunicationPei.inf =20 -# INF RuleOverride =3D BINARY $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTUR= E)$(TARGET)/IA32/PiSmmCommunicationPei.inf !if $(TPM_ENABLED) =3D=3D TRUE INF SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigPei.inf INF SecurityPkg/Tcg/TcgPei/TcgPei.inf INF SecurityPkg/Tcg/PhysicalPresencePei/PhysicalPresencePei.inf !endif -!if $(FTPM_ENABLE) =3D=3D TRUE -INF SecurityPkg/Tcg/Tcg2Pei/Tcg2Pei.inf #use PCD config -!endif INF MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf =20 !if $(ACPI50_ENABLE) =3D=3D TRUE @@ -359,31 +326,15 @@ [FV.FVRECOVERY] READ_LOCK_STATUS =3D TRUE FvNameGuid =3D B73FE497-B92E-416e-8326-45AD0D270091 =20 - -!if $(MINNOW2_FSP_BUILD) =3D=3D TRUE -INF IntelFspWrapperPkg/FspWrapperSecCore/FspWrapperSecCore.inf -!else -INF RuleOverride =3D BINARY $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)= $(TARGET)/IA32/SecCore.inf -!endif - +INF RuleOverride =3D BINARY Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/IA3= 2/SecCore.inf INF MdeModulePkg/Core/Pei/PeiMain.inf -!if $(MINNOW2_FSP_BUILD) =3D=3D TRUE -INF Vlv2TbltDevicePkg/FspSupport/BootModePei/BootModePei.inf -INF IntelFspWrapperPkg/FspInitPei/FspInitPei.inf -!endif -INF RuleOverride =3D BINARY $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)= $(TARGET)/IA32/CpuPeim.inf +INF RuleOverride =3D BINARY Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/IA3= 2/CpuPeim.inf INF MdeModulePkg/Universal/FaultTolerantWritePei/FaultTolerantWritePei.inf INF MdeModulePkg/Universal/Variable/Pei/VariablePei.inf =20 -INF $(PLATFORM_PACKAGE)/PlatformPei/PlatformPei.inf +INF Vlv2TbltDevicePkg/PlatformPei/PlatformPei.inf =20 -!if $(MINNOW2_FSP_BUILD) =3D=3D FALSE -INF RuleOverride =3D BINARY $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)= $(TARGET)/IA32/SeCUma.inf -!endif - -!if $(FTPM_ENABLE) =3D=3D TRUE -INF RuleOverride =3D BINARY $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)= $(TARGET)/IA32/fTPMInitPeim.inf -!endif +INF RuleOverride =3D BINARY Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/IA3= 2/SeCUma.inf =20 !if $(SOURCE_DEBUG_ENABLE) =3D=3D TRUE INF SourceLevelDebugPkg/DebugAgentPei/DebugAgentPei.inf @@ -397,12 +348,10 @@ [FV.FVRECOVERY] !endif !endif =20 -!if $(MINNOW2_FSP_BUILD) =3D=3D FALSE !if $(PCIESC_ENABLE) =3D=3D TRUE -INF RuleOverride =3D BINARY $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)= $(TARGET)/IA32/PchEarlyInitPeim.inf -!endif -INF RuleOverride =3D BINARY $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)= $(TARGET)/IA32/MemoryInit.inf +INF RuleOverride =3D BINARY Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/IA3= 2/PchEarlyInitPeim.inf !endif +INF RuleOverride =3D BINARY Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/IA3= 2/MemoryInit.inf =20 INF MdeModulePkg/Universal/PCD/Pei/Pcd.inf =20 @@ -440,10 +389,6 @@ [FV.FVMAIN] # EDK II Related Platform codes # =20 - !if $(MINNOW2_FSP_BUILD) =3D=3D TRUE - INF IntelFspWrapperPkg/FspNotifyDxe/FspNotifyDxe.inf - !endif - INF MdeModulePkg/Core/Dxe/DxeMain.inf INF MdeModulePkg/Universal/PCD/Dxe/Pcd.inf !if $(ACPI50_ENABLE) =3D=3D TRUE @@ -452,14 +397,14 @@ [FV.FVMAIN] !endif =20 =20 -INF IntelFrameworkModulePkg/Universal/CpuIoDxe/CpuIoDxe.inf INF UefiCpuPkg/CpuIo2Dxe/CpuIo2Dxe.inf INF MdeModulePkg/Universal/ReportStatusCodeRouter/RuntimeDxe/ReportStatusC= odeRouterRuntimeDxe.inf INF MdeModulePkg/Universal/StatusCodeHandler/RuntimeDxe/StatusCodeHandlerR= untimeDxe.inf INF MdeModulePkg/Universal/ReportStatusCodeRouter/Smm/ReportStatusCodeRout= erSmm.inf INF MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxe.inf INF UefiCpuPkg/CpuDxe/CpuDxe.inf -INF $(PLATFORM_PACKAGE)/Metronome/Metronome.inf +INF UefiCpuPkg/CpuS3DataDxe/CpuS3DataDxe.inf +INF MdeModulePkg/Universal/Metronome/Metronome.inf INF IntelFrameworkModulePkg/Universal/BdsDxe/BdsDxe.inf !if $(ARCH) =3D=3D IA32 INF USE=3DIA32 MdeModulePkg/Logo/Logo.inf @@ -469,13 +414,12 @@ [FV.FVMAIN] INF MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.inf INF MdeModulePkg/Core/RuntimeDxe/RuntimeDxe.inf INF MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteDxe.inf -INF IntelFrameworkModulePkg/Universal/Acpi/AcpiS3SaveDxe/AcpiS3SaveDxe.inf =20 INF MdeModulePkg/Universal/Variable/RuntimeDxe/VariableSmmRuntimeDxe.inf INF MdeModulePkg/Universal/Variable/RuntimeDxe/VariableSmm.inf -INF $(PLATFORM_PACKAGE)/FvbRuntimeDxe/FvbSmm.inf +INF Vlv2TbltDevicePkg/FvbRuntimeDxe/FvbSmm.inf INF MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteSmm.inf -INF RuleOverride =3D BINARY $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)= $(TARGET)/$(DXE_ARCHITECTURE)/PchSpiSmm.inf +INF RuleOverride =3D BINARY Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/$(D= XE_ARCHITECTURE)/PchSpiSmm.inf !if $(SECURE_BOOT_ENABLE) INF SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfig= Dxe.inf !endif @@ -485,89 +429,62 @@ [FV.FVMAIN] INF MdeModulePkg/Universal/MonotonicCounterRuntimeDxe/MonotonicCounterRunt= imeDxe.inf INF PcAtChipsetPkg/PcatRealTimeClockRuntimeDxe/PcatRealTimeClockRuntimeDxe= .inf INF MdeModulePkg/Universal/DevicePathDxe/DevicePathDxe.inf -INF $(PLATFORM_PACKAGE)/FvbRuntimeDxe/FvbRuntimeDxe.inf +INF Vlv2TbltDevicePkg/FvbRuntimeDxe/FvbRuntimeDxe.inf =20 =20 -INF $(PLATFORM_PACKAGE)/PlatformSetupDxe/PlatformSetupDxe.inf +INF Vlv2TbltDevicePkg/PlatformSetupDxe/PlatformSetupDxe.inf =20 !if $(DATAHUB_ENABLE) =3D=3D TRUE INF IntelFrameworkModulePkg/Universal/DataHubDxe/DataHubDxe.inf !endif -INF IntelFrameworkModulePkg/Universal/StatusCode/DatahubStatusCodeHandlerD= xe/DatahubStatusCodeHandlerDxe.inf INF MdeModulePkg/Universal/MemoryTest/NullMemoryTestDxe/NullMemoryTestDxe.= inf =20 -INF RuleOverride =3D BINARY $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)= $(TARGET)/$(DXE_ARCHITECTURE)/Dptf.inf +INF RuleOverride =3D BINARY Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/$(D= XE_ARCHITECTURE)/Dptf.inf =20 # # EDK II Related Silicon codes # -INF RuleOverride =3D BINARY $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)= $(TARGET)/$(DXE_ARCHITECTURE)/PchS3SupportDxe.inf +INF RuleOverride =3D BINARY Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/$(D= XE_ARCHITECTURE)/PchS3SupportDxe.inf =20 -!if $(USE_HPET_TIMER) =3D=3D TRUE INF PcAtChipsetPkg/HpetTimerDxe/HpetTimerDxe.inf -!else -INF RuleOverride =3D BINARY $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)= $(TARGET)/$(DXE_ARCHITECTURE)/SmartTimer.inf -!endif -INF RuleOverride =3D BINARY $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)= $(TARGET)/$(DXE_ARCHITECTURE)/SmmControl.inf +INF RuleOverride =3D BINARY Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/$(D= XE_ARCHITECTURE)/SmmControl.inf =20 -INF RuleOverride =3D BINARY $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)= $(TARGET)/$(DXE_ARCHITECTURE)/PchSmbusDxe.inf +INF RuleOverride =3D BINARY Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/$(D= XE_ARCHITECTURE)/PchSmbusDxe.inf =20 -INF RuleOverride =3D BINARY $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)= $(TARGET)/$(DXE_ARCHITECTURE)/IntelPchLegacyInterrupt.inf -INF RuleOverride =3D BINARY $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)= $(TARGET)/$(DXE_ARCHITECTURE)/PchReset.inf +INF RuleOverride =3D BINARY Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/$(D= XE_ARCHITECTURE)/PchReset.inf =20 -!if $(MINNOW2_FSP_BUILD) =3D=3D FALSE -INF RuleOverride =3D BINARY $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)= $(TARGET)/$(DXE_ARCHITECTURE)/PchInitDxe.inf -INF RuleOverride =3D BINARY $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)= $(TARGET)/$(DXE_ARCHITECTURE)/PchInitSmm.inf -!endif -INF RuleOverride =3D BINARY $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)= $(TARGET)/$(DXE_ARCHITECTURE)/PchSmiDispatcher.inf +INF RuleOverride =3D BINARY Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/$(D= XE_ARCHITECTURE)/PchInitDxe.inf +INF RuleOverride =3D BINARY Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/$(D= XE_ARCHITECTURE)/PchInitSmm.inf +INF RuleOverride =3D BINARY Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/$(D= XE_ARCHITECTURE)/PchSmiDispatcher.inf !if $(PCIESC_ENABLE) =3D=3D TRUE -INF RuleOverride =3D BINARY $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)= $(TARGET)/$(DXE_ARCHITECTURE)/PchPcieSmm.inf +INF RuleOverride =3D BINARY Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/$(D= XE_ARCHITECTURE)/PchPcieSmm.inf !endif =20 -INF RuleOverride =3D BINARY $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)= $(TARGET)/$(DXE_ARCHITECTURE)/PchSpiRuntime.inf -INF RuleOverride =3D BINARY $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)= $(TARGET)/$(DXE_ARCHITECTURE)/PchPolicyInitDxe.inf -INF RuleOverride =3D BINARY $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)= $(TARGET)/$(DXE_ARCHITECTURE)/PchBiosWriteProtect.inf -INF RuleOverride =3D BINARY $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)= $(TARGET)/$(DXE_ARCHITECTURE)/SmmAccess.inf -INF RuleOverride =3D BINARY $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)= $(TARGET)/$(DXE_ARCHITECTURE)/PciHostBridge.inf -!if $(MINNOW2_FSP_BUILD) =3D=3D FALSE -INF RuleOverride =3D BINARY $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)= $(TARGET)/$(DXE_ARCHITECTURE)/VlvInitDxe.inf -!else -INF IntelFrameworkModulePkg/Universal/LegacyRegionDxe/LegacyRegionDxe.inf -INF Vlv2TbltDevicePkg/VlvPlatformInitDxe/VlvPlatformInitDxe.inf -!endif -!if $(MINNOW2_FSP_BUILD) =3D=3D FALSE - !if $(SEC_ENABLE) =3D=3D TRUE - INF RuleOverride =3D BINARY $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTU= RE)$(TARGET)/$(DXE_ARCHITECTURE)/HeciDrv.inf - INF RuleOverride =3D BINARY $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTU= RE)$(TARGET)/$(DXE_ARCHITECTURE)/SeCPolicyInitDxe.inf - !endif -!endif +INF RuleOverride =3D BINARY Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/$(D= XE_ARCHITECTURE)/PchSpiRuntime.inf +INF RuleOverride =3D BINARY Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/$(D= XE_ARCHITECTURE)/PchPolicyInitDxe.inf +INF RuleOverride =3D BINARY Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/$(D= XE_ARCHITECTURE)/PchBiosWriteProtect.inf +INF RuleOverride =3D BINARY Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/$(D= XE_ARCHITECTURE)/SmmAccess.inf +INF RuleOverride =3D BINARY Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/$(D= XE_ARCHITECTURE)/PciHostBridge.inf +INF RuleOverride =3D BINARY Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/$(D= XE_ARCHITECTURE)/VlvInitDxe.inf !if $(TPM_ENABLED) =3D=3D TRUE INF SecurityPkg/Tcg/TcgConfigDxe/TcgConfigDxe.inf INF SecurityPkg/Tcg/TcgDxe/TcgDxe.inf INF RuleOverride =3D DRIVER_ACPITABLE SecurityPkg/Tcg/TcgSmm/TcgSmm.inf !endif -!if $(FTPM_ENABLE) =3D=3D TRUE -INF RuleOverride =3D BINARY $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)= $(TARGET)/IA32/Tpm2DeviceSeCPei.inf -INF RuleOverride =3D BINARY $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)= $(TARGET)/$(DXE_ARCHITECTURE)/Tpm2DeviceSeCDxe.inf -INF SecurityPkg/Tcg/MemoryOverwriteControl/TcgMor.inf -INF SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.inf -INF RuleOverride =3D BINARY $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)= $(TARGET)/$(DXE_ARCHITECTURE)/FtpmSmm.inf -!endif =20 # # EDK II Related Platform codes # -INF $(PLATFORM_PACKAGE)/PlatformSmm/PlatformSmm.inf -INF $(PLATFORM_PACKAGE)/PlatformInfoDxe/PlatformInfoDxe.inf -INF $(PLATFORM_PACKAGE)/PlatformCpuInfoDxe/PlatformCpuInfoDxe.inf -INF $(PLATFORM_PACKAGE)/PlatformDxe/PlatformDxe.inf -INF $(PLATFORM_PACKAGE)/PciPlatform/PciPlatform.inf -INF $(PLATFORM_PACKAGE)/SaveMemoryConfig/SaveMemoryConfig.inf -INF RuleOverride =3D BINARY $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)= $(TARGET)/$(DXE_ARCHITECTURE)/PlatformCpuPolicy.inf -INF $(PLATFORM_PACKAGE)/PpmPolicy/PpmPolicy.inf -INF $(PLATFORM_PACKAGE)/SmramSaveInfoHandlerSmm/SmramSaveInfoHandlerSmm.in= f +INF Vlv2TbltDevicePkg/PlatformSmm/PlatformSmm.inf +INF Vlv2TbltDevicePkg/PlatformInfoDxe/PlatformInfoDxe.inf +INF Vlv2TbltDevicePkg/PlatformCpuInfoDxe/PlatformCpuInfoDxe.inf +INF Vlv2TbltDevicePkg/PlatformDxe/PlatformDxe.inf +INF Vlv2TbltDevicePkg/PciPlatform/PciPlatform.inf +INF Vlv2TbltDevicePkg/SaveMemoryConfig/SaveMemoryConfig.inf +INF RuleOverride =3D BINARY Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/$(D= XE_ARCHITECTURE)/PlatformCpuPolicy.inf +INF Vlv2TbltDevicePkg/PpmPolicy/PpmPolicy.inf !if $(GOP_DRIVER_ENABLE) =3D=3D TRUE - INF $(PLATFORM_PACKAGE)/PlatformGopPolicy/PlatformGopPolicy.inf + INF Vlv2TbltDevicePkg/PlatformGopPolicy/PlatformGopPolicy.inf FILE DRIVER =3D FF0C8745-3270-4439-B74F-3E45F8C77064 { SECTION DXE_DEPEX_EXP =3D {gPlatformGOPPolicyGuid} SECTION PE32 =3D Vlv2SocBinPkg/GOP/7.2.1011/RELEASE_VS2008x86/$(DXE_ARCH= ITECTURE)/IntelGopDriver.efi @@ -575,7 +492,7 @@ [FV.FVMAIN] } !endif =20 -INF RuleOverride =3D BINARY $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)= $(TARGET)/$(DXE_ARCHITECTURE)/PnpDxe.inf +INF RuleOverride =3D BINARY Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/$(D= XE_ARCHITECTURE)/PnpDxe.inf # # SMM # @@ -586,25 +503,22 @@ [FV.FVMAIN] INF UefiCpuPkg/CpuIo2Smm/CpuIo2Smm.inf INF MdeModulePkg/Universal/LockBox/SmmLockBox/SmmLockBox.inf INF UefiCpuPkg/PiSmmCommunication/PiSmmCommunicationSmm.inf -INF $(PLATFORM_PACKAGE)/SmmSwDispatch2OnSmmSwDispatchThunk/SmmSwDispatch2O= nSmmSwDispatchThunk.inf =20 -# -# Remove the following two SMM binary modules that prevent platform from b= ooting to UEFI Shell -# -#INF RuleOverride =3D BINARY $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE= )$(TARGET)/$(DXE_ARCHITECTURE)/PowerManagement2.inf -#INF RuleOverride =3D BINARY $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE= )$(TARGET)/$(DXE_ARCHITECTURE)/DigitalThermalSensor.inf +INF RuleOverride =3D BINARY Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/$(D= XE_ARCHITECTURE)/PowerManagement2.inf +INF RuleOverride =3D BINARY Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/$(D= XE_ARCHITECTURE)/DigitalThermalSensor.inf +INF RuleOverride =3D BINARY Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/$(D= XE_ARCHITECTURE)/GraphicDxeInitSmm.inf =20 # # ACPI # INF MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/BootScriptExecutorDx= e.inf -INF $(PLATFORM_PACKAGE)/BootScriptSaveDxe/BootScriptSaveDxe.inf +INF MdeModulePkg/Universal/Acpi/S3SaveStateDxe/S3SaveStateDxe.inf INF IntelFrameworkModulePkg/Universal/Acpi/AcpiSupportDxe/AcpiSupportDxe.i= nf INF RuleOverride =3D ACPITABLE2 Vlv2DeviceRefCodePkg/ValleyView2Soc/CPU/Po= werManagement/AcpiTables/PowerManagementAcpiTables.inf =20 -INF RuleOverride =3D ACPITABLE $(PLATFORM_RC_PACKAGE)/AcpiTablesPCAT/AcpiT= ables.inf +INF RuleOverride =3D ACPITABLE Vlv2DeviceRefCodePkg/AcpiTablesPCAT/AcpiTab= les.inf =20 -INF $(PLATFORM_PACKAGE)/AcpiPlatform/AcpiPlatform.inf +INF Vlv2TbltDevicePkg/AcpiPlatform/AcpiPlatform.inf =20 INF MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsR= esourceTableDxe.inf =20 @@ -613,26 +527,17 @@ [FV.FVMAIN] # INF MdeModulePkg/Bus/Pci/PciBusDxe/PciBusDxe.inf =20 -INF RuleOverride =3D BINARY $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)= $(TARGET)/$(DXE_ARCHITECTURE)/ISPDxe.inf +INF RuleOverride =3D BINARY Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/$(D= XE_ARCHITECTURE)/ISPDxe.inf =20 =20 # # ISA # -INF $(PLATFORM_PACKAGE)/Wpce791/Wpce791.inf -INF IntelFrameworkModulePkg/Bus/Isa/IsaBusDxe/IsaBusDxe.inf -INF IntelFrameworkModulePkg/Bus/Isa/IsaIoDxe/IsaIoDxe.inf +INF Vlv2TbltDevicePkg/PcuSio/PcuSio.inf !if $(SOURCE_DEBUG_ENABLE) !=3D TRUE INF IntelFrameworkModulePkg/Bus/Isa/IsaSerialDxe/IsaSerialDxe.inf !endif -#INF IntelFrameworkModulePkg/Bus/Isa/Ps2MouseDxe/Ps2MouseDxe.inf -#INF IntelFrameworkModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2keyboardDxe.inf =20 -# -# SDIO -# -#INF RuleOverride =3D BINARY $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE= )$(TARGET)/$(DXE_ARCHITECTURE)/MmcHost.inf -#INF RuleOverride =3D BINARY $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE= )$(TARGET)/$(DXE_ARCHITECTURE)/MmcMediaDevice.inf # # IDE/SCSI/AHCI # @@ -642,7 +547,7 @@ [FV.FVMAIN] =20 INF MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf !if $(SATA_ENABLE) =3D=3D TRUE -INF RuleOverride =3D BINARY $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)= $(TARGET)/$(DXE_ARCHITECTURE)/SataController.inf +INF RuleOverride =3D BINARY Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/$(D= XE_ARCHITECTURE)/SataController.inf # =20 # @@ -659,7 +564,6 @@ [FV.FVMAIN] INF MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatformDxe.inf INF MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterDxe.inf INF MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsoleDxe.i= nf -INF IntelFrameworkModulePkg/Universal/Console/VgaClassDxe/VgaClassDxe.inf INF MdeModulePkg/Universal/Console/TerminalDxe/TerminalDxe.inf INF MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf INF MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngineDxe.inf @@ -682,9 +586,9 @@ [FV.FVMAIN] # SMBIOS # INF MdeModulePkg/Universal/SmbiosDxe/SmbiosDxe.inf -INF $(PLATFORM_PACKAGE)/SmBiosMiscDxe/SmBiosMiscDxe.inf +INF Vlv2TbltDevicePkg/SmBiosMiscDxe/SmBiosMiscDxe.inf =20 -INF RuleOverride =3D BINARY $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)= $(TARGET)/$(DXE_ARCHITECTURE)/SmbiosMemory.inf +INF RuleOverride =3D BINARY Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/$(D= XE_ARCHITECTURE)/SmbiosMemory.inf =20 =20 # @@ -719,8 +623,14 @@ [FV.FVMAIN] !if $(NETWORK_ENABLE) =3D=3D TRUE FILE DRIVER =3D 22DE1691-D65D-456a-993E-A253DD1F308C { SECTION PE32 =3D Vlv2SocBinPkg/UNDI/RtkUndiDxe/$(DXE_ARCHITECTURE)/Rtk= UndiDxe.efi - SECTION UI =3D "UNDI" + SECTION UI =3D "RtkUndiDxe" } + !if $(DXE_ARCHITECTURE) =3D=3D "X64" + FILE DRIVER =3D 7C7467E9-8BB3-4BF1-8694-6FED7D25D13E { + SECTION PE32 =3D Vlv2SocBinPkg/UNDI/I211PcieUndiDxe/$(DXE_ARCHITECTU= RE)/E7006X3.EFI + SECTION UI =3D "E7006X3" + } + !endif !endif =20 !if $(CAPSULE_ENABLE) @@ -908,7 +818,7 @@ [Rule.Common.UEFI_DRIVER.BINARY] =20 [Rule.Common.UEFI_DRIVER.NATIVE_BINARY] FILE DRIVER =3D $(NAMED_GUID) { - DXE_DEPEX DXE_DEPEX Optional $(WORKSPACE)/$(PLATFORM_PACKAGE)/Int= elGopDepex/IntelGopDriver.depex + DXE_DEPEX DXE_DEPEX Optional $(WORKSPACE)/Vlv2TbltDevicePkg/Intel= GopDepex/IntelGopDriver.depex PE32 PE32 |.efi UI STRING=3D"$(MODULE_NAME)" Optional VERSION STRING=3D"$(INF_VERSION)" Optional BUILD_NUM=3D$(BUILD_NUMBE= R) diff --git a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgConfig.dsc b/Platf= orm/Intel/Vlv2TbltDevicePkg/PlatformPkgConfig.dsc index 61eca30be1..d5068b514c 100644 --- a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgConfig.dsc +++ b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgConfig.dsc @@ -1,11 +1,9 @@ #/** @file # platform configuration file. # -# Copyright (c) 2012 - 2016, Intel Corporation. All rights reserved.
-# = =20 +# Copyright (c) 2012 - 2019, Intel Corporation. All rights reserved.
+# # SPDX-License-Identifier: BSD-2-Clause-Patent - -# = =20 # #**/ =20 @@ -13,12 +11,6 @@ # TRUE is ENABLE. FASLE is DISABLE. # =20 -# -# FSP selection -# -DEFINE MINNOW2_FSP_BUILD =3D FALSE - - DEFINE SCSI_ENABLE =3D TRUE =20 =20 @@ -31,14 +23,6 @@ # Feature selection # =20 -# -# Select system timer which is used to produce Timer Arch Protocol: -# TRUE - HPET timer is used. -# FALSE - 8254 timer is used. -# -DEFINE USE_HPET_TIMER =3D TRUE - - # # Feature selection # @@ -65,7 +49,6 @@ =20 DEFINE GOP_DRIVER_ENABLE =3D TRUE DEFINE DATAHUB_ENABLE =3D TRUE -DEFINE DATAHUB_STATUS_CODE_ENABLE =3D TRUE DEFINE USB_ENABLE =3D TRUE =20 DEFINE ISA_SERIAL_STATUS_CODE_ENABLE =3D TRUE diff --git a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGcc.fdf b/Platform= /Intel/Vlv2TbltDevicePkg/PlatformPkgGcc.fdf index a6859d3b6d..110efe28c3 100644 --- a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGcc.fdf +++ b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGcc.fdf @@ -30,17 +30,6 @@ [Defines] DEFINE FLASH_REGION_NVSTORAGE_SUBREGION_NV_FTW_SPARE_OFFSET =3D 0x000800= 00 DEFINE FLASH_REGION_NVSTORAGE_SUBREGION_NV_FTW_SPARE_SIZE =3D 0x000400= 00 =20 -!if $(MINNOW2_FSP_BUILD) =3D=3D TRUE -DEFINE FLASH_REGION_FSPBIN_OFFSET =3D 0x000C00= 00 -DEFINE FLASH_REGION_FSPBIN_SIZE =3D 0x000480= 00 -DEFINE FLASH_REGION_FSPBIN_BASE =3D 0xFFCC00= 00 - -DEFINE FLASH_REGION_AZALIABIN_OFFSET =3D 0x001080= 00 -DEFINE FLASH_REGION_AZALIABIN_SIZE =3D 0x000080= 00 -DEFINE FLASH_REGION_AZALIABIN_BASE =3D 0xFFD080= 00 - -!endif - DEFINE FLASH_REGION_FVMAIN_OFFSET =3D 0x001100= 00 DEFINE FLASH_REGION_FVMAIN_SIZE =3D 0x002150= 00 =20 @@ -79,17 +68,6 @@ [FD.Vlv] SET gUefiCpuPkgTokenSpaceGuid.PcdCpuMicrocodePatchAddress =3D $(FLASH_REGI= ON_VLVMICROCODE_BASE) + 0x60 SET gUefiCpuPkgTokenSpaceGuid.PcdCpuMicrocodePatchRegionSize =3D $(FLASH_R= EGION_VLVMICROCODE_SIZE) - 0x60 =20 -!if $(MINNOW2_FSP_BUILD) =3D=3D TRUE -# put below PCD value setting into dsc file -#SET gFspWrapperTokenSpaceGuid.PcdCpuMicrocodePatchAddress = =3D $(FLASH_REGION_VLVMICROCODE_BASE) -#SET gFspWrapperTokenSpaceGuid.PcdCpuMicrocodePatchRegionSize = =3D $(FLASH_REGION_VLVMICROCODE_SIZE) -#SET gFspWrapperTokenSpaceGuid.PcdFlashMicroCodeOffset = =3D 0x60 -#SET gFspWrapperTokenSpaceGuid.PcdFlashCodeCacheAddress = =3D $(FLASH_AREA_BASE_ADDRESS) -#SET gFspWrapperTokenSpaceGuid.PcdFlashCodeCacheSize = =3D $(FLASH_AREA_SIZE) -#SET gFspWrapperTokenSpaceGuid.PcdFlashFvFspBase = =3D $(FLASH_REGION_FSPBIN_BASE) -#SET gFspWrapperTokenSpaceGuid.PcdFlashFvFspSize = =3D $(FLASH_REGION_FSPBIN_SIZE) - -!endif ##########################################################################= ###### # # Following are lists of FD Region layout which correspond to the location= s of different @@ -129,18 +107,6 @@ [FD.Vlv] gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareBase|gEfiMdeModule= PkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareSize FILE =3D Vlv2TbltDevicePkg/Stitch/Gcc/NvStorageFtwSpare.bin =20 -!if $(MINNOW2_FSP_BUILD) =3D=3D TRUE - - $(FLASH_REGION_FSPBIN_OFFSET)|$(FLASH_REGION_FSPBIN_SIZE) - gFspWrapperTokenSpaceGuid.PcdFlashFvFspBase|gFspWrapperTokenSpaceGuid.Pc= dFlashFvFspSize - FILE =3D Vlv2SocBinPkg/FspBinary/FvFsp.bin - - - $(FLASH_REGION_AZALIABIN_OFFSET)|$(FLASH_REGION_AZALIABIN_SIZE) - FILE =3D Vlv2TbltDevicePkg/FspAzaliaConfigData/AzaliaConfig.bin - -!endif - # # Main Block # @@ -214,7 +180,7 @@ [FV.FVRECOVERY_COMPONENTS] READ_LOCK_CAP =3D TRUE READ_LOCK_STATUS =3D TRUE =20 -INF RuleOverride =3D BINARY $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE= )$(TARGET)/IA32/PchUsb.inf +INF RuleOverride =3D BINARY Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/IA= 32/PchUsb.inf INF MdeModulePkg/Bus/Pci/EhciPei/EhciPei.inf INF MdeModulePkg/Bus/Usb/UsbBusPei/UsbBusPei.inf INF MdeModulePkg/Bus/Usb/UsbBotPei/UsbBotPei.inf @@ -253,30 +219,21 @@ [FV.FVRECOVERY2] READ_LOCK_STATUS =3D TRUE FvNameGuid =3D B73FE497-B92E-416e-8326-45AD0D270092 =20 - - -INF $(PLATFORM_PACKAGE)/PlatformInitPei/PlatformInitPei.inf - -!if $(MINNOW2_FSP_BUILD) =3D=3D FALSE -INF RuleOverride =3D BINARY $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)= $(TARGET)/IA32/PchSmbusArpDisabled.inf -INF RuleOverride =3D BINARY $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)= $(TARGET)/IA32/VlvInitPeim.inf -INF RuleOverride =3D BINARY $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)= $(TARGET)/IA32/PchInitPeim.inf -INF RuleOverride =3D BINARY $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)= $(TARGET)/IA32/PchSpiPeim.inf -INF RuleOverride =3D BINARY $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)= $(TARGET)/IA32/PeiSmmAccess.inf -INF RuleOverride =3D BINARY $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)= $(TARGET)/IA32/PeiSmmControl.inf +INF Vlv2TbltDevicePkg/PlatformInitPei/PlatformInitPei.inf +INF RuleOverride =3D BINARY Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/IA3= 2/PchSmbusArpDisabled.inf +INF RuleOverride =3D BINARY Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/IA3= 2/VlvInitPeim.inf +INF RuleOverride =3D BINARY Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/IA3= 2/PchInitPeim.inf +INF RuleOverride =3D BINARY Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/IA3= 2/PchSpiPeim.inf +INF RuleOverride =3D BINARY Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/IA3= 2/PeiSmmAccess.inf +INF RuleOverride =3D BINARY Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/IA3= 2/PeiSmmControl.inf INF UefiCpuPkg/Universal/Acpi/S3Resume2Pei/S3Resume2Pei.inf -INF RuleOverride =3D BINARY $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)= $(TARGET)/IA32/MpS3.inf -!endif +INF UefiCpuPkg/PiSmmCommunication/PiSmmCommunicationPei.inf =20 -# INF RuleOverride =3D BINARY $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTUR= E)$(TARGET)/IA32/PiSmmCommunicationPei.inf !if $(TPM_ENABLED) =3D=3D TRUE INF SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigPei.inf INF SecurityPkg/Tcg/TcgPei/TcgPei.inf INF SecurityPkg/Tcg/PhysicalPresencePei/PhysicalPresencePei.inf !endif -!if $(FTPM_ENABLE) =3D=3D TRUE -INF SecurityPkg/Tcg/Tcg2Pei/Tcg2Pei.inf #use PCD config -!endif INF MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf =20 !if $(ACPI50_ENABLE) =3D=3D TRUE @@ -315,31 +272,15 @@ [FV.FVRECOVERY] READ_LOCK_STATUS =3D TRUE FvNameGuid =3D B73FE497-B92E-416e-8326-45AD0D270091 =20 - -!if $(MINNOW2_FSP_BUILD) =3D=3D TRUE -INF IntelFspWrapperPkg/FspWrapperSecCore/FspWrapperSecCore.inf -!else -INF RuleOverride =3D BINARY $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)= $(TARGET)/IA32/SecCore.inf -!endif - +INF RuleOverride =3D BINARY Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/IA3= 2/SecCore.inf INF MdeModulePkg/Core/Pei/PeiMain.inf -!if $(MINNOW2_FSP_BUILD) =3D=3D TRUE -INF Vlv2TbltDevicePkg/FspSupport/BootModePei/BootModePei.inf -INF IntelFspWrapperPkg/FspInitPei/FspInitPei.inf -!endif -INF RuleOverride =3D BINARY $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)= $(TARGET)/IA32/CpuPeim.inf +INF RuleOverride =3D BINARY Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/IA3= 2/CpuPeim.inf INF MdeModulePkg/Universal/FaultTolerantWritePei/FaultTolerantWritePei.inf INF MdeModulePkg/Universal/Variable/Pei/VariablePei.inf =20 -INF $(PLATFORM_PACKAGE)/PlatformPei/PlatformPei.inf +INF Vlv2TbltDevicePkg/PlatformPei/PlatformPei.inf =20 -!if $(MINNOW2_FSP_BUILD) =3D=3D FALSE -INF RuleOverride =3D BINARY $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)= $(TARGET)/IA32/SeCUma.inf -!endif - -!if $(FTPM_ENABLE) =3D=3D TRUE -INF RuleOverride =3D BINARY $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)= $(TARGET)/IA32/fTPMInitPeim.inf -!endif +INF RuleOverride =3D BINARY Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/IA3= 2/SeCUma.inf =20 !if $(SOURCE_DEBUG_ENABLE) =3D=3D TRUE INF SourceLevelDebugPkg/DebugAgentPei/DebugAgentPei.inf @@ -353,12 +294,10 @@ [FV.FVRECOVERY] !endif !endif =20 -!if $(MINNOW2_FSP_BUILD) =3D=3D FALSE !if $(PCIESC_ENABLE) =3D=3D TRUE -INF RuleOverride =3D BINARY $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)= $(TARGET)/IA32/PchEarlyInitPeim.inf -!endif -INF RuleOverride =3D BINARY $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)= $(TARGET)/IA32/MemoryInit.inf +INF RuleOverride =3D BINARY Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/IA3= 2/PchEarlyInitPeim.inf !endif +INF RuleOverride =3D BINARY Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/IA3= 2/MemoryInit.inf =20 INF MdeModulePkg/Universal/PCD/Pei/Pcd.inf =20 @@ -396,10 +335,6 @@ [FV.FVMAIN] # EDK II Related Platform codes # =20 - !if $(MINNOW2_FSP_BUILD) =3D=3D TRUE - INF IntelFspWrapperPkg/FspNotifyDxe/FspNotifyDxe.inf - !endif - INF MdeModulePkg/Core/Dxe/DxeMain.inf INF MdeModulePkg/Universal/PCD/Dxe/Pcd.inf !if $(ACPI50_ENABLE) =3D=3D TRUE @@ -408,14 +343,14 @@ [FV.FVMAIN] !endif =20 =20 -INF IntelFrameworkModulePkg/Universal/CpuIoDxe/CpuIoDxe.inf INF UefiCpuPkg/CpuIo2Dxe/CpuIo2Dxe.inf INF MdeModulePkg/Universal/ReportStatusCodeRouter/RuntimeDxe/ReportStatusC= odeRouterRuntimeDxe.inf INF MdeModulePkg/Universal/StatusCodeHandler/RuntimeDxe/StatusCodeHandlerR= untimeDxe.inf INF MdeModulePkg/Universal/ReportStatusCodeRouter/Smm/ReportStatusCodeRout= erSmm.inf INF MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxe.inf INF UefiCpuPkg/CpuDxe/CpuDxe.inf -INF $(PLATFORM_PACKAGE)/Metronome/Metronome.inf +INF UefiCpuPkg/CpuS3DataDxe/CpuS3DataDxe.inf +INF MdeModulePkg/Universal/Metronome/Metronome.inf INF IntelFrameworkModulePkg/Universal/BdsDxe/BdsDxe.inf !if $(ARCH) =3D=3D IA32 INF USE=3DIA32 MdeModulePkg/Logo/Logo.inf @@ -425,13 +360,12 @@ [FV.FVMAIN] INF MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.inf INF MdeModulePkg/Core/RuntimeDxe/RuntimeDxe.inf INF MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteDxe.inf -INF IntelFrameworkModulePkg/Universal/Acpi/AcpiS3SaveDxe/AcpiS3SaveDxe.inf =20 INF MdeModulePkg/Universal/Variable/RuntimeDxe/VariableSmmRuntimeDxe.inf INF MdeModulePkg/Universal/Variable/RuntimeDxe/VariableSmm.inf -INF $(PLATFORM_PACKAGE)/FvbRuntimeDxe/FvbSmm.inf +INF Vlv2TbltDevicePkg/FvbRuntimeDxe/FvbSmm.inf INF MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteSmm.inf -INF RuleOverride =3D BINARY $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)= $(TARGET)/$(DXE_ARCHITECTURE)/PchSpiSmm.inf +INF RuleOverride =3D BINARY Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/$(D= XE_ARCHITECTURE)/PchSpiSmm.inf !if $(SECURE_BOOT_ENABLE) INF SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfig= Dxe.inf !endif @@ -441,89 +375,62 @@ [FV.FVMAIN] INF MdeModulePkg/Universal/MonotonicCounterRuntimeDxe/MonotonicCounterRunt= imeDxe.inf INF PcAtChipsetPkg/PcatRealTimeClockRuntimeDxe/PcatRealTimeClockRuntimeDxe= .inf INF MdeModulePkg/Universal/DevicePathDxe/DevicePathDxe.inf -INF $(PLATFORM_PACKAGE)/FvbRuntimeDxe/FvbRuntimeDxe.inf +INF Vlv2TbltDevicePkg/FvbRuntimeDxe/FvbRuntimeDxe.inf =20 =20 -INF $(PLATFORM_PACKAGE)/PlatformSetupDxe/PlatformSetupDxe.inf +INF Vlv2TbltDevicePkg/PlatformSetupDxe/PlatformSetupDxe.inf =20 !if $(DATAHUB_ENABLE) =3D=3D TRUE INF IntelFrameworkModulePkg/Universal/DataHubDxe/DataHubDxe.inf !endif -INF IntelFrameworkModulePkg/Universal/StatusCode/DatahubStatusCodeHandlerD= xe/DatahubStatusCodeHandlerDxe.inf INF MdeModulePkg/Universal/MemoryTest/NullMemoryTestDxe/NullMemoryTestDxe.= inf =20 -INF RuleOverride =3D BINARY $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)= $(TARGET)/$(DXE_ARCHITECTURE)/Dptf.inf +INF RuleOverride =3D BINARY Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/$(D= XE_ARCHITECTURE)/Dptf.inf =20 # # EDK II Related Silicon codes # -INF RuleOverride =3D BINARY $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)= $(TARGET)/$(DXE_ARCHITECTURE)/PchS3SupportDxe.inf +INF RuleOverride =3D BINARY Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/$(D= XE_ARCHITECTURE)/PchS3SupportDxe.inf =20 -!if $(USE_HPET_TIMER) =3D=3D TRUE INF PcAtChipsetPkg/HpetTimerDxe/HpetTimerDxe.inf -!else -INF RuleOverride =3D BINARY $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)= $(TARGET)/$(DXE_ARCHITECTURE)/SmartTimer.inf -!endif -INF RuleOverride =3D BINARY $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)= $(TARGET)/$(DXE_ARCHITECTURE)/SmmControl.inf +INF RuleOverride =3D BINARY Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/$(D= XE_ARCHITECTURE)/SmmControl.inf =20 -INF RuleOverride =3D BINARY $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)= $(TARGET)/$(DXE_ARCHITECTURE)/PchSmbusDxe.inf +INF RuleOverride =3D BINARY Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/$(D= XE_ARCHITECTURE)/PchSmbusDxe.inf =20 -INF RuleOverride =3D BINARY $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)= $(TARGET)/$(DXE_ARCHITECTURE)/IntelPchLegacyInterrupt.inf -INF RuleOverride =3D BINARY $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)= $(TARGET)/$(DXE_ARCHITECTURE)/PchReset.inf +INF RuleOverride =3D BINARY Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/$(D= XE_ARCHITECTURE)/PchReset.inf =20 -!if $(MINNOW2_FSP_BUILD) =3D=3D FALSE -INF RuleOverride =3D BINARY $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)= $(TARGET)/$(DXE_ARCHITECTURE)/PchInitDxe.inf -INF RuleOverride =3D BINARY $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)= $(TARGET)/$(DXE_ARCHITECTURE)/PchInitSmm.inf -!endif -INF RuleOverride =3D BINARY $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)= $(TARGET)/$(DXE_ARCHITECTURE)/PchSmiDispatcher.inf +INF RuleOverride =3D BINARY Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/$(D= XE_ARCHITECTURE)/PchInitDxe.inf +INF RuleOverride =3D BINARY Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/$(D= XE_ARCHITECTURE)/PchInitSmm.inf +INF RuleOverride =3D BINARY Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/$(D= XE_ARCHITECTURE)/PchSmiDispatcher.inf !if $(PCIESC_ENABLE) =3D=3D TRUE -INF RuleOverride =3D BINARY $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)= $(TARGET)/$(DXE_ARCHITECTURE)/PchPcieSmm.inf +INF RuleOverride =3D BINARY Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/$(D= XE_ARCHITECTURE)/PchPcieSmm.inf !endif =20 -INF RuleOverride =3D BINARY $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)= $(TARGET)/$(DXE_ARCHITECTURE)/PchSpiRuntime.inf -INF RuleOverride =3D BINARY $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)= $(TARGET)/$(DXE_ARCHITECTURE)/PchPolicyInitDxe.inf -INF RuleOverride =3D BINARY $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)= $(TARGET)/$(DXE_ARCHITECTURE)/PchBiosWriteProtect.inf -INF RuleOverride =3D BINARY $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)= $(TARGET)/$(DXE_ARCHITECTURE)/SmmAccess.inf -INF RuleOverride =3D BINARY $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)= $(TARGET)/$(DXE_ARCHITECTURE)/PciHostBridge.inf -!if $(MINNOW2_FSP_BUILD) =3D=3D FALSE -INF RuleOverride =3D BINARY $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)= $(TARGET)/$(DXE_ARCHITECTURE)/VlvInitDxe.inf -!else -INF IntelFrameworkModulePkg/Universal/LegacyRegionDxe/LegacyRegionDxe.inf -INF Vlv2TbltDevicePkg/VlvPlatformInitDxe/VlvPlatformInitDxe.inf -!endif -!if $(MINNOW2_FSP_BUILD) =3D=3D FALSE - !if $(SEC_ENABLE) =3D=3D TRUE - INF RuleOverride =3D BINARY $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTU= RE)$(TARGET)/$(DXE_ARCHITECTURE)/HeciDrv.inf - INF RuleOverride =3D BINARY $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTU= RE)$(TARGET)/$(DXE_ARCHITECTURE)/SeCPolicyInitDxe.inf - !endif -!endif +INF RuleOverride =3D BINARY Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/$(D= XE_ARCHITECTURE)/PchSpiRuntime.inf +INF RuleOverride =3D BINARY Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/$(D= XE_ARCHITECTURE)/PchPolicyInitDxe.inf +INF RuleOverride =3D BINARY Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/$(D= XE_ARCHITECTURE)/PchBiosWriteProtect.inf +INF RuleOverride =3D BINARY Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/$(D= XE_ARCHITECTURE)/SmmAccess.inf +INF RuleOverride =3D BINARY Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/$(D= XE_ARCHITECTURE)/PciHostBridge.inf +INF RuleOverride =3D BINARY Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/$(D= XE_ARCHITECTURE)/VlvInitDxe.inf !if $(TPM_ENABLED) =3D=3D TRUE INF SecurityPkg/Tcg/TcgConfigDxe/TcgConfigDxe.inf INF SecurityPkg/Tcg/TcgDxe/TcgDxe.inf INF RuleOverride =3D DRIVER_ACPITABLE SecurityPkg/Tcg/TcgSmm/TcgSmm.inf !endif -!if $(FTPM_ENABLE) =3D=3D TRUE -INF RuleOverride =3D BINARY $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)= $(TARGET)/IA32/Tpm2DeviceSeCPei.inf -INF RuleOverride =3D BINARY $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)= $(TARGET)/$(DXE_ARCHITECTURE)/Tpm2DeviceSeCDxe.inf -INF SecurityPkg/Tcg/MemoryOverwriteControl/TcgMor.inf -INF SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.inf -INF RuleOverride =3D BINARY $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)= $(TARGET)/$(DXE_ARCHITECTURE)/FtpmSmm.inf -!endif =20 # # EDK II Related Platform codes # -INF $(PLATFORM_PACKAGE)/PlatformSmm/PlatformSmm.inf -INF $(PLATFORM_PACKAGE)/PlatformInfoDxe/PlatformInfoDxe.inf -INF $(PLATFORM_PACKAGE)/PlatformCpuInfoDxe/PlatformCpuInfoDxe.inf -INF $(PLATFORM_PACKAGE)/PlatformDxe/PlatformDxe.inf -INF $(PLATFORM_PACKAGE)/PciPlatform/PciPlatform.inf -INF $(PLATFORM_PACKAGE)/SaveMemoryConfig/SaveMemoryConfig.inf -INF RuleOverride =3D BINARY $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)= $(TARGET)/$(DXE_ARCHITECTURE)/PlatformCpuPolicy.inf -INF $(PLATFORM_PACKAGE)/PpmPolicy/PpmPolicy.inf -INF $(PLATFORM_PACKAGE)/SmramSaveInfoHandlerSmm/SmramSaveInfoHandlerSmm.in= f +INF Vlv2TbltDevicePkg/PlatformSmm/PlatformSmm.inf +INF Vlv2TbltDevicePkg/PlatformInfoDxe/PlatformInfoDxe.inf +INF Vlv2TbltDevicePkg/PlatformCpuInfoDxe/PlatformCpuInfoDxe.inf +INF Vlv2TbltDevicePkg/PlatformDxe/PlatformDxe.inf +INF Vlv2TbltDevicePkg/PciPlatform/PciPlatform.inf +INF Vlv2TbltDevicePkg/SaveMemoryConfig/SaveMemoryConfig.inf +INF RuleOverride =3D BINARY Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/$(D= XE_ARCHITECTURE)/PlatformCpuPolicy.inf +INF Vlv2TbltDevicePkg/PpmPolicy/PpmPolicy.inf !if $(GOP_DRIVER_ENABLE) =3D=3D TRUE - INF $(PLATFORM_PACKAGE)/PlatformGopPolicy/PlatformGopPolicy.inf + INF Vlv2TbltDevicePkg/PlatformGopPolicy/PlatformGopPolicy.inf FILE DRIVER =3D FF0C8745-3270-4439-B74F-3E45F8C77064 { SECTION DXE_DEPEX_EXP =3D {gPlatformGOPPolicyGuid} SECTION PE32 =3D Vlv2SocBinPkg/GOP/7.2.1011/RELEASE_VS2008x86/$(DXE_ARCH= ITECTURE)/IntelGopDriver.efi @@ -531,7 +438,7 @@ [FV.FVMAIN] } !endif =20 -INF RuleOverride =3D BINARY $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)= $(TARGET)/$(DXE_ARCHITECTURE)/PnpDxe.inf +INF RuleOverride =3D BINARY Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/$(D= XE_ARCHITECTURE)/PnpDxe.inf # # SMM # @@ -542,25 +449,22 @@ [FV.FVMAIN] INF UefiCpuPkg/CpuIo2Smm/CpuIo2Smm.inf INF MdeModulePkg/Universal/LockBox/SmmLockBox/SmmLockBox.inf INF UefiCpuPkg/PiSmmCommunication/PiSmmCommunicationSmm.inf -INF $(PLATFORM_PACKAGE)/SmmSwDispatch2OnSmmSwDispatchThunk/SmmSwDispatch2O= nSmmSwDispatchThunk.inf =20 -# -# Remove the following two SMM binary modules that prevent platform from b= ooting to UEFI Shell -# -#INF RuleOverride =3D BINARY $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE= )$(TARGET)/$(DXE_ARCHITECTURE)/PowerManagement2.inf -#INF RuleOverride =3D BINARY $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE= )$(TARGET)/$(DXE_ARCHITECTURE)/DigitalThermalSensor.inf +INF RuleOverride =3D BINARY Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/$(D= XE_ARCHITECTURE)/PowerManagement2.inf +INF RuleOverride =3D BINARY Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/$(D= XE_ARCHITECTURE)/DigitalThermalSensor.inf +INF RuleOverride =3D BINARY Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/$(D= XE_ARCHITECTURE)/GraphicDxeInitSmm.inf =20 # # ACPI # INF MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/BootScriptExecutorDx= e.inf -INF $(PLATFORM_PACKAGE)/BootScriptSaveDxe/BootScriptSaveDxe.inf +INF MdeModulePkg/Universal/Acpi/S3SaveStateDxe/S3SaveStateDxe.inf INF IntelFrameworkModulePkg/Universal/Acpi/AcpiSupportDxe/AcpiSupportDxe.i= nf INF RuleOverride =3D ACPITABLE2 Vlv2DeviceRefCodePkg/ValleyView2Soc/CPU/Po= werManagement/AcpiTables/PowerManagementAcpiTables.inf =20 -INF RuleOverride =3D ACPITABLE $(PLATFORM_RC_PACKAGE)/AcpiTablesPCAT/AcpiT= ables.inf +INF RuleOverride =3D ACPITABLE Vlv2DeviceRefCodePkg/AcpiTablesPCAT/AcpiTab= les.inf =20 -INF $(PLATFORM_PACKAGE)/AcpiPlatform/AcpiPlatform.inf +INF Vlv2TbltDevicePkg/AcpiPlatform/AcpiPlatform.inf =20 INF MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsR= esourceTableDxe.inf =20 @@ -569,26 +473,17 @@ [FV.FVMAIN] # INF MdeModulePkg/Bus/Pci/PciBusDxe/PciBusDxe.inf =20 -INF RuleOverride =3D BINARY $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)= $(TARGET)/$(DXE_ARCHITECTURE)/ISPDxe.inf +INF RuleOverride =3D BINARY Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/$(D= XE_ARCHITECTURE)/ISPDxe.inf =20 =20 # # ISA # -INF $(PLATFORM_PACKAGE)/Wpce791/Wpce791.inf -INF IntelFrameworkModulePkg/Bus/Isa/IsaBusDxe/IsaBusDxe.inf -INF IntelFrameworkModulePkg/Bus/Isa/IsaIoDxe/IsaIoDxe.inf +INF Vlv2TbltDevicePkg/PcuSio/PcuSio.inf !if $(SOURCE_DEBUG_ENABLE) !=3D TRUE INF IntelFrameworkModulePkg/Bus/Isa/IsaSerialDxe/IsaSerialDxe.inf !endif -#INF IntelFrameworkModulePkg/Bus/Isa/Ps2MouseDxe/Ps2MouseDxe.inf -#INF IntelFrameworkModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2keyboardDxe.inf =20 -# -# SDIO -# -#INF RuleOverride =3D BINARY $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE= )$(TARGET)/$(DXE_ARCHITECTURE)/MmcHost.inf -#INF RuleOverride =3D BINARY $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE= )$(TARGET)/$(DXE_ARCHITECTURE)/MmcMediaDevice.inf # # IDE/SCSI/AHCI # @@ -598,7 +493,7 @@ [FV.FVMAIN] =20 INF MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf !if $(SATA_ENABLE) =3D=3D TRUE -INF RuleOverride =3D BINARY $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)= $(TARGET)/$(DXE_ARCHITECTURE)/SataController.inf +INF RuleOverride =3D BINARY Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/$(D= XE_ARCHITECTURE)/SataController.inf # =20 # @@ -615,7 +510,6 @@ [FV.FVMAIN] INF MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatformDxe.inf INF MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterDxe.inf INF MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsoleDxe.i= nf -INF IntelFrameworkModulePkg/Universal/Console/VgaClassDxe/VgaClassDxe.inf INF MdeModulePkg/Universal/Console/TerminalDxe/TerminalDxe.inf INF MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf INF MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngineDxe.inf @@ -638,9 +532,9 @@ [FV.FVMAIN] # SMBIOS # INF MdeModulePkg/Universal/SmbiosDxe/SmbiosDxe.inf -INF $(PLATFORM_PACKAGE)/SmBiosMiscDxe/SmBiosMiscDxe.inf +INF Vlv2TbltDevicePkg/SmBiosMiscDxe/SmBiosMiscDxe.inf =20 -INF RuleOverride =3D BINARY $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)= $(TARGET)/$(DXE_ARCHITECTURE)/SmbiosMemory.inf +INF RuleOverride =3D BINARY Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/$(D= XE_ARCHITECTURE)/SmbiosMemory.inf =20 =20 # @@ -675,8 +569,14 @@ [FV.FVMAIN] !if $(NETWORK_ENABLE) =3D=3D TRUE FILE DRIVER =3D 22DE1691-D65D-456a-993E-A253DD1F308C { SECTION PE32 =3D Vlv2SocBinPkg/UNDI/RtkUndiDxe/$(DXE_ARCHITECTURE)/Rtk= UndiDxe.efi - SECTION UI =3D "UNDI" + SECTION UI =3D "RtkUndiDxe" } + !if $(DXE_ARCHITECTURE) =3D=3D "X64" + FILE DRIVER =3D 7C7467E9-8BB3-4BF1-8694-6FED7D25D13E { + SECTION PE32 =3D Vlv2SocBinPkg/UNDI/I211PcieUndiDxe/$(DXE_ARCHITECTU= RE)/E7006X3.EFI + SECTION UI =3D "E7006X3" + } + !endif !endif =20 !if $(CAPSULE_ENABLE) @@ -786,11 +686,7 @@ [Rule.Common.SEC] [Rule.Common.SEC.BINARY] FILE SEC =3D $(NAMED_GUID) RELOCS_STRIPPED { PE32 PE32 Align =3D 8 |.efi -!if $(MINNOW2_FSP_BUILD) =3D=3D TRUE - RAW RAW |.raw -!else RAW BIN Align =3D 16 |.com -!endif } =20 [Rule.Common.PEI_CORE] @@ -868,7 +764,7 @@ [Rule.Common.UEFI_DRIVER.BINARY] =20 [Rule.Common.UEFI_DRIVER.NATIVE_BINARY] FILE DRIVER =3D $(NAMED_GUID) { - DXE_DEPEX DXE_DEPEX Optional $(WORKSPACE)/$(PLATFORM_PACKAGE)/Int= elGopDepex/IntelGopDriver.depex + DXE_DEPEX DXE_DEPEX Optional $(WORKSPACE)/Vlv2TbltDevicePkg/Intel= GopDepex/IntelGopDriver.depex PE32 PE32 |.efi UI STRING=3D"$(MODULE_NAME)" Optional VERSION STRING=3D"$(INF_VERSION)" Optional BUILD_NUM=3D$(BUILD_NUMBE= R) diff --git a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc b/Platf= orm/Intel/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc index 0a57587e82..25d1beb400 100644 --- a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc +++ b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc @@ -18,25 +18,11 @@ [Defines] PLATFORM_GUID =3D 465B0A0B-7AC1-443b-8F67-7B8DEC14= 5F90 PLATFORM_VERSION =3D 0.1 DSC_SPECIFICATION =3D 0x00010005 - - # - # Set platform specific package/folder name, same as passed from PREBUIL= D script. - # PLATFORM_PACKAGE would be the same as PLATFORM_NAME as well as package= build folder - # DEFINE only takes effect at R9 DSC and FDF. - # - DEFINE PLATFORM_PACKAGE =3D Vlv2TbltDevicePkg - DEFINE PLATFORM_RC_PACKAGE =3D Vlv2DeviceRefCodePkg - DEFINE PLATFORM_BINARY_PACKAGE =3D Vlv2SocBinPkg - OUTPUT_DIRECTORY =3D Build/$(PLATFORM_PACKAGE) + OUTPUT_DIRECTORY =3D Build/Vlv2TbltDevicePkg SUPPORTED_ARCHITECTURES =3D IA32|X64 BUILD_TARGETS =3D DEBUG|RELEASE SKUID_IDENTIFIER =3D DEFAULT =20 - DEFINE CPU_ARCH =3DValleyView2 - DEFINE PROJECT_SC_FAMILY =3DIntelPch - DEFINE PROJECT_SC_ROOT =3D../$(PLATFORM_RC_PACKAGE)/ValleyView2= Soc/SouthCluster - DEFINE PROJECT_VLV_ROOT =3D../$(PLATFORM_RC_PACKAGE)/ValleyView= 2Soc/NorthCluster - DEFINE RC_BINARY_RELEASE =3D TRUE # # Platform On/Off features are defined here @@ -47,22 +33,18 @@ [Defines] # 3.BayleyBay # ENBDT_PF_ENABLE =3D TRUE # - !include $(PLATFORM_PACKAGE)/AutoPlatformCFG.txt - !include $(PLATFORM_PACKAGE)/PlatformPkgConfig.dsc + !include Vlv2TbltDevicePkg/AutoPlatformCFG.txt + !include Vlv2TbltDevicePkg/PlatformPkgConfig.dsc =20 DEFINE PLATFORMX64_ENABLE =3D TRUE =20 !if $(X64_CONFIG) =3D=3D TRUE DEFINE DXE_ARCHITECTURE =3D X64 - DEFINE EDK_DXE_ARCHITECTURE =3D X64 - DEFINE UNDI_DXE_ARCHITECTURE =3D 64 !else DEFINE DXE_ARCHITECTURE =3D IA32 - DEFINE EDK_DXE_ARCHITECTURE =3D Ia32 - DEFINE UNDI_DXE_ARCHITECTURE =3D 32 !endif =20 - FLASH_DEFINITION =3D $(PLATFORM_PACKAGE)/PlatformPkgG= cc.fdf + FLASH_DEFINITION =3D Vlv2TbltDevicePkg/PlatformPkgGcc= .fdf !if $(LFMA_ENABLE) =3D=3D TRUE FIX_LOAD_TOP_MEMORY_ADDRESS =3D 0xFFFFFFFFFFFFFFFF DEFINE TOP_MEMORY_ADDRESS =3D 0xFFFFFFFFFFFFFFFF @@ -73,10 +55,6 @@ [Defines] =20 DEFINE PLATFORM_PCIEXPRESS_BASE =3D 0E0000000 =20 - DEFINE SEC_ENABLE =3D FALSE - DEFINE SEC_DEBUG_INFO_ENABLE =3D FALSE - DEFINE FTPM_ENABLE =3D FALSE - ##########################################################################= ###### # # SKU Identification section - list of all SKU IDs supported by this @@ -100,7 +78,6 @@ [LibraryClasses.common] DxeCoreEntryPoint|MdePkg/Library/DxeCoreEntryPoint/DxeCoreEntryPoint.inf UefiDriverEntryPoint|MdePkg/Library/UefiDriverEntryPoint/UefiDriverEntry= Point.inf UefiApplicationEntryPoint|MdePkg/Library/UefiApplicationEntryPoint/UefiA= pplicationEntryPoint.inf - DxeSmmDriverEntryPoint|IntelFrameworkPkg/Library/DxeSmmDriverEntryPoint/= DxeSmmDriverEntryPoint.inf =20 # # Basic @@ -144,8 +121,7 @@ [LibraryClasses.common] GenericBdsLib|$(PLATFORM_PACKAGE)/Override/IntelFrameworkModulePkg/Libra= ry/GenericBdsLib/GenericBdsLib.inf BmpSupportLib|MdeModulePkg/Library/BaseBmpSupportLib/BaseBmpSupportLib.i= nf SafeIntLib|MdePkg/Library/BaseSafeIntLib/BaseSafeIntLib.inf - PlatformBdsLib|$(PLATFORM_PACKAGE)/Library/PlatformBdsLib/PlatformBdsLib= .inf - FlashDeviceLib|$(PLATFORM_PACKAGE)/Library/FlashDeviceLib/FlashDeviceLib= .inf + FlashDeviceLib|Vlv2TbltDevicePkg/Library/FlashDeviceLib/FlashDeviceLib.i= nf UefiBootManagerLib|MdeModulePkg/Library/UefiBootManagerLib/UefiBootManag= erLib.inf # # Framework @@ -168,10 +144,6 @@ [LibraryClasses.common] UefiScsiLib|MdePkg/Library/UefiScsiLib/UefiScsiLib.inf !endif =20 -!if $(S3_ENABLE) =3D=3D TRUE - S3Lib|IntelFrameworkModulePkg/Library/PeiS3Lib/PeiS3Lib.inf -!endif - OemHookStatusCodeLib|MdeModulePkg/Library/OemHookStatusCodeLibNull/OemHo= okStatusCodeLibNull.inf !if $(CAPSULE_ENABLE) =3D=3D TRUE CapsuleLib|MdeModulePkg/Library/DxeCapsuleLibFmp/DxeCapsuleLib.inf @@ -199,27 +171,27 @@ [LibraryClasses.common] # # ICH # - SmbusLib|$(PLATFORM_PACKAGE)/Library/SmbusLib/SmbusLib.inf - SmmLib|$(PLATFORM_PACKAGE)/Library/PchSmmLib/PchSmmLib.inf + SmbusLib|Vlv2TbltDevicePkg/Library/SmbusLib/SmbusLib.inf + SmmLib|Vlv2TbltDevicePkg/Library/PchSmmLib/PchSmmLib.inf =20 # # Platform # - TimerLib|$(PLATFORM_PACKAGE)/Library/IntelPchAcpiTimerLib/IntelPchAcpiTi= merLib.inf - ResetSystemLib|$(PLATFORM_PACKAGE)/Library/ResetSystemLib/ResetSystemLib= .inf + TimerLib|Vlv2TbltDevicePkg/Library/IntelPchAcpiTimerLib/IntelPchAcpiTime= rLib.inf + ResetSystemLib|Vlv2TbltDevicePkg/Library/ResetSystemLib/ResetSystemLib.i= nf =20 - PlatformCmosLib|$(PLATFORM_PACKAGE)/Library/PlatformCmosLib/PlatformCmos= Lib.inf + PlatformCmosLib|Vlv2TbltDevicePkg/Library/PlatformCmosLib/PlatformCmosLi= b.inf =20 # # Misc # - MonoStatusCodeLib|$(PLATFORM_PACKAGE)/MonoStatusCode/MonoStatusCode.inf + MonoStatusCodeLib|Vlv2TbltDevicePkg/MonoStatusCode/MonoStatusCode.inf !if $(TARGET) =3D=3D RELEASE DebugLib|MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.inf SerialPortLib|MdePkg/Library/BaseSerialPortLibNull/BaseSerialPortLibNull= .inf !else DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.in= f - SerialPortLib|$(PLATFORM_PACKAGE)/Library/SerialPortLib/SerialPortLib.in= f + SerialPortLib|MdeModulePkg/Library/BaseSerialPortLib16550/BaseSerialPort= Lib16550.inf !endif =20 PerformanceLib|MdePkg/Library/BasePerformanceLibNull/BasePerformanceLibN= ull.inf @@ -231,10 +203,11 @@ [LibraryClasses.common] =20 !endif =20 + PlatformHookLib|MdeModulePkg/Library/BasePlatformHookLibNull/BasePlatfor= mHookLibNull.inf + !if $(SOURCE_DEBUG_ENABLE) =3D=3D TRUE PeCoffExtraActionLib|SourceLevelDebugPkg/Library/PeCoffExtraActionLibDeb= ug/PeCoffExtraActionLibDebug.inf DebugCommunicationLib|SourceLevelDebugPkg/Library/DebugCommunicationLibS= erialPort/DebugCommunicationLibSerialPort.inf - PlatformHookLib|MdeModulePkg/Library/BasePlatformHookLibNull/BasePlatfor= mHookLibNull.inf SerialPortLib|MdeModulePkg/Library/BaseSerialPortLib16550/BaseSerialPort= Lib16550.inf !else PeCoffExtraActionLib|MdePkg/Library/BasePeCoffExtraActionLibNull/BasePeC= offExtraActionLibNull.inf @@ -249,10 +222,10 @@ [LibraryClasses.common] OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf !endif =20 - BiosIdLib|$(PLATFORM_PACKAGE)/Library/BiosIdLib/BiosIdLib.inf - CpuIA32Lib|$(PLATFORM_PACKAGE)/Library/CpuIA32Lib/CpuIA32Lib.inf + BiosIdLib|Vlv2TbltDevicePkg/Library/BiosIdLib/BiosIdLib.inf + CpuIA32Lib|Vlv2TbltDevicePkg/Library/CpuIA32Lib/CpuIA32Lib.inf =20 - StallSmmLib|$(PLATFORM_PACKAGE)/Library/StallSmmLib/StallSmmLib.inf + StallSmmLib|Vlv2TbltDevicePkg/Library/StallSmmLib/StallSmmLib.inf =20 !if $(SECURE_BOOT_ENABLE) =3D=3D TRUE OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf @@ -266,13 +239,10 @@ [LibraryClasses.common] AuthVariableLib|MdeModulePkg/Library/AuthVariableLibNull/AuthVariableLib= Null.inf !endif VarCheckLib|MdeModulePkg/Library/VarCheckLib/VarCheckLib.inf -!if $(RC_BINARY_RELEASE) =3D=3D TRUE - I2cLib|Vlv2TbltDevicePkg/Library/I2CLib/I2CLibNull.inf -!endif ShellLib|ShellPkg/Library/UefiShellLib/UefiShellLib.inf FileHandleLib|MdePkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf SortLib|MdeModulePkg/Library/UefiSortLib/UefiSortLib.inf -!if $(FTPM_ENABLE) =3D=3D TRUE || $(NETWORK_ISCSI_ENABLE) =3D=3D TRUE +!if $(NETWORK_ISCSI_ENABLE) =3D=3D TRUE BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf @@ -283,12 +253,6 @@ [LibraryClasses.common] =20 =20 Tpm2CommandLib|SecurityPkg/Library/Tpm2CommandLib/Tpm2CommandLib.inf -!if $(MINNOW2_FSP_BUILD) =3D=3D TRUE - FspApiLib|IntelFspWrapperPkg/Library/BaseFspApiLib/BaseFspApiLib.inf - FspPlatformInfoLib|IntelFspWrapperPkg/Library/BaseFspPlatformInfoLibSamp= le/BaseFspPlatformInfoLibSample.inf - FspPlatformSecLib|Vlv2TbltDevicePkg/FspSupport/Library/SecFspPlatformSec= LibVlv2/FspPlatformSecLibVlv2.inf - FspHobProcessLib|Vlv2TbltDevicePkg/FspSupport/Library/PeiFspHobProcessLi= bVlv2/FspHobProcessLibVlv2.inf -!endif =20 BootLogoLib|MdeModulePkg/Library/BootLogoLib/BootLogoLib.inf =20 @@ -309,14 +273,14 @@ [LibraryClasses.IA32.PEIM, LibraryClasses.IA32.PEI_CO= RE, LibraryClasses.IA32.SEC MemoryAllocationLib|MdePkg/Library/PeiMemoryAllocationLib/PeiMemoryAlloc= ationLib.inf ReportStatusCodeLib|MdeModulePkg/Library/PeiReportStatusCodeLib/PeiRepor= tStatusCodeLib.inf ExtractGuidedSectionLib|MdePkg/Library/PeiExtractGuidedSectionLib/PeiExt= ractGuidedSectionLib.inf - MultiPlatformLib|$(PLATFORM_PACKAGE)/Library/MultiPlatformLib/MultiPlatf= ormLib.inf + MultiPlatformLib|Vlv2TbltDevicePkg/Library/MultiPlatformLib/MultiPlatfor= mLib.inf BaseCryptLib|CryptoPkg/Library/BaseCryptLib/PeiCryptLib.inf CpuExceptionHandlerLib|UefiCpuPkg/Library/CpuExceptionHandlerLib/SecPeiC= puExceptionHandlerLib.inf MpInitLib|UefiCpuPkg/Library/MpInitLib/PeiMpInitLib.inf =20 !if $(PERFORMANCE_ENABLE) =3D=3D TRUE PerformanceLib|MdeModulePkg/Library/PeiPerformanceLib/PeiPerformanceLib.= inf - TimerLib|$(PLATFORM_PACKAGE)/Library/IntelPchAcpiTimerLib/IntelPchAcpiTi= merLib.inf + TimerLib|Vlv2TbltDevicePkg/Library/IntelPchAcpiTimerLib/IntelPchAcpiTime= rLib.inf !endif =20 !if $(TARGET) =3D=3D RELEASE @@ -324,7 +288,7 @@ [LibraryClasses.IA32.PEIM, LibraryClasses.IA32.PEI_CORE= , LibraryClasses.IA32.SEC SerialPortLib|MdePkg/Library/BaseSerialPortLibNull/BaseSerialPortLibNull= .inf !else DebugLib|MdeModulePkg/Library/PeiDxeDebugLibReportStatusCode/PeiDxeDebug= LibReportStatusCode.inf - SerialPortLib|$(PLATFORM_PACKAGE)/Library/SerialPortLib/SerialPortLib.in= f + SerialPortLib|MdeModulePkg/Library/BaseSerialPortLib16550/BaseSerialPort= Lib16550.inf !endif =20 LockBoxLib|MdeModulePkg/Library/SmmLockBoxLib/SmmLockBoxPeiLib.inf @@ -333,13 +297,6 @@ [LibraryClasses.IA32.PEIM, LibraryClasses.IA32.PEI_COR= E, LibraryClasses.IA32.SEC DebugAgentLib|SourceLevelDebugPkg/Library/DebugAgent/SecPeiDebugAgentLib= .inf !endif =20 - !if $(MINNOW2_FSP_BUILD) =3D=3D TRUE - PlatformFspLib|Vlv2TbltDevicePkg/Library/PlatformFspLib/PlatformFspLib.in= f - !endif -!if $(FTPM_ENABLE) =3D=3D TRUE - Tpm2DeviceLib|Vlv2TbltDevicePkg/Library/Tpm2DeviceLibSeCPei/Tpm2DeviceLi= bSeC.inf -!endif - [LibraryClasses.X64] # # DXE phase common @@ -356,7 +313,7 @@ [LibraryClasses.X64] !endif =20 LockBoxLib|MdeModulePkg/Library/SmmLockBoxLib/SmmLockBoxDxeLib.inf - EfiRegTableLib|$(PLATFORM_PACKAGE)/Library/EfiRegTableLib/EfiRegTableLib= .inf + EfiRegTableLib|Vlv2TbltDevicePkg/Library/EfiRegTableLib/EfiRegTableLib.i= nf =20 !if $(SECURE_BOOT_ENABLE) =3D=3D TRUE BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf @@ -371,14 +328,14 @@ [LibraryClasses.X64.DXE_DRIVER] CustomizedDisplayLib|MdeModulePkg/Library/CustomizedDisplayLib/Customize= dDisplayLib.inf !if $(PERFORMANCE_ENABLE) =3D=3D TRUE PerformanceLib|MdeModulePkg/Library/DxePerformanceLib/DxePerformanceLib.= inf - TimerLib|$(PLATFORM_PACKAGE)/Library/IntelPchAcpiTimerLib/IntelPchAcpiTi= merLib.inf + TimerLib|Vlv2TbltDevicePkg/Library/IntelPchAcpiTimerLib/IntelPchAcpiTime= rLib.inf !endif =20 !if $(SOURCE_DEBUG_ENABLE) =3D=3D TRUE DebugAgentLib|SourceLevelDebugPkg/Library/DebugAgent/DxeDebugAgentLib.in= f !endif =20 - FlashDeviceLib|$(PLATFORM_PACKAGE)/Library/FlashDeviceLib/FlashDeviceLib= Dxe.inf + FlashDeviceLib|Vlv2TbltDevicePkg/Library/FlashDeviceLib/FlashDeviceLibDx= e.inf =20 [LibraryClasses.X64.DXE_CORE] HobLib|MdePkg/Library/DxeCoreHobLib/DxeCoreHobLib.inf @@ -386,7 +343,7 @@ [LibraryClasses.X64.DXE_CORE] PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf !if $(PERFORMANCE_ENABLE) =3D=3D TRUE PerformanceLib|MdeModulePkg/Library/DxeCorePerformanceLib/DxeCorePerform= anceLib.inf - TimerLib|$(PLATFORM_PACKAGE)/Library/IntelPchAcpiTimerLib/IntelPchAcpiTi= merLib.inf + TimerLib|Vlv2TbltDevicePkg/Library/IntelPchAcpiTimerLib/IntelPchAcpiTime= rLib.inf !endif =20 !if $(SOURCE_DEBUG_ENABLE) =3D=3D TRUE @@ -411,7 +368,7 @@ [LibraryClasses.X64.DXE_SMM_DRIVER] =20 !if $(SOURCE_DEBUG_ENABLE) =3D=3D TRUE DebugAgentLib|SourceLevelDebugPkg/Library/DebugAgent/SmmDebugAgentLib.in= f - TimerLib|$(PLATFORM_PACKAGE)/Library/IntelPchAcpiTimerLib/IntelPchAcpiTi= merLib.inf + TimerLib|Vlv2TbltDevicePkg/Library/IntelPchAcpiTimerLib/IntelPchAcpiTime= rLib.inf !endif CpuExceptionHandlerLib|UefiCpuPkg/Library/CpuExceptionHandlerLib/SmmCpuE= xceptionHandlerLib.inf =20 @@ -485,12 +442,6 @@ [PcdsFeatureFlag.common] gEfiMdeModulePkgTokenSpaceGuid.PcdSupportUpdateCapsuleReset|TRUE !else gEfiMdeModulePkgTokenSpaceGuid.PcdSupportUpdateCapsuleReset|FALSE -!endif - gEfiCpuTokenSpaceGuid.PcdCpuSmmEnableBspElection|FALSE -!if $(DATAHUB_STATUS_CODE_ENABLE) =3D=3D TRUE - gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeUseDataHub|TRUE -!else - gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeUseDataHub|FALSE !endif gEfiMdeModulePkgTokenSpaceGuid.PcdPeiCoreImageLoaderSearchTeSectionFirst= |FALSE !if $(TARGET) =3D=3D RELEASE @@ -516,59 +467,20 @@ [PcdsFeatureFlag.common] !endif =20 =20 - ## This PCD specifies whether PS2 keyboard does a extended verification = during start. - gEfiMdeModulePkgTokenSpaceGuid.PcdPs2KbdExtendedVerification|FALSE - - ## This PCD specifies whether PS2 mouse does a extended verification dur= ing start. - gEfiMdeModulePkgTokenSpaceGuid.PcdPs2MouseExtendedVerification|FALSE - !if $(VARIABLE_INFO_ENABLE) =3D=3D TRUE gEfiMdeModulePkgTokenSpaceGuid.PcdVariableCollectStatistics|TRUE !else gEfiMdeModulePkgTokenSpaceGuid.PcdVariableCollectStatistics|FALSE !endif =20 - gEfiCpuTokenSpaceGuid.PcdCpuSmmBlockStartupThisAp|TRUE - !if $(SOURCE_DEBUG_ENABLE) gUefiCpuPkgTokenSpaceGuid.PcdCpuSmmDebug|TRUE !endif =20 + gEfiMdeModulePkgTokenSpaceGuid.PcdInstallAcpiSdtProtocol|TRUE + gUefiCpuPkgTokenSpaceGuid.PcdCpuSmmBlockStartupThisAp|TRUE + [PcdsFixedAtBuild.common] -!if $(MINNOW2_FSP_BUILD) =3D=3D TRUE -# $(FLASH_REGION_VLVMICROCODE_BASE) - gFspWrapperTokenSpaceGuid.PcdCpuMicrocodePatchAddress|0xFFC00000 -# $(FLASH_REGION_VLVMICROCODE_SIZE) - gFspWrapperTokenSpaceGuid.PcdCpuMicrocodePatchRegionSize|0x00040000 - gFspWrapperTokenSpaceGuid.PcdFlashMicroCodeOffset|0x60 -# $(FLASH_AREA_BASE_ADDRESS) - gFspWrapperTokenSpaceGuid.PcdFlashCodeCacheAddress|0xFF800000 -# $(FLASH_AREA_SIZE) - gFspWrapperTokenSpaceGuid.PcdFlashCodeCacheSize|0x00800000 -# $(FLASH_REGION_FSPBIN_BASE) - gFspWrapperTokenSpaceGuid.PcdFlashFvFspBase|0xFFCC0000 -!endif - -!if $(PERFORMANCE_ENABLE) =3D=3D TRUE -!if $(MINNOW2_FSP_BUILD) =3D=3D TRUE - # in FSP, when this got used, the memory already is up - gEfiCpuTokenSpaceGuid.PcdTemporaryRamBase|0x00080000 -!else - gEfiCpuTokenSpaceGuid.PcdTemporaryRamBase|0xFEF80000 -!endif - gEfiCpuTokenSpaceGuid.PcdTemporaryRamSize|0x00010000 - -!else - !if $(MINNOW2_FSP_BUILD) =3D=3D TRUE - gEfiCpuTokenSpaceGuid.PcdTemporaryRamBase|0x00080000 - !else - gEfiCpuTokenSpaceGuid.PcdTemporaryRamBase|0xFEF80000 - !endif - gEfiCpuTokenSpaceGuid.PcdTemporaryRamSize|0x00010000 - gEfiCpuTokenSpaceGuid.PcdPeiTemporaryRamStackSize|0x3C00 -!endif - - !if $(SECURE_BOOT_ENABLE) =3D=3D TRUE gEfiMdeModulePkgTokenSpaceGuid.PcdMaxVariableSize|0x22000 !else @@ -576,11 +488,8 @@ [PcdsFixedAtBuild.common] !endif gEfiMdeModulePkgTokenSpaceGuid.PcdHwErrStorageSize|0x00000800 gEfiMdeModulePkgTokenSpaceGuid.PcdMaxHardwareErrorVariableSize|0x400 - gEfiCpuTokenSpaceGuid.PcdCpuIEDRamSize|0x400000 - gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdS3AcpiReservedMemorySize|0x= 10000 gEfiMdeModulePkgTokenSpaceGuid.PcdSrIovSupport|FALSE gEfiMdeModulePkgTokenSpaceGuid.PcdAriSupport|FALSE - gEfiCpuTokenSpaceGuid.PcdCpuSmmApSyncTimeout|1000 !if $(S4_ENABLE) =3D=3D TRUE gEfiMdeModulePkgTokenSpaceGuid.PcdResetOnMemoryTypeInformationChange|TRU= E !else @@ -598,13 +507,9 @@ [PcdsFixedAtBuild.common] gEfiMdeModulePkgTokenSpaceGuid.PcdMaxPeiPerformanceLogEntries|60 !endif =20 - gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdEbdaReservedMemorySize|0x10= 000 gEfiMdeModulePkgTokenSpaceGuid.PcdLoadModuleAtFixAddressEnable|$(TOP_MEM= ORY_ADDRESS) gEfiMdeModulePkgTokenSpaceGuid.PcdBrowserSubtitleTextColor|0x0 gEfiMdeModulePkgTokenSpaceGuid.PcdBrowserFieldTextColor|0x01 - gEfiCpuTokenSpaceGuid.PcdCpuIEDEnabled|TRUE - gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdBiosVideoCheckVbeEnable|TRU= E - gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdBiosVideoCheckVgaEnable|TRU= E =20 !if $(SOURCE_DEBUG_ENABLE) =3D=3D TRUE gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x17 @@ -650,11 +555,6 @@ [PcdsFixedAtBuild.IA32] [PcdsPatchableInModule.common] gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x803805c6 gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseAddress|0x$(PLATFORM_PCIEXPRES= S_BASE) - gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdLegacyBiosCacheLegacyRegion= |FALSE - - ## This PCD specifies whether to use the optimized timing for best PS2 d= etection performance. - # Note this PCD could be set to TRUE for best boot performance and set = to FALSE for best device compatibility. - gEfiMdeModulePkgTokenSpaceGuid.PcdFastPS2Detection|TRUE =20 ########################################################################= ############################### # @@ -829,10 +729,6 @@ [PcdsDynamicExDefault.common.DEFAULT] gEfiVLVTokenSpaceGuid.PcdFTPMStatus|0 gEfiMdeModulePkgTokenSpaceGuid.PcdS3BootScriptTablePrivateSmmDataPtr|0 gEfiMdeModulePkgTokenSpaceGuid.PcdS3BootScriptTablePrivateDataPtr|0 - gEfiCpuTokenSpaceGuid.PcdCpuS3DataAddress|0 - gEfiCpuTokenSpaceGuid.PcdCpuHotPlugDataAddress|0 - gEfiCpuTokenSpaceGuid.PcdCpuCallbackSignal|0 - gEfiCpuTokenSpaceGuid.PcdCpuConfigContextBuffer|0 gEfiVLVTokenSpaceGuid.PcdCpuLockBoxDataAddress|0 gEfiVLVTokenSpaceGuid.PcdCpuSmramCpuDataAddress|0 gEfiVLVTokenSpaceGuid.PcdCpuLockBoxSize|0 @@ -845,24 +741,7 @@ [PcdsDynamicExDefault.X64.DEFAULT] =20 [Components.IA32] =20 - $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/SecCore.inf - - !if $(MINNOW2_FSP_BUILD) =3D=3D TRUE - IntelFspWrapperPkg/FspWrapperSecCore/FspWrapperSecCore.inf { - !if $(TARGET) =3D=3D DEBUG - - - DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPor= t.inf - !endif - } - Vlv2TbltDevicePkg/FspSupport/BootModePei/BootModePei.inf - IntelFspWrapperPkg/FspInitPei/FspInitPei.inf { - !if $(TARGET) =3D=3D DEBUG - - DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPor= t.inf - !endif - } - !endif + Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/IA32/SecCore.inf =20 MdeModulePkg/Core/Pei/PeiMain.inf { !if $(TARGET) =3D=3D DEBUG @@ -873,31 +752,23 @@ [Components.IA32] gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x80000046 } =20 - $(PLATFORM_PACKAGE)/MonoStatusCode/MonoStatusCode.inf { + Vlv2TbltDevicePkg/MonoStatusCode/MonoStatusCode.inf { !if $(TARGET) =3D=3D DEBUG gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x2E !endif } - $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/MemoryInit.= inf { + Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/IA32/MemoryInit.inf { gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x80000046 - - !if $(FTPM_ENABLE)=3D=3DTRUE - *_*_IA32_CC_FLAGS =3D /D FTPM_ENABLE - !endif } =20 !if $(RC_BINARY_RELEASE) =3D=3D TRUE - $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/SeCUma.inf -!endif - -!if $(FTPM_ENABLE) =3D=3D TRUE -$(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/fTPMInitPeim.= inf + Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/IA32/SeCUma.inf !endif =20 !if $(RC_BINARY_RELEASE) =3D=3D TRUE - $(PLATFORM_PACKAGE)/PlatformPei/PlatformPei.inf { + Vlv2TbltDevicePkg/PlatformPei/PlatformPei.inf { *_*_IA32_CC_FLAGS =3D -DRC_BINARY_RELEASE !if $(TARGET) =3D=3D DEBUG @@ -917,10 +788,6 @@ [Components.IA32] } !endif =20 -!if $(FTPM_ENABLE) =3D=3D TRUE - $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/Tpm2DeviceS= eCPei.inf -!endif - !if $(TPM_ENABLED) =3D=3D TRUE SecurityPkg/Tcg/PhysicalPresencePei/PhysicalPresencePei.inf SecurityPkg/Tcg/TcgPei/TcgPei.inf { @@ -931,7 +798,7 @@ [Components.IA32] } !endif =20 - $(PLATFORM_PACKAGE)/PlatformInitPei/PlatformInitPei.inf { + Vlv2TbltDevicePkg/PlatformInitPei/PlatformInitPei.inf { gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x803805c6 @@ -940,34 +807,33 @@ [Components.IA32] !endif PcdLib|MdePkg/Library/PeiPcdLib/PeiPcdLib.inf } - $(PLATFORM_PACKAGE)/FvInfoPei/FvInfoPei.inf + Vlv2TbltDevicePkg/FvInfoPei/FvInfoPei.inf =20 - $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/VlvInitPeim= .inf + Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/IA32/VlvInitPeim.inf !if $(PCIESC_ENABLE) =3D=3D TRUE - $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/PchEarlyIni= tPeim.inf { + Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/IA32/PchEarlyInitPeim.inf { gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x80000046 } !endif - $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/PchInitPeim= .inf + Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/IA32/PchInitPeim.inf =20 =20 - $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/PchSmbusArp= Disabled.inf - $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/PchSpiPeim.= inf - $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/PeiSmmAcces= s.inf - $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/PeiSmmContr= ol.inf + Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/IA32/PchSmbusArpDisabled.inf + Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/IA32/PchSpiPeim.inf + Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/IA32/PeiSmmAccess.inf + Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/IA32/PeiSmmControl.inf MdeModulePkg/Universal/PCD/Pei/Pcd.inf - $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/CpuPeim.inf + Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/IA32/CpuPeim.inf UefiCpuPkg/CpuIoPei/CpuIoPei.inf UefiCpuPkg/Universal/Acpi/S3Resume2Pei/S3Resume2Pei.inf - $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/MpS3.inf -# $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/PiSmmCommu= nicationPei.inf + UefiCpuPkg/PiSmmCommunication/PiSmmCommunicationPei.inf =20 !if $(RECOVERY_ENABLE) # # Recovery # - $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/PchUsb.inf + Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/IA32/PchUsb.inf MdeModulePkg/Bus/Pci/EhciPei/EhciPei.inf MdeModulePkg/Bus/Usb/UsbBusPei/UsbBusPei.inf MdeModulePkg/Bus/Usb/UsbBotPei/UsbBotPei.inf @@ -993,17 +859,6 @@ [Components.IA32] MdeModulePkg/Universal/Variable/Pei/VariablePei.inf MdeModulePkg/Universal/FaultTolerantWritePei/FaultTolerantWritePei.inf =20 -!if $(FTPM_ENABLE) =3D=3D TRUE - SecurityPkg/Tcg/Tcg2Pei/Tcg2Pei.inf { - - gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x80000046 - - DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPor= t.inf - NULL|SecurityPkg/Library\HashInstanceLibSha1/HashInstanceLibSha1.inf - NULL|SecurityPkg/Library/HashInstanceLibSha256/HashInstanceLibSha256= .inf - PcdLib|MdePkg/Library/PeiPcdLib/PeiPcdLib.inf - } -!endif !if $(TPM_ENABLED) =3D=3D TRUE SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigPei.inf { @@ -1013,7 +868,7 @@ [Components.IA32] !if $(ACPI50_ENABLE) =3D=3D TRUE MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTablePei/FirmwarePerf= ormancePei.inf{ - TimerLib|$(PLATFORM_PACKAGE)/Library/IntelPchAcpiTimerLib/IntelPchAc= piTimerLib.inf + TimerLib|Vlv2TbltDevicePkg/Library/IntelPchAcpiTimerLib/IntelPchAcpi= TimerLib.inf } =20 !endif @@ -1021,17 +876,6 @@ [Components.IA32] MdeModulePkg/Universal/ReportStatusCodeRouter/Pei/ReportStatusCodeRouter= Pei.inf !endif [Components.X64] - !if $(MINNOW2_FSP_BUILD) =3D=3D TRUE - IntelFspWrapperPkg/FspNotifyDxe/FspNotifyDxe.inf { - !if $(TARGET) =3D=3D DEBUG - - gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x80000046 - - DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPor= t.inf - !endif - } - - !endif # # EDK II Related Platform codes # @@ -1049,24 +893,10 @@ [Components.X64] DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPor= t.inf !endif } - IntelFrameworkModulePkg/Universal/Acpi/AcpiS3SaveDxe/AcpiS3SaveDxe.inf { - - gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0xF0000043 - - gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x27 - - !if $(TARGET) !=3D RELEASE - DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSeria= lPort.inf - !endif - - ICC:*_*_*_CC_FLAGS =3D -D MDEPKG_NDEBUG - GCC:RELEASE_*_*_CC_FLAGS =3D -D MDEPKG_NDEBUG - } MdeModulePkg/Universal/PCD/Dxe/Pcd.inf { PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf } - IntelFrameworkModulePkg/Universal/CpuIoDxe/CpuIoDxe.inf UefiCpuPkg/CpuIo2Dxe/CpuIo2Dxe.inf =20 MdeModulePkg/Universal/ReportStatusCodeRouter/RuntimeDxe/ReportStatusCod= eRouterRuntimeDxe.inf @@ -1099,13 +929,9 @@ [Components.X64] =20 !if $(TPM_ENABLED) =3D=3D TRUE NULL|SecurityPkg/Library/DxeTpmMeasureBootLib/DxeTpmMeasureBootLib.i= nf -!endif -!if $(FTPM_ENABLE) =3D=3D TRUE - NULL|SecurityPkg/Library/DxeTpm2MeasureBootLib/DxeTpm2MeasureBootLib= .inf !endif } - $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTU= RE)/MpCpu.inf - $(PLATFORM_PACKAGE)/Metronome/Metronome.inf + MdeModulePkg/Universal/Metronome/Metronome.inf =20 IntelFrameworkModulePkg/Universal/BdsDxe/BdsDxe.inf{ @@ -1115,12 +941,8 @@ [Components.X64] PlatformBdsLib|$(PLATFORM_PACKAGE)/Library/PlatformBdsLib/PlatformBd= sLib.inf DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPor= t.inf PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf - SerialPortLib|$(PLATFORM_PACKAGE)/Library/SerialPortLib/SerialPortLi= b.inf - !if $(FTPM_ENABLE) =3D=3D TRUE - Tpm2DeviceLib|Vlv2TbltDevicePkg/Library/Tpm2DeviceLibSeCDxe/Tpm2Devi= ceLibSeC.inf - !else + SerialPortLib|MdeModulePkg/Library/BaseSerialPortLib16550/BaseSerial= PortLib16550.inf Tpm2DeviceLib|SecurityPkg/Library/Tpm2DeviceLibTcg2/Tpm2DeviceLibTcg= 2.inf - !endif } =20 $(PLATFORM_PACKAGE)/UiApp/UiApp.inf @@ -1132,11 +954,11 @@ [Components.X64] MdeModulePkg/Universal/Variable/RuntimeDxe/VariableSmm.inf { NULL|MdeModulePkg/Library/VarCheckUefiLib/VarCheckUefiLib.inf - SerialPortLib|$(PLATFORM_PACKAGE)/Library/SerialPortLib/SerialPortLi= b.inf + SerialPortLib|MdeModulePkg/Library/BaseSerialPortLib16550/BaseSerial= PortLib16550.inf } - $(PLATFORM_PACKAGE)/FvbRuntimeDxe/FvbSmm.inf + Vlv2TbltDevicePkg/FvbRuntimeDxe/FvbSmm.inf MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteSmm.inf - $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTU= RE)/PchSpiSmm.inf + Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/PchSpiSmm= .inf !if $(SECURE_BOOT_ENABLE) =3D=3D TRUE SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigDx= e.inf { @@ -1158,9 +980,9 @@ [Components.X64] PcAtChipsetPkg/PcatRealTimeClockRuntimeDxe/PcatRealTimeClockRuntimeDxe.i= nf MdeModulePkg/Universal/DevicePathDxe/DevicePathDxe.inf =20 - $(PLATFORM_PACKAGE)/FvbRuntimeDxe/FvbRuntimeDxe.inf + Vlv2TbltDevicePkg/FvbRuntimeDxe/FvbRuntimeDxe.inf =20 - $(PLATFORM_PACKAGE)/PlatformSetupDxe/PlatformSetupDxe.inf + Vlv2TbltDevicePkg/PlatformSetupDxe/PlatformSetupDxe.inf =20 !if $(DATAHUB_ENABLE) =3D=3D TRUE IntelFrameworkModulePkg/Universal/DataHubDxe/DataHubDxe.inf { @@ -1168,38 +990,30 @@ [Components.X64] gEfiMdePkgTokenSpaceGuid.PcdMaximumLinkedListLength|0 } !endif - IntelFrameworkModulePkg/Universal/StatusCode/DatahubStatusCodeHandlerDxe= /DatahubStatusCodeHandlerDxe.inf MdeModulePkg/Universal/MemoryTest/NullMemoryTestDxe/NullMemoryTestDxe.in= f - $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTU= RE)/PchS3SupportDxe.inf - !if $(USE_HPET_TIMER) =3D=3D TRUE - PcAtChipsetPkg/HpetTimerDxe/HpetTimerDxe.inf - !else - $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTU= RE)/SmartTimer.inf - !endif - $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTU= RE)/SmmControl.inf + Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/PchS3Supp= ortDxe.inf + PcAtChipsetPkg/HpetTimerDxe/HpetTimerDxe.inf + Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/SmmContro= l.inf =20 - $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTU= RE)/PchSmbusDxe.inf - $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTU= RE)/IntelPchLegacyInterrupt.inf - $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTU= RE)/PchReset.inf - $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTU= RE)/PchInitDxe.inf{ + Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/PchSmbusD= xe.inf + Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/PchReset.= inf + Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/PchInitDx= e.inf{ gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0xF0000043 } - $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTU= RE)/PchInitSmm.inf + Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/PchInitSm= m.inf =20 - $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTU= RE)/PchSmiDispatcher.inf + Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/PchSmiDis= patcher.inf =20 !if $(PCIESC_ENABLE) =3D=3D TRUE - $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTU= RE)/PchPcieSmm.inf + Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/PchPcieSm= m.inf !endif - $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTU= RE)/PchSpiRuntime.inf - $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTU= RE)/PchPolicyInitDxe.inf - $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTU= RE)/PchBiosWriteProtect.inf - $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTU= RE)/SmmAccess.inf - $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTU= RE)/PciHostBridge.inf - $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTU= RE)/VlvInitDxe.inf - - IntelFrameworkModulePkg/Universal/LegacyRegionDxe/LegacyRegionDxe.inf + Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/PchSpiRun= time.inf + Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/PchPolicy= InitDxe.inf + Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/PchBiosWr= iteProtect.inf + Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/SmmAccess= .inf + Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/PciHostBr= idge.inf + Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/VlvInitDx= e.inf =20 # # Performance Application; Set PERFORMANCE_ENABLE=3DTRUE for normal boot= performance and smm performance data @@ -1219,35 +1033,9 @@ [Components.X64] PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf } =20 - $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTU= RE)/Dptf.inf - $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTU= RE)/PnpDxe.inf + Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/Dptf.inf + Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/PnpDxe.in= f =20 -!if $(SEC_ENABLE) =3D=3D TRUE - $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTU= RE)/HeciDrv.inf { -!if $(SEC_DEBUG_INFO_ENABLE) =3D=3D TRUE - - *_*_X64_CC_FLAGS =3D /DSEC_DEBUG_INFO=3D1 -!else - - *_*_X64_CC_FLAGS =3D /DSEC_DEBUG_INFO=3D0 -!endif - } - - $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTU= RE)/SeCPolicyInitDxe.inf -!endif - -!if $(FTPM_ENABLE) =3D=3D TRUE - $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTU= RE)/Tpm2DeviceSeCDxe.inf - SecurityPkg/Tcg/MemoryOverwriteControl/TcgMor.inf - SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.inf{ - - NULL|SecurityPkg/Library/HashInstanceLibSha1/HashInstanceLibSha1.inf - NULL|SecurityPkg/Library/HashInstanceLibSha256/HashInstanceLibSha256= .inf - PcdLib|MdePkg/Library\DxePcdLib/DxePcdLib.inf - Tpm2DeviceLib|Vlv2TbltDevicePkg/Library/Tpm2DeviceLibSeCDxe/Tpm2Devi= ceLibSeC.inf - } - $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTU= RE)/FtpmSmm.inf -!endif !if $(TPM_ENABLED) =3D=3D TRUE SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigPei.inf { @@ -1274,24 +1062,23 @@ [Components.X64] # # EDK II Related Platform codes # - $(PLATFORM_PACKAGE)/PlatformSmm/PlatformSmm.inf{ + Vlv2TbltDevicePkg/PlatformSmm/PlatformSmm.inf{ !if $(TARGET) !=3D RELEASE DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSeria= lPort.inf !endif PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf } - $(PLATFORM_PACKAGE)/PlatformInfoDxe/PlatformInfoDxe.inf - $(PLATFORM_PACKAGE)/PlatformCpuInfoDxe/PlatformCpuInfoDxe.inf - $(PLATFORM_PACKAGE)/PlatformDxe/PlatformDxe.inf + Vlv2TbltDevicePkg/PlatformInfoDxe/PlatformInfoDxe.inf + Vlv2TbltDevicePkg/PlatformCpuInfoDxe/PlatformCpuInfoDxe.inf + Vlv2TbltDevicePkg/PlatformDxe/PlatformDxe.inf =20 - $(PLATFORM_PACKAGE)/PciPlatform/PciPlatform.inf - $(PLATFORM_PACKAGE)/SaveMemoryConfig/SaveMemoryConfig.inf - $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTU= RE)/PlatformCpuPolicy.inf - $(PLATFORM_PACKAGE)/PpmPolicy/PpmPolicy.inf - $(PLATFORM_PACKAGE)/SmramSaveInfoHandlerSmm/SmramSaveInfoHandlerSmm.inf + Vlv2TbltDevicePkg/PciPlatform/PciPlatform.inf + Vlv2TbltDevicePkg/SaveMemoryConfig/SaveMemoryConfig.inf + Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/PlatformC= puPolicy.inf + Vlv2TbltDevicePkg/PpmPolicy/PpmPolicy.inf !if $(GOP_DRIVER_ENABLE) =3D=3D TRUE - $(PLATFORM_PACKAGE)/PlatformGopPolicy/PlatformGopPolicy.inf + Vlv2TbltDevicePkg/PlatformGopPolicy/PlatformGopPolicy.inf =20 !endif =20 @@ -1302,13 +1089,15 @@ [Components.X64] MdeModulePkg/Core/PiSmmCore/PiSmmIpl.inf MdeModulePkg/Core/PiSmmCore/PiSmmCore.inf UefiCpuPkg/CpuDxe/CpuDxe.inf + UefiCpuPkg/CpuS3DataDxe/CpuS3DataDxe.inf UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.inf UefiCpuPkg/CpuIo2Smm/CpuIo2Smm.inf MdeModulePkg/Universal/LockBox/SmmLockBox/SmmLockBox.inf UefiCpuPkg/PiSmmCommunication/PiSmmCommunicationSmm.inf - $(PLATFORM_PACKAGE)/SmmSwDispatch2OnSmmSwDispatchThunk/SmmSwDispatch2OnS= mmSwDispatchThunk.inf - $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTU= RE)/PowerManagement2.inf - $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTU= RE)/DigitalThermalSensor.inf + + Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/PowerMana= gement2.inf + Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/DigitalTh= ermalSensor.inf + Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/GraphicDx= eInitSmm.inf =20 # # ACPI @@ -1321,14 +1110,14 @@ [Components.X64] PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf } + MdeModulePkg/Universal/Acpi/S3SaveStateDxe/S3SaveStateDxe.inf =20 - $(PLATFORM_PACKAGE)/BootScriptSaveDxe/BootScriptSaveDxe.inf IntelFrameworkModulePkg/Universal/Acpi/AcpiSupportDxe/AcpiSupportDxe.inf Vlv2DeviceRefCodePkg/ValleyView2Soc/CPU/PowerManagement/AcpiTables/Power= ManagementAcpiTables.inf =20 - $(PLATFORM_RC_PACKAGE)/AcpiTablesPCAT/AcpiTables.inf + Vlv2DeviceRefCodePkg/AcpiTablesPCAT/AcpiTables.inf =20 - $(PLATFORM_PACKAGE)/AcpiPlatform/AcpiPlatform.inf + Vlv2TbltDevicePkg/AcpiPlatform/AcpiPlatform.inf =20 MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsRes= ourceTableDxe.inf =20 @@ -1338,31 +1127,23 @@ [Components.X64] MdeModulePkg/Bus/Pci/PciBusDxe/PciBusDxe.inf =20 =20 - $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTU= RE)/ISPDxe.inf + Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/ISPDxe.in= f =20 =20 -# -# ISA -# - $(PLATFORM_PACKAGE)/Wpce791/Wpce791.inf - IntelFrameworkModulePkg/Bus/Isa/IsaBusDxe/IsaBusDxe.inf - IntelFrameworkModulePkg/Bus/Isa/IsaIoDxe/IsaIoDxe.inf - IntelFrameworkModulePkg/Bus/Isa/IsaSerialDxe/IsaSerialDxe.inf - IntelFrameworkModulePkg/Bus/Isa/Ps2MouseDxe/Ps2MouseDxe.inf - IntelFrameworkModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2keyboardDxe.inf -# -# SDIO -# -# $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECT= URE)/MmcHost.inf -# $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECT= URE)/MmcMediaDevice.inf + # + # ISA + # + Vlv2TbltDevicePkg/PcuSio/PcuSio.inf + MdeModulePkg/Bus/Pci/PciSioSerialDxe/PciSioSerialDxe.inf + !if $(ACPI50_ENABLE) =3D=3D TRUE MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTableDxe/FirmwarePerf= ormanceDxe.inf { - TimerLib|$(PLATFORM_PACKAGE)/Library/IntelPchAcpiTimerLib/IntelPchAc= piTimerLib.inf + TimerLib|Vlv2TbltDevicePkg/Library/IntelPchAcpiTimerLib/IntelPchAcpi= TimerLib.inf } MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTableSmm/FirmwarePerf= ormanceSmm.inf { - TimerLib|$(PLATFORM_PACKAGE)/Library/IntelPchAcpiTimerLib/IntelPchAc= piTimerLib.inf + TimerLib|Vlv2TbltDevicePkg/Library/IntelPchAcpiTimerLib/IntelPchAcpi= TimerLib.inf } !endif =20 @@ -1370,7 +1151,6 @@ [Components.X64] # IDE/SCSI/AHCI # MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThru.inf - IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/IdeBusDxe.inf MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIoDxe.inf MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxe.inf MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf @@ -1394,7 +1174,7 @@ [Components.X64] gEfiMdePkgTokenSpaceGuid.PcdUefiLibMaxPrintBufferSize|8000 } !if $(SATA_ENABLE) =3D=3D TRUE - $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTU= RE)/SataController.inf + Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/SataContr= oller.inf !endif MdeModulePkg/Bus/Ata/AtaBusDxe/AtaBusDxe.inf !if $(SCSI_ENABLE) =3D=3D TRUE @@ -1407,7 +1187,6 @@ [Components.X64] MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatformDxe.inf MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterDxe.inf MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsoleDxe.inf - IntelFrameworkModulePkg/Universal/Console/VgaClassDxe/VgaClassDxe.inf MdeModulePkg/Universal/Console/TerminalDxe/TerminalDxe.inf MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngineDxe.inf @@ -1431,9 +1210,9 @@ [Components.X64] # SMBIOS # MdeModulePkg/Universal/SmbiosDxe/SmbiosDxe.inf - $(PLATFORM_PACKAGE)/SmBiosMiscDxe/SmBiosMiscDxe.inf + Vlv2TbltDevicePkg/SmBiosMiscDxe/SmBiosMiscDxe.inf =20 - $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTU= RE)/SmbiosMemory.inf + Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/SmbiosMem= ory.inf # # CPU/FW Microde # @@ -1448,12 +1227,6 @@ [Components.X64] # !include NetworkPkg/Network.dsc.inc =20 -!if $(NETWORK_ENABLE) =3D=3D TRUE - !if $(CSM_ENABLE) =3D=3D TRUE - IntelFrameworkModulePkg/Csm/BiosThunk/Snp16Dxe/Snp16Dxe.inf - !endif -!endif - !if $(CAPSULE_ENABLE) || $(MICOCODE_CAPSULE_ENABLE) MdeModulePkg/Universal/EsrtFmpDxe/EsrtFmpDxe.inf MdeModulePkg/Application/CapsuleApp/CapsuleApp.inf @@ -1471,7 +1244,7 @@ [Components.X64] DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPor= t.inf PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf - SerialPortLib|$(PLATFORM_PACKAGE)/Library/SerialPortLib/SerialPortLi= b.inf + SerialPortLib|MdeModulePkg/Library/BaseSerialPortLib16550/BaseSerial= PortLib16550.inf } !endif =20 @@ -1483,11 +1256,7 @@ [BuildOptions] # # Define token for different Platform # -!if $(MINNOW2_FSP_BUILD) =3D=3D TRUE - DEFINE MINNOW2_FSP_OPTION =3D -DMINNOW2_FSP_BUILD -!else DEFINE MINNOW2_FSP_OPTION =3D -!endif =20 !if $(ENBDT_PF_BUILD) =3D=3D TRUE DEFINE ENBDT_PF_ENABLE =3D -DENBDT_PF_ENABLE=3D1 @@ -1526,11 +1295,6 @@ [BuildOptions] DEFINE X64_BUILD_ENABLE =3D !endif =20 -!if $(FTPM_ENABLE) =3D=3D TRUE - DEFINE DSC_FTPM_BUILD_OPTIONS =3D -DFTPM_ENABLE -!else - DEFINE DSC_FTPM_BUILD_OPTIONS =3D -!endif !if $(TPM_ENABLED) =3D=3D TRUE DEFINE DSC_TPM_BUILD_OPTIONS =3D -DTPM_ENABLED !else @@ -1538,7 +1302,7 @@ [BuildOptions] !endif =20 =20 - DEFINE EDK_EDKII_DSC_FEATURE_BUILD_OPTIONS =3D $(MINNOW2_FSP_OPTION) $(M= INNOW2_BUILD_OPTION) $(ENBDT_PF_ENABLE) $(EXTERNAL_VGA_BUILD_OPTION) $(PCIE= _ENUM_WA_BUILD_OPTION) $(X0_WA_ENABLE_BUILD_OPTION) $(A0_WA_ENABLE_BUILD_OP= TION) $(MICROCODE_FREE_BUILD_OPTIONS) $(SIMICS_BUILD_OPTIONS) $(HYBRID_BUIL= D_OPTIONS) $(COMPACT_BUILD_OPTIONS) $(VP_BUILD_OPTIONS) $(SYSCTL_ID_BUILD_O= PTION) $(CLKGEN_CONFIG_EXTRA_BUILD_OPTION) $(SYSCTL_X0_CONVERT_BOARD_OPTION= ) $(ENBDT_S3_SUPPORT_OPTIONS) $(SATA_SUPPORT_BUILD_OPTION) $(PCIESC_SUPPORT= _BUILD_OPTION) $(DSC_FTPM_BUILD_OPTIONS) $(DSC_FTPM_ERROR_WR_BUILD_OPTIONS)= $(DSC_TPM_BUILD_OPTIONS) $(DSC_BYTI_SECURE_BOOT_BUILD_OPTIONS) + DEFINE EDK_EDKII_DSC_FEATURE_BUILD_OPTIONS =3D $(MINNOW2_FSP_OPTION) $(M= INNOW2_BUILD_OPTION) $(ENBDT_PF_ENABLE) $(EXTERNAL_VGA_BUILD_OPTION) $(PCIE= _ENUM_WA_BUILD_OPTION) $(X0_WA_ENABLE_BUILD_OPTION) $(A0_WA_ENABLE_BUILD_OP= TION) $(MICROCODE_FREE_BUILD_OPTIONS) $(SIMICS_BUILD_OPTIONS) $(HYBRID_BUIL= D_OPTIONS) $(COMPACT_BUILD_OPTIONS) $(VP_BUILD_OPTIONS) $(SYSCTL_ID_BUILD_O= PTION) $(CLKGEN_CONFIG_EXTRA_BUILD_OPTION) $(SYSCTL_X0_CONVERT_BOARD_OPTION= ) $(ENBDT_S3_SUPPORT_OPTIONS) $(SATA_SUPPORT_BUILD_OPTION) $(PCIESC_SUPPORT= _BUILD_OPTION) $(DSC_FTPM_ERROR_WR_BUILD_OPTIONS) $(DSC_TPM_BUILD_OPTIONS) = $(DSC_BYTI_SECURE_BOOT_BUILD_OPTIONS) !if $(PERFORMANCE_ENABLE) =3D=3D TRUE DEFINE PDB_BUILD_OPTION =3D /Zi !endif @@ -1570,76 +1334,6 @@ [BuildOptions.common.EDKII.DXE_SMM_DRIVER, BuildOpti= ons.common.EDKII.SMM_CORE] MSFT:*_*_*_DLINK_FLAGS =3D /ALIGN:4096 GCC:*_*_*_DLINK_FLAGS =3D -z common-page-size=3D0x1000 =20 -[BuildOptions.Common.EDK] - -# -# Define token for different Platform -# -!if $(ENBDT_PF_BUILD) =3D=3D TRUE - DEFINE ENBDT_PF_ENABLE =3D -DENBDT_PF_ENABLE=3D1 -!else - DEFINE ENBDT_PF_ENABLE =3D -DENBDT_PF_ENABLE=3D0 -!endif - -!if $(PERFORMANCE_ENABLE) =3D=3D TRUE - RELEASE_*_*_DLINK_FLAGS =3D -DEBUG -!endif - -!if $(S3_ENABLE) =3D=3D TRUE - DEFINE DSC_S3_BUILD_OPTIONS =3D -DEFI_S3_RESUME -!else - DEFINE DSC_S3_BUILD_OPTIONS =3D -!endif - -!if $(ENBDT_S3_SUPPORT) =3D=3D TRUE - DEFINE ENBDT_S3_SUPPORT_OPTIONS =3D -DNOCS_S3_SUPPORT -!else - DEFINE ENBDT_S3_SUPPORT_OPTIONS =3D -!endif - -!if $(X64_CONFIG) =3D=3D TRUE - DEFINE X64_BUILD_ENABLE =3D -DX64_BUILD_ENABLE=3D1 -!else - DEFINE X64_BUILD_ENABLE =3D -!endif - - - DEFINE EDK_GLUE_LIB_DEBUG =3D - DEFINE DEBUG_BUILD_OPTIONS =3D -D EFI_DEBUG -D DEBUG_MODE=3D1 /GL- $(ED= K_GLUE_LIB_DEBUG) -DEDKII_GLUE_DebugPrintErrorLevel=3D(EFI_D_ERROR) - DEFINE EDK_DSC_FEATURE_BUILD_OPTIONS =3D $(DSC_S3_BUILD_OPTIONS) $(DSC_A= CPI_BUILD_OPTIONS) $(DSC_SEC_BUILD_OPTIONS) $(DSC_FTPM_BUILD_OPTIONS) $(DSC= _FTPM_ERROR_WR_BUILD_OPTIONS) $(DSC_TPM_BUILD_OPTIONS) $(SOFTSDV_BUILD_OPTI= ONS) $(SIMICS_BUILD_OPTIONS) $(HYBRID_BUILD_OPTIONS) $(COMPACT_BUILD_OPTION= S) $(VP_BUILD_OPTIONS) $(QT_BUILD_OPTIONS) $(DSC_BYTI_SECURE_BOOT_BUILD_OPT= IONS) -D$(PROJECT_SC_CHIPSET) - - DEFINE EDK_DSC_OTHER_BUILD_OPTIONS =3D $(EDK_EDKII_DSC_FEATURE_BUILD_OPT= IONS) $(SV_BUILD_OPTIONS) $(INTEL_FASTBOOT_BUILD_OPTION) - DEFINE EDK_DSC_GLOBAL_BUILD_OPTIONS =3D $(ENBDT_PF_ENABLE) $(EDK_DSC_FEA= TURE_BUILD_OPTIONS) $(EDK_DSC_OTHER_BUILD_OPTIONS) -D EFI_SPECIFICATION_VER= SION=3D0x00020000 -D PI_SPECIFICATION_VERSION=3D0x00000009 -D TIANO_RELEA= SE_VERSION=3D0x00080006 -D SUPPORT_DEPRECATED_PCI_CFG_PPI -D CSM_SMMENTRY_P= ORT8DATA8 -D EDKII_GLUE_PciExpressBaseAddress=3D0x$(PLATFORM_PCIEXPRESS_BAS= E) -D MAX_VARIABLE_SIZE=3D0x2000 -D EFI_FIRMWARE_VENDOR=3D"L/"INTEL/"" -D E= FI_BUILD_VERSION=3D"L/"EDKII/"" -DEFI_PEI_REPORT_STATUS_CODE_ON $(ENBDT_S3_= SUPPORT_OPTIONS) - - *_*_IA32_ASM_FLAGS =3D -DEFI32 -D EDKII_GLUE_PciExpressBaseAddre= ss=3D$(PLATFORM_PCIEXPRESS_BASE)h -DNOCS_S3_SUPPORT - DEBUG_*_IA32_CC_FLAGS =3D -D EFI32 $(EDK_DSC_GLOBAL_BUILD_OPTIONS) = $(DEBUG_BUILD_OPTIONS) - RELEASE_*_IA32_CC_FLAGS =3D -D EFI32 $(EDK_DSC_GLOBAL_BUILD_OPTIONS) - DEBUG_*_IA32_VFRPP_FLAGS =3D -D EFI32 $(EDK_DSC_GLOBAL_BUILD_OPTIONS) = $(DEBUG_BUILD_OPTIONS) - RELEASE_*_IA32_VFRPP_FLAGS =3D -D EFI32 $(EDK_DSC_GLOBAL_BUILD_OPTIONS) - DEBUG_*_IA32_APP_FLAGS =3D -D EFI32 $(EDK_DSC_GLOBAL_BUILD_OPTIONS) = $(DEBUG_BUILD_OPTIONS) - RELEASE_*_IA32_APP_FLAGS =3D -D EFI32 $(EDK_DSC_GLOBAL_BUILD_OPTIONS) - DEBUG_*_IA32_PP_FLAGS =3D -D EFI32 $(EDK_DSC_GLOBAL_BUILD_OPTIONS) = $(DEBUG_BUILD_OPTIONS) - RELEASE_*_IA32_PP_FLAGS =3D -D EFI32 $(EDK_DSC_GLOBAL_BUILD_OPTIONS) - *_*_IA32_ASLPP_FLAGS =3D -D EDKII_GLUE_PciExpressBaseAddress=3D0x$= (PLATFORM_PCIEXPRESS_BASE) - *_*_IA32_ASLCC_FLAGS =3D -D EDKII_GLUE_PciExpressBaseAddress=3D0x$= (PLATFORM_PCIEXPRESS_BASE) - *_*_IA32_ASM16_FLAGS =3D -D EDKII_GLUE_PciExpressBaseAddress=3D$(P= LATFORM_PCIEXPRESS_BASE)h - - *_*_X64_ASM_FLAGS =3D -DEFIX64 -D EDKII_GLUE_PciExpressBaseAddr= ess=3D$(PLATFORM_PCIEXPRESS_BASE)h -DNOCS_S3_SUPPORT - DEBUG_*_X64_CC_FLAGS =3D -D EFIX64 $(EDK_DSC_GLOBAL_BUILD_OPTIONS)= $(DEBUG_BUILD_OPTIONS) - RELEASE_*_X64_CC_FLAGS =3D -D EFIX64 $(EDK_DSC_GLOBAL_BUILD_OPTIONS) - DEBUG_*_X64_VFRPP_FLAGS =3D -D EFIX64 $(EDK_DSC_GLOBAL_BUILD_OPTIONS)= $(DEBUG_BUILD_OPTIONS) - RELEASE_*_X64_VFRPP_FLAGS =3D -D EFIX64 $(EDK_DSC_GLOBAL_BUILD_OPTIONS) - DEBUG_*_X64_APP_FLAGS =3D -D EFIX64 $(EDK_DSC_GLOBAL_BUILD_OPTIONS)= $(DEBUG_BUILD_OPTIONS) - RELEASE_*_X64_APP_FLAGS =3D -D EFIX64 $(EDK_DSC_GLOBAL_BUILD_OPTIONS) - DEBUG_*_X64_PP_FLAGS =3D -D EFIX64 $(EDK_DSC_GLOBAL_BUILD_OPTIONS)= $(DEBUG_BUILD_OPTIONS) - RELEASE_*_X64_PP_FLAGS =3D -D EFIX64 $(EDK_DSC_GLOBAL_BUILD_OPTIONS) - *_*_X64_ASLPP_FLAGS =3D -D EDKII_GLUE_PciExpressBaseAddress=3D0x$= (PLATFORM_PCIEXPRESS_BASE) - *_*_X64_ASLCC_FLAGS =3D -D EDKII_GLUE_PciExpressBaseAddress=3D0x$= (PLATFORM_PCIEXPRESS_BASE) - *_*_X64_ASM16_FLAGS =3D -D EDKII_GLUE_PciExpressBaseAddress=3D$(P= LATFORM_PCIEXPRESS_BASE)h - # *_*_*_BUILD_FLAGS =3D -s - *_*_*_VFR_FLAGS =3D -c - *_*_*_BUILD_FLAGS =3D -c - [BuildOptions.Common.EDKII] *_*_IA32_ASM_FLAGS =3D $(VP_BUILD_OPTIONS) -D EDKII_GLUE_PciExpressB= aseAddress=3D$(PLATFORM_PCIEXPRESS_BASE)h -DNOCS_S3_SUPPORT =20 @@ -1654,25 +1348,3 @@ [BuildOptions.Common.EDKII] *_*_X64_APP_FLAGS =3D $(EDK_EDKII_DSC_FEATURE_BUILD_OPTIONS) *_*_X64_PP_FLAGS =3D $(EDK_EDKII_DSC_FEATURE_BUILD_OPTIONS) *_*_X64_ASLPP_FLAGS =3D $(EDK_EDKII_DSC_FEATURE_BUILD_OPTIONS) - - -[Components.X64] - $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTU= RE)/I2cBus.inf { - - gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0xF0000043 - } - - $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTU= RE)/I2cHost.inf { - - gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0xF0000043 - } - $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTU= RE)/I2cPortA0Pio.inf { - - gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x00000043 - } - - $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTU= RE)/I2cMmioDeviceDxe.inf { - - gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x00000043 - } - diff --git a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc b/Platfor= m/Intel/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc index 933a7ec760..8a5c42577d 100644 --- a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc +++ b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc @@ -18,25 +18,11 @@ [Defines] PLATFORM_GUID =3D 465B0A0B-7AC1-443b-8F67-7B8DEC14= 5F90 PLATFORM_VERSION =3D 0.1 DSC_SPECIFICATION =3D 0x00010005 - - # - # Set platform specific package/folder name, same as passed from PREBUIL= D script. - # PLATFORM_PACKAGE would be the same as PLATFORM_NAME as well as package= build folder - # DEFINE only takes effect at R9 DSC and FDF. - # - DEFINE PLATFORM_PACKAGE =3D Vlv2TbltDevicePkg - DEFINE PLATFORM_RC_PACKAGE =3D Vlv2DeviceRefCodePkg - DEFINE PLATFORM_BINARY_PACKAGE =3D Vlv2SocBinPkg - OUTPUT_DIRECTORY =3D Build/$(PLATFORM_PACKAGE) + OUTPUT_DIRECTORY =3D Build/Vlv2TbltDevicePkgIA32 SUPPORTED_ARCHITECTURES =3D IA32 BUILD_TARGETS =3D DEBUG|RELEASE SKUID_IDENTIFIER =3D DEFAULT =20 - DEFINE CPU_ARCH =3DValleyView2 - DEFINE PROJECT_SC_FAMILY =3DIntelPch - DEFINE PROJECT_SC_ROOT =3D../$(PLATFORM_RC_PACKAGE)/ValleyView2= Soc/SouthCluster - DEFINE PROJECT_VLV_ROOT =3D../$(PLATFORM_RC_PACKAGE)/ValleyView= 2Soc/NorthCluster - DEFINE RC_BINARY_RELEASE =3D TRUE # # Platform On/Off features are defined here @@ -47,20 +33,16 @@ [Defines] # 3.BayleyBay # ENBDT_PF_ENABLE =3D TRUE # - !include $(PLATFORM_PACKAGE)/AutoPlatformCFG.txt - !include $(PLATFORM_PACKAGE)/PlatformPkgConfig.dsc + !include Vlv2TbltDevicePkg/AutoPlatformCFG.txt + !include Vlv2TbltDevicePkg/PlatformPkgConfig.dsc =20 !if $(X64_CONFIG) =3D=3D TRUE DEFINE DXE_ARCHITECTURE =3D X64 - DEFINE EDK_DXE_ARCHITECTURE =3D X64 - DEFINE UNDI_DXE_ARCHITECTURE =3D 64 !else DEFINE DXE_ARCHITECTURE =3D IA32 - DEFINE EDK_DXE_ARCHITECTURE =3D Ia32 - DEFINE UNDI_DXE_ARCHITECTURE =3D 32 !endif =20 - FLASH_DEFINITION =3D $(PLATFORM_PACKAGE)/PlatformPkg.= fdf + FLASH_DEFINITION =3D Vlv2TbltDevicePkg/PlatformPkg.fd= f !if $(LFMA_ENABLE) =3D=3D TRUE FIX_LOAD_TOP_MEMORY_ADDRESS =3D 0xFFFFFFFFFFFFFFFF DEFINE TOP_MEMORY_ADDRESS =3D 0xFFFFFFFFFFFFFFFF @@ -71,10 +53,6 @@ [Defines] =20 DEFINE PLATFORM_PCIEXPRESS_BASE =3D 0E0000000 =20 - DEFINE SEC_ENABLE =3D FALSE - DEFINE SEC_DEBUG_INFO_ENABLE =3D FALSE - DEFINE FTPM_ENABLE =3D FALSE - ##########################################################################= ###### # # SKU Identification section - list of all SKU IDs supported by this @@ -98,7 +76,6 @@ [LibraryClasses.common] DxeCoreEntryPoint|MdePkg/Library/DxeCoreEntryPoint/DxeCoreEntryPoint.inf UefiDriverEntryPoint|MdePkg/Library/UefiDriverEntryPoint/UefiDriverEntry= Point.inf UefiApplicationEntryPoint|MdePkg/Library/UefiApplicationEntryPoint/UefiA= pplicationEntryPoint.inf - DxeSmmDriverEntryPoint|IntelFrameworkPkg/Library/DxeSmmDriverEntryPoint/= DxeSmmDriverEntryPoint.inf =20 # # Basic @@ -142,8 +119,7 @@ [LibraryClasses.common] GenericBdsLib|$(PLATFORM_PACKAGE)/Override/IntelFrameworkModulePkg/Libra= ry/GenericBdsLib/GenericBdsLib.inf BmpSupportLib|MdeModulePkg/Library/BaseBmpSupportLib/BaseBmpSupportLib.i= nf SafeIntLib|MdePkg/Library/BaseSafeIntLib/BaseSafeIntLib.inf - PlatformBdsLib|$(PLATFORM_PACKAGE)/Library/PlatformBdsLib/PlatformBdsLib= .inf - FlashDeviceLib|$(PLATFORM_PACKAGE)/Library/FlashDeviceLib/FlashDeviceLib= .inf + FlashDeviceLib|Vlv2TbltDevicePkg/Library/FlashDeviceLib/FlashDeviceLib.i= nf UefiBootManagerLib|MdeModulePkg/Library/UefiBootManagerLib/UefiBootManag= erLib.inf # # Framework @@ -166,10 +142,6 @@ [LibraryClasses.common] UefiScsiLib|MdePkg/Library/UefiScsiLib/UefiScsiLib.inf !endif =20 -!if $(S3_ENABLE) =3D=3D TRUE - S3Lib|IntelFrameworkModulePkg/Library/PeiS3Lib/PeiS3Lib.inf -!endif - OemHookStatusCodeLib|MdeModulePkg/Library/OemHookStatusCodeLibNull/OemHo= okStatusCodeLibNull.inf !if $(CAPSULE_ENABLE) =3D=3D TRUE CapsuleLib|MdeModulePkg/Library/DxeCapsuleLibFmp/DxeCapsuleLib.inf @@ -197,27 +169,27 @@ [LibraryClasses.common] # # ICH # - SmbusLib|$(PLATFORM_PACKAGE)/Library/SmbusLib/SmbusLib.inf - SmmLib|$(PLATFORM_PACKAGE)/Library/PchSmmLib/PchSmmLib.inf + SmbusLib|Vlv2TbltDevicePkg/Library/SmbusLib/SmbusLib.inf + SmmLib|Vlv2TbltDevicePkg/Library/PchSmmLib/PchSmmLib.inf =20 # # Platform # - TimerLib|$(PLATFORM_PACKAGE)/Library/IntelPchAcpiTimerLib/IntelPchAcpiTi= merLib.inf - ResetSystemLib|$(PLATFORM_PACKAGE)/Library/ResetSystemLib/ResetSystemLib= .inf + TimerLib|Vlv2TbltDevicePkg/Library/IntelPchAcpiTimerLib/IntelPchAcpiTime= rLib.inf + ResetSystemLib|Vlv2TbltDevicePkg/Library/ResetSystemLib/ResetSystemLib.i= nf =20 - PlatformCmosLib|$(PLATFORM_PACKAGE)/Library/PlatformCmosLib/PlatformCmos= Lib.inf + PlatformCmosLib|Vlv2TbltDevicePkg/Library/PlatformCmosLib/PlatformCmosLi= b.inf =20 # # Misc # - MonoStatusCodeLib|$(PLATFORM_PACKAGE)/MonoStatusCode/MonoStatusCode.inf + MonoStatusCodeLib|Vlv2TbltDevicePkg/MonoStatusCode/MonoStatusCode.inf !if $(TARGET) =3D=3D RELEASE DebugLib|MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.inf SerialPortLib|MdePkg/Library/BaseSerialPortLibNull/BaseSerialPortLibNull= .inf !else DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.in= f - SerialPortLib|$(PLATFORM_PACKAGE)/Library/SerialPortLib/SerialPortLib.in= f + SerialPortLib|MdeModulePkg/Library/BaseSerialPortLib16550/BaseSerialPort= Lib16550.inf !endif =20 PerformanceLib|MdePkg/Library/BasePerformanceLibNull/BasePerformanceLibN= ull.inf @@ -229,10 +201,11 @@ [LibraryClasses.common] =20 !endif =20 + PlatformHookLib|MdeModulePkg/Library/BasePlatformHookLibNull/BasePlatfor= mHookLibNull.inf + !if $(SOURCE_DEBUG_ENABLE) =3D=3D TRUE PeCoffExtraActionLib|SourceLevelDebugPkg/Library/PeCoffExtraActionLibDeb= ug/PeCoffExtraActionLibDebug.inf DebugCommunicationLib|SourceLevelDebugPkg/Library/DebugCommunicationLibS= erialPort/DebugCommunicationLibSerialPort.inf - PlatformHookLib|MdeModulePkg/Library/BasePlatformHookLibNull/BasePlatfor= mHookLibNull.inf SerialPortLib|MdeModulePkg/Library/BaseSerialPortLib16550/BaseSerialPort= Lib16550.inf !else PeCoffExtraActionLib|MdePkg/Library/BasePeCoffExtraActionLibNull/BasePeC= offExtraActionLibNull.inf @@ -247,10 +220,10 @@ [LibraryClasses.common] OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf !endif =20 - BiosIdLib|$(PLATFORM_PACKAGE)/Library/BiosIdLib/BiosIdLib.inf - CpuIA32Lib|$(PLATFORM_PACKAGE)/Library/CpuIA32Lib/CpuIA32Lib.inf + BiosIdLib|Vlv2TbltDevicePkg/Library/BiosIdLib/BiosIdLib.inf + CpuIA32Lib|Vlv2TbltDevicePkg/Library/CpuIA32Lib/CpuIA32Lib.inf =20 - StallSmmLib|$(PLATFORM_PACKAGE)/Library/StallSmmLib/StallSmmLib.inf + StallSmmLib|Vlv2TbltDevicePkg/Library/StallSmmLib/StallSmmLib.inf =20 !if $(SECURE_BOOT_ENABLE) =3D=3D TRUE OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf @@ -264,13 +237,10 @@ [LibraryClasses.common] AuthVariableLib|MdeModulePkg/Library/AuthVariableLibNull/AuthVariableLib= Null.inf !endif VarCheckLib|MdeModulePkg/Library/VarCheckLib/VarCheckLib.inf -!if $(RC_BINARY_RELEASE) =3D=3D TRUE - I2cLib|Vlv2TbltDevicePkg/Library/I2CLib/I2CLibNull.inf -!endif ShellLib|ShellPkg/Library/UefiShellLib/UefiShellLib.inf FileHandleLib|MdePkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf SortLib|MdeModulePkg/Library/UefiSortLib/UefiSortLib.inf -!if $(FTPM_ENABLE) =3D=3D TRUE || $(NETWORK_ISCSI_ENABLE) =3D=3D TRUE +!if $(NETWORK_ISCSI_ENABLE) =3D=3D TRUE BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf @@ -281,13 +251,6 @@ [LibraryClasses.common] =20 =20 Tpm2CommandLib|SecurityPkg/Library/Tpm2CommandLib/Tpm2CommandLib.inf -!if $(MINNOW2_FSP_BUILD) =3D=3D TRUE - FspApiLib|IntelFspWrapperPkg/Library/BaseFspApiLib/BaseFspApiLib.inf - FspPlatformInfoLib|IntelFspWrapperPkg/Library/BaseFspPlatformInfoLibSamp= le/BaseFspPlatformInfoLibSample.inf - FspPlatformSecLib|Vlv2TbltDevicePkg/FspSupport/Library/SecFspPlatformSec= LibVlv2/FspPlatformSecLibVlv2.inf - FspHobProcessLib|Vlv2TbltDevicePkg/FspSupport/Library/PeiFspHobProcessLi= bVlv2/FspHobProcessLibVlv2.inf -!endif - BootLogoLib|MdeModulePkg/Library/BootLogoLib/BootLogoLib.inf =20 [LibraryClasses.IA32.SEC] @@ -307,14 +270,14 @@ [LibraryClasses.IA32.PEIM, LibraryClasses.IA32.PEI_CO= RE, LibraryClasses.IA32.SEC MemoryAllocationLib|MdePkg/Library/PeiMemoryAllocationLib/PeiMemoryAlloc= ationLib.inf ReportStatusCodeLib|MdeModulePkg/Library/PeiReportStatusCodeLib/PeiRepor= tStatusCodeLib.inf ExtractGuidedSectionLib|MdePkg/Library/PeiExtractGuidedSectionLib/PeiExt= ractGuidedSectionLib.inf - MultiPlatformLib|$(PLATFORM_PACKAGE)/Library/MultiPlatformLib/MultiPlatf= ormLib.inf + MultiPlatformLib|Vlv2TbltDevicePkg/Library/MultiPlatformLib/MultiPlatfor= mLib.inf BaseCryptLib|CryptoPkg/Library/BaseCryptLib/PeiCryptLib.inf CpuExceptionHandlerLib|UefiCpuPkg/Library/CpuExceptionHandlerLib/SecPeiC= puExceptionHandlerLib.inf MpInitLib|UefiCpuPkg/Library/MpInitLib/PeiMpInitLib.inf =20 !if $(PERFORMANCE_ENABLE) =3D=3D TRUE PerformanceLib|MdeModulePkg/Library/PeiPerformanceLib/PeiPerformanceLib.= inf - TimerLib|$(PLATFORM_PACKAGE)/Library/IntelPchAcpiTimerLib/IntelPchAcpiTi= merLib.inf + TimerLib|Vlv2TbltDevicePkg/Library/IntelPchAcpiTimerLib/IntelPchAcpiTime= rLib.inf !endif =20 !if $(TARGET) =3D=3D RELEASE @@ -322,7 +285,7 @@ [LibraryClasses.IA32.PEIM, LibraryClasses.IA32.PEI_CORE= , LibraryClasses.IA32.SEC SerialPortLib|MdePkg/Library/BaseSerialPortLibNull/BaseSerialPortLibNull= .inf !else DebugLib|MdeModulePkg/Library/PeiDxeDebugLibReportStatusCode/PeiDxeDebug= LibReportStatusCode.inf - SerialPortLib|$(PLATFORM_PACKAGE)/Library/SerialPortLib/SerialPortLib.in= f + SerialPortLib|MdeModulePkg/Library/BaseSerialPortLib16550/BaseSerialPort= Lib16550.inf !endif =20 LockBoxLib|MdeModulePkg/Library/SmmLockBoxLib/SmmLockBoxPeiLib.inf @@ -331,13 +294,6 @@ [LibraryClasses.IA32.PEIM, LibraryClasses.IA32.PEI_COR= E, LibraryClasses.IA32.SEC DebugAgentLib|SourceLevelDebugPkg/Library/DebugAgent/SecPeiDebugAgentLib= .inf !endif =20 - !if $(MINNOW2_FSP_BUILD) =3D=3D TRUE - PlatformFspLib|Vlv2TbltDevicePkg/Library/PlatformFspLib/PlatformFspLib.in= f - !endif -!if $(FTPM_ENABLE) =3D=3D TRUE - Tpm2DeviceLib|Vlv2TbltDevicePkg/Library/Tpm2DeviceLibSeCPei/Tpm2DeviceLi= bSeC.inf -!endif - [LibraryClasses.IA32] # # DXE phase common @@ -354,7 +310,7 @@ [LibraryClasses.IA32] !endif =20 LockBoxLib|MdeModulePkg/Library/SmmLockBoxLib/SmmLockBoxDxeLib.inf - EfiRegTableLib|$(PLATFORM_PACKAGE)/Library/EfiRegTableLib/EfiRegTableLib= .inf + EfiRegTableLib|Vlv2TbltDevicePkg/Library/EfiRegTableLib/EfiRegTableLib.i= nf =20 !if $(SECURE_BOOT_ENABLE) =3D=3D TRUE BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf @@ -369,14 +325,14 @@ [LibraryClasses.IA32.DXE_DRIVER] CustomizedDisplayLib|MdeModulePkg/Library/CustomizedDisplayLib/Customize= dDisplayLib.inf !if $(PERFORMANCE_ENABLE) =3D=3D TRUE PerformanceLib|MdeModulePkg/Library/DxePerformanceLib/DxePerformanceLib.= inf - TimerLib|$(PLATFORM_PACKAGE)/Library/IntelPchAcpiTimerLib/IntelPchAcpiTi= merLib.inf + TimerLib|Vlv2TbltDevicePkg/Library/IntelPchAcpiTimerLib/IntelPchAcpiTime= rLib.inf !endif =20 !if $(SOURCE_DEBUG_ENABLE) =3D=3D TRUE DebugAgentLib|SourceLevelDebugPkg/Library/DebugAgent/DxeDebugAgentLib.in= f !endif =20 - FlashDeviceLib|$(PLATFORM_PACKAGE)/Library/FlashDeviceLib/FlashDeviceLib= Dxe.inf + FlashDeviceLib|Vlv2TbltDevicePkg/Library/FlashDeviceLib/FlashDeviceLibDx= e.inf =20 [LibraryClasses.IA32.DXE_CORE] HobLib|MdePkg/Library/DxeCoreHobLib/DxeCoreHobLib.inf @@ -384,7 +340,7 @@ [LibraryClasses.IA32.DXE_CORE] PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf !if $(PERFORMANCE_ENABLE) =3D=3D TRUE PerformanceLib|MdeModulePkg/Library/DxeCorePerformanceLib/DxeCorePerform= anceLib.inf - TimerLib|$(PLATFORM_PACKAGE)/Library/IntelPchAcpiTimerLib/IntelPchAcpiTi= merLib.inf + TimerLib|Vlv2TbltDevicePkg/Library/IntelPchAcpiTimerLib/IntelPchAcpiTime= rLib.inf !endif =20 !if $(SOURCE_DEBUG_ENABLE) =3D=3D TRUE @@ -409,7 +365,7 @@ [LibraryClasses.IA32.DXE_SMM_DRIVER] =20 !if $(SOURCE_DEBUG_ENABLE) =3D=3D TRUE DebugAgentLib|SourceLevelDebugPkg/Library/DebugAgent/SmmDebugAgentLib.in= f - TimerLib|$(PLATFORM_PACKAGE)/Library/IntelPchAcpiTimerLib/IntelPchAcpiTi= merLib.inf + TimerLib|Vlv2TbltDevicePkg/Library/IntelPchAcpiTimerLib/IntelPchAcpiTime= rLib.inf !endif CpuExceptionHandlerLib|UefiCpuPkg/Library/CpuExceptionHandlerLib/SmmCpuE= xceptionHandlerLib.inf =20 @@ -483,12 +439,6 @@ [PcdsFeatureFlag.common] gEfiMdeModulePkgTokenSpaceGuid.PcdSupportUpdateCapsuleReset|TRUE !else gEfiMdeModulePkgTokenSpaceGuid.PcdSupportUpdateCapsuleReset|FALSE -!endif - gEfiCpuTokenSpaceGuid.PcdCpuSmmEnableBspElection|FALSE -!if $(DATAHUB_STATUS_CODE_ENABLE) =3D=3D TRUE - gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeUseDataHub|TRUE -!else - gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeUseDataHub|FALSE !endif gEfiMdeModulePkgTokenSpaceGuid.PcdPeiCoreImageLoaderSearchTeSectionFirst= |FALSE !if $(TARGET) =3D=3D RELEASE @@ -514,59 +464,20 @@ [PcdsFeatureFlag.common] !endif =20 =20 - ## This PCD specifies whether PS2 keyboard does a extended verification = during start. - gEfiMdeModulePkgTokenSpaceGuid.PcdPs2KbdExtendedVerification|FALSE - - ## This PCD specifies whether PS2 mouse does a extended verification dur= ing start. - gEfiMdeModulePkgTokenSpaceGuid.PcdPs2MouseExtendedVerification|FALSE - !if $(VARIABLE_INFO_ENABLE) =3D=3D TRUE gEfiMdeModulePkgTokenSpaceGuid.PcdVariableCollectStatistics|TRUE !else gEfiMdeModulePkgTokenSpaceGuid.PcdVariableCollectStatistics|FALSE !endif =20 - gEfiCpuTokenSpaceGuid.PcdCpuSmmBlockStartupThisAp|TRUE - !if $(SOURCE_DEBUG_ENABLE) gUefiCpuPkgTokenSpaceGuid.PcdCpuSmmDebug|TRUE !endif =20 + gEfiMdeModulePkgTokenSpaceGuid.PcdInstallAcpiSdtProtocol|TRUE + gUefiCpuPkgTokenSpaceGuid.PcdCpuSmmBlockStartupThisAp|TRUE + [PcdsFixedAtBuild.common] -!if $(MINNOW2_FSP_BUILD) =3D=3D TRUE -# $(FLASH_REGION_VLVMICROCODE_BASE) - gFspWrapperTokenSpaceGuid.PcdCpuMicrocodePatchAddress|0xFFC00000 -# $(FLASH_REGION_VLVMICROCODE_SIZE) - gFspWrapperTokenSpaceGuid.PcdCpuMicrocodePatchRegionSize|0x00040000 - gFspWrapperTokenSpaceGuid.PcdFlashMicroCodeOffset|0x60 -# $(FLASH_AREA_BASE_ADDRESS) - gFspWrapperTokenSpaceGuid.PcdFlashCodeCacheAddress|0xFF800000 -# $(FLASH_AREA_SIZE) - gFspWrapperTokenSpaceGuid.PcdFlashCodeCacheSize|0x00800000 -# $(FLASH_REGION_FSPBIN_BASE) - gFspWrapperTokenSpaceGuid.PcdFlashFvFspBase|0xFFCC0000 -!endif - -!if $(PERFORMANCE_ENABLE) =3D=3D TRUE -!if $(MINNOW2_FSP_BUILD) =3D=3D TRUE - # in FSP, when this got used, the memory already is up - gEfiCpuTokenSpaceGuid.PcdTemporaryRamBase|0x00080000 -!else - gEfiCpuTokenSpaceGuid.PcdTemporaryRamBase|0xFEF80000 -!endif - gEfiCpuTokenSpaceGuid.PcdTemporaryRamSize|0x00010000 - -!else - !if $(MINNOW2_FSP_BUILD) =3D=3D TRUE - gEfiCpuTokenSpaceGuid.PcdTemporaryRamBase|0x00080000 - !else - gEfiCpuTokenSpaceGuid.PcdTemporaryRamBase|0xFEF80000 - !endif - gEfiCpuTokenSpaceGuid.PcdTemporaryRamSize|0x00010000 - gEfiCpuTokenSpaceGuid.PcdPeiTemporaryRamStackSize|0x3C00 -!endif - - !if $(SECURE_BOOT_ENABLE) =3D=3D TRUE gEfiMdeModulePkgTokenSpaceGuid.PcdMaxVariableSize|0x22000 !else @@ -574,11 +485,8 @@ [PcdsFixedAtBuild.common] !endif gEfiMdeModulePkgTokenSpaceGuid.PcdHwErrStorageSize|0x00000800 gEfiMdeModulePkgTokenSpaceGuid.PcdMaxHardwareErrorVariableSize|0x400 - gEfiCpuTokenSpaceGuid.PcdCpuIEDRamSize|0x400000 - gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdS3AcpiReservedMemorySize|0x= 10000 gEfiMdeModulePkgTokenSpaceGuid.PcdSrIovSupport|FALSE gEfiMdeModulePkgTokenSpaceGuid.PcdAriSupport|FALSE - gEfiCpuTokenSpaceGuid.PcdCpuSmmApSyncTimeout|1000 !if $(S4_ENABLE) =3D=3D TRUE gEfiMdeModulePkgTokenSpaceGuid.PcdResetOnMemoryTypeInformationChange|TRU= E !else @@ -596,13 +504,9 @@ [PcdsFixedAtBuild.common] gEfiMdeModulePkgTokenSpaceGuid.PcdMaxPeiPerformanceLogEntries|60 !endif =20 - gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdEbdaReservedMemorySize|0x10= 000 gEfiMdeModulePkgTokenSpaceGuid.PcdLoadModuleAtFixAddressEnable|$(TOP_MEM= ORY_ADDRESS) gEfiMdeModulePkgTokenSpaceGuid.PcdBrowserSubtitleTextColor|0x0 gEfiMdeModulePkgTokenSpaceGuid.PcdBrowserFieldTextColor|0x01 - gEfiCpuTokenSpaceGuid.PcdCpuIEDEnabled|TRUE - gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdBiosVideoCheckVbeEnable|TRU= E - gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdBiosVideoCheckVgaEnable|TRU= E =20 !if $(SOURCE_DEBUG_ENABLE) =3D=3D TRUE gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x17 @@ -648,11 +552,6 @@ [PcdsFixedAtBuild.IA32] [PcdsPatchableInModule.common] gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x803805c6 gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseAddress|0x$(PLATFORM_PCIEXPRES= S_BASE) - gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdLegacyBiosCacheLegacyRegion= |FALSE - - ## This PCD specifies whether to use the optimized timing for best PS2 d= etection performance. - # Note this PCD could be set to TRUE for best boot performance and set = to FALSE for best device compatibility. - gEfiMdeModulePkgTokenSpaceGuid.PcdFastPS2Detection|TRUE =20 ########################################################################= ############################### # @@ -827,10 +726,6 @@ [PcdsDynamicExDefault.common.DEFAULT] gEfiVLVTokenSpaceGuid.PcdFTPMStatus|0 gEfiMdeModulePkgTokenSpaceGuid.PcdS3BootScriptTablePrivateSmmDataPtr|0 gEfiMdeModulePkgTokenSpaceGuid.PcdS3BootScriptTablePrivateDataPtr|0 - gEfiCpuTokenSpaceGuid.PcdCpuS3DataAddress|0 - gEfiCpuTokenSpaceGuid.PcdCpuHotPlugDataAddress|0 - gEfiCpuTokenSpaceGuid.PcdCpuCallbackSignal|0 - gEfiCpuTokenSpaceGuid.PcdCpuConfigContextBuffer|0 gEfiVLVTokenSpaceGuid.PcdCpuLockBoxDataAddress|0 gEfiVLVTokenSpaceGuid.PcdCpuSmramCpuDataAddress|0 gEfiVLVTokenSpaceGuid.PcdCpuLockBoxSize|0 @@ -843,24 +738,7 @@ [PcdsDynamicExDefault.X64.DEFAULT] =20 [Components.IA32] =20 - $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/SecCore.inf - - !if $(MINNOW2_FSP_BUILD) =3D=3D TRUE - IntelFspWrapperPkg/FspWrapperSecCore/FspWrapperSecCore.inf { - !if $(TARGET) =3D=3D DEBUG - - - DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPor= t.inf - !endif - } - Vlv2TbltDevicePkg/FspSupport/BootModePei/BootModePei.inf - IntelFspWrapperPkg/FspInitPei/FspInitPei.inf { - !if $(TARGET) =3D=3D DEBUG - - DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPor= t.inf - !endif - } - !endif + Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/IA32/SecCore.inf =20 MdeModulePkg/Core/Pei/PeiMain.inf { !if $(TARGET) =3D=3D DEBUG @@ -871,31 +749,23 @@ [Components.IA32] gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x80000046 } =20 - $(PLATFORM_PACKAGE)/MonoStatusCode/MonoStatusCode.inf { + Vlv2TbltDevicePkg/MonoStatusCode/MonoStatusCode.inf { !if $(TARGET) =3D=3D DEBUG gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x2E !endif } - $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/MemoryInit.= inf { + Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/IA32/MemoryInit.inf { gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x80000046 - - !if $(FTPM_ENABLE)=3D=3DTRUE - *_*_IA32_CC_FLAGS =3D /D FTPM_ENABLE - !endif } =20 !if $(RC_BINARY_RELEASE) =3D=3D TRUE - $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/SeCUma.inf -!endif - -!if $(FTPM_ENABLE) =3D=3D TRUE -$(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/fTPMInitPeim.= inf + Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/IA32/SeCUma.inf !endif =20 !if $(RC_BINARY_RELEASE) =3D=3D TRUE - $(PLATFORM_PACKAGE)/PlatformPei/PlatformPei.inf { + Vlv2TbltDevicePkg/PlatformPei/PlatformPei.inf { *_*_IA32_CC_FLAGS =3D /DRC_BINARY_RELEASE !if $(TARGET) =3D=3D DEBUG @@ -915,10 +785,6 @@ [Components.IA32] } !endif =20 -!if $(FTPM_ENABLE) =3D=3D TRUE - $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/Tpm2DeviceS= eCPei.inf -!endif - !if $(TPM_ENABLED) =3D=3D TRUE SecurityPkg/Tcg/PhysicalPresencePei/PhysicalPresencePei.inf SecurityPkg/Tcg/TcgPei/TcgPei.inf { @@ -929,7 +795,7 @@ [Components.IA32] } !endif =20 - $(PLATFORM_PACKAGE)/PlatformInitPei/PlatformInitPei.inf { + Vlv2TbltDevicePkg/PlatformInitPei/PlatformInitPei.inf { gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x803805c6 @@ -938,34 +804,33 @@ [Components.IA32] !endif PcdLib|MdePkg/Library/PeiPcdLib/PeiPcdLib.inf } - $(PLATFORM_PACKAGE)/FvInfoPei/FvInfoPei.inf + Vlv2TbltDevicePkg/FvInfoPei/FvInfoPei.inf =20 - $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/VlvInitPeim= .inf + Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/IA32/VlvInitPeim.inf !if $(PCIESC_ENABLE) =3D=3D TRUE - $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/PchEarlyIni= tPeim.inf { + Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/IA32/PchEarlyInitPeim.inf { gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x80000046 } !endif - $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/PchInitPeim= .inf + Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/IA32/PchInitPeim.inf =20 =20 - $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/PchSmbusArp= Disabled.inf - $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/PchSpiPeim.= inf - $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/PeiSmmAcces= s.inf - $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/PeiSmmContr= ol.inf + Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/IA32/PchSmbusArpDisabled.inf + Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/IA32/PchSpiPeim.inf + Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/IA32/PeiSmmAccess.inf + Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/IA32/PeiSmmControl.inf MdeModulePkg/Universal/PCD/Pei/Pcd.inf - $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/CpuPeim.inf + Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/IA32/CpuPeim.inf UefiCpuPkg/CpuIoPei/CpuIoPei.inf UefiCpuPkg/Universal/Acpi/S3Resume2Pei/S3Resume2Pei.inf - $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/MpS3.inf -# $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/PiSmmCommu= nicationPei.inf + UefiCpuPkg/PiSmmCommunication/PiSmmCommunicationPei.inf =20 !if $(RECOVERY_ENABLE) # # Recovery # - $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/PchUsb.inf + Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/IA32/PchUsb.inf MdeModulePkg/Bus/Pci/EhciPei/EhciPei.inf MdeModulePkg/Bus/Usb/UsbBusPei/UsbBusPei.inf MdeModulePkg/Bus/Usb/UsbBotPei/UsbBotPei.inf @@ -991,17 +856,6 @@ [Components.IA32] MdeModulePkg/Universal/Variable/Pei/VariablePei.inf MdeModulePkg/Universal/FaultTolerantWritePei/FaultTolerantWritePei.inf =20 -!if $(FTPM_ENABLE) =3D=3D TRUE - SecurityPkg/Tcg/Tcg2Pei/Tcg2Pei.inf { - - gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x80000046 - - DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPor= t.inf - NULL|SecurityPkg/Library\HashInstanceLibSha1/HashInstanceLibSha1.inf - NULL|SecurityPkg/Library/HashInstanceLibSha256/HashInstanceLibSha256= .inf - PcdLib|MdePkg/Library/PeiPcdLib/PeiPcdLib.inf - } -!endif !if $(TPM_ENABLED) =3D=3D TRUE SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigPei.inf { @@ -1011,7 +865,7 @@ [Components.IA32] !if $(ACPI50_ENABLE) =3D=3D TRUE MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTablePei/FirmwarePerf= ormancePei.inf{ - TimerLib|$(PLATFORM_PACKAGE)/Library/IntelPchAcpiTimerLib/IntelPchAc= piTimerLib.inf + TimerLib|Vlv2TbltDevicePkg/Library/IntelPchAcpiTimerLib/IntelPchAcpi= TimerLib.inf } =20 !endif @@ -1019,17 +873,6 @@ [Components.IA32] MdeModulePkg/Universal/ReportStatusCodeRouter/Pei/ReportStatusCodeRouter= Pei.inf !endif [Components.IA32] - !if $(MINNOW2_FSP_BUILD) =3D=3D TRUE - IntelFspWrapperPkg/FspNotifyDxe/FspNotifyDxe.inf { - !if $(TARGET) =3D=3D DEBUG - - gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x80000046 - - DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPor= t.inf - !endif - } - - !endif # # EDK II Related Platform codes # @@ -1047,24 +890,10 @@ [Components.IA32] DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPor= t.inf !endif } - IntelFrameworkModulePkg/Universal/Acpi/AcpiS3SaveDxe/AcpiS3SaveDxe.inf { - - gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0xF0000043 - - gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x27 - - !if $(TARGET) !=3D RELEASE - DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSeria= lPort.inf - !endif - - ICC:*_*_*_CC_FLAGS =3D /D MDEPKG_NDEBUG - GCC:*_*_*_CC_FLAGS =3D -D MDEPKG_NDEBUG - } MdeModulePkg/Universal/PCD/Dxe/Pcd.inf { PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf } - IntelFrameworkModulePkg/Universal/CpuIoDxe/CpuIoDxe.inf UefiCpuPkg/CpuIo2Dxe/CpuIo2Dxe.inf =20 MdeModulePkg/Universal/ReportStatusCodeRouter/RuntimeDxe/ReportStatusCod= eRouterRuntimeDxe.inf @@ -1084,13 +913,9 @@ [Components.IA32] =20 !if $(TPM_ENABLED) =3D=3D TRUE NULL|SecurityPkg/Library/DxeTpmMeasureBootLib/DxeTpmMeasureBootLib.i= nf -!endif -!if $(FTPM_ENABLE) =3D=3D TRUE - NULL|SecurityPkg/Library/DxeTpm2MeasureBootLib/DxeTpm2MeasureBootLib= .inf !endif } - $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTU= RE)/MpCpu.inf - $(PLATFORM_PACKAGE)/Metronome/Metronome.inf + MdeModulePkg/Universal/Metronome/Metronome.inf =20 IntelFrameworkModulePkg/Universal/BdsDxe/BdsDxe.inf{ @@ -1100,12 +925,8 @@ [Components.IA32] PlatformBdsLib|$(PLATFORM_PACKAGE)/Library/PlatformBdsLib/PlatformBd= sLib.inf DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPor= t.inf PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf - SerialPortLib|$(PLATFORM_PACKAGE)/Library/SerialPortLib/SerialPortLi= b.inf - !if $(FTPM_ENABLE) =3D=3D TRUE - Tpm2DeviceLib|Vlv2TbltDevicePkg/Library/Tpm2DeviceLibSeCDxe/Tpm2Devi= ceLibSeC.inf - !else + SerialPortLib|MdeModulePkg/Library/BaseSerialPortLib16550/BaseSerial= PortLib16550.inf Tpm2DeviceLib|SecurityPkg/Library/Tpm2DeviceLibTcg2/Tpm2DeviceLibTcg= 2.inf - !endif } =20 $(PLATFORM_PACKAGE)/UiApp/UiApp.inf @@ -1117,11 +938,11 @@ [Components.IA32] MdeModulePkg/Universal/Variable/RuntimeDxe/VariableSmm.inf { NULL|MdeModulePkg/Library/VarCheckUefiLib/VarCheckUefiLib.inf - SerialPortLib|$(PLATFORM_PACKAGE)/Library/SerialPortLib/SerialPortLi= b.inf + SerialPortLib|MdeModulePkg/Library/BaseSerialPortLib16550/BaseSerial= PortLib16550.inf } - $(PLATFORM_PACKAGE)/FvbRuntimeDxe/FvbSmm.inf + Vlv2TbltDevicePkg/FvbRuntimeDxe/FvbSmm.inf MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteSmm.inf - $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTU= RE)/PchSpiSmm.inf + Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/PchSpiSmm= .inf !if $(SECURE_BOOT_ENABLE) =3D=3D TRUE SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigDx= e.inf { @@ -1143,9 +964,9 @@ [Components.IA32] PcAtChipsetPkg/PcatRealTimeClockRuntimeDxe/PcatRealTimeClockRuntimeDxe.i= nf MdeModulePkg/Universal/DevicePathDxe/DevicePathDxe.inf =20 - $(PLATFORM_PACKAGE)/FvbRuntimeDxe/FvbRuntimeDxe.inf + Vlv2TbltDevicePkg/FvbRuntimeDxe/FvbRuntimeDxe.inf =20 - $(PLATFORM_PACKAGE)/PlatformSetupDxe/PlatformSetupDxe.inf + Vlv2TbltDevicePkg/PlatformSetupDxe/PlatformSetupDxe.inf =20 !if $(DATAHUB_ENABLE) =3D=3D TRUE IntelFrameworkModulePkg/Universal/DataHubDxe/DataHubDxe.inf { @@ -1153,38 +974,30 @@ [Components.IA32] gEfiMdePkgTokenSpaceGuid.PcdMaximumLinkedListLength|0 } !endif - IntelFrameworkModulePkg/Universal/StatusCode/DatahubStatusCodeHandlerDxe= /DatahubStatusCodeHandlerDxe.inf MdeModulePkg/Universal/MemoryTest/NullMemoryTestDxe/NullMemoryTestDxe.in= f - $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTU= RE)/PchS3SupportDxe.inf - !if $(USE_HPET_TIMER) =3D=3D TRUE - PcAtChipsetPkg/HpetTimerDxe/HpetTimerDxe.inf - !else - $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTU= RE)/SmartTimer.inf - !endif - $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTU= RE)/SmmControl.inf + Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/PchS3Supp= ortDxe.inf + PcAtChipsetPkg/HpetTimerDxe/HpetTimerDxe.inf + Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/SmmContro= l.inf =20 - $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTU= RE)/PchSmbusDxe.inf - $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTU= RE)/IntelPchLegacyInterrupt.inf - $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTU= RE)/PchReset.inf - $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTU= RE)/PchInitDxe.inf{ + Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/PchSmbusD= xe.inf + Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/PchReset.= inf + Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/PchInitDx= e.inf{ gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0xF0000043 } - $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTU= RE)/PchInitSmm.inf + Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/PchInitSm= m.inf =20 - $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTU= RE)/PchSmiDispatcher.inf + Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/PchSmiDis= patcher.inf =20 !if $(PCIESC_ENABLE) =3D=3D TRUE - $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTU= RE)/PchPcieSmm.inf + Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/PchPcieSm= m.inf !endif - $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTU= RE)/PchSpiRuntime.inf - $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTU= RE)/PchPolicyInitDxe.inf - $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTU= RE)/PchBiosWriteProtect.inf - $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTU= RE)/SmmAccess.inf - $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTU= RE)/PciHostBridge.inf - $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTU= RE)/VlvInitDxe.inf - - IntelFrameworkModulePkg/Universal/LegacyRegionDxe/LegacyRegionDxe.inf + Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/PchSpiRun= time.inf + Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/PchPolicy= InitDxe.inf + Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/PchBiosWr= iteProtect.inf + Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/SmmAccess= .inf + Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/PciHostBr= idge.inf + Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/VlvInitDx= e.inf =20 # # Performance Application; Set PERFORMANCE_ENABLE=3DTRUE for normal boot= performance and smm performance data @@ -1204,35 +1017,9 @@ [Components.IA32] PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf } =20 - $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTU= RE)/Dptf.inf - $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTU= RE)/PnpDxe.inf + Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/Dptf.inf + Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/PnpDxe.in= f =20 -!if $(SEC_ENABLE) =3D=3D TRUE - $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTU= RE)/HeciDrv.inf { -!if $(SEC_DEBUG_INFO_ENABLE) =3D=3D TRUE - - *_*_X64_CC_FLAGS =3D /DSEC_DEBUG_INFO=3D1 -!else - - *_*_X64_CC_FLAGS =3D /DSEC_DEBUG_INFO=3D0 -!endif - } - - $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTU= RE)/SeCPolicyInitDxe.inf -!endif - -!if $(FTPM_ENABLE) =3D=3D TRUE - $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTU= RE)/Tpm2DeviceSeCDxe.inf - SecurityPkg/Tcg/MemoryOverwriteControl/TcgMor.inf - SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.inf{ - - NULL|SecurityPkg/Library/HashInstanceLibSha1/HashInstanceLibSha1.inf - NULL|SecurityPkg/Library/HashInstanceLibSha256/HashInstanceLibSha256= .inf - PcdLib|MdePkg/Library\DxePcdLib/DxePcdLib.inf - Tpm2DeviceLib|Vlv2TbltDevicePkg/Library/Tpm2DeviceLibSeCDxe/Tpm2Devi= ceLibSeC.inf - } - $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTU= RE)/FtpmSmm.inf -!endif !if $(TPM_ENABLED) =3D=3D TRUE SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigPei.inf { @@ -1259,24 +1046,23 @@ [Components.IA32] # # EDK II Related Platform codes # - $(PLATFORM_PACKAGE)/PlatformSmm/PlatformSmm.inf{ + Vlv2TbltDevicePkg/PlatformSmm/PlatformSmm.inf{ !if $(TARGET) !=3D RELEASE DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSeria= lPort.inf !endif PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf } - $(PLATFORM_PACKAGE)/PlatformInfoDxe/PlatformInfoDxe.inf - $(PLATFORM_PACKAGE)/PlatformCpuInfoDxe/PlatformCpuInfoDxe.inf - $(PLATFORM_PACKAGE)/PlatformDxe/PlatformDxe.inf + Vlv2TbltDevicePkg/PlatformInfoDxe/PlatformInfoDxe.inf + Vlv2TbltDevicePkg/PlatformCpuInfoDxe/PlatformCpuInfoDxe.inf + Vlv2TbltDevicePkg/PlatformDxe/PlatformDxe.inf =20 - $(PLATFORM_PACKAGE)/PciPlatform/PciPlatform.inf - $(PLATFORM_PACKAGE)/SaveMemoryConfig/SaveMemoryConfig.inf - $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTU= RE)/PlatformCpuPolicy.inf - $(PLATFORM_PACKAGE)/PpmPolicy/PpmPolicy.inf - $(PLATFORM_PACKAGE)/SmramSaveInfoHandlerSmm/SmramSaveInfoHandlerSmm.inf + Vlv2TbltDevicePkg/PciPlatform/PciPlatform.inf + Vlv2TbltDevicePkg/SaveMemoryConfig/SaveMemoryConfig.inf + Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/PlatformC= puPolicy.inf + Vlv2TbltDevicePkg/PpmPolicy/PpmPolicy.inf !if $(GOP_DRIVER_ENABLE) =3D=3D TRUE - $(PLATFORM_PACKAGE)/PlatformGopPolicy/PlatformGopPolicy.inf + Vlv2TbltDevicePkg/PlatformGopPolicy/PlatformGopPolicy.inf =20 !endif =20 @@ -1287,13 +1073,15 @@ [Components.IA32] MdeModulePkg/Core/PiSmmCore/PiSmmIpl.inf MdeModulePkg/Core/PiSmmCore/PiSmmCore.inf UefiCpuPkg/CpuDxe/CpuDxe.inf + UefiCpuPkg/CpuS3DataDxe/CpuS3DataDxe.inf UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.inf UefiCpuPkg/CpuIo2Smm/CpuIo2Smm.inf MdeModulePkg/Universal/LockBox/SmmLockBox/SmmLockBox.inf UefiCpuPkg/PiSmmCommunication/PiSmmCommunicationSmm.inf - $(PLATFORM_PACKAGE)/SmmSwDispatch2OnSmmSwDispatchThunk/SmmSwDispatch2OnS= mmSwDispatchThunk.inf - $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTU= RE)/PowerManagement2.inf - $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTU= RE)/DigitalThermalSensor.inf + + Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/PowerMana= gement2.inf + Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/DigitalTh= ermalSensor.inf + Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/GraphicDx= eInitSmm.inf =20 # # ACPI @@ -1306,14 +1094,14 @@ [Components.IA32] PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf } + MdeModulePkg/Universal/Acpi/S3SaveStateDxe/S3SaveStateDxe.inf =20 - $(PLATFORM_PACKAGE)/BootScriptSaveDxe/BootScriptSaveDxe.inf IntelFrameworkModulePkg/Universal/Acpi/AcpiSupportDxe/AcpiSupportDxe.inf Vlv2DeviceRefCodePkg/ValleyView2Soc/CPU/PowerManagement/AcpiTables/Power= ManagementAcpiTables.inf =20 - $(PLATFORM_RC_PACKAGE)/AcpiTablesPCAT/AcpiTables.inf + Vlv2DeviceRefCodePkg/AcpiTablesPCAT/AcpiTables.inf =20 - $(PLATFORM_PACKAGE)/AcpiPlatform/AcpiPlatform.inf + Vlv2TbltDevicePkg/AcpiPlatform/AcpiPlatform.inf =20 MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsRes= ourceTableDxe.inf =20 @@ -1323,31 +1111,23 @@ [Components.IA32] MdeModulePkg/Bus/Pci/PciBusDxe/PciBusDxe.inf =20 =20 - $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTU= RE)/ISPDxe.inf + Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/ISPDxe.in= f =20 =20 -# -# ISA -# - $(PLATFORM_PACKAGE)/Wpce791/Wpce791.inf - IntelFrameworkModulePkg/Bus/Isa/IsaBusDxe/IsaBusDxe.inf - IntelFrameworkModulePkg/Bus/Isa/IsaIoDxe/IsaIoDxe.inf - IntelFrameworkModulePkg/Bus/Isa/IsaSerialDxe/IsaSerialDxe.inf - IntelFrameworkModulePkg/Bus/Isa/Ps2MouseDxe/Ps2MouseDxe.inf - IntelFrameworkModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2keyboardDxe.inf -# -# SDIO -# -# $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECT= URE)/MmcHost.inf -# $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECT= URE)/MmcMediaDevice.inf + # + # ISA + # + Vlv2TbltDevicePkg/PcuSio/PcuSio.inf + MdeModulePkg/Bus/Pci/PciSioSerialDxe/PciSioSerialDxe.inf + !if $(ACPI50_ENABLE) =3D=3D TRUE MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTableDxe/FirmwarePerf= ormanceDxe.inf { - TimerLib|$(PLATFORM_PACKAGE)/Library/IntelPchAcpiTimerLib/IntelPchAc= piTimerLib.inf + TimerLib|Vlv2TbltDevicePkg/Library/IntelPchAcpiTimerLib/IntelPchAcpi= TimerLib.inf } MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTableSmm/FirmwarePerf= ormanceSmm.inf { - TimerLib|$(PLATFORM_PACKAGE)/Library/IntelPchAcpiTimerLib/IntelPchAc= piTimerLib.inf + TimerLib|Vlv2TbltDevicePkg/Library/IntelPchAcpiTimerLib/IntelPchAcpi= TimerLib.inf } !endif =20 @@ -1355,7 +1135,6 @@ [Components.IA32] # IDE/SCSI/AHCI # MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThru.inf - IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/IdeBusDxe.inf MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIoDxe.inf MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxe.inf MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf @@ -1379,7 +1158,7 @@ [Components.IA32] gEfiMdePkgTokenSpaceGuid.PcdUefiLibMaxPrintBufferSize|8000 } !if $(SATA_ENABLE) =3D=3D TRUE - $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTU= RE)/SataController.inf + Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/SataContr= oller.inf !endif MdeModulePkg/Bus/Ata/AtaBusDxe/AtaBusDxe.inf !if $(SCSI_ENABLE) =3D=3D TRUE @@ -1392,7 +1171,6 @@ [Components.IA32] MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatformDxe.inf MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterDxe.inf MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsoleDxe.inf - IntelFrameworkModulePkg/Universal/Console/VgaClassDxe/VgaClassDxe.inf MdeModulePkg/Universal/Console/TerminalDxe/TerminalDxe.inf MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngineDxe.inf @@ -1416,9 +1194,9 @@ [Components.IA32] # SMBIOS # MdeModulePkg/Universal/SmbiosDxe/SmbiosDxe.inf - $(PLATFORM_PACKAGE)/SmBiosMiscDxe/SmBiosMiscDxe.inf + Vlv2TbltDevicePkg/SmBiosMiscDxe/SmBiosMiscDxe.inf =20 - $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTU= RE)/SmbiosMemory.inf + Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/SmbiosMem= ory.inf # # CPU/FW Microde # @@ -1433,12 +1211,6 @@ [Components.IA32] # !include NetworkPkg/Network.dsc.inc =20 -!if $(NETWORK_ENABLE) =3D=3D TRUE - !if $(CSM_ENABLE) =3D=3D TRUE - IntelFrameworkModulePkg/Csm/BiosThunk/Snp16Dxe/Snp16Dxe.inf - !endif -!endif - !if $(CAPSULE_ENABLE) || $(MICOCODE_CAPSULE_ENABLE) MdeModulePkg/Universal/EsrtFmpDxe/EsrtFmpDxe.inf MdeModulePkg/Application/CapsuleApp/CapsuleApp.inf @@ -1456,7 +1228,7 @@ [Components.IA32] DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPor= t.inf PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf - SerialPortLib|$(PLATFORM_PACKAGE)/Library/SerialPortLib/SerialPortLi= b.inf + SerialPortLib|MdeModulePkg/Library/BaseSerialPortLib16550/BaseSerial= PortLib16550.inf } !endif =20 @@ -1468,11 +1240,7 @@ [BuildOptions] # # Define token for different Platform # -!if $(MINNOW2_FSP_BUILD) =3D=3D TRUE - DEFINE MINNOW2_FSP_OPTION =3D /DMINNOW2_FSP_BUILD -!else DEFINE MINNOW2_FSP_OPTION =3D -!endif =20 !if $(ENBDT_PF_BUILD) =3D=3D TRUE DEFINE ENBDT_PF_ENABLE =3D /DENBDT_PF_ENABLE=3D1 @@ -1511,11 +1279,6 @@ [BuildOptions] DEFINE X64_BUILD_ENABLE =3D !endif =20 -!if $(FTPM_ENABLE) =3D=3D TRUE - DEFINE DSC_FTPM_BUILD_OPTIONS =3D /DFTPM_ENABLE -!else - DEFINE DSC_FTPM_BUILD_OPTIONS =3D -!endif !if $(TPM_ENABLED) =3D=3D TRUE DEFINE DSC_TPM_BUILD_OPTIONS =3D /DTPM_ENABLED !else @@ -1523,7 +1286,7 @@ [BuildOptions] !endif =20 =20 - DEFINE EDK_EDKII_DSC_FEATURE_BUILD_OPTIONS =3D $(MINNOW2_FSP_OPTION) $(M= INNOW2_BUILD_OPTION) $(ENBDT_PF_ENABLE) $(EXTERNAL_VGA_BUILD_OPTION) $(PCIE= _ENUM_WA_BUILD_OPTION) $(X0_WA_ENABLE_BUILD_OPTION) $(A0_WA_ENABLE_BUILD_OP= TION) $(MICROCODE_FREE_BUILD_OPTIONS) $(SIMICS_BUILD_OPTIONS) $(HYBRID_BUIL= D_OPTIONS) $(COMPACT_BUILD_OPTIONS) $(VP_BUILD_OPTIONS) $(SYSCTL_ID_BUILD_O= PTION) $(CLKGEN_CONFIG_EXTRA_BUILD_OPTION) $(SYSCTL_X0_CONVERT_BOARD_OPTION= ) $(ENBDT_S3_SUPPORT_OPTIONS) $(SATA_SUPPORT_BUILD_OPTION) $(PCIESC_SUPPORT= _BUILD_OPTION) $(DSC_FTPM_BUILD_OPTIONS) $(DSC_FTPM_ERROR_WR_BUILD_OPTIONS)= $(DSC_TPM_BUILD_OPTIONS) $(DSC_BYTI_SECURE_BOOT_BUILD_OPTIONS) + DEFINE EDK_EDKII_DSC_FEATURE_BUILD_OPTIONS =3D $(MINNOW2_FSP_OPTION) $(M= INNOW2_BUILD_OPTION) $(ENBDT_PF_ENABLE) $(EXTERNAL_VGA_BUILD_OPTION) $(PCIE= _ENUM_WA_BUILD_OPTION) $(X0_WA_ENABLE_BUILD_OPTION) $(A0_WA_ENABLE_BUILD_OP= TION) $(MICROCODE_FREE_BUILD_OPTIONS) $(SIMICS_BUILD_OPTIONS) $(HYBRID_BUIL= D_OPTIONS) $(COMPACT_BUILD_OPTIONS) $(VP_BUILD_OPTIONS) $(SYSCTL_ID_BUILD_O= PTION) $(CLKGEN_CONFIG_EXTRA_BUILD_OPTION) $(SYSCTL_X0_CONVERT_BOARD_OPTION= ) $(ENBDT_S3_SUPPORT_OPTIONS) $(SATA_SUPPORT_BUILD_OPTION) $(PCIESC_SUPPORT= _BUILD_OPTION) $(DSC_FTPM_ERROR_WR_BUILD_OPTIONS) $(DSC_TPM_BUILD_OPTIONS) = $(DSC_BYTI_SECURE_BOOT_BUILD_OPTIONS) !if $(PERFORMANCE_ENABLE) =3D=3D TRUE DEFINE PDB_BUILD_OPTION =3D /Zi !endif @@ -1556,76 +1319,6 @@ [BuildOptions.common.EDKII.DXE_SMM_DRIVER, BuildOpti= ons.common.EDKII.SMM_CORE] MSFT:*_*_*_DLINK_FLAGS =3D /ALIGN:4096 GCC:*_*_*_DLINK_FLAGS =3D -z common-page-size=3D0x1000 =20 -[BuildOptions.Common.EDK] - -# -# Define token for different Platform -# -!if $(ENBDT_PF_BUILD) =3D=3D TRUE - DEFINE ENBDT_PF_ENABLE =3D /DENBDT_PF_ENABLE=3D1 -!else - DEFINE ENBDT_PF_ENABLE =3D /DENBDT_PF_ENABLE=3D0 -!endif - -!if $(PERFORMANCE_ENABLE) =3D=3D TRUE - RELEASE_*_*_DLINK_FLAGS =3D /DEBUG -!endif - -!if $(S3_ENABLE) =3D=3D TRUE - DEFINE DSC_S3_BUILD_OPTIONS =3D /DEFI_S3_RESUME -!else - DEFINE DSC_S3_BUILD_OPTIONS =3D -!endif - -!if $(ENBDT_S3_SUPPORT) =3D=3D TRUE - DEFINE ENBDT_S3_SUPPORT_OPTIONS =3D /DNOCS_S3_SUPPORT -!else - DEFINE ENBDT_S3_SUPPORT_OPTIONS =3D -!endif - -!if $(X64_CONFIG) =3D=3D TRUE - DEFINE X64_BUILD_ENABLE =3D /DX64_BUILD_ENABLE=3D1 -!else - DEFINE X64_BUILD_ENABLE =3D -!endif - - - DEFINE EDK_GLUE_LIB_DEBUG =3D - DEFINE DEBUG_BUILD_OPTIONS =3D /D EFI_DEBUG /D DEBUG_MODE=3D1 /GL- $(ED= K_GLUE_LIB_DEBUG) /DEDKII_GLUE_DebugPrintErrorLevel=3D(EFI_D_ERROR) - DEFINE EDK_DSC_FEATURE_BUILD_OPTIONS =3D $(DSC_S3_BUILD_OPTIONS) $(DSC_A= CPI_BUILD_OPTIONS) $(DSC_SEC_BUILD_OPTIONS) $(DSC_FTPM_BUILD_OPTIONS) $(DSC= _FTPM_ERROR_WR_BUILD_OPTIONS) $(DSC_TPM_BUILD_OPTIONS) $(SOFTSDV_BUILD_OPTI= ONS) $(SIMICS_BUILD_OPTIONS) $(HYBRID_BUILD_OPTIONS) $(COMPACT_BUILD_OPTION= S) $(VP_BUILD_OPTIONS) $(QT_BUILD_OPTIONS) $(DSC_BYTI_SECURE_BOOT_BUILD_OPT= IONS) /D$(PROJECT_SC_CHIPSET) - - DEFINE EDK_DSC_OTHER_BUILD_OPTIONS =3D $(EDK_EDKII_DSC_FEATURE_BUILD_OPT= IONS) $(SV_BUILD_OPTIONS) $(INTEL_FASTBOOT_BUILD_OPTION) - DEFINE EDK_DSC_GLOBAL_BUILD_OPTIONS =3D $(ENBDT_PF_ENABLE) $(EDK_DSC_FEA= TURE_BUILD_OPTIONS) $(EDK_DSC_OTHER_BUILD_OPTIONS) /D EFI_SPECIFICATION_VER= SION=3D0x00020000 /D PI_SPECIFICATION_VERSION=3D0x00000009 /D TIANO_RELEA= SE_VERSION=3D0x00080006 /D SUPPORT_DEPRECATED_PCI_CFG_PPI /D CSM_SMMENTRY_P= ORT8DATA8 /D EDKII_GLUE_PciExpressBaseAddress=3D0x$(PLATFORM_PCIEXPRESS_BAS= E) /D MAX_VARIABLE_SIZE=3D0x2000 /D EFI_FIRMWARE_VENDOR=3D"L/"INTEL/"" /D E= FI_BUILD_VERSION=3D"L/"EDKII/"" /DEFI_PEI_REPORT_STATUS_CODE_ON $(ENBDT_S3_= SUPPORT_OPTIONS) - - *_*_IA32_ASM_FLAGS =3D /DEFI32 /D EDKII_GLUE_PciExpressBaseAddre= ss=3D$(PLATFORM_PCIEXPRESS_BASE)h /DNOCS_S3_SUPPORT - DEBUG_*_IA32_CC_FLAGS =3D /D EFI32 $(EDK_DSC_GLOBAL_BUILD_OPTIONS) = $(DEBUG_BUILD_OPTIONS) - RELEASE_*_IA32_CC_FLAGS =3D /D EFI32 $(EDK_DSC_GLOBAL_BUILD_OPTIONS) - DEBUG_*_IA32_VFRPP_FLAGS =3D /D EFI32 $(EDK_DSC_GLOBAL_BUILD_OPTIONS) = $(DEBUG_BUILD_OPTIONS) - RELEASE_*_IA32_VFRPP_FLAGS =3D /D EFI32 $(EDK_DSC_GLOBAL_BUILD_OPTIONS) - DEBUG_*_IA32_APP_FLAGS =3D /D EFI32 $(EDK_DSC_GLOBAL_BUILD_OPTIONS) = $(DEBUG_BUILD_OPTIONS) - RELEASE_*_IA32_APP_FLAGS =3D /D EFI32 $(EDK_DSC_GLOBAL_BUILD_OPTIONS) - DEBUG_*_IA32_PP_FLAGS =3D /D EFI32 $(EDK_DSC_GLOBAL_BUILD_OPTIONS) = $(DEBUG_BUILD_OPTIONS) - RELEASE_*_IA32_PP_FLAGS =3D /D EFI32 $(EDK_DSC_GLOBAL_BUILD_OPTIONS) - *_*_IA32_ASLPP_FLAGS =3D /D EDKII_GLUE_PciExpressBaseAddress=3D0x$= (PLATFORM_PCIEXPRESS_BASE) - *_*_IA32_ASLCC_FLAGS =3D /D EDKII_GLUE_PciExpressBaseAddress=3D0x$= (PLATFORM_PCIEXPRESS_BASE) - *_*_IA32_ASM16_FLAGS =3D /D EDKII_GLUE_PciExpressBaseAddress=3D$(P= LATFORM_PCIEXPRESS_BASE)h - - *_*_X64_ASM_FLAGS =3D /DEFIX64 /D EDKII_GLUE_PciExpressBaseAddr= ess=3D$(PLATFORM_PCIEXPRESS_BASE)h /DNOCS_S3_SUPPORT - DEBUG_*_X64_CC_FLAGS =3D /D EFIX64 $(EDK_DSC_GLOBAL_BUILD_OPTIONS)= $(DEBUG_BUILD_OPTIONS) - RELEASE_*_X64_CC_FLAGS =3D /D EFIX64 $(EDK_DSC_GLOBAL_BUILD_OPTIONS) - DEBUG_*_X64_VFRPP_FLAGS =3D /D EFIX64 $(EDK_DSC_GLOBAL_BUILD_OPTIONS)= $(DEBUG_BUILD_OPTIONS) - RELEASE_*_X64_VFRPP_FLAGS =3D /D EFIX64 $(EDK_DSC_GLOBAL_BUILD_OPTIONS) - DEBUG_*_X64_APP_FLAGS =3D /D EFIX64 $(EDK_DSC_GLOBAL_BUILD_OPTIONS)= $(DEBUG_BUILD_OPTIONS) - RELEASE_*_X64_APP_FLAGS =3D /D EFIX64 $(EDK_DSC_GLOBAL_BUILD_OPTIONS) - DEBUG_*_X64_PP_FLAGS =3D /D EFIX64 $(EDK_DSC_GLOBAL_BUILD_OPTIONS)= $(DEBUG_BUILD_OPTIONS) - RELEASE_*_X64_PP_FLAGS =3D /D EFIX64 $(EDK_DSC_GLOBAL_BUILD_OPTIONS) - *_*_X64_ASLPP_FLAGS =3D /D EDKII_GLUE_PciExpressBaseAddress=3D0x$= (PLATFORM_PCIEXPRESS_BASE) - *_*_X64_ASLCC_FLAGS =3D /D EDKII_GLUE_PciExpressBaseAddress=3D0x$= (PLATFORM_PCIEXPRESS_BASE) - *_*_X64_ASM16_FLAGS =3D /D EDKII_GLUE_PciExpressBaseAddress=3D$(P= LATFORM_PCIEXPRESS_BASE)h - # *_*_*_BUILD_FLAGS =3D -s - *_*_*_VFR_FLAGS =3D -c - *_*_*_BUILD_FLAGS =3D -c - [BuildOptions.Common.EDKII] *_*_IA32_ASM_FLAGS =3D $(VP_BUILD_OPTIONS) /D EDKII_GLUE_PciExpressB= aseAddress=3D$(PLATFORM_PCIEXPRESS_BASE)h /DNOCS_S3_SUPPORT =20 @@ -1640,25 +1333,3 @@ [BuildOptions.Common.EDKII] *_*_X64_APP_FLAGS =3D $(EDK_EDKII_DSC_FEATURE_BUILD_OPTIONS) *_*_X64_PP_FLAGS =3D $(EDK_EDKII_DSC_FEATURE_BUILD_OPTIONS) *_*_X64_ASLPP_FLAGS =3D $(EDK_EDKII_DSC_FEATURE_BUILD_OPTIONS) - - -[Components.IA32] - $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTU= RE)/I2cBus.inf { - - gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0xF0000043 - } - - $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTU= RE)/I2cHost.inf { - - gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0xF0000043 - } - $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTU= RE)/I2cPortA0Pio.inf { - - gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x00000043 - } - - $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTU= RE)/I2cMmioDeviceDxe.inf { - - gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x00000043 - } - diff --git a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgX64.dsc b/Platform= /Intel/Vlv2TbltDevicePkg/PlatformPkgX64.dsc index 9ec48f9fee..c0fe0892ac 100644 --- a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgX64.dsc +++ b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgX64.dsc @@ -18,25 +18,11 @@ [Defines] PLATFORM_GUID =3D 465B0A0B-7AC1-443b-8F67-7B8DEC14= 5F90 PLATFORM_VERSION =3D 0.1 DSC_SPECIFICATION =3D 0x00010005 - - # - # Set platform specific package/folder name, same as passed from PREBUIL= D script. - # PLATFORM_PACKAGE would be the same as PLATFORM_NAME as well as package= build folder - # DEFINE only takes effect at R9 DSC and FDF. - # - DEFINE PLATFORM_PACKAGE =3D Vlv2TbltDevicePkg - DEFINE PLATFORM_RC_PACKAGE =3D Vlv2DeviceRefCodePkg - DEFINE PLATFORM_BINARY_PACKAGE =3D Vlv2SocBinPkg - OUTPUT_DIRECTORY =3D Build/$(PLATFORM_PACKAGE) + OUTPUT_DIRECTORY =3D Build/Vlv2TbltDevicePkg SUPPORTED_ARCHITECTURES =3D IA32|X64 BUILD_TARGETS =3D DEBUG|RELEASE SKUID_IDENTIFIER =3D DEFAULT =20 - DEFINE CPU_ARCH =3DValleyView2 - DEFINE PROJECT_SC_FAMILY =3DIntelPch - DEFINE PROJECT_SC_ROOT =3D../$(PLATFORM_RC_PACKAGE)/ValleyView2= Soc/SouthCluster - DEFINE PROJECT_VLV_ROOT =3D../$(PLATFORM_RC_PACKAGE)/ValleyView= 2Soc/NorthCluster - DEFINE RC_BINARY_RELEASE =3D TRUE # # Platform On/Off features are defined here @@ -47,22 +33,18 @@ [Defines] # 3.BayleyBay # ENBDT_PF_ENABLE =3D TRUE # - !include $(PLATFORM_PACKAGE)/AutoPlatformCFG.txt - !include $(PLATFORM_PACKAGE)/PlatformPkgConfig.dsc + !include Vlv2TbltDevicePkg/AutoPlatformCFG.txt + !include Vlv2TbltDevicePkg/PlatformPkgConfig.dsc =20 DEFINE PLATFORMX64_ENABLE =3D TRUE =20 !if $(X64_CONFIG) =3D=3D TRUE DEFINE DXE_ARCHITECTURE =3D X64 - DEFINE EDK_DXE_ARCHITECTURE =3D X64 - DEFINE UNDI_DXE_ARCHITECTURE =3D 64 !else DEFINE DXE_ARCHITECTURE =3D IA32 - DEFINE EDK_DXE_ARCHITECTURE =3D Ia32 - DEFINE UNDI_DXE_ARCHITECTURE =3D 32 !endif =20 - FLASH_DEFINITION =3D $(PLATFORM_PACKAGE)/PlatformPkg.= fdf + FLASH_DEFINITION =3D Vlv2TbltDevicePkg/PlatformPkg.fd= f !if $(LFMA_ENABLE) =3D=3D TRUE FIX_LOAD_TOP_MEMORY_ADDRESS =3D 0xFFFFFFFFFFFFFFFF DEFINE TOP_MEMORY_ADDRESS =3D 0xFFFFFFFFFFFFFFFF @@ -73,10 +55,6 @@ [Defines] =20 DEFINE PLATFORM_PCIEXPRESS_BASE =3D 0E0000000 =20 - DEFINE SEC_ENABLE =3D FALSE - DEFINE SEC_DEBUG_INFO_ENABLE =3D FALSE - DEFINE FTPM_ENABLE =3D FALSE - ##########################################################################= ###### # # SKU Identification section - list of all SKU IDs supported by this @@ -100,7 +78,6 @@ [LibraryClasses.common] DxeCoreEntryPoint|MdePkg/Library/DxeCoreEntryPoint/DxeCoreEntryPoint.inf UefiDriverEntryPoint|MdePkg/Library/UefiDriverEntryPoint/UefiDriverEntry= Point.inf UefiApplicationEntryPoint|MdePkg/Library/UefiApplicationEntryPoint/UefiA= pplicationEntryPoint.inf - DxeSmmDriverEntryPoint|IntelFrameworkPkg/Library/DxeSmmDriverEntryPoint/= DxeSmmDriverEntryPoint.inf =20 # # Basic @@ -144,8 +121,7 @@ [LibraryClasses.common] GenericBdsLib|$(PLATFORM_PACKAGE)/Override/IntelFrameworkModulePkg/Libra= ry/GenericBdsLib/GenericBdsLib.inf BmpSupportLib|MdeModulePkg/Library/BaseBmpSupportLib/BaseBmpSupportLib.i= nf SafeIntLib|MdePkg/Library/BaseSafeIntLib/BaseSafeIntLib.inf - PlatformBdsLib|$(PLATFORM_PACKAGE)/Library/PlatformBdsLib/PlatformBdsLib= .inf - FlashDeviceLib|$(PLATFORM_PACKAGE)/Library/FlashDeviceLib/FlashDeviceLib= .inf + FlashDeviceLib|Vlv2TbltDevicePkg/Library/FlashDeviceLib/FlashDeviceLib.i= nf UefiBootManagerLib|MdeModulePkg/Library/UefiBootManagerLib/UefiBootManag= erLib.inf # # Framework @@ -167,9 +143,6 @@ [LibraryClasses.common] !if $(SCSI_ENABLE) =3D=3D TRUE UefiScsiLib|MdePkg/Library/UefiScsiLib/UefiScsiLib.inf !endif -!if $(S3_ENABLE) =3D=3D TRUE - S3Lib|IntelFrameworkModulePkg/Library/PeiS3Lib/PeiS3Lib.inf -!endif =20 OemHookStatusCodeLib|MdeModulePkg/Library/OemHookStatusCodeLibNull/OemHo= okStatusCodeLibNull.inf !if $(CAPSULE_ENABLE) =3D=3D TRUE @@ -198,27 +171,27 @@ [LibraryClasses.common] # # ICH # - SmbusLib|$(PLATFORM_PACKAGE)/Library/SmbusLib/SmbusLib.inf - SmmLib|$(PLATFORM_PACKAGE)/Library/PchSmmLib/PchSmmLib.inf + SmbusLib|Vlv2TbltDevicePkg/Library/SmbusLib/SmbusLib.inf + SmmLib|Vlv2TbltDevicePkg/Library/PchSmmLib/PchSmmLib.inf =20 # # Platform # - TimerLib|$(PLATFORM_PACKAGE)/Library/IntelPchAcpiTimerLib/IntelPchAcpiTi= merLib.inf - ResetSystemLib|$(PLATFORM_PACKAGE)/Library/ResetSystemLib/ResetSystemLib= .inf + TimerLib|Vlv2TbltDevicePkg/Library/IntelPchAcpiTimerLib/IntelPchAcpiTime= rLib.inf + ResetSystemLib|Vlv2TbltDevicePkg/Library/ResetSystemLib/ResetSystemLib.i= nf =20 - PlatformCmosLib|$(PLATFORM_PACKAGE)/Library/PlatformCmosLib/PlatformCmos= Lib.inf + PlatformCmosLib|Vlv2TbltDevicePkg/Library/PlatformCmosLib/PlatformCmosLi= b.inf =20 # # Misc # - MonoStatusCodeLib|$(PLATFORM_PACKAGE)/MonoStatusCode/MonoStatusCode.inf + MonoStatusCodeLib|Vlv2TbltDevicePkg/MonoStatusCode/MonoStatusCode.inf !if $(TARGET) =3D=3D RELEASE DebugLib|MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.inf SerialPortLib|MdePkg/Library/BaseSerialPortLibNull/BaseSerialPortLibNull= .inf !else DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.in= f - SerialPortLib|$(PLATFORM_PACKAGE)/Library/SerialPortLib/SerialPortLib.in= f + SerialPortLib|MdeModulePkg/Library/BaseSerialPortLib16550/BaseSerialPort= Lib16550.inf !endif =20 PerformanceLib|MdePkg/Library/BasePerformanceLibNull/BasePerformanceLibN= ull.inf @@ -230,10 +203,11 @@ [LibraryClasses.common] =20 !endif =20 + PlatformHookLib|MdeModulePkg/Library/BasePlatformHookLibNull/BasePlatfor= mHookLibNull.inf + !if $(SOURCE_DEBUG_ENABLE) =3D=3D TRUE PeCoffExtraActionLib|SourceLevelDebugPkg/Library/PeCoffExtraActionLibDeb= ug/PeCoffExtraActionLibDebug.inf DebugCommunicationLib|SourceLevelDebugPkg/Library/DebugCommunicationLibS= erialPort/DebugCommunicationLibSerialPort.inf - PlatformHookLib|MdeModulePkg/Library/BasePlatformHookLibNull/BasePlatfor= mHookLibNull.inf SerialPortLib|MdeModulePkg/Library/BaseSerialPortLib16550/BaseSerialPort= Lib16550.inf !else PeCoffExtraActionLib|MdePkg/Library/BasePeCoffExtraActionLibNull/BasePeC= offExtraActionLibNull.inf @@ -248,10 +222,10 @@ [LibraryClasses.common] OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf !endif =20 - BiosIdLib|$(PLATFORM_PACKAGE)/Library/BiosIdLib/BiosIdLib.inf - CpuIA32Lib|$(PLATFORM_PACKAGE)/Library/CpuIA32Lib/CpuIA32Lib.inf + BiosIdLib|Vlv2TbltDevicePkg/Library/BiosIdLib/BiosIdLib.inf + CpuIA32Lib|Vlv2TbltDevicePkg/Library/CpuIA32Lib/CpuIA32Lib.inf =20 - StallSmmLib|$(PLATFORM_PACKAGE)/Library/StallSmmLib/StallSmmLib.inf + StallSmmLib|Vlv2TbltDevicePkg/Library/StallSmmLib/StallSmmLib.inf =20 !if $(SECURE_BOOT_ENABLE) =3D=3D TRUE OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf @@ -265,15 +239,10 @@ [LibraryClasses.common] AuthVariableLib|MdeModulePkg/Library/AuthVariableLibNull/AuthVariableLib= Null.inf !endif VarCheckLib|MdeModulePkg/Library/VarCheckLib/VarCheckLib.inf -!if $(RC_BINARY_RELEASE) =3D=3D TRUE - I2cLib|Vlv2TbltDevicePkg/Library/I2CLib/I2CLibNull.inf -!endif ShellLib|ShellPkg/Library/UefiShellLib/UefiShellLib.inf - ShellCommandLib|ShellPkg/Library/UefiShellCommandLib/UefiShellCommandLib= .inf - HandleParsingLib|ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsing= Lib.inf FileHandleLib|MdePkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf SortLib|MdeModulePkg/Library/UefiSortLib/UefiSortLib.inf -!if $(FTPM_ENABLE) =3D=3D TRUE || $(NETWORK_ISCSI_ENABLE) =3D=3D TRUE +!if $(NETWORK_ISCSI_ENABLE) =3D=3D TRUE BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf @@ -284,13 +253,6 @@ [LibraryClasses.common] =20 =20 Tpm2CommandLib|SecurityPkg/Library/Tpm2CommandLib/Tpm2CommandLib.inf -!if $(MINNOW2_FSP_BUILD) =3D=3D TRUE - FspApiLib|IntelFspWrapperPkg/Library/BaseFspApiLib/BaseFspApiLib.inf - FspPlatformInfoLib|IntelFspWrapperPkg/Library/BaseFspPlatformInfoLibSamp= le/BaseFspPlatformInfoLibSample.inf - FspPlatformSecLib|Vlv2TbltDevicePkg/FspSupport/Library/SecFspPlatformSec= LibVlv2/FspPlatformSecLibVlv2.inf - FspHobProcessLib|Vlv2TbltDevicePkg/FspSupport/Library/PeiFspHobProcessLi= bVlv2/FspHobProcessLibVlv2.inf -!endif - BootLogoLib|MdeModulePkg/Library/BootLogoLib/BootLogoLib.inf =20 [LibraryClasses.IA32.SEC] @@ -310,14 +272,14 @@ [LibraryClasses.IA32.PEIM, LibraryClasses.IA32.PEI_CO= RE, LibraryClasses.IA32.SEC MemoryAllocationLib|MdePkg/Library/PeiMemoryAllocationLib/PeiMemoryAlloc= ationLib.inf ReportStatusCodeLib|MdeModulePkg/Library/PeiReportStatusCodeLib/PeiRepor= tStatusCodeLib.inf ExtractGuidedSectionLib|MdePkg/Library/PeiExtractGuidedSectionLib/PeiExt= ractGuidedSectionLib.inf - MultiPlatformLib|$(PLATFORM_PACKAGE)/Library/MultiPlatformLib/MultiPlatf= ormLib.inf + MultiPlatformLib|Vlv2TbltDevicePkg/Library/MultiPlatformLib/MultiPlatfor= mLib.inf BaseCryptLib|CryptoPkg/Library/BaseCryptLib/PeiCryptLib.inf CpuExceptionHandlerLib|UefiCpuPkg/Library/CpuExceptionHandlerLib/SecPeiC= puExceptionHandlerLib.inf MpInitLib|UefiCpuPkg/Library/MpInitLib/PeiMpInitLib.inf =20 !if $(PERFORMANCE_ENABLE) =3D=3D TRUE PerformanceLib|MdeModulePkg/Library/PeiPerformanceLib/PeiPerformanceLib.= inf - TimerLib|$(PLATFORM_PACKAGE)/Library/IntelPchAcpiTimerLib/IntelPchAcpiTi= merLib.inf + TimerLib|Vlv2TbltDevicePkg/Library/IntelPchAcpiTimerLib/IntelPchAcpiTime= rLib.inf !endif =20 !if $(TARGET) =3D=3D RELEASE @@ -325,7 +287,7 @@ [LibraryClasses.IA32.PEIM, LibraryClasses.IA32.PEI_CORE= , LibraryClasses.IA32.SEC SerialPortLib|MdePkg/Library/BaseSerialPortLibNull/BaseSerialPortLibNull= .inf !else DebugLib|MdeModulePkg/Library/PeiDxeDebugLibReportStatusCode/PeiDxeDebug= LibReportStatusCode.inf - SerialPortLib|$(PLATFORM_PACKAGE)/Library/SerialPortLib/SerialPortLib.in= f + SerialPortLib|MdeModulePkg/Library/BaseSerialPortLib16550/BaseSerialPort= Lib16550.inf !endif =20 LockBoxLib|MdeModulePkg/Library/SmmLockBoxLib/SmmLockBoxPeiLib.inf @@ -334,13 +296,6 @@ [LibraryClasses.IA32.PEIM, LibraryClasses.IA32.PEI_COR= E, LibraryClasses.IA32.SEC DebugAgentLib|SourceLevelDebugPkg/Library/DebugAgent/SecPeiDebugAgentLib= .inf !endif =20 - !if $(MINNOW2_FSP_BUILD) =3D=3D TRUE - PlatformFspLib|Vlv2TbltDevicePkg/Library/PlatformFspLib/PlatformFspLib.in= f - !endif -!if $(FTPM_ENABLE) =3D=3D TRUE - Tpm2DeviceLib|Vlv2TbltDevicePkg/Library/Tpm2DeviceLibSeCPei/Tpm2DeviceLi= bSeC.inf -!endif - [LibraryClasses.X64] # # DXE phase common @@ -357,7 +312,7 @@ [LibraryClasses.X64] !endif =20 LockBoxLib|MdeModulePkg/Library/SmmLockBoxLib/SmmLockBoxDxeLib.inf - EfiRegTableLib|$(PLATFORM_PACKAGE)/Library/EfiRegTableLib/EfiRegTableLib= .inf + EfiRegTableLib|Vlv2TbltDevicePkg/Library/EfiRegTableLib/EfiRegTableLib.i= nf =20 !if $(SECURE_BOOT_ENABLE) =3D=3D TRUE BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf @@ -372,14 +327,14 @@ [LibraryClasses.X64.DXE_DRIVER] CustomizedDisplayLib|MdeModulePkg/Library/CustomizedDisplayLib/Customize= dDisplayLib.inf !if $(PERFORMANCE_ENABLE) =3D=3D TRUE PerformanceLib|MdeModulePkg/Library/DxePerformanceLib/DxePerformanceLib.= inf - TimerLib|$(PLATFORM_PACKAGE)/Library/IntelPchAcpiTimerLib/IntelPchAcpiTi= merLib.inf + TimerLib|Vlv2TbltDevicePkg/Library/IntelPchAcpiTimerLib/IntelPchAcpiTime= rLib.inf !endif =20 !if $(SOURCE_DEBUG_ENABLE) =3D=3D TRUE DebugAgentLib|SourceLevelDebugPkg/Library/DebugAgent/DxeDebugAgentLib.in= f !endif =20 - FlashDeviceLib|$(PLATFORM_PACKAGE)/Library/FlashDeviceLib/FlashDeviceLib= Dxe.inf + FlashDeviceLib|Vlv2TbltDevicePkg/Library/FlashDeviceLib/FlashDeviceLibDx= e.inf =20 [LibraryClasses.X64.DXE_CORE] HobLib|MdePkg/Library/DxeCoreHobLib/DxeCoreHobLib.inf @@ -387,7 +342,7 @@ [LibraryClasses.X64.DXE_CORE] PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf !if $(PERFORMANCE_ENABLE) =3D=3D TRUE PerformanceLib|MdeModulePkg/Library/DxeCorePerformanceLib/DxeCorePerform= anceLib.inf - TimerLib|$(PLATFORM_PACKAGE)/Library/IntelPchAcpiTimerLib/IntelPchAcpiTi= merLib.inf + TimerLib|Vlv2TbltDevicePkg/Library/IntelPchAcpiTimerLib/IntelPchAcpiTime= rLib.inf !endif =20 !if $(SOURCE_DEBUG_ENABLE) =3D=3D TRUE @@ -412,7 +367,7 @@ [LibraryClasses.X64.DXE_SMM_DRIVER] =20 !if $(SOURCE_DEBUG_ENABLE) =3D=3D TRUE DebugAgentLib|SourceLevelDebugPkg/Library/DebugAgent/SmmDebugAgentLib.in= f - TimerLib|$(PLATFORM_PACKAGE)/Library/IntelPchAcpiTimerLib/IntelPchAcpiTi= merLib.inf + TimerLib|Vlv2TbltDevicePkg/Library/IntelPchAcpiTimerLib/IntelPchAcpiTime= rLib.inf !endif CpuExceptionHandlerLib|UefiCpuPkg/Library/CpuExceptionHandlerLib/SmmCpuE= xceptionHandlerLib.inf =20 @@ -486,12 +441,6 @@ [PcdsFeatureFlag.common] gEfiMdeModulePkgTokenSpaceGuid.PcdSupportUpdateCapsuleReset|TRUE !else gEfiMdeModulePkgTokenSpaceGuid.PcdSupportUpdateCapsuleReset|FALSE -!endif - gEfiCpuTokenSpaceGuid.PcdCpuSmmEnableBspElection|FALSE -!if $(DATAHUB_STATUS_CODE_ENABLE) =3D=3D TRUE - gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeUseDataHub|TRUE -!else - gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeUseDataHub|FALSE !endif gEfiMdeModulePkgTokenSpaceGuid.PcdPeiCoreImageLoaderSearchTeSectionFirst= |FALSE !if $(TARGET) =3D=3D RELEASE @@ -517,59 +466,20 @@ [PcdsFeatureFlag.common] !endif =20 =20 - ## This PCD specifies whether PS2 keyboard does a extended verification = during start. - gEfiMdeModulePkgTokenSpaceGuid.PcdPs2KbdExtendedVerification|FALSE - - ## This PCD specifies whether PS2 mouse does a extended verification dur= ing start. - gEfiMdeModulePkgTokenSpaceGuid.PcdPs2MouseExtendedVerification|FALSE - !if $(VARIABLE_INFO_ENABLE) =3D=3D TRUE gEfiMdeModulePkgTokenSpaceGuid.PcdVariableCollectStatistics|TRUE !else gEfiMdeModulePkgTokenSpaceGuid.PcdVariableCollectStatistics|FALSE !endif =20 - gEfiCpuTokenSpaceGuid.PcdCpuSmmBlockStartupThisAp|TRUE - !if $(SOURCE_DEBUG_ENABLE) gUefiCpuPkgTokenSpaceGuid.PcdCpuSmmDebug|TRUE !endif =20 + gEfiMdeModulePkgTokenSpaceGuid.PcdInstallAcpiSdtProtocol|TRUE + gUefiCpuPkgTokenSpaceGuid.PcdCpuSmmBlockStartupThisAp|TRUE + [PcdsFixedAtBuild.common] -!if $(MINNOW2_FSP_BUILD) =3D=3D TRUE -# $(FLASH_REGION_VLVMICROCODE_BASE) - gFspWrapperTokenSpaceGuid.PcdCpuMicrocodePatchAddress|0xFFC00000 -# $(FLASH_REGION_VLVMICROCODE_SIZE) - gFspWrapperTokenSpaceGuid.PcdCpuMicrocodePatchRegionSize|0x00040000 - gFspWrapperTokenSpaceGuid.PcdFlashMicroCodeOffset|0x60 -# $(FLASH_AREA_BASE_ADDRESS) - gFspWrapperTokenSpaceGuid.PcdFlashCodeCacheAddress|0xFF800000 -# $(FLASH_AREA_SIZE) - gFspWrapperTokenSpaceGuid.PcdFlashCodeCacheSize|0x00800000 -# $(FLASH_REGION_FSPBIN_BASE) - gFspWrapperTokenSpaceGuid.PcdFlashFvFspBase|0xFFCC0000 -!endif - -!if $(PERFORMANCE_ENABLE) =3D=3D TRUE -!if $(MINNOW2_FSP_BUILD) =3D=3D TRUE - # in FSP, when this got used, the memory already is up - gEfiCpuTokenSpaceGuid.PcdTemporaryRamBase|0x00080000 -!else - gEfiCpuTokenSpaceGuid.PcdTemporaryRamBase|0xFEF80000 -!endif - gEfiCpuTokenSpaceGuid.PcdTemporaryRamSize|0x00010000 - -!else - !if $(MINNOW2_FSP_BUILD) =3D=3D TRUE - gEfiCpuTokenSpaceGuid.PcdTemporaryRamBase|0x00080000 - !else - gEfiCpuTokenSpaceGuid.PcdTemporaryRamBase|0xFEF80000 - !endif - gEfiCpuTokenSpaceGuid.PcdTemporaryRamSize|0x00010000 - gEfiCpuTokenSpaceGuid.PcdPeiTemporaryRamStackSize|0x3C00 -!endif - - !if $(SECURE_BOOT_ENABLE) =3D=3D TRUE gEfiMdeModulePkgTokenSpaceGuid.PcdMaxVariableSize|0x22000 !else @@ -577,11 +487,8 @@ [PcdsFixedAtBuild.common] !endif gEfiMdeModulePkgTokenSpaceGuid.PcdHwErrStorageSize|0x00000800 gEfiMdeModulePkgTokenSpaceGuid.PcdMaxHardwareErrorVariableSize|0x400 - gEfiCpuTokenSpaceGuid.PcdCpuIEDRamSize|0x400000 - gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdS3AcpiReservedMemorySize|0x= 10000 gEfiMdeModulePkgTokenSpaceGuid.PcdSrIovSupport|FALSE gEfiMdeModulePkgTokenSpaceGuid.PcdAriSupport|FALSE - gEfiCpuTokenSpaceGuid.PcdCpuSmmApSyncTimeout|1000 !if $(S4_ENABLE) =3D=3D TRUE gEfiMdeModulePkgTokenSpaceGuid.PcdResetOnMemoryTypeInformationChange|TRU= E !else @@ -599,13 +506,9 @@ [PcdsFixedAtBuild.common] gEfiMdeModulePkgTokenSpaceGuid.PcdMaxPeiPerformanceLogEntries|60 !endif =20 - gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdEbdaReservedMemorySize|0x10= 000 gEfiMdeModulePkgTokenSpaceGuid.PcdLoadModuleAtFixAddressEnable|$(TOP_MEM= ORY_ADDRESS) gEfiMdeModulePkgTokenSpaceGuid.PcdBrowserSubtitleTextColor|0x0 gEfiMdeModulePkgTokenSpaceGuid.PcdBrowserFieldTextColor|0x01 - gEfiCpuTokenSpaceGuid.PcdCpuIEDEnabled|TRUE - gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdBiosVideoCheckVbeEnable|TRU= E - gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdBiosVideoCheckVgaEnable|TRU= E =20 !if $(SOURCE_DEBUG_ENABLE) =3D=3D TRUE gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x17 @@ -651,11 +554,6 @@ [PcdsFixedAtBuild.IA32] [PcdsPatchableInModule.common] gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x803805c6 gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseAddress|0x$(PLATFORM_PCIEXPRES= S_BASE) - gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdLegacyBiosCacheLegacyRegion= |FALSE - - ## This PCD specifies whether to use the optimized timing for best PS2 d= etection performance. - # Note this PCD could be set to TRUE for best boot performance and set = to FALSE for best device compatibility. - gEfiMdeModulePkgTokenSpaceGuid.PcdFastPS2Detection|TRUE =20 ########################################################################= ############################### # @@ -830,10 +728,6 @@ [PcdsDynamicExDefault.common.DEFAULT] gEfiVLVTokenSpaceGuid.PcdFTPMStatus|0 gEfiMdeModulePkgTokenSpaceGuid.PcdS3BootScriptTablePrivateSmmDataPtr|0 gEfiMdeModulePkgTokenSpaceGuid.PcdS3BootScriptTablePrivateDataPtr|0 - gEfiCpuTokenSpaceGuid.PcdCpuS3DataAddress|0 - gEfiCpuTokenSpaceGuid.PcdCpuHotPlugDataAddress|0 - gEfiCpuTokenSpaceGuid.PcdCpuCallbackSignal|0 - gEfiCpuTokenSpaceGuid.PcdCpuConfigContextBuffer|0 gEfiVLVTokenSpaceGuid.PcdCpuLockBoxDataAddress|0 gEfiVLVTokenSpaceGuid.PcdCpuSmramCpuDataAddress|0 gEfiVLVTokenSpaceGuid.PcdCpuLockBoxSize|0 @@ -846,24 +740,7 @@ [PcdsDynamicExDefault.X64.DEFAULT] =20 [Components.IA32] =20 - $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/SecCore.inf - - !if $(MINNOW2_FSP_BUILD) =3D=3D TRUE - IntelFspWrapperPkg/FspWrapperSecCore/FspWrapperSecCore.inf { - !if $(TARGET) =3D=3D DEBUG - - - DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPor= t.inf - !endif - } - Vlv2TbltDevicePkg/FspSupport/BootModePei/BootModePei.inf - IntelFspWrapperPkg/FspInitPei/FspInitPei.inf { - !if $(TARGET) =3D=3D DEBUG - - DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPor= t.inf - !endif - } - !endif + Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/IA32/SecCore.inf =20 MdeModulePkg/Core/Pei/PeiMain.inf { !if $(TARGET) =3D=3D DEBUG @@ -874,31 +751,23 @@ [Components.IA32] gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x80000046 } =20 - $(PLATFORM_PACKAGE)/MonoStatusCode/MonoStatusCode.inf { + Vlv2TbltDevicePkg/MonoStatusCode/MonoStatusCode.inf { !if $(TARGET) =3D=3D DEBUG gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x2E !endif } - $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/MemoryInit.= inf { + Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/IA32/MemoryInit.inf { gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x80000046 - - !if $(FTPM_ENABLE)=3D=3DTRUE - *_*_IA32_CC_FLAGS =3D /D FTPM_ENABLE - !endif } =20 !if $(RC_BINARY_RELEASE) =3D=3D TRUE - $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/SeCUma.inf -!endif - -!if $(FTPM_ENABLE) =3D=3D TRUE -$(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/fTPMInitPeim.= inf + Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/IA32/SeCUma.inf !endif =20 !if $(RC_BINARY_RELEASE) =3D=3D TRUE - $(PLATFORM_PACKAGE)/PlatformPei/PlatformPei.inf { + Vlv2TbltDevicePkg/PlatformPei/PlatformPei.inf { *_*_IA32_CC_FLAGS =3D /DRC_BINARY_RELEASE !if $(TARGET) =3D=3D DEBUG @@ -918,10 +787,6 @@ [Components.IA32] } !endif =20 -!if $(FTPM_ENABLE) =3D=3D TRUE - $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/Tpm2DeviceS= eCPei.inf -!endif - !if $(TPM_ENABLED) =3D=3D TRUE SecurityPkg/Tcg/PhysicalPresencePei/PhysicalPresencePei.inf SecurityPkg/Tcg/TcgPei/TcgPei.inf { @@ -932,7 +797,7 @@ [Components.IA32] } !endif =20 - $(PLATFORM_PACKAGE)/PlatformInitPei/PlatformInitPei.inf { + Vlv2TbltDevicePkg/PlatformInitPei/PlatformInitPei.inf { gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x803805c6 @@ -941,34 +806,33 @@ [Components.IA32] !endif PcdLib|MdePkg/Library/PeiPcdLib/PeiPcdLib.inf } - $(PLATFORM_PACKAGE)/FvInfoPei/FvInfoPei.inf + Vlv2TbltDevicePkg/FvInfoPei/FvInfoPei.inf =20 - $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/VlvInitPeim= .inf + Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/IA32/VlvInitPeim.inf !if $(PCIESC_ENABLE) =3D=3D TRUE - $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/PchEarlyIni= tPeim.inf { + Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/IA32/PchEarlyInitPeim.inf { gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x80000046 } !endif - $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/PchInitPeim= .inf + Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/IA32/PchInitPeim.inf =20 =20 - $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/PchSmbusArp= Disabled.inf - $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/PchSpiPeim.= inf - $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/PeiSmmAcces= s.inf - $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/PeiSmmContr= ol.inf + Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/IA32/PchSmbusArpDisabled.inf + Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/IA32/PchSpiPeim.inf + Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/IA32/PeiSmmAccess.inf + Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/IA32/PeiSmmControl.inf MdeModulePkg/Universal/PCD/Pei/Pcd.inf - $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/CpuPeim.inf + Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/IA32/CpuPeim.inf UefiCpuPkg/CpuIoPei/CpuIoPei.inf UefiCpuPkg/Universal/Acpi/S3Resume2Pei/S3Resume2Pei.inf - $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/MpS3.inf -# $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/PiSmmCommu= nicationPei.inf + UefiCpuPkg/PiSmmCommunication/PiSmmCommunicationPei.inf =20 !if $(RECOVERY_ENABLE) # # Recovery # - $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/PchUsb.inf + Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/IA32/PchUsb.inf MdeModulePkg/Bus/Pci/EhciPei/EhciPei.inf MdeModulePkg/Bus/Usb/UsbBusPei/UsbBusPei.inf MdeModulePkg/Bus/Usb/UsbBotPei/UsbBotPei.inf @@ -994,17 +858,6 @@ [Components.IA32] MdeModulePkg/Universal/Variable/Pei/VariablePei.inf MdeModulePkg/Universal/FaultTolerantWritePei/FaultTolerantWritePei.inf =20 -!if $(FTPM_ENABLE) =3D=3D TRUE - SecurityPkg/Tcg/Tcg2Pei/Tcg2Pei.inf { - - gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x80000046 - - DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPor= t.inf - NULL|SecurityPkg/Library\HashInstanceLibSha1/HashInstanceLibSha1.inf - NULL|SecurityPkg/Library/HashInstanceLibSha256/HashInstanceLibSha256= .inf - PcdLib|MdePkg/Library/PeiPcdLib/PeiPcdLib.inf - } -!endif !if $(TPM_ENABLED) =3D=3D TRUE SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigPei.inf { @@ -1014,7 +867,7 @@ [Components.IA32] !if $(ACPI50_ENABLE) =3D=3D TRUE MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTablePei/FirmwarePerf= ormancePei.inf{ - TimerLib|$(PLATFORM_PACKAGE)/Library/IntelPchAcpiTimerLib/IntelPchAc= piTimerLib.inf + TimerLib|Vlv2TbltDevicePkg/Library/IntelPchAcpiTimerLib/IntelPchAcpi= TimerLib.inf } =20 !endif @@ -1022,17 +875,6 @@ [Components.IA32] MdeModulePkg/Universal/ReportStatusCodeRouter/Pei/ReportStatusCodeRouter= Pei.inf !endif [Components.X64] - !if $(MINNOW2_FSP_BUILD) =3D=3D TRUE - IntelFspWrapperPkg/FspNotifyDxe/FspNotifyDxe.inf { - !if $(TARGET) =3D=3D DEBUG - - gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x80000046 - - DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPor= t.inf - !endif - } - - !endif # # EDK II Related Platform codes # @@ -1050,24 +892,10 @@ [Components.X64] DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPor= t.inf !endif } - IntelFrameworkModulePkg/Universal/Acpi/AcpiS3SaveDxe/AcpiS3SaveDxe.inf { - - gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0xF0000043 - - gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x27 - - !if $(TARGET) !=3D RELEASE - DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSeria= lPort.inf - !endif - - ICC:*_*_*_CC_FLAGS =3D /D MDEPKG_NDEBUG - GCC:*_*_*_CC_FLAGS =3D -D MDEPKG_NDEBUG - } MdeModulePkg/Universal/PCD/Dxe/Pcd.inf { PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf } - IntelFrameworkModulePkg/Universal/CpuIoDxe/CpuIoDxe.inf UefiCpuPkg/CpuIo2Dxe/CpuIo2Dxe.inf =20 MdeModulePkg/Universal/ReportStatusCodeRouter/RuntimeDxe/ReportStatusCod= eRouterRuntimeDxe.inf @@ -1100,13 +928,9 @@ [Components.X64] =20 !if $(TPM_ENABLED) =3D=3D TRUE NULL|SecurityPkg/Library/DxeTpmMeasureBootLib/DxeTpmMeasureBootLib.i= nf -!endif -!if $(FTPM_ENABLE) =3D=3D TRUE - NULL|SecurityPkg/Library/DxeTpm2MeasureBootLib/DxeTpm2MeasureBootLib= .inf !endif } - $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTU= RE)/MpCpu.inf - $(PLATFORM_PACKAGE)/Metronome/Metronome.inf + MdeModulePkg/Universal/Metronome/Metronome.inf =20 IntelFrameworkModulePkg/Universal/BdsDxe/BdsDxe.inf{ @@ -1116,12 +940,8 @@ [Components.X64] PlatformBdsLib|$(PLATFORM_PACKAGE)/Library/PlatformBdsLib/PlatformBd= sLib.inf DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPor= t.inf PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf - SerialPortLib|$(PLATFORM_PACKAGE)/Library/SerialPortLib/SerialPortLi= b.inf - !if $(FTPM_ENABLE) =3D=3D TRUE - Tpm2DeviceLib|Vlv2TbltDevicePkg/Library/Tpm2DeviceLibSeCDxe/Tpm2Devi= ceLibSeC.inf - !else + SerialPortLib|MdeModulePkg/Library/BaseSerialPortLib16550/BaseSerial= PortLib16550.inf Tpm2DeviceLib|SecurityPkg/Library/Tpm2DeviceLibTcg2/Tpm2DeviceLibTcg= 2.inf - !endif } =20 $(PLATFORM_PACKAGE)/UiApp/UiApp.inf @@ -1133,11 +953,11 @@ [Components.X64] MdeModulePkg/Universal/Variable/RuntimeDxe/VariableSmm.inf { NULL|MdeModulePkg/Library/VarCheckUefiLib/VarCheckUefiLib.inf - SerialPortLib|$(PLATFORM_PACKAGE)/Library/SerialPortLib/SerialPortLi= b.inf + SerialPortLib|MdeModulePkg/Library/BaseSerialPortLib16550/BaseSerial= PortLib16550.inf } - $(PLATFORM_PACKAGE)/FvbRuntimeDxe/FvbSmm.inf + Vlv2TbltDevicePkg/FvbRuntimeDxe/FvbSmm.inf MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteSmm.inf - $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTU= RE)/PchSpiSmm.inf + Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/PchSpiSmm= .inf !if $(SECURE_BOOT_ENABLE) =3D=3D TRUE SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigDx= e.inf { @@ -1159,9 +979,9 @@ [Components.X64] PcAtChipsetPkg/PcatRealTimeClockRuntimeDxe/PcatRealTimeClockRuntimeDxe.i= nf MdeModulePkg/Universal/DevicePathDxe/DevicePathDxe.inf =20 - $(PLATFORM_PACKAGE)/FvbRuntimeDxe/FvbRuntimeDxe.inf + Vlv2TbltDevicePkg/FvbRuntimeDxe/FvbRuntimeDxe.inf =20 - $(PLATFORM_PACKAGE)/PlatformSetupDxe/PlatformSetupDxe.inf + Vlv2TbltDevicePkg/PlatformSetupDxe/PlatformSetupDxe.inf =20 !if $(DATAHUB_ENABLE) =3D=3D TRUE IntelFrameworkModulePkg/Universal/DataHubDxe/DataHubDxe.inf { @@ -1169,38 +989,30 @@ [Components.X64] gEfiMdePkgTokenSpaceGuid.PcdMaximumLinkedListLength|0 } !endif - IntelFrameworkModulePkg/Universal/StatusCode/DatahubStatusCodeHandlerDxe= /DatahubStatusCodeHandlerDxe.inf MdeModulePkg/Universal/MemoryTest/NullMemoryTestDxe/NullMemoryTestDxe.in= f - $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTU= RE)/PchS3SupportDxe.inf - !if $(USE_HPET_TIMER) =3D=3D TRUE - PcAtChipsetPkg/HpetTimerDxe/HpetTimerDxe.inf - !else - $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTU= RE)/SmartTimer.inf - !endif - $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTU= RE)/SmmControl.inf + Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/PchS3Supp= ortDxe.inf + PcAtChipsetPkg/HpetTimerDxe/HpetTimerDxe.inf + Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/SmmContro= l.inf =20 - $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTU= RE)/PchSmbusDxe.inf - $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTU= RE)/IntelPchLegacyInterrupt.inf - $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTU= RE)/PchReset.inf - $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTU= RE)/PchInitDxe.inf{ + Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/PchSmbusD= xe.inf + Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/PchReset.= inf + Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/PchInitDx= e.inf{ gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0xF0000043 } - $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTU= RE)/PchInitSmm.inf + Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/PchInitSm= m.inf =20 - $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTU= RE)/PchSmiDispatcher.inf + Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/PchSmiDis= patcher.inf =20 !if $(PCIESC_ENABLE) =3D=3D TRUE - $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTU= RE)/PchPcieSmm.inf + Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/PchPcieSm= m.inf !endif - $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTU= RE)/PchSpiRuntime.inf - $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTU= RE)/PchPolicyInitDxe.inf - $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTU= RE)/PchBiosWriteProtect.inf - $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTU= RE)/SmmAccess.inf - $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTU= RE)/PciHostBridge.inf - $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTU= RE)/VlvInitDxe.inf - - IntelFrameworkModulePkg/Universal/LegacyRegionDxe/LegacyRegionDxe.inf + Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/PchSpiRun= time.inf + Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/PchPolicy= InitDxe.inf + Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/PchBiosWr= iteProtect.inf + Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/SmmAccess= .inf + Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/PciHostBr= idge.inf + Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/VlvInitDx= e.inf =20 # # Performance Application; Set PERFORMANCE_ENABLE=3DTRUE for normal boot= performance and smm performance data @@ -1220,35 +1032,9 @@ [Components.X64] PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf } =20 - $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTU= RE)/Dptf.inf - $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTU= RE)/PnpDxe.inf + Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/Dptf.inf + Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/PnpDxe.in= f =20 -!if $(SEC_ENABLE) =3D=3D TRUE - $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTU= RE)/HeciDrv.inf { -!if $(SEC_DEBUG_INFO_ENABLE) =3D=3D TRUE - - *_*_X64_CC_FLAGS =3D /DSEC_DEBUG_INFO=3D1 -!else - - *_*_X64_CC_FLAGS =3D /DSEC_DEBUG_INFO=3D0 -!endif - } - - $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTU= RE)/SeCPolicyInitDxe.inf -!endif - -!if $(FTPM_ENABLE) =3D=3D TRUE - $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTU= RE)/Tpm2DeviceSeCDxe.inf - SecurityPkg/Tcg/MemoryOverwriteControl/TcgMor.inf - SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.inf{ - - NULL|SecurityPkg/Library/HashInstanceLibSha1/HashInstanceLibSha1.inf - NULL|SecurityPkg/Library/HashInstanceLibSha256/HashInstanceLibSha256= .inf - PcdLib|MdePkg/Library\DxePcdLib/DxePcdLib.inf - Tpm2DeviceLib|Vlv2TbltDevicePkg/Library/Tpm2DeviceLibSeCDxe/Tpm2Devi= ceLibSeC.inf - } - $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTU= RE)/FtpmSmm.inf -!endif !if $(TPM_ENABLED) =3D=3D TRUE SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigPei.inf { @@ -1275,24 +1061,23 @@ [Components.X64] # # EDK II Related Platform codes # - $(PLATFORM_PACKAGE)/PlatformSmm/PlatformSmm.inf{ + Vlv2TbltDevicePkg/PlatformSmm/PlatformSmm.inf{ !if $(TARGET) !=3D RELEASE DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSeria= lPort.inf !endif PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf } - $(PLATFORM_PACKAGE)/PlatformInfoDxe/PlatformInfoDxe.inf - $(PLATFORM_PACKAGE)/PlatformCpuInfoDxe/PlatformCpuInfoDxe.inf - $(PLATFORM_PACKAGE)/PlatformDxe/PlatformDxe.inf + Vlv2TbltDevicePkg/PlatformInfoDxe/PlatformInfoDxe.inf + Vlv2TbltDevicePkg/PlatformCpuInfoDxe/PlatformCpuInfoDxe.inf + Vlv2TbltDevicePkg/PlatformDxe/PlatformDxe.inf =20 - $(PLATFORM_PACKAGE)/PciPlatform/PciPlatform.inf - $(PLATFORM_PACKAGE)/SaveMemoryConfig/SaveMemoryConfig.inf - $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTU= RE)/PlatformCpuPolicy.inf - $(PLATFORM_PACKAGE)/PpmPolicy/PpmPolicy.inf - $(PLATFORM_PACKAGE)/SmramSaveInfoHandlerSmm/SmramSaveInfoHandlerSmm.inf + Vlv2TbltDevicePkg/PciPlatform/PciPlatform.inf + Vlv2TbltDevicePkg/SaveMemoryConfig/SaveMemoryConfig.inf + Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/PlatformC= puPolicy.inf + Vlv2TbltDevicePkg/PpmPolicy/PpmPolicy.inf !if $(GOP_DRIVER_ENABLE) =3D=3D TRUE - $(PLATFORM_PACKAGE)/PlatformGopPolicy/PlatformGopPolicy.inf + Vlv2TbltDevicePkg/PlatformGopPolicy/PlatformGopPolicy.inf =20 !endif =20 @@ -1303,13 +1088,15 @@ [Components.X64] MdeModulePkg/Core/PiSmmCore/PiSmmIpl.inf MdeModulePkg/Core/PiSmmCore/PiSmmCore.inf UefiCpuPkg/CpuDxe/CpuDxe.inf + UefiCpuPkg/CpuS3DataDxe/CpuS3DataDxe.inf UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.inf UefiCpuPkg/CpuIo2Smm/CpuIo2Smm.inf MdeModulePkg/Universal/LockBox/SmmLockBox/SmmLockBox.inf UefiCpuPkg/PiSmmCommunication/PiSmmCommunicationSmm.inf - $(PLATFORM_PACKAGE)/SmmSwDispatch2OnSmmSwDispatchThunk/SmmSwDispatch2OnS= mmSwDispatchThunk.inf - $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTU= RE)/PowerManagement2.inf - $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTU= RE)/DigitalThermalSensor.inf + + Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/PowerMana= gement2.inf + Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/DigitalTh= ermalSensor.inf + Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/GraphicDx= eInitSmm.inf =20 # # ACPI @@ -1322,14 +1109,14 @@ [Components.X64] PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf } + MdeModulePkg/Universal/Acpi/S3SaveStateDxe/S3SaveStateDxe.inf =20 - $(PLATFORM_PACKAGE)/BootScriptSaveDxe/BootScriptSaveDxe.inf IntelFrameworkModulePkg/Universal/Acpi/AcpiSupportDxe/AcpiSupportDxe.inf Vlv2DeviceRefCodePkg/ValleyView2Soc/CPU/PowerManagement/AcpiTables/Power= ManagementAcpiTables.inf =20 - $(PLATFORM_RC_PACKAGE)/AcpiTablesPCAT/AcpiTables.inf + Vlv2DeviceRefCodePkg/AcpiTablesPCAT/AcpiTables.inf =20 - $(PLATFORM_PACKAGE)/AcpiPlatform/AcpiPlatform.inf + Vlv2TbltDevicePkg/AcpiPlatform/AcpiPlatform.inf =20 MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsRes= ourceTableDxe.inf =20 @@ -1339,31 +1126,23 @@ [Components.X64] MdeModulePkg/Bus/Pci/PciBusDxe/PciBusDxe.inf =20 =20 - $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTU= RE)/ISPDxe.inf + Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/ISPDxe.in= f =20 =20 -# -# ISA -# - $(PLATFORM_PACKAGE)/Wpce791/Wpce791.inf - IntelFrameworkModulePkg/Bus/Isa/IsaBusDxe/IsaBusDxe.inf - IntelFrameworkModulePkg/Bus/Isa/IsaIoDxe/IsaIoDxe.inf - IntelFrameworkModulePkg/Bus/Isa/IsaSerialDxe/IsaSerialDxe.inf - IntelFrameworkModulePkg/Bus/Isa/Ps2MouseDxe/Ps2MouseDxe.inf - IntelFrameworkModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2keyboardDxe.inf -# -# SDIO -# -# $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECT= URE)/MmcHost.inf -# $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECT= URE)/MmcMediaDevice.inf + # + # ISA + # + Vlv2TbltDevicePkg/PcuSio/PcuSio.inf + MdeModulePkg/Bus/Pci/PciSioSerialDxe/PciSioSerialDxe.inf + !if $(ACPI50_ENABLE) =3D=3D TRUE MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTableDxe/FirmwarePerf= ormanceDxe.inf { - TimerLib|$(PLATFORM_PACKAGE)/Library/IntelPchAcpiTimerLib/IntelPchAc= piTimerLib.inf + TimerLib|Vlv2TbltDevicePkg/Library/IntelPchAcpiTimerLib/IntelPchAcpi= TimerLib.inf } MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTableSmm/FirmwarePerf= ormanceSmm.inf { - TimerLib|$(PLATFORM_PACKAGE)/Library/IntelPchAcpiTimerLib/IntelPchAc= piTimerLib.inf + TimerLib|Vlv2TbltDevicePkg/Library/IntelPchAcpiTimerLib/IntelPchAcpi= TimerLib.inf } !endif =20 @@ -1371,7 +1150,6 @@ [Components.X64] # IDE/SCSI/AHCI # MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThru.inf - IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/IdeBusDxe.inf MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIoDxe.inf MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxe.inf MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf @@ -1395,7 +1173,7 @@ [Components.X64] gEfiMdePkgTokenSpaceGuid.PcdUefiLibMaxPrintBufferSize|8000 } !if $(SATA_ENABLE) =3D=3D TRUE - $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTU= RE)/SataController.inf + Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/SataContr= oller.inf !endif MdeModulePkg/Bus/Ata/AtaBusDxe/AtaBusDxe.inf !if $(SCSI_ENABLE) =3D=3D TRUE @@ -1408,7 +1186,6 @@ [Components.X64] MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatformDxe.inf MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterDxe.inf MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsoleDxe.inf - IntelFrameworkModulePkg/Universal/Console/VgaClassDxe/VgaClassDxe.inf MdeModulePkg/Universal/Console/TerminalDxe/TerminalDxe.inf MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngineDxe.inf @@ -1432,9 +1209,9 @@ [Components.X64] # SMBIOS # MdeModulePkg/Universal/SmbiosDxe/SmbiosDxe.inf - $(PLATFORM_PACKAGE)/SmBiosMiscDxe/SmBiosMiscDxe.inf + Vlv2TbltDevicePkg/SmBiosMiscDxe/SmBiosMiscDxe.inf =20 - $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTU= RE)/SmbiosMemory.inf + Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/SmbiosMem= ory.inf # # CPU/FW Microde # @@ -1449,12 +1226,6 @@ [Components.X64] # !include NetworkPkg/Network.dsc.inc =20 -!if $(NETWORK_ENABLE) =3D=3D TRUE - !if $(CSM_ENABLE) =3D=3D TRUE - IntelFrameworkModulePkg/Csm/BiosThunk/Snp16Dxe/Snp16Dxe.inf - !endif -!endif - !if $(CAPSULE_ENABLE) || $(MICOCODE_CAPSULE_ENABLE) MdeModulePkg/Universal/EsrtFmpDxe/EsrtFmpDxe.inf MdeModulePkg/Application/CapsuleApp/CapsuleApp.inf @@ -1472,7 +1243,7 @@ [Components.X64] DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPor= t.inf PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf - SerialPortLib|$(PLATFORM_PACKAGE)/Library/SerialPortLib/SerialPortLi= b.inf + SerialPortLib|MdeModulePkg/Library/BaseSerialPortLib16550/BaseSerial= PortLib16550.inf } !endif =20 @@ -1484,11 +1255,7 @@ [BuildOptions] # # Define token for different Platform # -!if $(MINNOW2_FSP_BUILD) =3D=3D TRUE - DEFINE MINNOW2_FSP_OPTION =3D /DMINNOW2_FSP_BUILD -!else DEFINE MINNOW2_FSP_OPTION =3D -!endif =20 !if $(ENBDT_PF_BUILD) =3D=3D TRUE DEFINE ENBDT_PF_ENABLE =3D /DENBDT_PF_ENABLE=3D1 @@ -1527,11 +1294,6 @@ [BuildOptions] DEFINE X64_BUILD_ENABLE =3D !endif =20 -!if $(FTPM_ENABLE) =3D=3D TRUE - DEFINE DSC_FTPM_BUILD_OPTIONS =3D /DFTPM_ENABLE -!else - DEFINE DSC_FTPM_BUILD_OPTIONS =3D -!endif !if $(TPM_ENABLED) =3D=3D TRUE DEFINE DSC_TPM_BUILD_OPTIONS =3D /DTPM_ENABLED !else @@ -1539,7 +1301,7 @@ [BuildOptions] !endif =20 =20 - DEFINE EDK_EDKII_DSC_FEATURE_BUILD_OPTIONS =3D $(MINNOW2_FSP_OPTION) $(M= INNOW2_BUILD_OPTION) $(ENBDT_PF_ENABLE) $(EXTERNAL_VGA_BUILD_OPTION) $(PCIE= _ENUM_WA_BUILD_OPTION) $(X0_WA_ENABLE_BUILD_OPTION) $(A0_WA_ENABLE_BUILD_OP= TION) $(MICROCODE_FREE_BUILD_OPTIONS) $(SIMICS_BUILD_OPTIONS) $(HYBRID_BUIL= D_OPTIONS) $(COMPACT_BUILD_OPTIONS) $(VP_BUILD_OPTIONS) $(SYSCTL_ID_BUILD_O= PTION) $(CLKGEN_CONFIG_EXTRA_BUILD_OPTION) $(SYSCTL_X0_CONVERT_BOARD_OPTION= ) $(ENBDT_S3_SUPPORT_OPTIONS) $(SATA_SUPPORT_BUILD_OPTION) $(PCIESC_SUPPORT= _BUILD_OPTION) $(DSC_FTPM_BUILD_OPTIONS) $(DSC_FTPM_ERROR_WR_BUILD_OPTIONS)= $(DSC_TPM_BUILD_OPTIONS) $(DSC_BYTI_SECURE_BOOT_BUILD_OPTIONS) + DEFINE EDK_EDKII_DSC_FEATURE_BUILD_OPTIONS =3D $(MINNOW2_FSP_OPTION) $(M= INNOW2_BUILD_OPTION) $(ENBDT_PF_ENABLE) $(EXTERNAL_VGA_BUILD_OPTION) $(PCIE= _ENUM_WA_BUILD_OPTION) $(X0_WA_ENABLE_BUILD_OPTION) $(A0_WA_ENABLE_BUILD_OP= TION) $(MICROCODE_FREE_BUILD_OPTIONS) $(SIMICS_BUILD_OPTIONS) $(HYBRID_BUIL= D_OPTIONS) $(COMPACT_BUILD_OPTIONS) $(VP_BUILD_OPTIONS) $(SYSCTL_ID_BUILD_O= PTION) $(CLKGEN_CONFIG_EXTRA_BUILD_OPTION) $(SYSCTL_X0_CONVERT_BOARD_OPTION= ) $(ENBDT_S3_SUPPORT_OPTIONS) $(SATA_SUPPORT_BUILD_OPTION) $(PCIESC_SUPPORT= _BUILD_OPTION) $(DSC_FTPM_ERROR_WR_BUILD_OPTIONS) $(DSC_TPM_BUILD_OPTIONS) = $(DSC_BYTI_SECURE_BOOT_BUILD_OPTIONS) !if $(PERFORMANCE_ENABLE) =3D=3D TRUE DEFINE PDB_BUILD_OPTION =3D /Zi !endif @@ -1572,76 +1334,6 @@ [BuildOptions.common.EDKII.DXE_SMM_DRIVER, BuildOpti= ons.common.EDKII.SMM_CORE] MSFT:*_*_*_DLINK_FLAGS =3D /ALIGN:4096 GCC:*_*_*_DLINK_FLAGS =3D -z common-page-size=3D0x1000 =20 -[BuildOptions.Common.EDK] - -# -# Define token for different Platform -# -!if $(ENBDT_PF_BUILD) =3D=3D TRUE - DEFINE ENBDT_PF_ENABLE =3D /DENBDT_PF_ENABLE=3D1 -!else - DEFINE ENBDT_PF_ENABLE =3D /DENBDT_PF_ENABLE=3D0 -!endif - -!if $(PERFORMANCE_ENABLE) =3D=3D TRUE - RELEASE_*_*_DLINK_FLAGS =3D /DEBUG -!endif - -!if $(S3_ENABLE) =3D=3D TRUE - DEFINE DSC_S3_BUILD_OPTIONS =3D /DEFI_S3_RESUME -!else - DEFINE DSC_S3_BUILD_OPTIONS =3D -!endif - -!if $(ENBDT_S3_SUPPORT) =3D=3D TRUE - DEFINE ENBDT_S3_SUPPORT_OPTIONS =3D /DNOCS_S3_SUPPORT -!else - DEFINE ENBDT_S3_SUPPORT_OPTIONS =3D -!endif - -!if $(X64_CONFIG) =3D=3D TRUE - DEFINE X64_BUILD_ENABLE =3D /DX64_BUILD_ENABLE=3D1 -!else - DEFINE X64_BUILD_ENABLE =3D -!endif - - - DEFINE EDK_GLUE_LIB_DEBUG =3D - DEFINE DEBUG_BUILD_OPTIONS =3D /D EFI_DEBUG /D DEBUG_MODE=3D1 /GL- $(ED= K_GLUE_LIB_DEBUG) /DEDKII_GLUE_DebugPrintErrorLevel=3D(EFI_D_ERROR) - DEFINE EDK_DSC_FEATURE_BUILD_OPTIONS =3D $(DSC_S3_BUILD_OPTIONS) $(DSC_A= CPI_BUILD_OPTIONS) $(DSC_SEC_BUILD_OPTIONS) $(DSC_FTPM_BUILD_OPTIONS) $(DSC= _FTPM_ERROR_WR_BUILD_OPTIONS) $(DSC_TPM_BUILD_OPTIONS) $(SOFTSDV_BUILD_OPTI= ONS) $(SIMICS_BUILD_OPTIONS) $(HYBRID_BUILD_OPTIONS) $(COMPACT_BUILD_OPTION= S) $(VP_BUILD_OPTIONS) $(QT_BUILD_OPTIONS) $(DSC_BYTI_SECURE_BOOT_BUILD_OPT= IONS) /D$(PROJECT_SC_CHIPSET) - - DEFINE EDK_DSC_OTHER_BUILD_OPTIONS =3D $(EDK_EDKII_DSC_FEATURE_BUILD_OPT= IONS) $(SV_BUILD_OPTIONS) $(INTEL_FASTBOOT_BUILD_OPTION) - DEFINE EDK_DSC_GLOBAL_BUILD_OPTIONS =3D $(ENBDT_PF_ENABLE) $(EDK_DSC_FEA= TURE_BUILD_OPTIONS) $(EDK_DSC_OTHER_BUILD_OPTIONS) /D EFI_SPECIFICATION_VER= SION=3D0x00020000 /D PI_SPECIFICATION_VERSION=3D0x00000009 /D TIANO_RELEA= SE_VERSION=3D0x00080006 /D SUPPORT_DEPRECATED_PCI_CFG_PPI /D CSM_SMMENTRY_P= ORT8DATA8 /D EDKII_GLUE_PciExpressBaseAddress=3D0x$(PLATFORM_PCIEXPRESS_BAS= E) /D MAX_VARIABLE_SIZE=3D0x2000 /D EFI_FIRMWARE_VENDOR=3D"L/"INTEL/"" /D E= FI_BUILD_VERSION=3D"L/"EDKII/"" /DEFI_PEI_REPORT_STATUS_CODE_ON $(ENBDT_S3_= SUPPORT_OPTIONS) - - *_*_IA32_ASM_FLAGS =3D /DEFI32 /D EDKII_GLUE_PciExpressBaseAddre= ss=3D$(PLATFORM_PCIEXPRESS_BASE)h /DNOCS_S3_SUPPORT - DEBUG_*_IA32_CC_FLAGS =3D /D EFI32 $(EDK_DSC_GLOBAL_BUILD_OPTIONS) = $(DEBUG_BUILD_OPTIONS) - RELEASE_*_IA32_CC_FLAGS =3D /D EFI32 $(EDK_DSC_GLOBAL_BUILD_OPTIONS) - DEBUG_*_IA32_VFRPP_FLAGS =3D /D EFI32 $(EDK_DSC_GLOBAL_BUILD_OPTIONS) = $(DEBUG_BUILD_OPTIONS) - RELEASE_*_IA32_VFRPP_FLAGS =3D /D EFI32 $(EDK_DSC_GLOBAL_BUILD_OPTIONS) - DEBUG_*_IA32_APP_FLAGS =3D /D EFI32 $(EDK_DSC_GLOBAL_BUILD_OPTIONS) = $(DEBUG_BUILD_OPTIONS) - RELEASE_*_IA32_APP_FLAGS =3D /D EFI32 $(EDK_DSC_GLOBAL_BUILD_OPTIONS) - DEBUG_*_IA32_PP_FLAGS =3D /D EFI32 $(EDK_DSC_GLOBAL_BUILD_OPTIONS) = $(DEBUG_BUILD_OPTIONS) - RELEASE_*_IA32_PP_FLAGS =3D /D EFI32 $(EDK_DSC_GLOBAL_BUILD_OPTIONS) - *_*_IA32_ASLPP_FLAGS =3D /D EDKII_GLUE_PciExpressBaseAddress=3D0x$= (PLATFORM_PCIEXPRESS_BASE) - *_*_IA32_ASLCC_FLAGS =3D /D EDKII_GLUE_PciExpressBaseAddress=3D0x$= (PLATFORM_PCIEXPRESS_BASE) - *_*_IA32_ASM16_FLAGS =3D /D EDKII_GLUE_PciExpressBaseAddress=3D$(P= LATFORM_PCIEXPRESS_BASE)h - - *_*_X64_ASM_FLAGS =3D /DEFIX64 /D EDKII_GLUE_PciExpressBaseAddr= ess=3D$(PLATFORM_PCIEXPRESS_BASE)h /DNOCS_S3_SUPPORT - DEBUG_*_X64_CC_FLAGS =3D /D EFIX64 $(EDK_DSC_GLOBAL_BUILD_OPTIONS)= $(DEBUG_BUILD_OPTIONS) - RELEASE_*_X64_CC_FLAGS =3D /D EFIX64 $(EDK_DSC_GLOBAL_BUILD_OPTIONS) - DEBUG_*_X64_VFRPP_FLAGS =3D /D EFIX64 $(EDK_DSC_GLOBAL_BUILD_OPTIONS)= $(DEBUG_BUILD_OPTIONS) - RELEASE_*_X64_VFRPP_FLAGS =3D /D EFIX64 $(EDK_DSC_GLOBAL_BUILD_OPTIONS) - DEBUG_*_X64_APP_FLAGS =3D /D EFIX64 $(EDK_DSC_GLOBAL_BUILD_OPTIONS)= $(DEBUG_BUILD_OPTIONS) - RELEASE_*_X64_APP_FLAGS =3D /D EFIX64 $(EDK_DSC_GLOBAL_BUILD_OPTIONS) - DEBUG_*_X64_PP_FLAGS =3D /D EFIX64 $(EDK_DSC_GLOBAL_BUILD_OPTIONS)= $(DEBUG_BUILD_OPTIONS) - RELEASE_*_X64_PP_FLAGS =3D /D EFIX64 $(EDK_DSC_GLOBAL_BUILD_OPTIONS) - *_*_X64_ASLPP_FLAGS =3D /D EDKII_GLUE_PciExpressBaseAddress=3D0x$= (PLATFORM_PCIEXPRESS_BASE) - *_*_X64_ASLCC_FLAGS =3D /D EDKII_GLUE_PciExpressBaseAddress=3D0x$= (PLATFORM_PCIEXPRESS_BASE) - *_*_X64_ASM16_FLAGS =3D /D EDKII_GLUE_PciExpressBaseAddress=3D$(P= LATFORM_PCIEXPRESS_BASE)h - # *_*_*_BUILD_FLAGS =3D -s - *_*_*_VFR_FLAGS =3D -c - *_*_*_BUILD_FLAGS =3D -c - [BuildOptions.Common.EDKII] *_*_IA32_ASM_FLAGS =3D $(VP_BUILD_OPTIONS) /D EDKII_GLUE_PciExpressB= aseAddress=3D$(PLATFORM_PCIEXPRESS_BASE)h /DNOCS_S3_SUPPORT =20 @@ -1656,25 +1348,3 @@ [BuildOptions.Common.EDKII] *_*_X64_APP_FLAGS =3D $(EDK_EDKII_DSC_FEATURE_BUILD_OPTIONS) *_*_X64_PP_FLAGS =3D $(EDK_EDKII_DSC_FEATURE_BUILD_OPTIONS) *_*_X64_ASLPP_FLAGS =3D $(EDK_EDKII_DSC_FEATURE_BUILD_OPTIONS) - - -[Components.X64] - $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTU= RE)/I2cBus.inf { - - gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0xF0000043 - } - - $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTU= RE)/I2cHost.inf { - - gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0xF0000043 - } - $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTU= RE)/I2cPortA0Pio.inf { - - gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x00000043 - } - - $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTU= RE)/I2cMmioDeviceDxe.inf { - - gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x00000043 - } - diff --git a/Platform/Intel/Vlv2TbltDevicePkg/PlatformSetupDxe/PlatformSetu= pDxe.h b/Platform/Intel/Vlv2TbltDevicePkg/PlatformSetupDxe/PlatformSetupDxe= .h index 53372bb922..1ba75175e1 100644 --- a/Platform/Intel/Vlv2TbltDevicePkg/PlatformSetupDxe/PlatformSetupDxe.h +++ b/Platform/Intel/Vlv2TbltDevicePkg/PlatformSetupDxe/PlatformSetupDxe.h @@ -1,18 +1,15 @@ /*++ =20 - Copyright (c) 2004 - 2014, Intel Corporation. All rights reserved.
- = =20 + Copyright (c) 2004 - 2019, Intel Corporation. All rights reserved.
+ SPDX-License-Identifier: BSD-2-Clause-Patent =20 - = =20 - - **/ =20 #ifndef _PLAT_OVER_MNGR_H_ #define _PLAT_OVER_MNGR_H_ =20 -#include +#include =20 #include #include @@ -57,24 +54,11 @@ #include #include #include -#include + +typedef UINT16 STRING_REF; + extern EFI_HII_HANDLE mHiiHandle; =20 -UINT32 -ConvertBase10ToRaw ( - IN EFI_EXP_BASE10_DATA *Data); - -UINT32 -ConvertBase2ToRaw ( - IN EFI_EXP_BASE2_DATA *Data); - -EFI_STATUS -GetStringFromToken ( - IN EFI_GUID *ProducerGuid, - IN STRING_REF Token, - OUT CHAR16 **String - ); - VOID SwapEntries ( IN CHAR8 *Data diff --git a/Platform/Intel/Vlv2TbltDevicePkg/PlatformSetupDxe/PlatformSetu= pDxe.inf b/Platform/Intel/Vlv2TbltDevicePkg/PlatformSetupDxe/PlatformSetupD= xe.inf index 6d7e7c3f6c..ae100df26d 100644 --- a/Platform/Intel/Vlv2TbltDevicePkg/PlatformSetupDxe/PlatformSetupDxe.in= f +++ b/Platform/Intel/Vlv2TbltDevicePkg/PlatformSetupDxe/PlatformSetupDxe.in= f @@ -1,11 +1,8 @@ # # -# Copyright (c) 2014 - 2018, Intel Corporation. All rights reserved.
-# = =20 +# Copyright (c) 2014 - 2019, Intel Corporation. All rights reserved.
+# # SPDX-License-Identifier: BSD-2-Clause-Patent - -# = =20 -# # # This driver produces UEFI PLATFORM_DRIVER_OVERRIDE_PROTOCOL if this pro= tocol doesn't exist. # It doesn't install again if this protocol exists. @@ -63,7 +60,6 @@ [Sources] [Packages] MdePkg/MdePkg.dec MdeModulePkg/MdeModulePkg.dec - IntelFrameworkPkg/IntelFrameworkPkg.dec Vlv2TbltDevicePkg/PlatformPkg.dec Vlv2DeviceRefCodePkg/Vlv2DeviceRefCodePkg.dec #for PchAccess.h SecurityPkg/SecurityPkg.dec @@ -94,10 +90,6 @@ [Guids] # # gEfiCallerIdGuid ## Private ## Variable:L"= PlatDriOver" gEfiIfrTianoGuid ## CONSUMES ## Guid - gEfiProcessorSubClassGuid - gEfiMiscSubClassGuid - gEfiCacheSubClassGuid - gEfiMemorySubClassGuid gEfiPlatformInfoGuid gEfiNormalSetupGuid gEfiSecureBootEnableDisableGuid @@ -123,8 +115,6 @@ [Protocols] gEfiDevicePathToTextProtocolGuid ## CONSUMED gEdkiiFormBrowserEx2ProtocolGuid =20 - gEfiDataHubProtocolGuid - gEfiLegacyBiosProtocolGuid gEfiSimpleNetworkProtocolGuid =20 gEfiDiskInfoProtocolGuid ## CONSUMED diff --git a/Platform/Intel/Vlv2TbltDevicePkg/PlatformSetupDxe/SetupInfoRec= ords.c b/Platform/Intel/Vlv2TbltDevicePkg/PlatformSetupDxe/SetupInfoRecords= .c index c404ada588..fb82cdb984 100644 --- a/Platform/Intel/Vlv2TbltDevicePkg/PlatformSetupDxe/SetupInfoRecords.c +++ b/Platform/Intel/Vlv2TbltDevicePkg/PlatformSetupDxe/SetupInfoRecords.c @@ -1,12 +1,9 @@ /** @file =20 - Copyright (c) 2004 - 2014, Intel Corporation. All rights reserved.
- = =20 + Copyright (c) 2004 - 2019, Intel Corporation. All rights reserved.
+ SPDX-License-Identifier: BSD-2-Clause-Patent =20 - = =20 - - Module Name: =20 SetupInfoRecords.c @@ -19,7 +16,6 @@ Revision History: --*/ =20 #include "PlatformSetupDxe.h" -#include #include #include #include @@ -31,7 +27,6 @@ Revision History: #include #include #include -#include #include =20 #include "Valleyview.h" @@ -1172,11 +1167,6 @@ UpdatePlatformInformation ( { UINT32 MicroCodeVersion; CHAR16 Buffer[40]; - UINT8 IgdVBIOSRevH; - UINT8 IgdVBIOSRevL; - UINT16 EDX; - EFI_IA32_REGISTER_SET RegSet; - EFI_LEGACY_BIOS_PROTOCOL *LegacyBios =3D NULL; EFI_STATUS Status; UINT8 CpuFlavor=3D0; EFI_PEI_HOB_POINTERS GuidHob; @@ -1202,35 +1192,6 @@ UpdatePlatformInformation ( } } =20 - // - //VBIOS version - // - Status =3D gBS->LocateProtocol( - &gEfiLegacyBiosProtocolGuid, - NULL, - (void **)&LegacyBios - ); - if (!EFI_ERROR (Status)) { - RegSet.X.AX =3D 0x5f01; - Status =3D LegacyBios->Int86 (LegacyBios, 0x10, &RegSet); - ASSERT_EFI_ERROR(Status); - - // - // simulate AMI int15 (ax=3D5f01) handler - // check NbInt15.asm in AMI code for asm edition - // - EDX =3D (UINT16)((RegSet.E.EBX >> 16) & 0xffff); - IgdVBIOSRevH =3D (UINT8)(((EDX & 0x0F00) >> 4) | (EDX & 0x000F)); - IgdVBIOSRevL =3D (UINT8)(((RegSet.X.BX & 0x0F00) >> 4) | (RegSet.X.BX & = 0x000F)); - - if (IgdVBIOSRevH=3D=3D0 && IgdVBIOSRevL=3D=3D0){ - HiiSetString(mHiiHandle, STRING_TOKEN(STR_CHIP_IGD_VBIOS_REV_VALUE), L= "N/A", NULL); - } else { - UnicodeSPrint (Buffer, sizeof (Buffer), L"%02X%02X", IgdVBIOSRevH,IgdV= BIOSRevL); - HiiSetString(mHiiHandle, STRING_TOKEN(STR_CHIP_IGD_VBIOS_REV_VALUE), B= uffer, NULL); - } - } - Status =3D GetGOPDriverName(Name); =20 if (!EFI_ERROR(Status)) diff --git a/Platform/Intel/Vlv2TbltDevicePkg/PlatformSmm/Platform.c b/Plat= form/Intel/Vlv2TbltDevicePkg/PlatformSmm/Platform.c index 8b46fbdfd1..14b9250e99 100644 --- a/Platform/Intel/Vlv2TbltDevicePkg/PlatformSmm/Platform.c +++ b/Platform/Intel/Vlv2TbltDevicePkg/PlatformSmm/Platform.c @@ -1,11 +1,9 @@ /** @file =20 - Copyright (c) 2004 - 2014, Intel Corporation. All rights reserved.
- = =20 + Copyright (c) 2004 - 2019, Intel Corporation. All rights reserved.
+ SPDX-License-Identifier: BSD-2-Clause-Patent =20 - = =20 - Module Name: =20 Platform.c @@ -70,26 +68,9 @@ UINT8 mTco1Sources[] =3D { IchnNmi }; =20 -UINTN -DevicePathSize ( - IN EFI_DEVICE_PATH_PROTOCOL *DevicePath - ); - VOID S4S5ProgClock(); =20 -EFI_STATUS -InitRuntimeScriptTable ( - IN EFI_SYSTEM_TABLE *SystemTable - ); - -VOID -S5SleepWakeOnRtcCallBack ( - IN EFI_HANDLE DispatchHandle, - IN EFI_SMM_SX_DISPATCH_CONTEXT *DispatchContext - ); - - VOID EnableS5WakeOnRtc(); =20 @@ -98,12 +79,6 @@ HexToBcd( UINT8 HexValue ); =20 -UINT8 -BcdToHex( - IN UINT8 BcdValue - ); - - VOID CpuSmmSxWorkAround( ); @@ -779,46 +754,6 @@ DummyTco1Callback ( { } =20 -UINTN -DevicePathSize ( - IN EFI_DEVICE_PATH_PROTOCOL *DevicePath - ) -{ - EFI_DEVICE_PATH_PROTOCOL *Start; - - if (DevicePath =3D=3D NULL) { - return 0; - } - - // - // Search for the end of the device path structure - // - Start =3D DevicePath; - while (!IsDevicePathEnd (DevicePath)) { - DevicePath =3D NextDevicePathNode (DevicePath); - } - - // - // Compute the size and add back in the size of the end device path stru= cture - // - return ((UINTN)DevicePath - (UINTN)Start) + sizeof(EFI_DEVICE_PATH_PROTO= COL); -} - -/** - - @param DispatchHandle The handle of this callback, obtained when regis= tering - @param DispatchContext The predefined context which contained sleep typ= e and phase - -**/ -VOID -S5SleepWakeOnRtcCallBack ( - IN EFI_HANDLE DispatchHandle, - IN EFI_SMM_SX_DISPATCH_CONTEXT *DispatchContext - ) -{ - EnableS5WakeOnRtc(); -} - /** =20 @retval 1. Check Alarm interrupt is not set. @@ -981,17 +916,3 @@ HexToBcd( return ((UINT8)(LowByte + (HighByte << 4))); } =20 -UINT8 -BcdToHex( - IN UINT8 BcdValue - ) -{ - UINTN HighByte; - UINTN LowByte; - - HighByte =3D (UINTN)((BcdValue >> 4) * 10); - LowByte =3D (UINTN)(BcdValue & 0x0F); - - return ((UINT8)(LowByte + HighByte)); -} - diff --git a/Platform/Intel/Vlv2TbltDevicePkg/PlatformSmm/PlatformSmm.inf b= /Platform/Intel/Vlv2TbltDevicePkg/PlatformSmm/PlatformSmm.inf index 1b7b05d9b3..3c4f55cf54 100644 --- a/Platform/Intel/Vlv2TbltDevicePkg/PlatformSmm/PlatformSmm.inf +++ b/Platform/Intel/Vlv2TbltDevicePkg/PlatformSmm/PlatformSmm.inf @@ -1,11 +1,8 @@ # # -# Copyright (c) 1999 - 2018, Intel Corporation. All rights reserved -# = =20 +# Copyright (c) 1999 - 2019, Intel Corporation. All rights reserved +# # SPDX-License-Identifier: BSD-2-Clause-Patent - -# = =20 -# # # Module Name: # @@ -51,16 +48,8 @@ [LibraryClasses] =20 [Guids] gEfiSetupVariableGuid - gDmiDataGuid - gEfiAcpiVariableCompatiblityGuid - gEfiPciLanInfoGuid - gEfiPciLanInfoGuid - -[FeaturePcd] - gEfiMdeModulePkgTokenSpaceGuid.PcdDxeIplSwitchToLongMode =20 [Protocols] - gEfiSmmBase2ProtocolGuid gEfiSmmIchnDispatchProtocolGuid gEfiGlobalNvsAreaProtocolGuid gEfiSmmSwDispatchProtocolGuid @@ -75,13 +64,11 @@ [Packages] IntelFrameworkPkg/IntelFrameworkPkg.dec Vlv2DeviceRefCodePkg/Vlv2DeviceRefCodePkg.dec Vlv2TbltDevicePkg/PlatformPkg.dec - IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec =20 [Pcd.common] gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseAddress =20 [Depex] - gEfiSmmBase2ProtocolGuid AND gEfiSmmAccess2ProtocolGuid AND gEfiSmmPowerButtonDispatchProtocolGuid AND gEfiSmmSxDispatchProtocolGuid AND diff --git a/Platform/Intel/Vlv2TbltDevicePkg/PlatformSmm/S3Save.c b/Platfo= rm/Intel/Vlv2TbltDevicePkg/PlatformSmm/S3Save.c index 19089233b2..7bd0270655 100644 --- a/Platform/Intel/Vlv2TbltDevicePkg/PlatformSmm/S3Save.c +++ b/Platform/Intel/Vlv2TbltDevicePkg/PlatformSmm/S3Save.c @@ -1,12 +1,9 @@ /** @file =20 - Copyright (c) 2004 - 2014, Intel Corporation. All rights reserved.
- = =20 + Copyright (c) 2004 - 2019, Intel Corporation. All rights reserved.
+ SPDX-License-Identifier: BSD-2-Clause-Patent =20 - = =20 - - Module Name: =20 IchS3Save.c @@ -23,52 +20,6 @@ Revision History extern UINT16 mAcpiBaseAddr; EFI_PHYSICAL_ADDRESS mRuntimeScriptTableBase; =20 -EFI_STATUS -InitRuntimeScriptTable ( - IN EFI_SYSTEM_TABLE *SystemTable - ) -{ - EFI_STATUS Status; - UINT32 VarAttrib; - UINTN VarSize; - ACPI_VARIABLE_SET_COMPATIBILITY *AcpiVariableBase; - - // - // Allocate runtime ACPI script table space. We need it to save some - // settings done by CSM, which runs after normal script table closed - // - Status =3D gBS->AllocatePages ( - AllocateAnyPages, - EfiACPIReclaimMemory, - 1, - &mRuntimeScriptTableBase - ); - if (EFI_ERROR(Status)) { - return EFI_OUT_OF_RESOURCES ; - } - - // - // Save runtime script table base into global ACPI variable - // - VarAttrib =3D EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_RUNTIME_ACC= ESS - | EFI_VARIABLE_NON_VOLATILE; - VarSize =3D sizeof (UINTN); - Status =3D SystemTable->RuntimeServices->GetVariable ( - ACPI_GLOBAL_VARIABLE, - &gEfiAcpiVariableCompatiblityGuid, - &VarAttrib, - &VarSize, - &AcpiVariableBase - ); - if (EFI_ERROR(Status)) { - return Status; - } - - AcpiVariableBase->RuntimeScriptTableBase =3D mRuntimeScriptTableBase; - - return EFI_SUCCESS; -} - EFI_STATUS SaveRuntimeScriptTable ( VOID diff --git a/Platform/Intel/Vlv2TbltDevicePkg/PlatformSmm/SmmPlatform.h b/P= latform/Intel/Vlv2TbltDevicePkg/PlatformSmm/SmmPlatform.h index 8bf2ebafc1..bcb1d8ae92 100644 --- a/Platform/Intel/Vlv2TbltDevicePkg/PlatformSmm/SmmPlatform.h +++ b/Platform/Intel/Vlv2TbltDevicePkg/PlatformSmm/SmmPlatform.h @@ -1,11 +1,9 @@ /*++ =20 - Copyright (c) 2004 - 2014, Intel Corporation. All rights reserved.
- = =20 + Copyright (c) 2004 - 2019, Intel Corporation. All rights reserved.
+ SPDX-License-Identifier: BSD-2-Clause-Patent =20 - = =20 - Module Name: =20 SmmPlatform.h @@ -35,7 +33,6 @@ Abstract: #include #include #include "Protocol/GlobalNvsArea.h" -#include #include #include #include diff --git a/Platform/Intel/Vlv2TbltDevicePkg/PpmPolicy/PpmPolicy.inf b/Pla= tform/Intel/Vlv2TbltDevicePkg/PpmPolicy/PpmPolicy.inf index 331076a2d4..2c0a13f6af 100644 --- a/Platform/Intel/Vlv2TbltDevicePkg/PpmPolicy/PpmPolicy.inf +++ b/Platform/Intel/Vlv2TbltDevicePkg/PpmPolicy/PpmPolicy.inf @@ -1,9 +1,8 @@ #/*++ # -# Copyright (c) 1999 - 2014, Intel Corporation. All rights reserved -# = =20 +# Copyright (c) 1999 - 2019, Intel Corporation. All rights reserved +# # SPDX-License-Identifier: BSD-2-Clause-Patent -# =20 # # Module Name: # @@ -29,7 +28,6 @@ [Sources] [Packages] MdePkg/MdePkg.dec Vlv2TbltDevicePkg/PlatformPkg.dec - Vlv2SocBinPkg/Vlv2SocBinPkg.dec Vlv2DeviceRefCodePkg/Vlv2DeviceRefCodePkg.dec =20 [LibraryClasses] diff --git a/Platform/Intel/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscBaseBoardMa= nufacturerFunction.c b/Platform/Intel/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscB= aseBoardManufacturerFunction.c index aa8c213d83..4e02486853 100644 --- a/Platform/Intel/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscBaseBoardManufactu= rerFunction.c +++ b/Platform/Intel/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscBaseBoardManufactu= rerFunction.c @@ -1,10 +1,8 @@ /*++ =20 -Copyright (c) 2009 - 2014, Intel Corporation. All rights reserved.
- = =20 +Copyright (c) 2009 - 2019, Intel Corporation. All rights reserved.
+ SPDX-License-Identifier: BSD-2-Clause-Patent - = =20 - =20 Module Name: =20 @@ -138,7 +136,7 @@ MISC_SMBIOS_TABLE_FUNCTION(MiscBaseBoardManufacturer) &MacStr ); if (EFI_ERROR (Status)) {=09 - return Status; + MacStr =3D L"000000000000"; } SerialNumber =3D MacStr; =20 SerialNumStrLen =3D StrLen(SerialNumber); diff --git a/Platform/Intel/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscOemType0x94= Function.c b/Platform/Intel/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscOemType0x94= Function.c index 15c180129c..81b66ce9af 100644 --- a/Platform/Intel/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscOemType0x94Functio= n.c +++ b/Platform/Intel/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscOemType0x94Functio= n.c @@ -1,13 +1,9 @@ /*++ =20 -Copyright (c) 1999 - 2014, Intel Corporation. All rights reserved. - = =20 +Copyright (c) 1999 - 2019, Intel Corporation. All rights reserved. + SPDX-License-Identifier: BSD-2-Clause-Patent =20 - = =20 - - - Module Name: =20 MiscOemType0x94Function.c @@ -36,7 +32,6 @@ Abstract: #include =20 #include -#include #include #include #include @@ -527,11 +522,6 @@ UpdatePlatformInformation ( { UINT32 MicroCodeVersion; CHAR16 Buffer[40]; - UINT8 IgdVBIOSRevH; - UINT8 IgdVBIOSRevL; - UINT16 EDX; - EFI_IA32_REGISTER_SET RegSet; - EFI_LEGACY_BIOS_PROTOCOL *LegacyBios =3D NULL; EFI_STATUS Status; UINT8 CpuFlavor=3D0; EFI_PEI_HOB_POINTERS GuidHob; @@ -561,34 +551,6 @@ UpdatePlatformInformation ( } } =20 - // - //VBIOS version - // - Status =3D gBS->LocateProtocol( - &gEfiLegacyBiosProtocolGuid, - NULL, - (VOID **)&LegacyBios - ); - - RegSet.X.AX =3D 0x5f01; - Status =3D LegacyBios->Int86 (LegacyBios, 0x10, &RegSet); - ASSERT_EFI_ERROR(Status); - - // - // simulate AMI int15 (ax=3D5f01) handler - // check NbInt15.asm in AMI code for asm edition - // - EDX =3D (UINT16)((RegSet.E.EBX >> 16) & 0xffff); - IgdVBIOSRevH =3D (UINT8)(((EDX & 0x0F00) >> 4) | (EDX & 0x000F)); - IgdVBIOSRevL =3D (UINT8)(((RegSet.X.BX & 0x0F00) >> 4) | (RegSet.X.BX & = 0x000F)); - - if (IgdVBIOSRevH=3D=3D0 && IgdVBIOSRevL=3D=3D0) { - HiiSetString(mHiiHandle, STRING_TOKEN(STR_CHIP_IGD_VBIOS_REV_VALUE), L= "N/A", NULL); - } else { - UnicodeSPrint (Buffer, sizeof (Buffer), L"%02X%02X", IgdVBIOSRevH,IgdV= BIOSRevL); - HiiSetString(mHiiHandle, STRING_TOKEN(STR_CHIP_IGD_VBIOS_REV_VALUE), B= uffer, NULL); - } - Status =3D TGetGOPDriverName(Name); =20 if(!EFI_ERROR(Status)) diff --git a/Platform/Intel/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscSystemManuf= acturerFunction.c b/Platform/Intel/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscSyst= emManufacturerFunction.c index 63c4f50ed5..f537e0db76 100644 --- a/Platform/Intel/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscSystemManufacturer= Function.c +++ b/Platform/Intel/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscSystemManufacturer= Function.c @@ -1,10 +1,8 @@ /*++ =20 -Copyright (c) 2009 - 2014, Intel Corporation. All rights reserved.
- = =20 +Copyright (c) 2009 - 2019, Intel Corporation. All rights reserved.
+ SPDX-License-Identifier: BSD-2-Clause-Patent - = =20 - =20 Module Name: =20 @@ -219,8 +217,8 @@ AddSmbiosManuCallback ( NULL, &MacStr ); - if (EFI_ERROR (Status)) {=09 - return Status; + if (EFI_ERROR (Status)) { + MacStr =3D L"000000000000"; } SerialNumber =3D MacStr;=20 SerialNumStrLen =3D StrLen(SerialNumber); diff --git a/Platform/Intel/Vlv2TbltDevicePkg/SmBiosMiscDxe/SmBiosMiscDxe.i= nf b/Platform/Intel/Vlv2TbltDevicePkg/SmBiosMiscDxe/SmBiosMiscDxe.inf index 9d2f5410a0..99b1a18185 100644 --- a/Platform/Intel/Vlv2TbltDevicePkg/SmBiosMiscDxe/SmBiosMiscDxe.inf +++ b/Platform/Intel/Vlv2TbltDevicePkg/SmBiosMiscDxe/SmBiosMiscDxe.inf @@ -2,12 +2,9 @@ # Component name for module MiscSubclass # # FIX ME! -# Copyright (c) 2006 - 2019, Intel Corporation. All rights reserved.
-# = =20 +# Copyright (c) 2006 - 2019, Intel Corporation. All rights reserved.
+# # SPDX-License-Identifier: BSD-2-Clause-Patent -# = =20 -# -# # ## =20 @@ -87,9 +84,8 @@ [Packages] MdeModulePkg/MdeModulePkg.dec Vlv2TbltDevicePkg/PlatformPkg.dec MdePkg/MdePkg.dec - IntelFrameworkPkg/IntelFrameworkPkg.dec Vlv2DeviceRefCodePkg/Vlv2DeviceRefCodePkg.dec - NetworkPkg/NetworkPkg.dec + NetworkPkg/NetworkPkg.dec =20 [LibraryClasses] HiiLib @@ -107,13 +103,10 @@ [LibraryClasses] PrintLib CpuIA32Lib PchPlatformLib - I2cLib NetLib HobLib =20 [Guids] - gEfiProcessorSubClassGuid - gEfiCacheSubClassGuid gEfiNormalSetupGuid gEfiPlatformInfoGuid gEfiVlv2VariableGuid @@ -137,4 +130,4 @@ [Pcd] gEfiVLVTokenSpaceGuid.PcdProductSerialNumber =20 [Depex] - gEfiSmbiosProtocolGuid AND gMemInfoProtocolGuid AND gEfiMpServiceProtocol= Guid AND gEfiSimpleNetworkProtocolGuid + gEfiSmbiosProtocolGuid AND gMemInfoProtocolGuid AND gEfiMpServiceProtoco= lGuid diff --git a/Platform/Intel/Vlv2TbltDevicePkg/VlvPlatformInitDxe/IgdOpRegio= n.c b/Platform/Intel/Vlv2TbltDevicePkg/VlvPlatformInitDxe/IgdOpRegion.c index ba81bd9def..8fe1482106 100644 --- a/Platform/Intel/Vlv2TbltDevicePkg/VlvPlatformInitDxe/IgdOpRegion.c +++ b/Platform/Intel/Vlv2TbltDevicePkg/VlvPlatformInitDxe/IgdOpRegion.c @@ -1,13 +1,10 @@ =20 /*++ =20 -Copyright (c) 2011 - 2018, Intel Corporation. All rights reserved - = =20 +Copyright (c) 2011 - 2019, Intel Corporation. All rights reserved + SPDX-License-Identifier: BSD-2-Clause-Patent =20 - = =20 - - Module Name: =20 IgdOpRegion.c @@ -35,14 +32,12 @@ Abstract: =20 #include "IgdOpRegion.h" #include "VlvPlatformInit.h" -#include -#include +#include #include =20 #include =20 #include -#include #include #include #include diff --git a/Platform/Intel/Vlv2TbltDevicePkg/VlvPlatformInitDxe/IgdOpRegio= n.h b/Platform/Intel/Vlv2TbltDevicePkg/VlvPlatformInitDxe/IgdOpRegion.h index cd1d208d61..597bdaf46a 100644 --- a/Platform/Intel/Vlv2TbltDevicePkg/VlvPlatformInitDxe/IgdOpRegion.h +++ b/Platform/Intel/Vlv2TbltDevicePkg/VlvPlatformInitDxe/IgdOpRegion.h @@ -1,13 +1,10 @@ =20 /*++ =20 -Copyright (c) 1999 - 2014, Intel Corporation. All rights reserved - = =20 +Copyright (c) 1999 - 2019, Intel Corporation. All rights reserved + SPDX-License-Identifier: BSD-2-Clause-Patent =20 - = =20 - - Module Name: =20 IgdOpRegion.h @@ -36,7 +33,7 @@ Abstract: #include "VlvPlatformInit.h" #include "VlvCommonDefinitions.h" #include -#include +#include =20 // // @@ -177,24 +174,6 @@ GetSVER ( OUT UINT8 *SVER ); =20 -/** - Acquire the string associated with the ProducerGuid and return it. - - @param ProducerGuid The Guid to search the HII database for - @param Token The token value of the string to extract - @param String The string that is extracted - - @retval EFI_SUCCESS The function completed successfully - @retval EFI_NOT_FOUND The requested string was not found - -**/ -EFI_STATUS -GetStringFromToken ( - IN EFI_GUID *ProducerGuid, - IN STRING_REF Token, - OUT CHAR16 **String - ); - /** =20 Graphics OpRegion / Software SCI driver installation function. diff --git a/Platform/Intel/Vlv2TbltDevicePkg/VlvPlatformInitDxe/VlvPlatfor= mInitDxe.inf b/Platform/Intel/Vlv2TbltDevicePkg/VlvPlatformInitDxe/VlvPlatf= ormInitDxe.inf index 9d277dd7cf..1e86adadb3 100644 --- a/Platform/Intel/Vlv2TbltDevicePkg/VlvPlatformInitDxe/VlvPlatformInitDx= e.inf +++ b/Platform/Intel/Vlv2TbltDevicePkg/VlvPlatformInitDxe/VlvPlatformInitDx= e.inf @@ -2,11 +2,10 @@ # #/*++ # -# Copyright (c) 1999 - 2018, Intel Corporation. All rights reserved -# = =20 +# Copyright (c) 1999 - 2019, Intel Corporation. All rights reserved +# = =20 + # SPDX-License-Identifier: BSD-2-Clause-Patent - -# = =20 # # Module Name: # @@ -34,7 +33,6 @@ [Sources] =20 [Packages] MdePkg/MdePkg.dec - IntelFrameworkPkg/IntelFrameworkPkg.dec Vlv2DeviceRefCodePkg/Vlv2DeviceRefCodePkg.dec Vlv2TbltDevicePkg/PlatformPkg.dec =20 diff --git a/Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.bat b/Platform/Intel/= Vlv2TbltDevicePkg/bld_vlv.bat index d8594053b0..8cf8938a4e 100644 --- a/Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.bat +++ b/Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.bat @@ -212,8 +212,12 @@ if defined VS140COMNTOOLS ( goto :BldFail ) =20 -echo Ensuring correct build directory is present for GenBiosId... -set BUILD_PATH=3D%WORKSPACE%\Build\%PLATFORM_NAME%\%TARGET%_%TOOL_CHAIN_TA= G% +echo Ensuring correct build directory is present +if "%Arch%"=3D=3D"IA32" ( + set BUILD_PATH=3D%WORKSPACE%\Build\%PLATFORM_NAME%IA32\%TARGET%_%TOOL_CH= AIN_TAG% +) else ( + set BUILD_PATH=3D%WORKSPACE%\Build\%PLATFORM_NAME%\%TARGET%_%TOOL_CHAIN_= TAG% +) =20 echo Modifing Conf files for this build... :: Remove lines with these tags from target.txt @@ -240,16 +244,6 @@ move /Y %WORKSPACE%\Conf\target.txt.tmp %WORKSPACE%\Co= nf\target.txt >nul :: Build BIOS ::********************************************************************** =20 -echo Creating BiosId... -if not exist %BUILD_PATH%\IA32 mkdir %BUILD_PATH%\IA32 -%PLATFORM_PACKAGE%\GenBiosId.exe -i %WORKSPACE%\Conf\BiosId.env -o %BUILD_= PATH%\IA32\BiosId.bin -ob %WORKSPACE%\Conf\BiosId.bat -if "%Arch%"=3D=3D"X64" ( - if not exist %BUILD_PATH%\X64 mkdir %BUILD_PATH%\X64 - %PLATFORM_PACKAGE%\GenBiosId.exe -i %WORKSPACE%\Conf\BiosId.env -o %BUI= LD_PATH%\X64\BiosId.bin -ob %WORKSPACE%\Conf\BiosId.bat -) - -if %ERRORLEVEL% NEQ 0 goto BldFail - echo. echo Invoking EDK2 build... call build %Build_Flags% @@ -267,31 +261,14 @@ pushd %PLATFORM_PACKAGE% %PLATFORM_PACKAGE%\fce read -i %BUILD_PATH%\FV\Vlv.fd > %BUILD_PATH%\FV\Hi= iDefaultData.txt =20 :: save changes to VlvXXX.fd -%PLATFORM_PACKAGE%\fce update -i %BUILD_PATH%\FV\Vlv.fd -s %BUILD_PATH%\FV= \HiiDefaultData.txt -o %BUILD_PATH%\FV\Vlv%Arch%.fd +%PLATFORM_PACKAGE%\fce update -i %BUILD_PATH%\FV\Vlv.fd -s %BUILD_PATH%\FV= \HiiDefaultData.txt -o %BUILD_PATH%\FV\Vlv.ROM popd =20 if %ERRORLEVEL% NEQ 0 goto BldFail ::echo FD successfully updated with default Hii values. =20 -:: Set the Board_Id, Build_Type, Version_Major, and Version_Minor environm= ent variables -find /v "#" %WORKSPACE%\Conf\BiosId.env > ver_strings -for /f "tokens=3D1,3" %%i in (ver_strings) do set %%i=3D%%j -del /f/q ver_strings >nul - -set BIOS_Name=3D%BOARD_ID%_%Arch%_%BUILD_TYPE%_%VERSION_MAJOR%_%VERSION_MI= NOR%.ROM -copy /y/b %BUILD_PATH%\FV\Vlv%Arch%.fd %PLATFORM_PACKAGE%\Stitch\%BIOS_Na= me% >nul -copy /y/b %BUILD_PATH%\FV\Vlv%Arch%.fd %BUILD_PATH%\FV\Vlv.ROM >nul - -echo. -echo Build location: %BUILD_PATH% -echo BIOS ROM Created: %BIOS_Name% -echo. -echo -------------------- The EDKII BIOS build has successfully completed.= -------------------- -echo. - @REM build capsule here -echo > %BUILD_PATH%\FV\SYSTEMFIRMWAREUPDATECARGO.Fv -build -p %PLATFORM_PACKAGE%\PlatformCapsule.dsc +call build -p %PLATFORM_PACKAGE%\PlatformCapsule.dsc =20 goto Exit =20 --=20 2.21.0.windows.1