Sync EDKII BaseTools to BaseTools project r1971

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

31 files changed, 66 insertions, 64 deletions

diff --git a/BaseTools/Source/Python/GenFds/AprioriSection.py b/BaseTools/Source/Python/GenFds/AprioriSection.py
index 92a9794..bb40d75 100644
--- a/BaseTools/Source/Python/GenFds/AprioriSection.py
+++ b/BaseTools/Source/Python/GenFds/AprioriSection.py
@@ -1,9 +1,9 @@
 ## @file

 # process APRIORI file data and generate PEI/DXE APRIORI file

 #

-#  Copyright (c) 2007, Intel Corporation

+#  Copyright (c) 2007, Intel Corporation. All rights reserved.<BR>

 #

-#  All rights reserved. This program and the accompanying materials

+#  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

 #  http://opensource.org/licenses/bsd-license.php

diff --git a/BaseTools/Source/Python/GenFds/Attribute.py b/BaseTools/Source/Python/GenFds/Attribute.py
index 67f9956..17761f2 100644
--- a/BaseTools/Source/Python/GenFds/Attribute.py
+++ b/BaseTools/Source/Python/GenFds/Attribute.py
@@ -1,9 +1,9 @@
 ## @file

 # name value pair

 #

-#  Copyright (c) 2007, Intel Corporation

+#  Copyright (c) 2007, Intel Corporation. All rights reserved.<BR>

 #

-#  All rights reserved. This program and the accompanying materials

+#  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

 #  http://opensource.org/licenses/bsd-license.php

diff --git a/BaseTools/Source/Python/GenFds/Capsule.py b/BaseTools/Source/Python/GenFds/Capsule.py
index 961b88a..fb9213b 100644
--- a/BaseTools/Source/Python/GenFds/Capsule.py
+++ b/BaseTools/Source/Python/GenFds/Capsule.py
@@ -1,9 +1,9 @@
 ## @file

 # generate capsule

 #

-#  Copyright (c) 2007, Intel Corporation

+#  Copyright (c) 2007, Intel Corporation. All rights reserved.<BR>

 #

-#  All rights reserved. This program and the accompanying materials

+#  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

 #  http://opensource.org/licenses/bsd-license.php

diff --git a/BaseTools/Source/Python/GenFds/CapsuleData.py b/BaseTools/Source/Python/GenFds/CapsuleData.py
index 0940094..85307b9 100644
--- a/BaseTools/Source/Python/GenFds/CapsuleData.py
+++ b/BaseTools/Source/Python/GenFds/CapsuleData.py
@@ -1,9 +1,9 @@
 ## @file

 # generate capsule

 #

-#  Copyright (c) 2007, Intel Corporation

+#  Copyright (c) 2007, Intel Corporation. All rights reserved.<BR>

 #

-#  All rights reserved. This program and the accompanying materials

+#  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

 #  http://opensource.org/licenses/bsd-license.php

diff --git a/BaseTools/Source/Python/GenFds/ComponentStatement.py b/BaseTools/Source/Python/GenFds/ComponentStatement.py
index 8a7540f..1cf9261 100644
--- a/BaseTools/Source/Python/GenFds/ComponentStatement.py
+++ b/BaseTools/Source/Python/GenFds/ComponentStatement.py
@@ -1,9 +1,9 @@
 ## @file

 # VTF components

 #

-#  Copyright (c) 2007, Intel Corporation

+#  Copyright (c) 2007, Intel Corporation. All rights reserved.<BR>

 #

-#  All rights reserved. This program and the accompanying materials

+#  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

 #  http://opensource.org/licenses/bsd-license.php

diff --git a/BaseTools/Source/Python/GenFds/CompressSection.py b/BaseTools/Source/Python/GenFds/CompressSection.py
index 7e12667..4bcf286 100644
--- a/BaseTools/Source/Python/GenFds/CompressSection.py
+++ b/BaseTools/Source/Python/GenFds/CompressSection.py
@@ -1,9 +1,9 @@
 ## @file

 # process compress section generation

 #

