Build drivers for IPF, X64, IA32 arch

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

3 files changed, 30 insertions, 26 deletions

diff --git a/IntelFrameworkPkg/Library/DxeReportStatusCodeLibFramework/ReportStatusCodeLib.c b/IntelFrameworkPkg/Library/DxeReportStatusCodeLibFramework/ReportStatusCodeLib.c
index e2f9d5fa47..728703ab32 100644
--- a/IntelFrameworkPkg/Library/DxeReportStatusCodeLibFramework/ReportStatusCodeLib.c
+++ b/IntelFrameworkPkg/Library/DxeReportStatusCodeLibFramework/ReportStatusCodeLib.c
@@ -78,7 +78,7 @@ InternalReportStatusCode (
     if (gBS == NULL) {

       return EFI_UNSUPPORTED;

     }

-    Status = gBS->LocateProtocol (&gEfiStatusCodeRuntimeProtocolGuid, NULL, &StatusCode);

+    Status = gBS->LocateProtocol (&gEfiStatusCodeRuntimeProtocolGuid, NULL, (VOID**)&StatusCode);

     if (!EFI_ERROR (Status) && StatusCode != NULL) {

       ReportStatusCode = StatusCode->ReportStatusCode;

     } else if (gRT->Hdr.Revision < 0x20000) {

diff --git a/MdeModulePkg/Library/EdkFvbServiceLib/X64/Fvb.c b/MdeModulePkg/Library/EdkFvbServiceLib/X64/Fvb.c
index 7bc89a0c87..4679624e70 100644
--- a/MdeModulePkg/Library/EdkFvbServiceLib/X64/Fvb.c
+++ b/MdeModulePkg/Library/EdkFvbServiceLib/X64/Fvb.c
@@ -250,8 +250,8 @@ FvbVirtualAddressChangeNotifyEvent (
       if (NULL != mFvbEntry[Index].Fvb) {

         EfiConvertPointer (0x0, (VOID **) &mFvbEntry[Index].Fvb->GetBlockSize);

         EfiConvertPointer (0x0, (VOID **) &mFvbEntry[Index].Fvb->GetPhysicalAddress);

-        EfiConvertPointer (0x0, (VOID **) &mFvbEntry[Index].Fvb->GetVolumeAttributes);

-        EfiConvertPointer (0x0, (VOID **) &mFvbEntry[Index].Fvb->SetVolumeAttributes);

+        EfiConvertPointer (0x0, (VOID **) &mFvbEntry[Index].Fvb->GetAttributes);

+        EfiConvertPointer (0x0, (VOID **) &mFvbEntry[Index].Fvb->SetAttributes);

         EfiConvertPointer (0x0, (VOID **) &mFvbEntry[Index].Fvb->Read);

         EfiConvertPointer (0x0, (VOID **) &mFvbEntry[Index].Fvb->Write);

         EfiConvertPointer (0x0, (VOID **) &mFvbEntry[Index].Fvb->EraseBlocks);

@@ -459,7 +459,7 @@ EfiFvbGetVolumeAttributes (
     return EFI_INVALID_PARAMETER;

   }

 

-  return mFvbEntry[Instance].Fvb->GetVolumeAttributes (mFvbEntry[Instance].Fvb, Attributes);

+  return mFvbEntry[Instance].Fvb->GetAttributes (mFvbEntry[Instance].Fvb, Attributes);

 }

 

 /**

@@ -491,7 +491,7 @@ EfiFvbSetVolumeAttributes (
     return EFI_INVALID_PARAMETER;

   }

 

-  return mFvbEntry[Instance].Fvb->SetVolumeAttributes (mFvbEntry[Instance].Fvb, &Attributes);

+  return mFvbEntry[Instance].Fvb->SetAttributes (mFvbEntry[Instance].Fvb, &Attributes);

 }

 

 /**

diff --git a/MdeModulePkg/MdeModulePkg.dsc b/MdeModulePkg/MdeModulePkg.dsc
index 26af5d61a3..ee44ee182c 100644
--- a/MdeModulePkg/MdeModulePkg.dsc
+++ b/MdeModulePkg/MdeModulePkg.dsc
@@ -356,21 +356,23 @@
   PcdStatusCodeValueRemoteConsoleInputError|gEfiMdePkgTokenSpaceGuid|0x01040007   # EFI_PERIPHERAL_REMOTE_CONSOLE | EFI_P_EC_INPUT_ERROR

   PcdStatusCodeValueRemoteConsoleOutputError|gEfiMdePkgTokenSpaceGuid|0x01040008  # EFI_PERIPHERAL_REMOTE_CONSOLE | EFI_P_EC_OUTPUT_ERROR

 

+[PcdsFixedAtBuild.IPF]

+  PcdIoBlockBaseAddressForIpf|gEfiMdePkgTokenSpaceGuid|0x0ffffc000000

+  

 [PcdsPatchableInModule.common]

   PcdDebugPrintErrorLevel|gEfiMdePkgTokenSpaceGuid|0x80000000

   PcdPciExpressBaseAddress|gEfiMdePkgTokenSpaceGuid|0xE0000000

   PcdFSBClock|gEfiMdePkgTokenSpaceGuid|200000000

 

-

 ################################################################################

 #

 # Components Section - list of all EDK II Modules needed by this Platform

 #

 ################################################################################

 

-

-[Components.Ia32]

-  $(WORKSPACE)/MdeModulePkg/Library/EdkFvbServiceLib/EdkFvbServiceLib.inf

+[Components.common]

+  $(WORKSPACE)/MdeModulePkg/Core/Pei/PeiMain.inf

+  $(WORKSPACE)/MdeModulePkg/Core/Dxe/DxeMain.inf

   $(WORKSPACE)/MdeModulePkg/Library/DxeCorePerformanceLib/DxeCorePerformanceLib.inf

   $(WORKSPACE)/MdeModulePkg/Library/DxePerformanceLib/DxePerformanceLib.inf

   $(WORKSPACE)/MdeModulePkg/Library/PeiPerformanceLib/PeiPerformanceLib.inf

@@ -379,34 +381,24 @@
   $(WORKSPACE)/MdeModulePkg/Application/HelloWorld/HelloWorld.inf

 

   $(WORKSPACE)/MdeModulePkg/Bus/Pci/AtapiPassThruDxe/AtapiPassThru.inf

-  $(WORKSPACE)/MdeModulePkg/Bus/Pci/EhciDxe/EhciDxe.inf

-  $(WORKSPACE)/MdeModulePkg/Bus/Pci/UhciDxe/UhciDxe.inf

   $(WORKSPACE)/MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBus.inf

   $(WORKSPACE)/MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDisk.inf

-  $(WORKSPACE)/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBusDxe.inf

-  $(WORKSPACE)/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorageDxe.inf

 

-  $(WORKSPACE)/MdeModulePkg/Core/Dxe/DxeMain.inf

   $(WORKSPACE)/MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf

-  $(WORKSPACE)/MdeModulePkg/Core/Pei/PeiMain.inf

-

   $(WORKSPACE)/MdeModulePkg/Universal/Disk/DiskIo/Dxe/DiskIo.inf

   $(WORKSPACE)/MdeModulePkg/Universal/Disk/Partition/Dxe/Partition.inf

   $(WORKSPACE)/MdeModulePkg/Universal/Disk/UnicodeCollation/English/Dxe/English.inf

   $(WORKSPACE)/MdeModulePkg/Universal/SecurityStubDxe/SecurityStub.inf

-  $(WORKSPACE)/MdeModulePkg/Universal/Capsule/RuntimeDxe/CapsuleRuntime.inf

+

   $(WORKSPACE)/MdeModulePkg/Universal/Ebc/Dxe/Ebc.inf

   $(WORKSPACE)/MdeModulePkg/Universal/GenericMemoryTest/Dxe/NullMemoryTest.inf

   $(WORKSPACE)/MdeModulePkg/Universal/FirmwareVolume/FaultTolerantWriteLite/Dxe/FtwLite.inf

   $(WORKSPACE)/MdeModulePkg/Universal/BaseMemoryTestPei/BaseMemoryTest.inf

   $(WORKSPACE)/MdeModulePkg/Universal/FirmwareVolume/GuidedSectionExtraction/Crc32SectionExtract/Dxe/Crc32SectionExtract.inf

-  $(WORKSPACE)/MdeModulePkg/Universal/VariableRuntimeDxe/Variable.inf

-  $(WORKSPACE)/MdeModulePkg/Universal/EmuVariableRuntimeDxe/EmuVariable.inf

   $(WORKSPACE)/MdeModulePkg/Universal/RuntimeDxe/Runtime.inf

-  $(WORKSPACE)/MdeModulePkg/Universal/MonotonicCounterDxe/MonotonicCounter.inf

+

   $(WORKSPACE)/MdeModulePkg/Universal/WatchDogTimerDxe/WatchDogTimer.inf

   $(WORKSPACE)/MdeModulePkg/Universal/VariablePei/Variable.inf

-  $(WORKSPACE)/MdeModulePkg/Universal/VariableRuntimeDxe/Variable.inf

   $(WORKSPACE)/MdeModulePkg/Universal/DebugSupportDxe/DebugSupport.inf

   $(WORKSPACE)/MdeModulePkg/Universal/DebugPortDxe/DebugPort.inf

   $(WORKSPACE)/MdeModulePkg/Universal/PCD/Dxe/Pcd.inf

@@ -415,14 +407,26 @@
   $(WORKSPACE)/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitter.inf

   $(WORKSPACE)/MdeModulePkg/Universal/DevicePathDxe/DevicePath.inf

   $(WORKSPACE)/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsole.inf

-  $(WORKSPACE)/MdeModulePkg/Universal/Console/TerminalDxe/Terminal.inf

+  $(WORKSPACE)/MdeModulePkg/Universal/Console/TerminalDxe/Terminal.inf  

+  $(WORKSPACE)/MdeModulePkg/Application/HelloWorld/HelloWorld.inf

+  $(WORKSPACE)/MdeModulePkg/Bus/Pci/EhciDxe/EhciDxe.inf

+  $(WORKSPACE)/MdeModulePkg/Bus/Pci/UhciDxe/UhciDxe.inf

+  $(WORKSPACE)/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBusDxe.inf

+  $(WORKSPACE)/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorageDxe.inf  

+

+[Components.Ia32]

+  $(WORKSPACE)/MdeModulePkg/Universal/Capsule/RuntimeDxe/CapsuleRuntime.inf  

+  $(WORKSPACE)/MdeModulePkg/Universal/VariableRuntimeDxe/Variable.inf

+  $(WORKSPACE)/MdeModulePkg/Universal/EmuVariableRuntimeDxe/EmuVariable.inf

+  $(WORKSPACE)/MdeModulePkg/Universal/MonotonicCounterDxe/MonotonicCounter.inf

 

 [Components.X64]

-  $(WORKSPACE)/MdeModulePkg/Application/HelloWorld/HelloWorld.inf

+  $(WORKSPACE)/MdeModulePkg/Universal/Capsule/RuntimeDxe/CapsuleRuntime.inf  

+  $(WORKSPACE)/MdeModulePkg/Universal/VariableRuntimeDxe/Variable.inf

+  $(WORKSPACE)/MdeModulePkg/Universal/EmuVariableRuntimeDxe/EmuVariable.inf

+  $(WORKSPACE)/MdeModulePkg/Universal/MonotonicCounterDxe/MonotonicCounter.inf  

 

 [Components.IPF]

-  $(WORKSPACE)/MdeModulePkg/Application/HelloWorld/HelloWorld.inf

-  #$(WORKSPACE)/MdeModulePkg/Universal/EmuVariableRuntimeDxe/EmuVariableIpf.inf

 

 [Components.EBC]

-  $(WORKSPACE)/MdeModulePkg/Application/HelloWorld/HelloWorld.inf

+