Perfected MSA files.
authorvanjeff <vanjeff@6f19259b-4bc3-4df7-8a09-765794883524>
Tue, 10 Apr 2007 09:26:43 +0000 (09:26 +0000)
committervanjeff <vanjeff@6f19259b-4bc3-4df7-8a09-765794883524>
Tue, 10 Apr 2007 09:26:43 +0000 (09:26 +0000)
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@2554 6f19259b-4bc3-4df7-8a09-765794883524

19 files changed:
EdkNt32Pkg/Dxe/Nt32Platform/MiscSubclass/MiscSubclassDriver.msa
EdkNt32Pkg/Dxe/PlatformBds/PlatformBds.msa
EdkNt32Pkg/Dxe/WinNtThunk/Bus/BlockIo/WinNtBlockIo.msa
EdkNt32Pkg/Dxe/WinNtThunk/Bus/Console/WinNtConsole.msa
EdkNt32Pkg/Dxe/WinNtThunk/Bus/SerialIo/WinNtSerialIo.msa
EdkNt32Pkg/Dxe/WinNtThunk/Bus/SimpleFileSystem/WinNtSimpleFileSystem.msa
EdkNt32Pkg/Dxe/WinNtThunk/Bus/Uga/WinNtUga.msa
EdkNt32Pkg/Dxe/WinNtThunk/Bus/WinNtBusDriver/WinNtBusDriver.msa
EdkNt32Pkg/Dxe/WinNtThunk/Chipset/Metronome/Metronome.msa
EdkNt32Pkg/Dxe/WinNtThunk/Chipset/RealTimeClock/RealTimeClock.msa
EdkNt32Pkg/Dxe/WinNtThunk/Chipset/Reset/Reset.msa
EdkNt32Pkg/Dxe/WinNtThunk/Chipset/Timer/Timer.msa
EdkNt32Pkg/Dxe/WinNtThunk/Cpu/Cpu.msa
EdkNt32Pkg/Dxe/WinNtThunk/WinNtThunk/WinNtThunk.msa
EdkNt32Pkg/Pei/Autoscan/WinNtAutoScan.msa
EdkNt32Pkg/Pei/FlashMap/FlashMap.msa
EdkNt32Pkg/Pei/WinNtStuff/WinNtStuff.msa
EdkNt32Pkg/RuntimeDxe/FvbServices/Nt32Fwh.msa
EdkNt32Pkg/Sec/SecMain.msa

index 088ac95..981acf4 100644 (file)
@@ -9,10 +9,10 @@
     <Description>\r
       Parses the MiscSubclassDataTable and reports any generated data to the DataHub.\r
       All .uni file who tagged with "ToolCode="DUMMY"" in following file list is included by\r
-      MiscSubclassDriver.uni file, the StrGather tool will expand MiscSubclassDriver.uni file \r
+      MiscSubclassDriver.uni file, the StrGather tool will expand MiscSubclassDriver.uni file\r
       and parse all .uni file.\r
     </Description>\r
-    <Copyright>Copyright (c) 2006, Intel Corporation</Copyright>\r
+    <Copyright>Copyright (c) 2006 - 2007, Intel Corporation</Copyright>\r
     <License>All rights reserved. This program and the accompanying materials\r
       are licensed and made available under the terms and conditions of the BSD License\r
       which accompanies this distribution.  The full text of the license may be found at\r
@@ -22,7 +22,7 @@
     <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>\r
   </MsaHeader>\r
   <ModuleDefinitions>\r
-    <SupportedArchitectures>IA32 X64 IPF EBC</SupportedArchitectures>\r
+    <SupportedArchitectures>IA32</SupportedArchitectures>\r
     <BinaryModule>false</BinaryModule>\r
     <OutputFileBasename>MiscSubclass</OutputFileBasename>\r
   </ModuleDefinitions>\r
     <DataHubRecord Usage="ALWAYS_PRODUCED">\r
       <DataHubCName>SystemOptionString</DataHubCName>\r
     </DataHubRecord>\r
