3 files changed, 9 insertions, 7 deletions
diff --git a/EdkNt32Pkg/Pei/Autoscan/WinNtAutoScan.msa b/EdkNt32Pkg/Pei/Autoscan/WinNtAutoScan.msa
index dc3e7c1..8a0beea 100644
--- a/EdkNt32Pkg/Pei/Autoscan/WinNtAutoScan.msa
+++ b/EdkNt32Pkg/Pei/Autoscan/WinNtAutoScan.msa
@@ -17,7 +17,7 @@
     <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>
   </MsaHeader>
   <ModuleDefinitions>
-    <SupportedArchitectures>IA32 X64 IPF EBC</SupportedArchitectures>
+    <SupportedArchitectures>IA32</SupportedArchitectures>
     <BinaryModule>false</BinaryModule>
     <OutputFileBasename>WinNtAutoScan</OutputFileBasename>
   </ModuleDefinitions>
diff --git a/EdkNt32Pkg/Pei/FlashMap/FlashMap.msa b/EdkNt32Pkg/Pei/FlashMap/FlashMap.msa
index 5a0503e..3bf00a0 100644
--- a/EdkNt32Pkg/Pei/FlashMap/FlashMap.msa
+++ b/EdkNt32Pkg/Pei/FlashMap/FlashMap.msa
@@ -55,6 +55,11 @@
       <ProtocolCName>gEfiFirmwareVolumeBlockProtocolGuid</ProtocolCName>
     </Protocol>
   </Protocols>
+  <Hobs>
+    <HobTypes HobGuidCName="gEfiFlashMapHobGuid" Usage="ALWAYS_CONSUMED">
+      <HobType>GUID_EXTENSION</HobType>
+    </HobTypes>
+  </Hobs>
   <PPIs>
     <Ppi Usage="ALWAYS_PRODUCED">
       <PpiCName>gPeiFlashMapPpiGuid</PpiCName>
@@ -65,9 +70,6 @@
   </PPIs>
   <Guids>
     <GuidCNames Usage="ALWAYS_CONSUMED">
-      <GuidCName>gEfiFlashMapHobGuid</GuidCName>
-    </GuidCNames>
-    <GuidCNames Usage="ALWAYS_CONSUMED">
       <GuidCName>gEfiFirmwareFileSystemGuid</GuidCName>
     </GuidCNames>
   </Guids>
@@ -82,10 +84,10 @@
     <PcdEntry PcdItemType="DYNAMIC">
       <C_Name>PcdFlashNvStorageVariableBase</C_Name>
       <TokenSpaceGuidCName>gEfiGenericPlatformTokenSpaceGuid</TokenSpaceGuidCName>
-      <HelpText>The driver sets the NV Storage FV base address defined by this PCD.  
+      <HelpText>The driver sets the NV Storage FV base address defined by this PCD.
         This base address point to an EFI_FIRMWARE_VOLUMN_HEADER struct. Variable PEIM
         will get the base address from this PCD. In NT emulator, this PCD is a DYNAMIC
-        type, as FD is mapped to process space by WinNT OS. On real platform, it is 
+        type, as FD is mapped to process space by WinNT OS. On real platform, it is
         normally a FIXED_AT_BUILD type as system memory map is fixed to BIOS.</HelpText>
     </PcdEntry>
     <PcdEntry PcdItemType="DYNAMIC">
diff --git a/EdkNt32Pkg/Pei/WinNtStuff/WinNtStuff.msa b/EdkNt32Pkg/Pei/WinNtStuff/WinNtStuff.msa
index d0b5bb2..9b4faf1 100644
--- a/EdkNt32Pkg/Pei/WinNtStuff/WinNtStuff.msa
+++ b/EdkNt32Pkg/Pei/WinNtStuff/WinNtStuff.msa
@@ -17,7 +17,7 @@
     <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>
   </MsaHeader>
   <ModuleDefinitions>
-    <SupportedArchitectures>IA32 X64 IPF EBC</SupportedArchitectures>
+    <SupportedArchitectures>IA32</SupportedArchitectures>
     <BinaryModule>false</BinaryModule>
     <OutputFileBasename>WinNtStuff</OutputFileBasename>
   </ModuleDefinitions>