From c5ae1de611ec60371ec8711711354c5c6c96bb1e Mon Sep 17 00:00:00 2001 From: geekboy15a Date: Fri, 18 May 2012 20:22:36 +0000 Subject: [PATCH] DuetPkg: Enabled build with new version of CpuDxe driver. Added a definition to the LocalApicLib in the project files to allow Duet to build with the updated version of the CpuDxe driver. Tracker: 207345 Signed-off-by: Erik Bjorge Reviewed-by: Rosenbaum, Lee G Reviewed-by: Sun Rui git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@13337 6f19259b-4bc3-4df7-8a09-765794883524 --- DuetPkg/DuetPkgIa32.dsc | 13 +++++++------ DuetPkg/DuetPkgX64.dsc | 12 ++++++------ 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/DuetPkg/DuetPkgIa32.dsc b/DuetPkg/DuetPkgIa32.dsc index ffca5788eb..215be6719c 100644 --- a/DuetPkg/DuetPkgIa32.dsc +++ b/DuetPkg/DuetPkgIa32.dsc @@ -73,7 +73,7 @@ UefiDecompressLib|MdePkg/Library/BaseUefiDecompressLib/BaseUefiDecompressLib.inf DxeServicesLib|MdePkg/Library/DxeServicesLib/DxeServicesLib.inf DxeServicesTableLib|MdePkg/Library/DxeServicesTableLib/DxeServicesTableLib.inf - + # # Generic Modules # @@ -102,13 +102,14 @@ SerialPortLib|MdeModulePkg/Library/BaseSerialPortLib16550/BaseSerialPortLib16550.inf MtrrLib|UefiCpuPkg/Library/MtrrLib/MtrrLib.inf CpuExceptionHandlerLib|MdeModulePkg/Library/CpuExceptionHandlerLibNull/CpuExceptionHandlerLibNull.inf - + LocalApicLib|UefiCpuPkg/Library/BaseXApicLib/BaseXApicLib.inf + # # To save size, use NULL library for DebugLib and ReportStatusCodeLib. # If need status code output, do library instance overriden as below DxeMain.inf does # DebugLib|MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.inf - DebugPrintErrorLevelLib|MdePkg/Library/BaseDebugPrintErrorLevelLib/BaseDebugPrintErrorLevelLib.inf + DebugPrintErrorLevelLib|MdePkg/Library/BaseDebugPrintErrorLevelLib/BaseDebugPrintErrorLevelLib.inf ReportStatusCodeLib|MdePkg/Library/BaseReportStatusCodeLibNull/BaseReportStatusCodeLibNull.inf [LibraryClasses.common.DXE_CORE] @@ -257,9 +258,9 @@ ################################################################################################### # # BuildOptions Section - Define the module specific tool chain flags that should be used as -# the default flags for a module. These flags are appended to any -# standard flags that are defined by the build process. They can be -# applied for any modules or only those modules with the specific +# the default flags for a module. These flags are appended to any +# standard flags that are defined by the build process. They can be +# applied for any modules or only those modules with the specific # module style (EDK or EDKII) specified in [Components] section. # ################################################################################################### diff --git a/DuetPkg/DuetPkgX64.dsc b/DuetPkg/DuetPkgX64.dsc index ec9a254b53..4d62b05da6 100644 --- a/DuetPkg/DuetPkgX64.dsc +++ b/DuetPkg/DuetPkgX64.dsc @@ -73,7 +73,7 @@ UefiDecompressLib|MdePkg/Library/BaseUefiDecompressLib/BaseUefiDecompressLib.inf DxeServicesLib|MdePkg/Library/DxeServicesLib/DxeServicesLib.inf DxeServicesTableLib|MdePkg/Library/DxeServicesTableLib/DxeServicesTableLib.inf - + # # Generic Modules # @@ -103,14 +103,14 @@ MtrrLib|UefiCpuPkg/Library/MtrrLib/MtrrLib.inf LockBoxLib|MdeModulePkg/Library/LockBoxNullLib/LockBoxNullLib.inf CpuExceptionHandlerLib|MdeModulePkg/Library/CpuExceptionHandlerLibNull/CpuExceptionHandlerLibNull.inf + LocalApicLib|UefiCpuPkg/Library/BaseXApicLib/BaseXApicLib.inf - # # To save size, use NULL library for DebugLib and ReportStatusCodeLib. # If need status code output, do library instance overriden as below DxeMain.inf does # DebugLib|MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.inf - DebugPrintErrorLevelLib|MdePkg/Library/BaseDebugPrintErrorLevelLib/BaseDebugPrintErrorLevelLib.inf + DebugPrintErrorLevelLib|MdePkg/Library/BaseDebugPrintErrorLevelLib/BaseDebugPrintErrorLevelLib.inf ReportStatusCodeLib|MdePkg/Library/BaseReportStatusCodeLibNull/BaseReportStatusCodeLibNull.inf [LibraryClasses.common.DXE_CORE] @@ -259,9 +259,9 @@ ################################################################################################### # # BuildOptions Section - Define the module specific tool chain flags that should be used as -# the default flags for a module. These flags are appended to any -# standard flags that are defined by the build process. They can be -# applied for any modules or only those modules with the specific +# the default flags for a module. These flags are appended to any +# standard flags that are defined by the build process. They can be +# applied for any modules or only those modules with the specific # module style (EDK or EDKII) specified in [Components] section. # ################################################################################################### -- 2.39.2