-    <DataHubRecord Usage="SOMETIMES_CONSUMED">\r
-      <DataHubCName>ProcessorSubClassData</DataHubCName>\r
-    </DataHubRecord>\r
     <DataHubRecord Usage="SOMETIMES_PRODUCED">\r
       <DataHubCName>MemorySubClassData</DataHubCName>\r
     </DataHubRecord>\r
index d1ee0ff..052b1d8 100644 (file)
     <Protocol Usage="ALWAYS_CONSUMED">\r
       <ProtocolCName>gEfiCpuIoProtocolGuid</ProtocolCName>\r
     </Protocol>\r
-    <Protocol Usage="ALWAYS_CONSUMED">\r
+    <Protocol Usage="SOMETIMES_CONSUMED">\r
       <ProtocolCName>gEfiUgaDrawProtocolGuid</ProtocolCName>\r
     </Protocol>\r
-    <Protocol Usage="ALWAYS_CONSUMED">\r
+    <Protocol Usage="SOMETIMES_CONSUMED">\r
       <ProtocolCName>gEfiLoadFileProtocolGuid</ProtocolCName>\r
     </Protocol>\r
-    <Protocol Usage="ALWAYS_CONSUMED">\r
+    <Protocol Usage="SOMETIMES_CONSUMED">\r
       <ProtocolCName>gEfiSimpleFileSystemProtocolGuid</ProtocolCName>\r
     </Protocol>\r
     <Protocol Usage="ALWAYS_CONSUMED">\r
       <ProtocolCName>gEfiDevicePathProtocolGuid</ProtocolCName>\r
     </Protocol>\r
-    <Protocol Usage="ALWAYS_CONSUMED">\r
+    <Protocol Usage="SOMETIMES_CONSUMED">\r
       <ProtocolCName>gEfiBlockIoProtocolGuid</ProtocolCName>\r
     </Protocol>\r
     <Protocol Usage="ALWAYS_CONSUMED">\r
       <ProtocolCName>gEfiSerialIoProtocolGuid</ProtocolCName>\r
     </Protocol>\r
-    <Protocol Usage="ALWAYS_CONSUMED">\r
-      <ProtocolCName>gEfiGenericMemTestProtocolGuid</ProtocolCName>\r
-    </Protocol>\r
     <Protocol Usage="SOMETIMES_CONSUMED">\r
-      <ProtocolCName>gEfiCpuArchProtocolGuid</ProtocolCName>\r
+      <ProtocolCName>gEfiGenericMemTestProtocolGuid</ProtocolCName>\r
     </Protocol>\r
     <Protocol Usage="SOMETIMES_CONSUMED">\r
-      <ProtocolCName>gEfiDriverBindingProtocolGuid</ProtocolCName>\r
+      <ProtocolCName>gEfiGraphicsOutputProtocolGuid</ProtocolCName>\r
     </Protocol>\r
   </Protocols>\r
+  <Hobs>\r
+    <HobTypes HobGuidCName="gEfiFlashMapHobGuid" Usage="ALWAYS_CONSUMED">\r
+      <HobType>GUID_EXTENSION</HobType>\r
+    </HobTypes>\r
+  </Hobs>\r
   <DataHubs>\r
     <DataHubRecord Usage="SOMETIMES_CONSUMED">\r
       <DataHubCName>BiosVendor</DataHubCName>\r
     <DataHubRecord Usage="SOMETIMES_CONSUMED">\r
       <DataHubCName>MemoryArray</DataHubCName>\r
     </DataHubRecord>\r
-    <DataHubRecord Usage="SOMETIMES_CONSUMED">\r
-      <DataHubCName>SerialIoDevice</DataHubCName>\r
-    </DataHubRecord>\r
-    <DataHubRecord Usage="SOMETIMES_CONSUMED">\r
-      <DataHubCName>SerialIoPort</DataHubCName>\r
-    </DataHubRecord>\r
   </DataHubs>\r
   <Guids>\r
     <GuidCNames Usage="ALWAYS_CONSUMED">\r
     <GuidCNames Usage="ALWAYS_CONSUMED">\r
       <GuidCName>gEfiGenericPlatformVariableGuid</GuidCName>\r
     </GuidCNames>\r
-    <GuidCNames Usage="ALWAYS_CONSUMED">\r
-      <GuidCName>gEfiFlashMapHobGuid</GuidCName>\r
-    </GuidCNames>\r
     <GuidCNames Usage="ALWAYS_CONSUMED">\r
       <GuidCName>gEfiFileSystemVolumeLabelInfoIdGuid</GuidCName>\r
     </GuidCNames>\r
     <GuidCNames Usage="ALWAYS_CONSUMED">\r
       <GuidCName>gEfiFileInfoGuid</GuidCName>\r
     </GuidCNames>\r
-    <GuidCNames Usage="ALWAYS_CONSUMED">\r
+    <GuidCNames Usage="SOMETIMES_CONSUMED">\r
       <GuidCName>gEfiDefaultBmpLogoGuid</GuidCName>\r
     </GuidCNames>\r
   </Guids>\r
index e6ba0f0..afbf8de 100644 (file)
@@ -20,7 +20,7 @@
     <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>\r
   </MsaHeader>\r
   <ModuleDefinitions>\r
-    <SupportedArchitectures>IA32 X64 IPF EBC</SupportedArchitectures>\r
+    <SupportedArchitectures>IA32</SupportedArchitectures>\r
     <BinaryModule>false</BinaryModule>\r
     <OutputFileBasename>WinNtBlockIo</OutputFileBasename>\r
   </ModuleDefinitions>\r
index f60a5d1..595213e 100644 (file)
@@ -17,7 +17,7 @@
     <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>\r
   </MsaHeader>\r
   <ModuleDefinitions>\r
-    <SupportedArchitectures>IA32 X64 IPF EBC</SupportedArchitectures>\r
+    <SupportedArchitectures>IA32</SupportedArchitectures>\r
     <BinaryModule>false</BinaryModule>\r
     <OutputFileBasename>WinNtConsole</OutputFileBasename>\r
   </ModuleDefinitions>\r
index e2cf66e..b7e5107 100644 (file)
@@ -18,7 +18,7 @@
     <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>\r
   </MsaHeader>\r
   <ModuleDefinitions>\r
-    <SupportedArchitectures>IA32 X64 IPF EBC</SupportedArchitectures>\r
+    <SupportedArchitectures>IA32</SupportedArchitectures>\r
     <BinaryModule>false</BinaryModule>\r
     <OutputFileBasename>WinNtSerialIo</OutputFileBasename>\r
   </ModuleDefinitions>\r
index 6c0ef48..c60e293 100644 (file)
@@ -20,7 +20,7 @@
     <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>\r
   </MsaHeader>\r
   <ModuleDefinitions>\r
-    <SupportedArchitectures>IA32 X64 IPF EBC</SupportedArchitectures>\r
+    <SupportedArchitectures>IA32</SupportedArchitectures>\r
     <BinaryModule>false</BinaryModule>\r
     <OutputFileBasename>WinNtSimpleFileSystem</OutputFileBasename>\r
   </ModuleDefinitions>\r
index 86b667b..0024262 100644 (file)
@@ -20,7 +20,7 @@
     <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>\r
   </MsaHeader>\r
   <ModuleDefinitions>\r
-    <SupportedArchitectures>IA32 X64 IPF EBC</SupportedArchitectures>\r
+    <SupportedArchitectures>IA32</SupportedArchitectures>\r
     <BinaryModule>false</BinaryModule>\r
     <OutputFileBasename>WinNtUga</OutputFileBasename>\r
   </ModuleDefinitions>\r
index 39d6c7b..2fb7d61 100644 (file)
@@ -19,7 +19,7 @@
     <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>\r
   </MsaHeader>\r
   <ModuleDefinitions>\r
-    <SupportedArchitectures>IA32 X64 IPF EBC</SupportedArchitectures>\r
+    <SupportedArchitectures>IA32</SupportedArchitectures>\r
     <BinaryModule>false</BinaryModule>\r
     <OutputFileBasename>WinNtBusDriver</OutputFileBasename>\r
   </ModuleDefinitions>\r
     <Protocol Usage="TO_START">\r
       <ProtocolCName>gEfiWinNtThunkProtocolGuid</ProtocolCName>\r
     </Protocol>\r
-    <Protocol Usage="TO_START">\r
+    <Protocol Usage="BY_START">\r
       <ProtocolCName>gEfiDevicePathProtocolGuid</ProtocolCName>\r
     </Protocol>\r
+    <Protocol Usage="BY_START">\r
+      <ProtocolCName>gWinNtBusDriverGuid</ProtocolCName>\r
+    </Protocol>\r
   </Protocols>\r
   <Guids>\r
     <GuidCNames Usage="ALWAYS_CONSUMED">\r
     <GuidCNames Usage="ALWAYS_CONSUMED">\r
       <GuidCName>gEfiWinNtCPUSpeedGuid</GuidCName>\r
     </GuidCNames>\r
-    <GuidCNames Usage="ALWAYS_CONSUMED">\r
-      <GuidCName>gWinNtBusDriverGuid</GuidCName>\r
-    </GuidCNames>\r
   </Guids>\r
   <Externs>\r
     <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>\r
index b0b3d81..e4dc0b1 100644 (file)
@@ -17,7 +17,7 @@
     <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>\r
   </MsaHeader>\r
   <ModuleDefinitions>\r
-    <SupportedArchitectures>IA32 X64 IPF EBC</SupportedArchitectures>\r
+    <SupportedArchitectures>IA32</SupportedArchitectures>\r
     <BinaryModule>false</BinaryModule>\r
     <OutputFileBasename>Metronome</OutputFileBasename>\r
   </ModuleDefinitions>\r
index 45d0e6d..0fe3cd0 100644 (file)
@@ -17,7 +17,7 @@
     <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>\r
   </MsaHeader>\r
   <ModuleDefinitions>\r
-    <SupportedArchitectures>IA32 X64 IPF EBC</SupportedArchitectures>\r
+    <SupportedArchitectures>IA32</SupportedArchitectures>\r
     <BinaryModule>false</BinaryModule>\r
     <OutputFileBasename>RealTimeClock</OutputFileBasename>\r
   </ModuleDefinitions>\r
index 6c03ec3..404da8d 100644 (file)
@@ -17,7 +17,7 @@
     <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>\r
   </MsaHeader>\r
   <ModuleDefinitions>\r
-    <SupportedArchitectures>IA32 X64 IPF EBC</SupportedArchitectures>\r
+    <SupportedArchitectures>IA32</SupportedArchitectures>\r
     <BinaryModule>false</BinaryModule>\r
     <OutputFileBasename>Reset</OutputFileBasename>\r
   </ModuleDefinitions>\r
index f163548..b022741 100644 (file)
@@ -7,7 +7,7 @@
     <Version>1.0</Version>\r
     <Abstract>NT Emulation Timer Architectural Protocol Driver as defined in DXE CIS</Abstract>\r
     <Description>This Timer module uses an NT Thread to simulate the timer-tick driven\r
-      timer service.  In the future, the Thread creation should possibly be \r
+      timer service.  In the future, the Thread creation should possibly be\r
       abstracted by the CPU architectural protocol</Description>\r
     <Copyright>Copyright (c) 2006 - 2007, Intel Corporation</Copyright>\r
     <License>All rights reserved. This program and the accompanying materials\r
@@ -19,7 +19,7 @@
     <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>\r
   </MsaHeader>\r
   <ModuleDefinitions>\r
-    <SupportedArchitectures>IA32 X64 IPF EBC</SupportedArchitectures>\r
+    <SupportedArchitectures>IA32</SupportedArchitectures>\r
     <BinaryModule>false</BinaryModule>\r
     <OutputFileBasename>Timer</OutputFileBasename>\r
   </ModuleDefinitions>\r
index b96caa2..f0f22f9 100644 (file)
@@ -17,7 +17,7 @@
     <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>\r
   </MsaHeader>\r
   <ModuleDefinitions>\r
-    <SupportedArchitectures>IA32 X64 IPF EBC</SupportedArchitectures>\r
+    <SupportedArchitectures>IA32</SupportedArchitectures>\r
     <BinaryModule>false</BinaryModule>\r
     <OutputFileBasename>Cpu</OutputFileBasename>\r
   </ModuleDefinitions>\r
index 5f79138..223f4e6 100644 (file)
@@ -17,7 +17,7 @@
     <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>\r
   </MsaHeader>\r
   <ModuleDefinitions>\r
-    <SupportedArchitectures>IA32 X64 IPF EBC</SupportedArchitectures>\r
+    <SupportedArchitectures>IA32</SupportedArchitectures>\r
     <BinaryModule>false</BinaryModule>\r
     <OutputFileBasename>WinNtThunk</OutputFileBasename>\r
   </ModuleDefinitions>\r
index dc3e7c1..8a0beea 100644 (file)
@@ -17,7 +17,7 @@
     <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>\r
   </MsaHeader>\r
   <ModuleDefinitions>\r
-    <SupportedArchitectures>IA32 X64 IPF EBC</SupportedArchitectures>\r
+    <SupportedArchitectures>IA32</SupportedArchitectures>\r
     <BinaryModule>false</BinaryModule>\r
     <OutputFileBasename>WinNtAutoScan</OutputFileBasename>\r
   </ModuleDefinitions>\r
index 5a0503e..3bf00a0 100644 (file)
       <ProtocolCName>gEfiFirmwareVolumeBlockProtocolGuid</ProtocolCName>\r
     </Protocol>\r
   </Protocols>\r
+  <Hobs>\r
+    <HobTypes HobGuidCName="gEfiFlashMapHobGuid" Usage="ALWAYS_CONSUMED">\r
+      <HobType>GUID_EXTENSION</HobType>\r
+    </HobTypes>\r
+  </Hobs>\r
   <PPIs>\r
     <Ppi Usage="ALWAYS_PRODUCED">\r
       <PpiCName>gPeiFlashMapPpiGuid</PpiCName>\r
@@ -64,9 +69,6 @@
     </Ppi>\r
   </PPIs>\r
   <Guids>\r
-    <GuidCNames Usage="ALWAYS_CONSUMED">\r
-      <GuidCName>gEfiFlashMapHobGuid</GuidCName>\r
-    </GuidCNames>\r
     <GuidCNames Usage="ALWAYS_CONSUMED">\r
       <GuidCName>gEfiFirmwareFileSystemGuid</GuidCName>\r
     </GuidCNames>\r
     <PcdEntry PcdItemType="DYNAMIC">\r
       <C_Name>PcdFlashNvStorageVariableBase</C_Name>\r
       <TokenSpaceGuidCName>gEfiGenericPlatformTokenSpaceGuid</TokenSpaceGuidCName>\r
-      <HelpText>The driver sets the NV Storage FV base address defined by this PCD.  \r
+      <HelpText>The driver sets the NV Storage FV base address defined by this PCD.\r
         This base address point to an EFI_FIRMWARE_VOLUMN_HEADER struct. Variable PEIM\r
         will get the base address from this PCD. In NT emulator, this PCD is a DYNAMIC\r
-        type, as FD is mapped to process space by WinNT OS. On real platform, it is \r
+        type, as FD is mapped to process space by WinNT OS. On real platform, it is\r
         normally a FIXED_AT_BUILD type as system memory map is fixed to BIOS.</HelpText>\r
     </PcdEntry>\r
     <PcdEntry PcdItemType="DYNAMIC">\r
index d0b5bb2..9b4faf1 100644 (file)
@@ -17,7 +17,7 @@
     <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>\r
   </MsaHeader>\r
   <ModuleDefinitions>\r
-    <SupportedArchitectures>IA32 X64 IPF EBC</SupportedArchitectures>\r
+    <SupportedArchitectures>IA32</SupportedArchitectures>\r
     <BinaryModule>false</BinaryModule>\r
     <OutputFileBasename>WinNtStuff</OutputFileBasename>\r
   </ModuleDefinitions>\r
