User customize build method for BootSector module.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@5089 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/DuetPkg/BootSector/BootSector.inf b/DuetPkg/BootSector/BootSector.inf
index 149d4e49f6c000002c184dbe02d8c035764e5673..df6106e30ffb9e5df4c57c37d2389c768b0d1229 100644 (file)
--- a/DuetPkg/BootSector/BootSector.inf
+++ b/DuetPkg/BootSector/BootSector.inf
@@ -6,7 +6,7 @@
   VERSION_STRING                 = 1.0\r
   EDK_RELEASE_VERSION            = 0x00020000\r
   EFI_SPECIFICATION_VERSION      = 0x00020000\r
-\r
+  CUSTOM_MAKEFILE                = Makefile\r
 [Packages]\r
   MdePkg/MdePkg.dec\r
   DuetPkg/DuetPkg.dec\r

diff --git a/DuetPkg/DuetPkg.dsc b/DuetPkg/DuetPkg.dsc
index d47bad9382df5f4a7badf431f863105cdf765eac..924ea09cdcd38181aa53998dbae110a793481e40 100644 (file)
--- a/DuetPkg/DuetPkg.dsc
+++ b/DuetPkg/DuetPkg.dsc
@@ -9,7 +9,7 @@
   SUPPORTED_ARCHITECTURES        = IA32|X64\r
   BUILD_TARGETS                  = DEBUG\r
   SKUID_IDENTIFIER               = DEFAULT\r
-  FLASH_DEFINITION               = DuetPkg/DuetPkg.fdf\r
+  #FLASH_DEFINITION               = DuetPkg/DuetPkg.fdf\r
 \r
 [LibraryClasses.common]\r
   BaseLib|MdePkg/Library/BaseLib/BaseLib.inf\r
@@ -70,7 +70,7 @@
   ReportStatusCodeLib|IntelFrameworkModulePkg/Library/DxeReportStatusCodeLibFramework/DxeReportStatusCodeLib.inf\r
   SerialPortLib|MdePkg/Library/SerialPortLibNull/SerialPortLibNull.inf\r
   IoLib|IntelFrameworkPkg/Library/DxeIoLibCpuIo/DxeIoLibCpuIo.inf\r
-  TimerLib|MdePkg/Library/SecPeiDxeTimerLibCpu/SecPeiDxeTimerLibCpu.inf\r
+  TimerLib|MdePkg/Library/BaseTimerLibNullTemplate/BaseTimerLibNullTemplate.inf\r
 \r
 [LibraryClasses.common.UEFI_DRIVER]\r
   MemoryAllocationLib|MdePkg/Library/DxeMemoryAllocationLib/DxeMemoryAllocationLib.inf\r

diff --git a/DuetPkg/Library/DuetBdsLib/BdsPlatform.c b/DuetPkg/Library/DuetBdsLib/BdsPlatform.c
index e8404e55244a475d2933b4acc0ea082df19b9e98..b7b58ac0d0a9ec8821f5a726dd5c0724c6e8227a 100644 (file)
--- a/DuetPkg/Library/DuetBdsLib/BdsPlatform.c
+++ b/DuetPkg/Library/DuetBdsLib/BdsPlatform.c
@@ -1246,7 +1246,7 @@ Returns:
   //\r
   // Check whether the user input after the duration time has expired \r
   //\r
-  OldTpl = BdsLibGetCurrentTpl();\r
+  OldTpl = EfiGetCurrentTpl();\r
   gBS->RestoreTPL (TPL_APPLICATION); \r
   gBS->WaitForEvent (1, &UserInputDurationTime, &Index);\r
   gBS->CloseEvent (UserInputDurationTime);\r