-#  Copyright (c) 2007, Intel Corporation

+#  Copyright (c) 2007, Intel Corporation. All rights reserved.<BR>

 #

-#  All rights reserved. This program and the accompanying materials

+#  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

 #  http://opensource.org/licenses/bsd-license.php

diff --git a/BaseTools/Source/Python/GenFds/DataSection.py b/BaseTools/Source/Python/GenFds/DataSection.py
index 7f24b51..dff4691 100644
--- a/BaseTools/Source/Python/GenFds/DataSection.py
+++ b/BaseTools/Source/Python/GenFds/DataSection.py
@@ -1,9 +1,9 @@
 ## @file

 # process data section generation

 #

-#  Copyright (c) 2007, Intel Corporation

+#  Copyright (c) 2007, Intel Corporation. All rights reserved.<BR>

 #

-#  All rights reserved. This program and the accompanying materials

+#  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

 #  http://opensource.org/licenses/bsd-license.php

diff --git a/BaseTools/Source/Python/GenFds/DepexSection.py b/BaseTools/Source/Python/GenFds/DepexSection.py
index 8650a73..39678b2 100644
--- a/BaseTools/Source/Python/GenFds/DepexSection.py
+++ b/BaseTools/Source/Python/GenFds/DepexSection.py
@@ -1,9 +1,9 @@
 ## @file

 # process depex section generation

 #

-#  Copyright (c) 2007, Intel Corporation

+#  Copyright (c) 2007, Intel Corporation. All rights reserved.<BR>

 #

-#  All rights reserved. This program and the accompanying materials

+#  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

 #  http://opensource.org/licenses/bsd-license.php

diff --git a/BaseTools/Source/Python/GenFds/EfiSection.py b/BaseTools/Source/Python/GenFds/EfiSection.py
index ad953fa..5419e11 100644
--- a/BaseTools/Source/Python/GenFds/EfiSection.py
+++ b/BaseTools/Source/Python/GenFds/EfiSection.py
@@ -1,9 +1,9 @@
 ## @file

 # process rule section generation

 #

-#  Copyright (c) 2007, Intel Corporation

+#  Copyright (c) 2007, Intel Corporation. All rights reserved.<BR>

 #

-#  All rights reserved. This program and the accompanying materials

+#  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

 #  http://opensource.org/licenses/bsd-license.php

diff --git a/BaseTools/Source/Python/GenFds/Fd.py b/BaseTools/Source/Python/GenFds/Fd.py
index 26de500..cbfd671 100644
--- a/BaseTools/Source/Python/GenFds/Fd.py
+++ b/BaseTools/Source/Python/GenFds/Fd.py
@@ -1,9 +1,9 @@
 ## @file

 # process FD generation

 #

-#  Copyright (c) 2007, Intel Corporation

+#  Copyright (c) 2007, Intel Corporation. All rights reserved.<BR>

 #

-#  All rights reserved. This program and the accompanying materials

+#  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

 #  http://opensource.org/licenses/bsd-license.php

diff --git a/BaseTools/Source/Python/GenFds/FdfParser.py b/BaseTools/Source/Python/GenFds/FdfParser.py
index 1e87eb4..ea19156 100644
--- a/BaseTools/Source/Python/GenFds/FdfParser.py
+++ b/BaseTools/Source/Python/GenFds/FdfParser.py
@@ -1,9 +1,9 @@
 ## @file

 # parse FDF file

 #

-#  Copyright (c) 2007 - 2010, Intel Corporation

+#  Copyright (c) 2007 - 2010, Intel Corporation. All rights reserved.<BR>

 #

-#  All rights reserved. This program and the accompanying materials

+#  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

 #  http://opensource.org/licenses/bsd-license.php

diff --git a/BaseTools/Source/Python/GenFds/Ffs.py b/BaseTools/Source/Python/GenFds/Ffs.py
index 438bd18..d9f1cda 100644
--- a/BaseTools/Source/Python/GenFds/Ffs.py
+++ b/BaseTools/Source/Python/GenFds/Ffs.py
@@ -1,9 +1,9 @@
 ## @file

 # process FFS generation

 #

-#  Copyright (c) 2007, Intel Corporation

+#  Copyright (c) 2007, Intel Corporation. All rights reserved.<BR>

 #

-#  All rights reserved. This program and the accompanying materials

+#  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

 #  http://opensource.org/licenses/bsd-license.php

diff --git a/BaseTools/Source/Python/GenFds/FfsFileStatement.py b/BaseTools/Source/Python/GenFds/FfsFileStatement.py
index b0b1b00..013dbb1 100644
--- a/BaseTools/Source/Python/GenFds/FfsFileStatement.py
+++ b/BaseTools/Source/Python/GenFds/FfsFileStatement.py
@@ -1,9 +1,9 @@
 ## @file

 # process FFS generation from FILE statement

 #

-#  Copyright (c) 2007 - 2010, Intel Corporation

+#  Copyright (c) 2007 - 2010, Intel Corporation. All rights reserved.<BR>

 #

-#  All rights reserved. This program and the accompanying materials

+#  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

 #  http://opensource.org/licenses/bsd-license.php

diff --git a/BaseTools/Source/Python/GenFds/FfsInfStatement.py b/BaseTools/Source/Python/GenFds/FfsInfStatement.py
index b00e5a2..d95af34 100644
--- a/BaseTools/Source/Python/GenFds/FfsInfStatement.py
+++ b/BaseTools/Source/Python/GenFds/FfsInfStatement.py
@@ -1,9 +1,9 @@
 ## @file

 # process FFS generation from INF statement

 #

-#  Copyright (c) 2007 - 2010, Intel Corporation

+#  Copyright (c) 2007 - 2010, Intel Corporation. All rights reserved.<BR>

 #

-#  All rights reserved. This program and the accompanying materials

+#  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

 #  http://opensource.org/licenses/bsd-license.php

diff --git a/BaseTools/Source/Python/GenFds/Fv.py b/BaseTools/Source/Python/GenFds/Fv.py
index 8d2ef1d..7b6305b 100644
--- a/BaseTools/Source/Python/GenFds/Fv.py
+++ b/BaseTools/Source/Python/GenFds/Fv.py
@@ -1,9 +1,9 @@
 ## @file

 # process FV generation

 #

-#  Copyright (c) 2007 - 2010, Intel Corporation

+#  Copyright (c) 2007 - 2010, Intel Corporation. All rights reserved.<BR>

 #

-#  All rights reserved. This program and the accompanying materials

+#  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

 #  http://opensource.org/licenses/bsd-license.php

diff --git a/BaseTools/Source/Python/GenFds/FvImageSection.py b/BaseTools/Source/Python/GenFds/FvImageSection.py
index c945ce9..f5d3f4f 100644
--- a/BaseTools/Source/Python/GenFds/FvImageSection.py
+++ b/BaseTools/Source/Python/GenFds/FvImageSection.py
@@ -1,9 +1,9 @@
 ## @file

 # process FV image section generation

 #

-#  Copyright (c) 2007, Intel Corporation

+#  Copyright (c) 2007, Intel Corporation. All rights reserved.<BR>

 #

-#  All rights reserved. This program and the accompanying materials

+#  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

 #  http://opensource.org/licenses/bsd-license.php

diff --git a/BaseTools/Source/Python/GenFds/GenFds.py b/BaseTools/Source/Python/GenFds/GenFds.py
index 5e9a022..cb82c71 100644
--- a/BaseTools/Source/Python/GenFds/GenFds.py
+++ b/BaseTools/Source/Python/GenFds/GenFds.py
@@ -1,9 +1,9 @@
 ## @file
 # generate flash image
 #
-#  Copyright (c) 2007 - 2010, Intel Corporation
+#  Copyright (c) 2007 - 2010, Intel Corporation. All rights reserved.<BR>
 #
-#  All rights reserved. This program and the accompanying materials
+#  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
 #  http://opensource.org/licenses/bsd-license.php
@@ -35,6 +35,7 @@ import Common.GlobalData as GlobalData
 from Common import EdkLogger
 from Common.String import *
 from Common.Misc import DirCache,PathClass
+from Common.Misc import SaveFileOnChange
 
 ## Version and Copyright
 versionNumber = "1.0"
@@ -486,14 +487,15 @@ class GenFds :
 
     def GenerateGuidXRefFile(BuildDb, ArchList):
         GuidXRefFileName = os.path.join(GenFdsGlobalVariable.FvDir, "Guid.xref")
-        GuidXRefFile = open(GuidXRefFileName, "w+")
+        GuidXRefFile = StringIO.StringIO('')
         for Arch in ArchList:
             PlatformDataBase = BuildDb.BuildObject[GenFdsGlobalVariable.ActivePlatform, Arch]
             for ModuleFile in PlatformDataBase.Modules:
                 Module = BuildDb.BuildObject[ModuleFile, Arch]
                 GuidXRefFile.write("%s %s\n" % (Module.Guid, Module.BaseName))
+        SaveFileOnChange(GuidXRefFileName, GuidXRefFile.getvalue(), False)

         GuidXRefFile.close()
-        GenFdsGlobalVariable.InfLogger("\nGUID cross reference file saved to %s" % GuidXRefFileName)
+        GenFdsGlobalVariable.InfLogger("\nGUID cross reference file can be found at %s" % GuidXRefFileName)
         
     ##Define GenFd as static function
     GenFd = staticmethod(GenFd)
diff --git a/BaseTools/Source/Python/GenFds/GenFdsGlobalVariable.py b/BaseTools/Source/Python/GenFds/GenFdsGlobalVariable.py
index cad2758..e9eace9 100644
--- a/BaseTools/Source/Python/GenFds/GenFdsGlobalVariable.py
+++ b/BaseTools/Source/Python/GenFds/GenFdsGlobalVariable.py
@@ -1,9 +1,9 @@
 ## @file
 # Global variables for GenFds
 #
-#  Copyright (c) 2007 - 2010, Intel Corporation
+#  Copyright (c) 2007 - 2010, Intel Corporation. All rights reserved.<BR>
 #
-#  All rights reserved. This program and the accompanying materials
+#  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
 #  http://opensource.org/licenses/bsd-license.php
diff --git a/BaseTools/Source/Python/GenFds/GuidSection.py b/BaseTools/Source/Python/GenFds/GuidSection.py
index d967880..0ef5a23 100644
--- a/BaseTools/Source/Python/GenFds/GuidSection.py
+++ b/BaseTools/Source/Python/GenFds/GuidSection.py
@@ -1,9 +1,9 @@
 ## @file

 # process GUIDed section generation

 #

-#  Copyright (c) 2007 - 2010, Intel Corporation

+#  Copyright (c) 2007 - 2010, Intel Corporation. All rights reserved.<BR>

 #

-#  All rights reserved. This program and the accompanying materials

+#  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

 #  http://opensource.org/licenses/bsd-license.php

diff --git a/BaseTools/Source/Python/GenFds/OptRomFileStatement.py b/BaseTools/Source/Python/GenFds/OptRomFileStatement.py
index c360c6d..a98d208 100644
--- a/BaseTools/Source/Python/GenFds/OptRomFileStatement.py
+++ b/BaseTools/Source/Python/GenFds/OptRomFileStatement.py
@@ -1,9 +1,9 @@
 ## @file

 # process OptionROM generation from FILE statement

 #

-#  Copyright (c) 2007, Intel Corporation

+#  Copyright (c) 2007, Intel Corporation. All rights reserved.<BR>

 #

-#  All rights reserved. This program and the accompanying materials

+#  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

 #  http://opensource.org/licenses/bsd-license.php

diff --git a/BaseTools/Source/Python/GenFds/OptRomInfStatement.py b/BaseTools/Source/Python/GenFds/OptRomInfStatement.py
index 8cd7429..d64f836 100644
--- a/BaseTools/Source/Python/GenFds/OptRomInfStatement.py
+++ b/BaseTools/Source/Python/GenFds/OptRomInfStatement.py
@@ -1,9 +1,9 @@
 ## @file

 # process OptionROM generation from INF statement

 #

-#  Copyright (c) 2007, Intel Corporation

+#  Copyright (c) 2007, Intel Corporation. All rights reserved.<BR>

 #

-#  All rights reserved. This program and the accompanying materials

+#  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

 #  http://opensource.org/licenses/bsd-license.php

diff --git a/BaseTools/Source/Python/GenFds/OptionRom.py b/BaseTools/Source/Python/GenFds/OptionRom.py
index 28e77aa..ce46413 100644
--- a/BaseTools/Source/Python/GenFds/OptionRom.py
+++ b/BaseTools/Source/Python/GenFds/OptionRom.py
@@ -1,9 +1,9 @@
 ## @file

 # process OptionROM generation

 #

-#  Copyright (c) 2007, Intel Corporation

+#  Copyright (c) 2007, Intel Corporation. All rights reserved.<BR>

 #

-#  All rights reserved. This program and the accompanying materials

+#  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

 #  http://opensource.org/licenses/bsd-license.php

diff --git a/BaseTools/Source/Python/GenFds/Region.py b/BaseTools/Source/Python/GenFds/Region.py
index 99f1ac3..09971b3 100644
--- a/BaseTools/Source/Python/GenFds/Region.py
+++ b/BaseTools/Source/Python/GenFds/Region.py
@@ -1,9 +1,9 @@
 ## @file

 # process FD Region generation

 #

-#  Copyright (c) 2007, Intel Corporation

+#  Copyright (c) 2007, Intel Corporation. All rights reserved.<BR>

 #

-#  All rights reserved. This program and the accompanying materials

+#  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

 #  http://opensource.org/licenses/bsd-license.php

diff --git a/BaseTools/Source/Python/GenFds/Rule.py b/BaseTools/Source/Python/GenFds/Rule.py
index 40a5f88..0e112cf 100644
--- a/BaseTools/Source/Python/GenFds/Rule.py
+++ b/BaseTools/Source/Python/GenFds/Rule.py
@@ -1,9 +1,9 @@
 ## @file

 # Rule object for generating FFS

 #

-#  Copyright (c) 2007, Intel Corporation

+#  Copyright (c) 2007, Intel Corporation. All rights reserved.<BR>

 #

-#  All rights reserved. This program and the accompanying materials

+#  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

 #  http://opensource.org/licenses/bsd-license.php

diff --git a/BaseTools/Source/Python/GenFds/RuleComplexFile.py b/BaseTools/Source/Python/GenFds/RuleComplexFile.py
index 63e65c5..36c483f 100644
--- a/BaseTools/Source/Python/GenFds/RuleComplexFile.py
+++ b/BaseTools/Source/Python/GenFds/RuleComplexFile.py
@@ -1,9 +1,9 @@
 ## @file

 # Complex Rule object for generating FFS

 #

-#  Copyright (c) 2007, Intel Corporation

+#  Copyright (c) 2007, Intel Corporation. All rights reserved.<BR>

 #

-#  All rights reserved. This program and the accompanying materials

+#  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

 #  http://opensource.org/licenses/bsd-license.php

diff --git a/BaseTools/Source/Python/GenFds/RuleSimpleFile.py b/BaseTools/Source/Python/GenFds/RuleSimpleFile.py
index c6fdbd8..061f984 100644
--- a/BaseTools/Source/Python/GenFds/RuleSimpleFile.py
+++ b/BaseTools/Source/Python/GenFds/RuleSimpleFile.py
@@ -1,9 +1,9 @@
 ## @file

 # Simple Rule object for generating FFS

 #

-#  Copyright (c) 2007, Intel Corporation

+#  Copyright (c) 2007, Intel Corporation. All rights reserved.<BR>

 #

-#  All rights reserved. This program and the accompanying materials

+#  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

 #  http://opensource.org/licenses/bsd-license.php

diff --git a/BaseTools/Source/Python/GenFds/Section.py b/BaseTools/Source/Python/GenFds/Section.py
index 2e24697..8c884b6 100644
--- a/BaseTools/Source/Python/GenFds/Section.py
+++ b/BaseTools/Source/Python/GenFds/Section.py
@@ -1,9 +1,9 @@
 ## @file

 # section base class

 #

-#  Copyright (c) 2007, Intel Corporation

+#  Copyright (c) 2007, Intel Corporation. All rights reserved.<BR>

 #

-#  All rights reserved. This program and the accompanying materials

+#  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

 #  http://opensource.org/licenses/bsd-license.php

diff --git a/BaseTools/Source/Python/GenFds/UiSection.py b/BaseTools/Source/Python/GenFds/UiSection.py
index e660055..e1b69ed 100644
--- a/BaseTools/Source/Python/GenFds/UiSection.py
+++ b/BaseTools/Source/Python/GenFds/UiSection.py
@@ -1,9 +1,9 @@
 ## @file

 # process UI section generation

 #

-#  Copyright (c) 2007, Intel Corporation

+#  Copyright (c) 2007, Intel Corporation. All rights reserved.<BR>

 #

-#  All rights reserved. This program and the accompanying materials

+#  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

 #  http://opensource.org/licenses/bsd-license.php

diff --git a/BaseTools/Source/Python/GenFds/VerSection.py b/BaseTools/Source/Python/GenFds/VerSection.py
index e27d0a2..3fca406 100644
--- a/BaseTools/Source/Python/GenFds/VerSection.py
+++ b/BaseTools/Source/Python/GenFds/VerSection.py
@@ -1,9 +1,9 @@
 ## @file

 # process Version section generation

 #

-#  Copyright (c) 2007, Intel Corporation

+#  Copyright (c) 2007, Intel Corporation. All rights reserved.<BR>

 #

-#  All rights reserved. This program and the accompanying materials

+#  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

 #  http://opensource.org/licenses/bsd-license.php

diff --git a/BaseTools/Source/Python/GenFds/Vtf.py b/BaseTools/Source/Python/GenFds/Vtf.py
index eebc7b1..2bea934 100644
--- a/BaseTools/Source/Python/GenFds/Vtf.py
+++ b/BaseTools/Source/Python/GenFds/Vtf.py
@@ -1,9 +1,9 @@
 ## @file

 # process VTF generation

 #

-#  Copyright (c) 2007, Intel Corporation

+#  Copyright (c) 2007, Intel Corporation. All rights reserved.<BR>

 #

-#  All rights reserved. This program and the accompanying materials

+#  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

 #  http://opensource.org/licenses/bsd-license.php

diff --git a/BaseTools/Source/Python/GenFds/__init__.py b/BaseTools/Source/Python/GenFds/__init__.py
index 1c5796a..6ba4ed4 100644
--- a/BaseTools/Source/Python/GenFds/__init__.py
+++ b/BaseTools/Source/Python/GenFds/__init__.py
@@ -4,8 +4,8 @@
 # This file is required to make Python interpreter treat the directory

 # as containing package.

 #

-# Copyright (c) 2007 - 2010, Intel Corporation<BR>

-# All rights reserved. This program and the accompanying materials

+# Copyright (c) 2007 - 2010, 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

 # http://opensource.org/licenses/bsd-license.php