index 1eec75e..0586c28 100644 (file)
@@ -6,10 +6,10 @@
     <GuidValue>BDFE5FAA-2A35-44bb-B17A-8084D4E2B9E9</GuidValue>\r
     <Version>1.0</Version>\r
     <Abstract>Component description file for Nt32 Fimware Volume Block DXE driver module.</Abstract>\r
-    <Description>This DXE runtime driver implements and produces the Fimware Volue Block Protocol on \r
+    <Description>This DXE runtime driver implements and produces the Fimware Volue Block Protocol on\r
     NT32 emulator.\r
     </Description>\r
-    <Copyright>Copyright (c) 2006, Intel Corporation</Copyright>\r
+    <Copyright>Copyright (c) 2006 - 2007, Intel Corporation</Copyright>\r
     <License>All rights reserved. This program and the accompanying materials\r
       are licensed and made available under the terms and conditions of the BSD License\r
       which accompanies this distribution.  The full text of the license may be found at\r
@@ -19,7 +19,7 @@
     <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>\r
   </MsaHeader>\r
   <ModuleDefinitions>\r
-    <SupportedArchitectures>IA32 X64 IPF EBC</SupportedArchitectures>\r
+    <SupportedArchitectures>IA32</SupportedArchitectures>\r
     <BinaryModule>false</BinaryModule>\r
     <OutputFileBasename>FwBlockService</OutputFileBasename>\r
   </ModuleDefinitions>\r
@@ -57,9 +57,9 @@
   </LibraryClassDefinitions>\r
   <SourceFiles>\r
     <Filename>Nt32Fwh.dxs</Filename>\r
-    <Filename SupArchList="IA32">FWBlockService.c</Filename>\r
-    <Filename SupArchList="IA32">FwBlockService.h</Filename>\r
-    <Filename SupArchList="IA32">FvbInfo.c</Filename>\r
+    <Filename>FWBlockService.c</Filename>\r
+    <Filename>FwBlockService.h</Filename>\r
+    <Filename>FvbInfo.c</Filename>\r
   </SourceFiles>\r
   <PackageDependencies>\r
     <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>\r
@@ -76,6 +76,9 @@
     <Protocol Usage="ALWAYS_PRODUCED">\r
       <ProtocolCName>gEfiFvbExtensionProtocolGuid</ProtocolCName>\r
     </Protocol>\r
+    <Protocol Usage="ALWAYS_PRODUCED">\r
+      <ProtocolCName>gEfiAlternateFvBlockGuid</ProtocolCName>\r
+    </Protocol>\r
   </Protocols>\r
   <Events>\r
     <CreateEvents>\r
index e276e3f..28e8d15 100644 (file)
@@ -17,7 +17,7 @@
     <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>\r
   </MsaHeader>\r
   <ModuleDefinitions>\r
-    <SupportedArchitectures>IA32 X64 IPF EBC</SupportedArchitectures>\r
+    <SupportedArchitectures>IA32</SupportedArchitectures>\r
     <BinaryModule>false</BinaryModule>\r
     <OutputFileBasename>SecMain</OutputFileBasename>\r
   </ModuleDefinitions>\r
@@ -94,7 +94,7 @@
     <PcdEntry PcdItemType="FIXED_AT_BUILD">\r
       <C_Name>PcdWinNtBootMode</C_Name>\r
       <TokenSpaceGuidCName>gEfiEdkNt32PkgTokenSpaceGuid</TokenSpaceGuidCName>\r
-      <HelpText>This PCD defines the boot mode for simualtor. \r
+      <HelpText>This PCD defines the boot mode for simualtor.\r
         The boot mode can be set as following value:\r
           0x0: Boot with full configuration.\r
           0x1: Boot with minimal configuration.\r
           0x4: Boot with default settings.\r
           0x5: Boot on S4 resume.\r
           0x6: Boot on S5 resume.\r
-          0x10: Boot on S2 resume. \r
+          0x10: Boot on S2 resume.\r
           0x11: Boot on S3 resume.\r
           0x12: Boot on flash update.\r
           0x20: Boot in reovery mode.</HelpText>\r