1 files changed, 12 insertions, 6 deletions
diff --git a/BaseTools/Source/Python/build/BuildReport.py b/BaseTools/Source/Python/build/BuildReport.py
index d5ea3bd3e5..2058a7bae7 100644
--- a/BaseTools/Source/Python/build/BuildReport.py
+++ b/BaseTools/Source/Python/build/BuildReport.py
@@ -4,7 +4,7 @@
 # This module contains the functionality to generate build report after
 # build all target completes successfully.
 #
-# Copyright (c) 2010, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2010 - 2012, Intel Corporation. All rights reserved.<BR>
 # This program and the accompanying materials
 # are licensed and made available under the terms and conditions of the BSD License
 # which accompanies this distribution.  The full text of the license may be found at
@@ -72,6 +72,9 @@ gGlueLibEntryPoint = re.compile(r"__EDKII_GLUE_MODULE_ENTRY_POINT__\s*=\s*(\w+)"
 ## Tags for MaxLength of line in report
 gLineMaxLength = 120
 
+## Tags for end of line in report
+gEndOfLine = "\r\n"
+
 ## Tags for section start, end and separator
 gSectionStart = ">" + "=" * (gLineMaxLength-2) + "<"
 gSectionEnd = "<" + "=" * (gLineMaxLength-2) + ">" + "\n"
@@ -91,9 +94,9 @@ gPcdTypeMap = {
   'Dynamic'          : ('DYN',    'Dynamic'),
   'DynamicHii'       : ('DYNHII', 'Dynamic'),
   'DynamicVpd'       : ('DYNVPD', 'Dynamic'),
-  'DynamicEx'        : ('DEX',    'Dynamic'),
-  'DynamicExHii'     : ('DEXHII', 'Dynamic'),
-  'DynamicExVpd'     : ('DEXVPD', 'Dynamic'),
+  'DynamicEx'        : ('DEX',    'DynamicEx'),
+  'DynamicExHii'     : ('DEXHII', 'DynamicEx'),
+  'DynamicExVpd'     : ('DEXVPD', 'DynamicEx'),
   }
 
 ## The look up table to map module type to driver type
@@ -128,7 +131,7 @@ gOpCodeList = ["BEFORE", "AFTER", "PUSH", "AND", "OR", "NOT", "TRUE", "FALSE", "
 def FileWrite(File, String, Wrapper=False):
     if Wrapper:
         String = textwrap.fill(String, 120)
-    File.write(String + "\r\n")
+    File.write(String + gEndOfLine)
 
 ##
 # Find all the header file that the module source directly includes.
@@ -203,6 +206,8 @@ def FileLinesSplit(Content=None, MaxLength=None):
             NewContentList.append(Line)
     for NewLine in NewContentList:
         NewContent += NewLine + TAB_LINE_BREAK
+    
+    NewContent = NewContent.replace(TAB_LINE_BREAK, gEndOfLine).replace('\r\r\n', gEndOfLine)
     return NewContent
     
     
@@ -694,7 +699,8 @@ class PcdReport(object):
         # Collect PCDs defined in DSC common section
         #
         self.DscPcdDefault = {}
-        for Platform in Wa.BuildDatabase.WorkspaceDb.PlatformList:
+        for Arch in Wa.ArchList:
+            Platform = Wa.BuildDatabase[Wa.MetaFile, Arch, Wa.BuildTarget, Wa.ToolChain]
             for (TokenCName, TokenSpaceGuidCName) in Platform.Pcds:
                 DscDefaultValue = Platform.Pcds[(TokenCName, TokenSpaceGuidCName)].DefaultValue
                 if DscDefaultValue: