License header updated to match correct format.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Yingke Liu <yingke.d.liu@intel.com>
Reviewed-by: Liming Gao <liming.gao@intel.com>

git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@15971 6f19259b-4bc3-4df7-8a09-765794883524

BaseTools/BuildEnv

@@ -1,5 +1,8 @@
+## @file
+# Setup the environment for unix-like systems running a bash-like shell.
+# This file must be "sourced" not merely executed. For example: ". edksetup.sh"
 #
-# Copyright (c) 2006 - 2012, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2006 - 2014, 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
@@ -7,10 +10,6 @@
 # 
 # THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
 # WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
-
-#
-# Setup the environment for unix-like systems running a bash-like shell.
-# This file must be "sourced" not merely executed. For example: ". edksetup.sh"
 #
 
 SetWorkspace() {

BaseTools/Conf/build_rule.template

@@ -299,7 +299,7 @@
         $(CP) ${dst} $(OUTPUT_DIR)
         $(CP) ${dst} $(BIN_DIR)
         -$(CP) $(DEBUG_DIR)(+)*.map $(OUTPUT_DIR)
-
+        -$(CP) $(DEBUG_DIR)(+)*.pdb $(OUTPUT_DIR) 
     <Command.GCC>
         $(CP) ${src} $(DEBUG_DIR)(+)$(MODULE_NAME).debug
         $(OBJCOPY) --strip-unneeded -R .eh_frame ${src}

BaseTools/Source/C/Common/BinderFuncs.c

@@ -1,6 +1,7 @@
 /** @file
+Binder function implementations for ANSI C libraries.
 
-Copyright (c) 1999 - 2008, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 1999 - 2014, 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
@@ -9,14 +10,6 @@ http://opensource.org/licenses/bsd-license.php
 THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
 WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 
-Module Name:
-
-  BinderFuncs.c
-
-Abstract:
-
-  Binder function implementations for ANSI C libraries.
-
 **/
 
 #include "BinderFuncs.h"

BaseTools/Source/C/Common/BinderFuncs.h

@@ -1,6 +1,9 @@
 /** @file
-
+Prototypes for binder functions that allow common code to be written which then 
-Copyright (c) 1999 - 2008, Intel Corporation. All rights reserved.<BR>
+links to implementation of these functions which is appropriate for the specific 
+environment that they are running under.
+  
+Copyright (c) 1999 - 2014, 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
@@ -9,17 +12,6 @@ http://opensource.org/licenses/bsd-license.php
 THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
 WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 
-Module Name:
-
-  BinderFuncs.h
-
-Abstract:
-
-  Prototypes for binder functions that allow common code to be
-  written which then links to implementation of these functions
-  which is appropriate for the specific environment that they
-  are running under.
-
 **/
 
 #ifndef BinderFuncs_h_INCLUDED

BaseTools/Source/C/Common/CommonLib.c

@@ -1,4 +1,5 @@
 /** @file
+Common basic Library Functions
 
 Copyright (c) 2004 - 2014, Intel Corporation. All rights reserved.<BR>
 This program and the accompanying materials                          
@@ -9,14 +10,6 @@ http://opensource.org/licenses/bsd-license.php
 THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     
 WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             
 
-Module Name:
-
-  CommonLib.c
-
-Abstract:
-
-  Common basic Library Functions
- 
 **/
 
 #include <stdio.h>

BaseTools/Source/C/Common/CommonLib.h

@@ -1,4 +1,5 @@
 /** @file
+Common library assistance routines.
 
 Copyright (c) 2004 - 2014, Intel Corporation. All rights reserved.<BR>
 This program and the accompanying materials
@@ -9,14 +10,6 @@ http://opensource.org/licenses/bsd-license.php
 THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
 WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 
-Module Name:
-
-  CommonLib.h
-
-Abstract:
-
-  Common library assistance routines.
-
 **/
 
 #ifndef _EFI_COMMON_LIB_H
@@ -31,6 +24,7 @@ Abstract:
 #ifdef __cplusplus
 extern "C" {
 #endif
+
 //
 // Function declarations
 //

BaseTools/Source/C/Common/Compress.h

@@ -1,6 +1,8 @@
 /** @file
-
+Header file for compression routine.
-Copyright (c) 2004 - 2008, Intel Corporation. All rights reserved.<BR>
+Providing both EFI and Tiano Compress algorithms.
+  
+Copyright (c) 2004 - 2014, 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        
@@ -8,15 +10,6 @@ http://opensource.org/licenses/bsd-license.php
                                                                                           
 THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     
 WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             
-
-Module Name:
-
-  Compress.h
-
-Abstract:
-
-  Header file for compression routine.
-  Providing both EFI and Tiano Compress algorithms.
   
 **/
 

BaseTools/Source/C/Common/Crc32.c

@@ -1,6 +1,7 @@
 /** @file
+CalcuateCrc32 routine.
 
-Copyright (c) 2004, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2004 - 2014, 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        
@@ -9,14 +10,6 @@ http://opensource.org/licenses/bsd-license.php
 THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     
 WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             
 
-Module Name:
-
-  crc32.c
-
-Abstract:
-
-  CalcuateCrc32 routine.
-  
 **/
 
 #include <stdlib.h>

BaseTools/Source/C/Common/Crc32.h

@@ -1,6 +1,7 @@
 /** @file
+Header file for CalcuateCrc32 routine
 
-Copyright (c) 2004 - 2008, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2004 - 2014, 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        
@@ -9,14 +10,6 @@ http://opensource.org/licenses/bsd-license.php
 THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     
 WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             
 
-Module Name:
-
-  Crc32.h
-
-Abstract:
-
-  Header file for CalcuateCrc32 routine
-  
 **/
 
 #ifndef _CRC32_H

BaseTools/Source/C/Common/Decompress.c

@@ -1,6 +1,8 @@
 /** @file
+Decompressor. Algorithm Ported from OPSD code (Decomp.asm) for Efi and Tiano 
+compress algorithm.
 
-Copyright (c) 2004 - 2008, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2004 - 2014, 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
@@ -9,15 +11,6 @@ http://opensource.org/licenses/bsd-license.php
 THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
 WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 
-Module Name:
-
-  Decompress.c
-
-Abstract:
-
-  Decompressor. Algorithm Ported from OPSD code (Decomp.asm)
-  for Efi and Tiano compress algorithm.
-
 --*/
 
 #include <stdlib.h>

BaseTools/Source/C/Common/Decompress.h

@@ -1,6 +1,7 @@
 /** @file
+Header file for compression routine
 
-Copyright (c) 2006 - 2008, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2006 - 2014, 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        
@@ -9,14 +10,6 @@ http://opensource.org/licenses/bsd-license.php
 THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     
 WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             
 
-Module Name:
-  
-  Decompress.h
-
-Abstract:
-
-  Header file for compression routine
-  
 **/
 
 #ifndef _EFI_DECOMPRESS_H

BaseTools/Source/C/Common/EfiCompress.c

@@ -1,6 +1,10 @@
 /** @file
-
+Compression routine. The compression algorithm is a mixture of LZ77 and Huffman 
-Copyright (c) 2006 - 2008, Intel Corporation. All rights reserved.<BR>
+coding. LZ77 transforms the source data into a sequence of Original Characters 
+and Pointers to repeated strings. This sequence is further divided into Blocks 
+and Huffman codings are applied to each Block.
+  
+Copyright (c) 2006 - 2014, 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        
@@ -9,18 +13,6 @@ http://opensource.org/licenses/bsd-license.php
 THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     
 WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             
 
-Module Name:
-
-  EfiCompress.c
-
-Abstract:
-
-  Compression routine. The compression algorithm is a mixture of
-  LZ77 and Huffman coding. LZ77 transforms the source data into a
-  sequence of Original Characters and Pointers to repeated strings.
-  This sequence is further divided into Blocks and Huffman codings
-  are applied to each Block.
-
 **/
 
 #include "Compress.h"

BaseTools/Source/C/Common/EfiUtilityMsgs.c

@@ -1,6 +1,7 @@
 /** @file
+EFI tools utility functions to display warning, error, and informational messages
 
-Copyright (c) 2004 - 2008, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2004 - 2014, 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
@@ -9,15 +10,6 @@ http://opensource.org/licenses/bsd-license.php
 THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
 WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 
-Module Name:
-
-  EfiUtilityMsgs.c
-
-Abstract:
-
-  EFI tools utility functions to display warning, error, and informational
-  messages.
-
 --*/
 
 #include <stdio.h>

BaseTools/Source/C/Common/EfiUtilityMsgs.h

@@ -1,6 +1,7 @@
 /** @file
+Defines and prototypes for common EFI utility error and debug messages.
 
-Copyright (c) 2004 - 2008, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2004 - 2014, 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        
@@ -9,14 +10,6 @@ http://opensource.org/licenses/bsd-license.php
 THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     
 WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             
 
-Module Name:
-
-  EfiUtilityMsgs.h
-
-Abstract:
-
-  Defines and prototypes for common EFI utility error and debug messages.
-  
 **/
 
 #ifndef _EFI_UTILITY_MSGS_H_

BaseTools/Source/C/Common/FirmwareVolumeBuffer.c

@@ -1,4 +1,5 @@
 /** @file
+EFI Firmware Volume routines which work on a Fv image in buffers.
 
 Copyright (c) 1999 - 2014, Intel Corporation. All rights reserved.<BR>
 This program and the accompanying materials
@@ -9,14 +10,6 @@ http://opensource.org/licenses/bsd-license.php
 THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
 WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 
-Module Name:
-
-  FirmwareVolumeBuffer.c
-
-Abstract:
-
-  EFI Firmware Volume routines which work on a Fv image in buffers.
-
 **/
 
 #include "FirmwareVolumeBufferLib.h"
@@ -32,6 +25,11 @@ Abstract:
         ) \
     )
 
+
+//
+// Local prototypes
+//
+
 STATIC
 UINT32
 FvBufGetSecHdrLen(

BaseTools/Source/C/Common/FirmwareVolumeBufferLib.h

@@ -1,4 +1,5 @@
 /** @file
+EFI Firmware Volume routines which work on a Fv image in buffers.
 
 Copyright (c) 1999 - 2014, Intel Corporation. All rights reserved.<BR>
 This program and the accompanying materials
@@ -9,14 +10,6 @@ http://opensource.org/licenses/bsd-license.php
 THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
 WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 
-Module Name:
-
-  FirmwareVolumeBufferLib.h
-  
-Abstract:
-
-  EFI Firmware Volume routines which work on a Fv image in buffers.
-
 **/
 
 #ifndef FirmwareVolumeBuffer_h_INCLUDED

BaseTools/Source/C/Common/FvLib.c

@@ -1,6 +1,7 @@
 /** @file
+These functions assist in parsing and manipulating a Firmware Volume.
 
-Copyright (c) 2004 - 2013, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2004 - 2014, 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        
@@ -9,14 +10,6 @@ http://opensource.org/licenses/bsd-license.php
 THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     
 WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             
 
-Module Name:
-
-  FvLib.c
-
-Abstract:
-
-  These functions assist in parsing and manipulating a Firmware Volume.
-
 **/
 
 //

BaseTools/Source/C/Common/FvLib.h

@@ -1,6 +1,7 @@
 /** @file
-
+These functions assist in parsing and manipulating a Firmware Volume.
-Copyright (c) 2004 - 2013, Intel Corporation. All rights reserved.<BR>
+  
+Copyright (c) 2004 - 2014, 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        
@@ -9,14 +10,6 @@ http://opensource.org/licenses/bsd-license.php
 THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     
 WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             
 
-Module Name:
-
-  FvLib.h
-
-Abstract:
-
-  These functions assist in parsing and manipulating a Firmware Volume.
-
 **/
 
 #ifndef _EFI_FV_LIB_H

BaseTools/Source/C/Common/MemoryFile.c

@@ -1,6 +1,7 @@
 /** @file
+This contains some useful functions for accessing files.
 
-Copyright (c) 2004 - 2008, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2004 - 2014, 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        
@@ -9,14 +10,6 @@ http://opensource.org/licenses/bsd-license.php
 THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     
 WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             
 
-Module Name:
-
-  MemoryFile.c
-
-Abstract:
-
-  This contains some useful functions for accessing files.
-
 **/
 
 #include <assert.h>

BaseTools/Source/C/Common/MemoryFile.h

@@ -1,4 +1,5 @@
 /** @file
+Header file for helper functions useful for accessing files.
 
 Copyright (c) 2004 - 2014, Intel Corporation. All rights reserved.<BR>
 This program and the accompanying materials                          
@@ -9,14 +10,6 @@ http://opensource.org/licenses/bsd-license.php
 THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     
 WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             
 
-Module Name:
-
-  MemoryFile.h
-
-Abstract:
-
-  Header file for helper functions useful for accessing files.
-
 **/
 
 #ifndef _EFI_MEMORY_FILE_H

BaseTools/Source/C/Common/MyAlloc.c

@@ -1,6 +1,7 @@
 /** @file
+File for memory allocation tracking functions.
 
-Copyright (c) 2004 - 2008, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2004 - 2014, 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        
@@ -9,14 +10,6 @@ http://opensource.org/licenses/bsd-license.php
 THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     
 WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             
 
-Module Name:
-
-  MyAlloc.c
-
-Abstract:
-
-  File for memory allocation tracking functions.
-
 **/
 
 #include "MyAlloc.h"

BaseTools/Source/C/Common/MyAlloc.h

@@ -1,6 +1,7 @@
 /** @file
+Header file for memory allocation tracking functions.
 
-Copyright (c) 2004 - 2008, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2004 - 2014, 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        
@@ -9,14 +10,6 @@ http://opensource.org/licenses/bsd-license.php
 THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     
 WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             
 
-Module Name:
-
-  MyAlloc.h
-
-Abstract:
-
-  Header file for memory allocation tracking functions.
-
 **/
 
 #ifndef _MYALLOC_H_

BaseTools/Source/C/Common/OsPath.c

@@ -1,4 +1,5 @@
 /** @file
+Functions useful to operate file directories by parsing file path.
 
 Copyright (c) 2007 - 2014, Intel Corporation. All rights reserved.<BR>
 This program and the accompanying materials                          
@@ -9,14 +10,6 @@ http://opensource.org/licenses/bsd-license.php
 THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     
 WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             
 
-Module Name:
-
-  StringFuncs.c
-
-Abstract:
-
-  Functions useful to operate file directories by parsing file path.
-
 **/
 
 #include <stdio.h>

BaseTools/Source/C/Common/OsPath.h

@@ -1,6 +1,8 @@
 /** @file
+Header file for helper functions useful to operate file directories by parsing 
+file path.
 
-Copyright (c) 2007 - 2008, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2007 - 2014, 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        
@@ -9,15 +11,6 @@ http://opensource.org/licenses/bsd-license.php
 THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     
 WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             
 
-Module Name:
-
-  OsPath.h
-
-Abstract:
-
-  Header file for helper functions useful to operate file directories 
-  by parsing file path. 
-
 **/
 
 #ifndef _EFI_OS_PATH_H

BaseTools/Source/C/Common/ParseGuidedSectionTools.c

@@ -1,6 +1,7 @@
 /** @file
+Helper functions for parsing GuidedSectionTools.txt
 
-Copyright (c) 2007 - 2008, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2007 - 2014, 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        
@@ -9,14 +10,6 @@ http://opensource.org/licenses/bsd-license.php
 THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     
 WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             
 
-Module Name:
-
-  ParseGuidedSectionTools.c
-
-Abstract:
-
-  Helper functions for parsing GuidedSectionTools.txt
-
 **/
 
 #include <assert.h>

BaseTools/Source/C/Common/ParseGuidedSectionTools.h

@@ -1,6 +1,7 @@
 /** @file
+Header file for helper functions for parsing GuidedSectionTools.txt
 
-Copyright (c) 2007 - 2008, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2007 - 2014, 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        
@@ -9,14 +10,6 @@ http://opensource.org/licenses/bsd-license.php
 THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     
 WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             
 
-Module Name:
-
-  ParseGuidedSectionTools.h
-
-Abstract:
-
-  Header file for helper functions for parsing GuidedSectionTools.txt
-
 **/
 
 #ifndef _EFI_PARSE_GUIDED_SECTION_TOOLS_H

BaseTools/Source/C/Common/ParseInf.c

@@ -1,4 +1,5 @@
 /** @file
+This contains some useful functions for parsing INF files.
 
 Copyright (c) 2004 - 2014, Intel Corporation. All rights reserved.<BR>
 This program and the accompanying materials                          
@@ -9,15 +10,7 @@ http://opensource.org/licenses/bsd-license.php
 THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     
 WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             
 
-Module Name:
+**/
-
-  ParseInf.c
-
-Abstract:
-
-  This contains some useful functions for parsing INF files.
-
---*/
 
 #include <assert.h>
 #include <string.h>

BaseTools/Source/C/Common/ParseInf.h

@@ -1,4 +1,5 @@
 /** @file
+Header file for helper functions useful for parsing INF files.
 
 Copyright (c) 2004 - 2014, Intel Corporation. All rights reserved.<BR>
 This program and the accompanying materials                          
@@ -9,14 +10,6 @@ http://opensource.org/licenses/bsd-license.php
 THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     
 WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             
 
-Module Name:
-
-  ParseInf.h
-
-Abstract:
-
-  Header file for helper functions useful for parsing INF files.
-
 **/
 
 #ifndef _EFI_PARSE_INF_H

BaseTools/Source/C/Common/PeCoffLib.h

@@ -1,7 +1,7 @@
 /** @file
 	Function prototypes and defines on Memory Only PE COFF loader
 
-	Copyright (c) 2006, Intel Corporation. All rights reserved.<BR>
+	Copyright (c) 2006 - 2014, 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        
@@ -10,8 +10,6 @@
 	THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     
 	WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             
 
-	Module Name:	PeCoffLib.h
-
 **/
 
 #ifndef __BASE_PE_COFF_LIB_H__

BaseTools/Source/C/Common/PeCoffLoaderEx.c

@@ -1,6 +1,7 @@
 /** @file
+IA32, X64 and IPF Specific relocation fixups
 
-Copyright (c) 2004 - 2008, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2004 - 2014, Intel Corporation. All rights reserved.<BR>
 Portions Copyright (c) 2011 - 2013, ARM Ltd. All rights reserved.<BR>
 This program and the accompanying materials                          
 are licensed and made available under the terms and conditions of the BSD License         
@@ -10,16 +11,6 @@ http://opensource.org/licenses/bsd-license.php
 THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     
 WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             
 
-Module Name:
-
-    PeCoffLoaderEx.c
-
-Abstract:
-
-    IA32, X64, IPF, ARM and AArch64 Specific relocation fixups
-
-Revision History
-
 --*/
 
 #include <Common/UefiBaseTypes.h>

BaseTools/Source/C/Common/SimpleFileParsing.c

@@ -1,4 +1,5 @@
 /** @file
+Generic but simple file parsing routines.
 
 Copyright (c) 2004 - 2014, Intel Corporation. All rights reserved.<BR>
 This program and the accompanying materials                          
@@ -9,14 +10,6 @@ http://opensource.org/licenses/bsd-license.php
 THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     
 WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             
 
-Module Name:
-
-  SimpleFileParsing.c  
-
-Abstract:
-
-  Generic but simple file parsing routines.
-
 --*/
 
 #include <stdio.h>

BaseTools/Source/C/Common/SimpleFileParsing.h

@@ -1,6 +1,7 @@
 /** @file
+Function prototypes and defines for the simple file parsing routines.
 
-Copyright (c) 2004 - 2008, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2004 - 2014, 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        
@@ -9,14 +10,6 @@ http://opensource.org/licenses/bsd-license.php
 THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     
 WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             
 
-Module Name:
-
-  SimpleFileParsing.h
-
-Abstract:
-
-  Function prototypes and defines for the simple file parsing routines.
-
 **/
 
 #ifndef _SIMPLE_FILE_PARSING_H_

BaseTools/Source/C/Common/StringFuncs.c

@@ -1,6 +1,7 @@
 /** @file
+Function prototypes and defines for string routines.
 
-Copyright (c) 2007 - 2008, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2007 - 2014, 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        
@@ -9,14 +10,6 @@ http://opensource.org/licenses/bsd-license.php
 THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     
 WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             
 
-Module Name:
-
-  StringFuncs.c
-
-Abstract:
-
-  Function prototypes and defines for string routines.
-
 **/
 
 #include <string.h>

BaseTools/Source/C/Common/StringFuncs.h

@@ -1,6 +1,7 @@
-/**
+/** @file
+String routines implementation
 
-Copyright (c) 2007 - 2008, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2007 - 2014, 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        
@@ -9,14 +10,6 @@ http://opensource.org/licenses/bsd-license.php
 THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     
 WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             
 
-Module Name:
-
-  StringFuncs.h
-
-Abstract:
-
-  String routines implementation.
-
 **/
 
 #ifndef _EFI_STRING_FUNCS_H

BaseTools/Source/C/Common/TianoCompress.c

@@ -1,6 +1,10 @@
 /** @file
-
+Compression routine. The compression algorithm is a mixture of LZ77 and Huffman 
-Copyright (c) 2006 - 2008, Intel Corporation. All rights reserved.<BR>
+coding. LZ77 transforms the source data into a sequence of Original Characters 
+and Pointers to repeated strings. This sequence is further divided into Blocks 
+and Huffman codings are applied to each Block.
+  
+Copyright (c) 2006 - 2014, 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        
@@ -9,18 +13,6 @@ http://opensource.org/licenses/bsd-license.php
 THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     
 WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             
 
-Module Name:
-
-  TianoCompress.c
-
-Abstract:
-
-  Compression routine. The compression algorithm is a mixture of
-  LZ77 and Huffman coding. LZ77 transforms the source data into a
-  sequence of Original Characters and Pointers to repeated strings.
-  This sequence is further divided into Blocks and Huffman codings
-  are applied to each Block.
-
 **/
 
 #include "Compress.h"

BaseTools/Source/C/Common/WinNtInclude.h

@@ -1,4 +1,5 @@
 /** @file
+Include file for the WinNt Library
 
 Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>
 This program and the accompanying materials
@@ -9,12 +10,6 @@ http://opensource.org/licenses/bsd-license.php
 THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
 WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 
-Module Name:
-  WinNtInclude.h
-
-Abstract:
-  Include file for the WinNt Library
-
 **/
 
 #ifndef __WIN_NT_INCLUDE_H__

BaseTools/Source/C/EfiLdrImage/EfiLdrImage.c

@@ -1,5 +1,11 @@
 /** @file
-
+Creates and EFILDR image.
+This tool combines several PE Image files together using following format denoted as EBNF:
+FILE := EFILDR_HEADER
+        EFILDR_IMAGE +
+        <PeImageFileContent> +
+The order of EFILDR_IMAGE is same as the order of placing PeImageFileContent.
+  
 Copyright (c) 2006 - 2014, 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         
@@ -9,21 +15,6 @@ http://opensource.org/licenses/bsd-license.php
 THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     
 WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             
 
-Module Name:
-
-  efildrimage.c
-
-Abstract:
-
-  Creates and EFILDR image.
-  This tool combines several PE Image files together using following format denoted as EBNF:
-  FILE := EFILDR_HEADER
-          EFILDR_IMAGE +
-          <PeImageFileContent> +
-  The order of EFILDR_IMAGE is same as the order of placing PeImageFileContent.
-
-Revision History
-
 **/
 
 

BaseTools/Source/C/EfiRom/EfiRom.c

@@ -1,4 +1,5 @@
 /** @file
+Utility program to create an EFI option ROM image from binary and EFI PE32 files.
 
 Copyright (c) 1999 - 2014, Intel Corporation. All rights reserved.<BR>
 This program and the accompanying materials are licensed and made available 
@@ -9,15 +10,6 @@ http://opensource.org/licenses/bsd-license.php
 THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
 WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 
-Module Name:
-
-  EfiRom.c
-  
-Abstract:
-
-  Utility program to create an EFI option ROM image from binary and 
-  EFI PE32 files.
-
 **/
 
 #include "EfiUtilityMsgs.h"

BaseTools/Source/C/EfiRom/EfiRom.h

@@ -1,6 +1,7 @@
 /** @file
+This file contains the relevant declarations required to generate Option Rom File
 
-Copyright (c) 1999 - 2008, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 1999 - 2014, 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
@@ -9,16 +10,6 @@ http://opensource.org/licenses/bsd-license.php
 THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
 WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 
-
-Module Name:  
-
-  EfiRom.h
-
-Abstract:
-
-  This file contains the relevant declarations required
-  to generate Option Rom File
-
 **/
 
 #ifndef __EFI_ROM_H__

BaseTools/Source/C/GenBootSector/GenBootSector.c

@@ -1,5 +1,9 @@
 /** @file
-
+Reading/writing MBR/DBR.
+  NOTE:
+    If we write MBR to disk, we just update the MBR code and the partition table wouldn't be over written.
+    If we process DBR, we will patch MBR to set first partition active if no active partition exists.
+    
 Copyright (c) 2006 - 2014, 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         
@@ -9,16 +13,6 @@ http://opensource.org/licenses/bsd-license.php
 THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     
 WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             
 
-Module Name:
-
-  genbootsector.c
-  
-Abstract:
-  Reading/writing MBR/DBR.
-  NOTE:
-    If we write MBR to disk, we just update the MBR code and the partition table wouldn't be over written.
-    If we process DBR, we will patch MBR to set first partition active if no active partition exists.
-
 **/
 
 #include <windows.h>

BaseTools/Source/C/GenCrc32/GenCrc32.c

@@ -1,4 +1,5 @@
 /** @file
+Calculate Crc32 value and Verify Crc32 value for input data.
 
 Copyright (c) 2007 - 2014, Intel Corporation. All rights reserved.<BR>
 This program and the accompanying materials                          
@@ -9,13 +10,6 @@ http://opensource.org/licenses/bsd-license.php
 THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     
 WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             
 
-Module Name:
-
-  GenCrc32.c
-
-Abstract:
-  Calculate Crc32 value and Verify Crc32 value for input data.
-
 **/
 
 #include <stdio.h>

BaseTools/Source/C/GenFfs/GenFfs.c

@@ -1,4 +1,5 @@
-/**
+/** @file
+This file contains functions required to generate a Firmware File System file.
 
 Copyright (c) 2004 - 2014, Intel Corporation. All rights reserved.<BR>
 This program and the accompanying materials                          
@@ -9,15 +10,6 @@ http://opensource.org/licenses/bsd-license.php
 THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     
 WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             
 
-Module Name:
-
-  GenFfs.c
-
-Abstract:
-
-  This file contains functions required to generate a Firmware File System
-  file.
-
 **/
 
 #include <stdio.h>
@@ -899,7 +891,7 @@ Returns:
   // Open output file to write ffs data.
   //
   remove(OutputFileName);
-  FfsFile = fopen (OutputFileName, "wb");
+  FfsFile = fopen (LongFilePath (OutputFileName), "wb");
   if (FfsFile == NULL) {
     Error (NULL, 0, 0001, "Error opening file", OutputFileName);
     goto Finish;

BaseTools/Source/C/GenFv/GenFv.c

@@ -1,4 +1,8 @@
 /** @file
+  This contains all code necessary to build the GenFvImage.exe utility.       
+  This utility relies heavily on the GenFvImage Lib.  Definitions for both
+  can be found in the Tiano Firmware Volume Generation Utility 
+  Specification, review draft.
 
 Copyright (c) 2007 - 2014, Intel Corporation. All rights reserved.<BR>
 This program and the accompanying materials                          
@@ -9,17 +13,6 @@ http://opensource.org/licenses/bsd-license.php
 THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     
 WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             
 
-Module Name:
-
-  GenFv.c
-
-Abstract:
-
-  This contains all code necessary to build the GenFvImage.exe utility.       
-  This utility relies heavily on the GenFvImage Lib.  Definitions for both
-  can be found in the Tiano Firmware Volume Generation Utility 
-  Specification, review draft.
-
 **/
 
 //

BaseTools/Source/C/GenFv/GenFvInternalLib.c

@@ -1,4 +1,5 @@
 /** @file
+This file contains the internal functions required to generate a Firmware Volume.
 
 Copyright (c) 2004 - 2014, Intel Corporation. All rights reserved.<BR>
 Portions Copyright (c) 2011 - 2013, ARM Ltd. All rights reserved.<BR>
@@ -10,14 +11,6 @@ http://opensource.org/licenses/bsd-license.php
 THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     
 WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             
 
-Module Name:
-
-  GenFvInternalLib.c
-
-Abstract:
-
-  This file contains the internal functions required to generate a Firmware Volume.
-
 **/
 
 //

BaseTools/Source/C/GenFv/GenFvInternalLib.h

@@ -1,5 +1,7 @@
 /** @file
-
+This file contains describes the public interfaces to the GenFvImage Library.
+The basic purpose of the library is to create Firmware Volume images.
+  
 Copyright (c) 2004 - 2014, 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         
@@ -9,15 +11,6 @@ http://opensource.org/licenses/bsd-license.php
 THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     
 WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             
 
-Module Name:
-  
-  GenFvInternalLib.h
-
-Abstract:
-
-  This file contains describes the public interfaces to the GenFvImage Library.
-  The basic purpose of the library is to create Firmware Volume images.
-
 **/
 
 #ifndef _EFI_GEN_FV_INTERNAL_LIB_H

BaseTools/Source/C/GenFw/Elf32Convert.c

@@ -1,6 +1,7 @@
 /** @file
+Elf32 Convert solution
 
-Copyright (c) 2010 - 2011, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2010 - 2014, Intel Corporation. All rights reserved.<BR>
 Portions copyright (c) 2013, ARM Ltd. All rights reserved.<BR>
 
 This program and the accompanying materials are licensed and made available

BaseTools/Source/C/GenFw/Elf32Convert.h

@@ -1,6 +1,7 @@
 /** @file
+Header file for Elf32 Convert solution
 
-Copyright (c) 2010, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2010 - 2014, 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 

BaseTools/Source/C/GenFw/Elf64Convert.c

@@ -1,6 +1,7 @@
 /** @file
+Elf64 convert solution
 
-Copyright (c) 2010 - 2011, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2010 - 2014, Intel Corporation. All rights reserved.<BR>
 Portions copyright (c) 2013-2014, ARM Ltd. All rights reserved.<BR>
 
 This program and the accompanying materials are licensed and made available

BaseTools/Source/C/GenFw/Elf64Convert.h

@@ -1,6 +1,7 @@
 /** @file
+Header file for Elf64 convert solution
 
-Copyright (c) 2010, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2010 - 2014, 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 

BaseTools/Source/C/GenFw/ElfConvert.c

@@ -1,6 +1,7 @@
 /** @file
+Elf convert solution
 
-Copyright (c) 2010 - 2011, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2010 - 2014, 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 

BaseTools/Source/C/GenFw/ElfConvert.h

@@ -1,6 +1,7 @@
 /** @file
+Header file for Elf convert solution
 
-Copyright (c) 2010 - 2011, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2010 - 2014, 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 

BaseTools/Source/C/GenFw/GenFw.c

@@ -1,4 +1,5 @@
 /** @file
+Converts a pe32+ image to an FW, Te image type, or other specific image.
 
 Copyright (c) 2004 - 2014, Intel Corporation. All rights reserved.<BR>
 This program and the accompanying materials
@@ -9,14 +10,6 @@ http://opensource.org/licenses/bsd-license.php
 THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
 WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 
-Module Name:
-
-    GenFw.c
-
-Abstract:
-
-    Converts a pe32+ image to an FW, Te image type, or other specific image.
-
 **/
 
 #include "WinNtInclude.h"

BaseTools/Source/C/GenFw/GenFw.h

@@ -1,6 +1,7 @@
 /** @file
+Header file for GenFw
 
-Copyright (c) 2010 - 2011, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2010 - 2014, 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 

BaseTools/Source/C/GenPage/GenPage.c

@@ -1,18 +1,4 @@
 /** @file
-
-Copyright (c) 2006 - 2014, 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                                            
-                                                                                          
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             
-
-Module Name:
-  GenPage.c
-  
-Abstract:
   Pre-Create a 4G page table (2M pages).
   It's used in DUET x64 build needed to enter LongMode.
  
@@ -28,6 +14,16 @@ Abstract:
                         (
                           Directory-Ptr Directory {512}
                         ) {4}
+
+Copyright (c) 2006 - 2014, 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                                            
+                                                                                          
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             
+
 **/
 
 #include <stdio.h>

BaseTools/Source/C/GenPage/VirtualMemory.h

@@ -1,6 +1,13 @@
 /** @file 
+x64 Long Mode Virtual Memory Management Definitions  
 
-Copyright (c) 2006 - 2008, Intel Corporation. All rights reserved.<BR>
+  References:
+    1) IA-32 Intel(R) Atchitecture Software Developer's Manual Volume 1:Basic Architecture, Intel
+    2) IA-32 Intel(R) Atchitecture Software Developer's Manual Volume 2:Instruction Set Reference, Intel
+    3) IA-32 Intel(R) Atchitecture Software Developer's Manual Volume 3:System Programmer's Guide, Intel
+    4) AMD64 Architecture Programmer's Manual Volume 2: System Programming
+    
+Copyright (c) 2006 - 2014, 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        
@@ -8,19 +15,7 @@ http://opensource.org/licenses/bsd-license.php
                                                                                           
 THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     
 WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             
-
-Module Name:
-  VirtualMemory.h
   
-Abstract:
-
-  x64 Long Mode Virtual Memory Management Definitions  
-
-  References:
-    1) IA-32 Intel(R) Atchitecture Software Developer's Manual Volume 1:Basic Architecture, Intel
-    2) IA-32 Intel(R) Atchitecture Software Developer's Manual Volume 2:Instruction Set Reference, Intel
-    3) IA-32 Intel(R) Atchitecture Software Developer's Manual Volume 3:System Programmer's Guide, Intel
-    4) AMD64 Architecture Programmer's Manual Volume 2: System Programming
 **/
 
 #ifndef _VIRTUAL_MEMORY_H_

BaseTools/Source/C/GenSec/GenSec.c

@@ -1,4 +1,5 @@
 /** @file
+Creates output file that is a properly formed section per the PI spec.
 
 Copyright (c) 2004 - 2014, Intel Corporation. All rights reserved.<BR>
 This program and the accompanying materials                          
@@ -9,14 +10,6 @@ http://opensource.org/licenses/bsd-license.php
 THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     
 WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             
 
-Module Name:
-
-  GenSection.c
-
-Abstract:
-
-  Creates output file that is a properly formed section per the PI spec.
-
 **/
 
 #include <stdio.h>

BaseTools/Source/C/GenVtf/GenVtf.c

@@ -1,4 +1,6 @@
-/**
+/** @file
+This file contains functions required to generate a boot strap file (BSF) also 
+known as the Volume Top File (VTF)
 
 Copyright (c) 1999 - 2014, Intel Corporation. All rights reserved.<BR>
 This program and the accompanying materials are licensed and made available 
@@ -9,16 +11,6 @@ http://opensource.org/licenses/bsd-license.php
 THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
 WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 
-
-Module Name:
-
-  GenVtf.c
-
-Abstract:
-
-  This file contains functions required to generate a boot strap file (BSF)
-  also known as the Volume Top File (VTF)
-
 **/
 
 //

BaseTools/Source/C/GenVtf/GenVtf.h

@@ -1,6 +1,7 @@
 /** @file
-
+This file contains the relevant declarations required to generate Boot Strap File
-Copyright (c) 1999 - 2008, Intel Corporation. All rights reserved.<BR>
+  
+Copyright (c) 1999 - 2014, 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
@@ -9,16 +10,6 @@ http://opensource.org/licenses/bsd-license.php
 THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
 WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 
-
-Module Name:  
-
-  GenVtf.h
-
-Abstract:
-
-  This file contains the relevant declarations required
-  to generate Boot Strap File
-
 **/
 
 //

BaseTools/Source/C/GnuGenBootSector/GnuGenBootSector.c

@@ -1,5 +1,9 @@
 /** @file
-
+Reading/writing MBR/DBR.
+  NOTE:
+    If we write MBR to disk, we just update the MBR code and the partition table wouldn't be over written.
+    If we process DBR, we will patch MBR to set first partition active if no active partition exists.
+    
 Copyright (c) 2006 - 2014, 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         
@@ -9,16 +13,6 @@ http://opensource.org/licenses/bsd-license.php
 THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     
 WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             
 
-Module Name:
-
-  GnuGenBootSector.c
-  
-Abstract:
-  Reading/writing MBR/DBR.
-  NOTE:
-    If we write MBR to disk, we just update the MBR code and the partition table wouldn't be over written.
-    If we process DBR, we will patch MBR to set first partition active if no active partition exists.
-
 **/
 
 #include "CommonLib.h"

BaseTools/Source/C/Include/Common/BaseTypes.h

@@ -3,7 +3,7 @@
 
   This file is stand alone self consistent set of definitions. 
 
-  Copyright (c) 2006, Intel Corporation. All rights reserved.<BR>
+  Copyright (c) 2006 - 2014, 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        
@@ -12,8 +12,6 @@
   THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     
   WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             
 
-  File Name:  BaseTypes.h
-
 **/
 
 #ifndef __BASE_TYPES_H__

BaseTools/Source/C/Include/Common/BuildVersion.h

@@ -1,16 +1,14 @@
 /** @file
-  This file is for build version number auto generation
+This file is for build version number auto generation
 
-  Copyright (c) 2011, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2011 - 2014, Intel Corporation. All rights reserved.<BR>
-  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         
+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        
+which accompanies this distribution.  The full text of the license may be found at
-  http://opensource.org/licenses/bsd-license.php                                            
+http://opensource.org/licenses/bsd-license.php
 
-  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
-
-  File Name:  BuildVersion.h
 
 **/
 

BaseTools/Source/C/Include/Common/MdeModuleHii.h

@@ -1,18 +1,16 @@
 /** @file
   EDK II specific HII relative definition.
 
-  Copyright (c) 2006 - 2011, Intel Corporation. All rights reserved.<BR>
+  Copyright (c) 2006 - 2014, 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:
+  distribution.  The full text of the license may be found at
     http://opensource.org/licenses/bsd-license.php
 
   THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
   WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 
-  File Name: MdeModuleHii.h
-
 **/
 
 #ifndef _MDEMODULE_HII_H

BaseTools/Source/C/Include/Common/PiFirmwareFile.h

@@ -1,21 +1,19 @@
 /** @file
   The firmware file related definitions in PI.
+  
+  @par Revision Reference:
+  Version 1.0.
 
-  Copyright (c) 2006 - 2013, Intel Corporation. All rights reserved.<BR>
+  Copyright (c) 2006 - 2014, 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:
+  distribution.  The full text of the license may be found at
     http://opensource.org/licenses/bsd-license.php
 
   THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
   WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 
-  File Name: PiFirmwareFile.h
-
-  @par Revision Reference:
-  Version 1.0.
-
 **/
 
 #ifndef __PI_FIRMWARE_FILE_H__

BaseTools/Source/C/Include/Common/PiFirmwareVolume.h

@@ -1,21 +1,19 @@
 /** @file
   The firmware volume related definitions in PI.
 
-  Copyright (c) 2006 - 2013, Intel Corporation. All rights reserved.<BR>
+  @par Revision Reference:
+  Version 1.2C
+
+  Copyright (c) 2006 - 2014, 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:
+  distribution.  The full text of the license may be found at
     http://opensource.org/licenses/bsd-license.php
 
   THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
   WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 
-  File Name: PiFirmwareVolume.h
-
-  @par Revision Reference:
-  Version 1.2C
-
 **/
 
 #ifndef __PI_FIRMWAREVOLUME_H__

BaseTools/Source/C/Include/Common/UefiBaseTypes.h

@@ -1,18 +1,16 @@
 /** @file
   Defines data types and constants introduced in UEFI.
 
-  Copyright (c) 2006 - 2013, Intel Corporation. All rights reserved.<BR>
+  Copyright (c) 2006 - 2014, 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:
+  distribution.  The full text of the license may be found at
     http://opensource.org/licenses/bsd-license.php
 
   THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
   WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 
-  File Name: UefiBaseTypes.h
-
 **/
 
 #ifndef __UEFI_BASETYPE_H__

BaseTools/Source/C/Include/Common/UefiCapsule.h

@@ -1,21 +1,18 @@
 /** @file
   Defines for the EFI Capsule functionality.
+  @par Revision Reference:
+  These definitions are from Uefi Spec.
 
-  Copyright (c) 2006 - 2009, Intel Corporation. All rights reserved.<BR>
+  Copyright (c) 2006 - 2014, 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:
+  distribution.  The full text of the license may be found at
     http://opensource.org/licenses/bsd-license.php
 
   THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
   WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 
-  File Name:  Capsule.h
-
-  @par Revision Reference:
-  These definitions are from Uefi Spec.
-
 **/
 
 #ifndef _EFI_CAPSULE_H_

BaseTools/Source/C/Include/Common/UefiInternalFormRepresentation.h

@@ -3,21 +3,19 @@
   IFR is primarily consumed by the EFI presentation engine, and produced by EFI
   internal application and drivers as well as all add-in card option-ROM drivers
 
-  Copyright (c) 2006 - 2013, Intel Corporation. All rights reserved.<BR>
+  @par Revision Reference:
+  These definitions are from UEFI2.1.
+
+  Copyright (c) 2006 - 2014, 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:
+  distribution.  The full text of the license may be found at
     http://opensource.org/licenses/bsd-license.php
 
   THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
   WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 
-  File Name: UefiInternalFormRepresentation.h
-
-  @par Revision Reference:
-  These definitions are from UEFI2.1.
-
 **/
 
 #ifndef __UEFI_INTERNAL_FORMREPRESENTATION_H__

BaseTools/Source/C/Include/Common/UefiMultiPhase.h

@@ -1,18 +1,17 @@
 /** @file
-  This includes some definitions introduced in UEFI that will be used in both PEI and DXE phases.
+  This includes some definitions introduced in UEFI that will be used in both PEI 
+  and DXE phases.
 
-  Copyright (c) 2006 - 2012, Intel Corporation. All rights reserved.<BR>
+  Copyright (c) 2006 - 2014, 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:
+  distribution.  The full text of the license may be found at
     http://opensource.org/licenses/bsd-license.php
 
   THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
   WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 
-  File Name: UefiMultiPhase.h
-
 **/
 
 #ifndef __UEFI_MULTIPHASE_H__

BaseTools/Source/C/Include/Common/VariableFormat.h

@@ -1,18 +1,16 @@
 /**@file
   Header file for EFI Variable Services.
 
-  Copyright (c) 2007 - 2010, Intel Corporation. All rights reserved.<BR>
+  Copyright (c) 2007 - 2014, 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:
+  distribution.  The full text of the license may be found at
     http://opensource.org/licenses/bsd-license.php
   
   THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
   WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 
-  File Name: VariableFormat.h
-
 **/
 
 #ifndef __VARIABLE_FORMAT_H__

BaseTools/Source/C/Include/Common/WorkingBlockHeader.h

@@ -4,18 +4,16 @@
   working block, the header structure of the variable block, FTW
   working block, or event log block.
 
-  Copyright (c) 2006 - 2010, Intel Corporation. All rights reserved.<BR>
+  Copyright (c) 2006 - 2014, 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:
+  distribution.  The full text of the license may be found at
     http://opensource.org/licenses/bsd-license.php
 
   THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
   WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 
-  File Name: WorkingBlockHeader.h
-
 **/
 
 #ifndef __EFI_WORKING_BLOCK_HEADER_H__

BaseTools/Source/C/Include/Guid/PcAnsi.h

@@ -1,21 +1,18 @@
 /** @file
   Terminal Device Path Vendor Guid.
-
+  @par Revision Reference:
-  Copyright (c) 2006 - 2008, Intel Corporation. All rights reserved.<BR>
+  GUIDs defined in UEFI 2.0 spec.
+  
+  Copyright (c) 2006 - 2014, 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:
+  distribution.  The full text of the license may be found at
     http://opensource.org/licenses/bsd-license.php
 
   THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
   WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 
-  File Name: PcAnsi.h
-
-  @par Revision Reference:
-  GUIDs defined in UEFI 2.0 spec.
-
 **/
 
 #ifndef __PC_ANSI_H__

BaseTools/Source/C/Include/Guid/PiFirmwareFileSystem.h

@@ -1,22 +1,20 @@
 /** @file
   Guid used to define the Firmware File System. See PI spec volume 3 for more
   details.
+  
+  @par Revision Reference:
+  Guids defined in PI Spec Volume 3
 
-  Copyright (c) 2006 - 2013, Intel Corporation. All rights reserved.<BR>
+  Copyright (c) 2006 - 2014, 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:
+  distribution.  The full text of the license may be found at
     http://opensource.org/licenses/bsd-license.php
 
   THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
   WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 
-  File Name:  PiFirmwareFileSystem.h
-
-  @par Revision Reference:
-  Guids defined in PI Spec Volume 3
-
 **/
 
 #ifndef __FIRMWARE_FILE_SYSTEM2_GUID_H__

BaseTools/Source/C/Include/Ia32/ProcessorBind.h

@@ -1,18 +1,16 @@
 /** @file
   Processor or Compiler specific defines and types for x64.
 
-  Copyright (c) 2006 - 2012, Intel Corporation. All rights reserved.<BR>
+  Copyright (c) 2006 - 2014, 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:
+  distribution.  The full text of the license may be found at
     http://opensource.org/licenses/bsd-license.php
 
   THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
   WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 
-  File Name:  ProcessorBind.h
-
 **/
 
 #ifndef __PROCESSOR_BIND_H__

BaseTools/Source/C/Include/IndustryStandard/Acpi.h

@@ -2,18 +2,16 @@
   This file contains some basic ACPI definitions that are consumed by drivers
   that do not care about ACPI versions.
 
-  Copyright (c) 2006, Intel Corporation. All rights reserved.<BR>
+  Copyright (c) 2006 - 2014, 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:
+  distribution.  The full text of the license may be found at
     http://opensource.org/licenses/bsd-license.php
 
   THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
   WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 
-  File Name:  Acpi.h
-
 **/
 
 #ifndef _ACPI_H_

BaseTools/Source/C/Include/IndustryStandard/Acpi1_0.h

@@ -1,18 +1,16 @@
 /** @file
   ACPI 1.0b definitions from the ACPI Specification, revision 1.0b
 
-  Copyright (c) 2006 - 2007, Intel Corporation. All rights reserved.<BR>
+  Copyright (c) 2006 - 2014, 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:
+  distribution.  The full text of the license may be found at
     http://opensource.org/licenses/bsd-license.php
 
   THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
   WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 
-  File Name: Acpi1_0.h
-
 **/
 
 #ifndef _ACPI_1_0_H_

BaseTools/Source/C/Include/IndustryStandard/Acpi2_0.h

@@ -1,18 +1,16 @@
 /** @file
   ACPI 2.0 definitions from the ACPI Specification, revision 2.0
 
-  Copyright (c) 2006 - 2007, Intel Corporation. All rights reserved.<BR>
+  Copyright (c) 2006 - 2014, 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:
+  distribution.  The full text of the license may be found at
     http://opensource.org/licenses/bsd-license.php
 
   THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
   WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 
-  File Name: Acpi2_0.h
-
 **/
 
 #ifndef _ACPI_2_0_H_

BaseTools/Source/C/Include/IndustryStandard/Acpi3_0.h

@@ -1,18 +1,16 @@
 /** @file
   ACPI 3.0 definitions from the ACPI Specification Revision 3.0 September 2, 2004
 
-  Copyright (c) 2006 - 2007, Intel Corporation. All rights reserved.<BR>
+  Copyright (c) 2006 - 2014, 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:
+  distribution.  The full text of the license may be found at
     http://opensource.org/licenses/bsd-license.php
 
   THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
   WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 
-  File Name: Acpi3_0.h
-
 **/
 
 #ifndef _ACPI_3_0_H_

BaseTools/Source/C/Include/IndustryStandard/EfiPci.h

@@ -1,18 +1,16 @@
 /** @file
   Support for EFI PCI specification.
 
-  Copyright (c) 2006 - 2008, Intel Corporation. All rights reserved.<BR>
+  Copyright (c) 2006 - 2014, 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:
+  distribution.  The full text of the license may be found at
-    http://opensource.org/licenses/bsd-license.php
+  http://opensource.org/licenses/bsd-license.php
 
   THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
   WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 
-  File Name:  EfiPci.h
-
 **/
 
 #ifndef _EFI_PCI_H_

BaseTools/Source/C/Include/IndustryStandard/MemoryMappedConfigurationSpaceAccessTable.h

@@ -3,18 +3,16 @@
   in the PCI Firmware Specification, version 3.0 draft version 0.5.
   Specification is available at http://www.pcisig.com.
 
-  Copyright (c) 2006 - 2008, Intel Corporation. All rights reserved.<BR>
+  Copyright (c) 2006 - 2014, 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:
+  distribution.  The full text of the license may be found at
-    http://opensource.org/licenses/bsd-license.php
+  http://opensource.org/licenses/bsd-license.php
 
   THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
   WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 
-  File Name: MemoryMappedConfigurationSpaceAccessTable.h
-
 **/
 
 #ifndef _MEMORY_MAPPED_CONFIGURATION_SPACE_ACCESS_TABLE_H_

BaseTools/Source/C/Include/IndustryStandard/PeImage.h

@@ -4,19 +4,17 @@
 
   @bug Fix text - doc as defined in MSFT EFI specification.
 
-  Copyright (c) 2006 - 2013, Intel Corporation. All rights reserved.<BR>
+  Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>
   Portions copyright (c) 2011 - 2013, ARM Ltd. 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:
+  distribution.  The full text of the license may be found at
     http://opensource.org/licenses/bsd-license.php
 
   THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
   WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 
-  File Name:  PeImage.h
-
 **/
 
 #ifndef __PE_IMAGE_H__

BaseTools/Source/C/Include/IndustryStandard/pci22.h

@@ -1,18 +1,16 @@
 /** @file
   Support for PCI 2.2 standard.
 
-  Copyright (c) 2006 - 2013, Intel Corporation. All rights reserved.<BR>
+  Copyright (c) 2006 - 2014, 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:
+  distribution.  The full text of the license may be found at
-    http://opensource.org/licenses/bsd-license.php
+  http://opensource.org/licenses/bsd-license.php
 
   THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
   WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 
-  File Name:  pci22.h
-
 **/
 
 #ifndef _PCI22_H

BaseTools/Source/C/Include/IndustryStandard/pci23.h

@@ -1,18 +1,16 @@
 /** @file
   Support for PCI 2.3 standard.
 
-  Copyright (c) 2006 - 2008, Intel Corporation. All rights reserved.<BR>
+  Copyright (c) 2006 - 2014, 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:
+  distribution.  The full text of the license may be found at
-    http://opensource.org/licenses/bsd-license.php
+  http://opensource.org/licenses/bsd-license.php
 
   THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
   WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 
-  File Name:  pci23.h
-
 **/
 
 #ifndef _PCI23_H

BaseTools/Source/C/Include/IndustryStandard/pci30.h

@@ -1,18 +1,16 @@
 /** @file
   Support for PCI 3.0 standard.
 
-  Copyright (c) 2006 - 2008, Intel Corporation. All rights reserved.<BR>
+  Copyright (c) 2006 - 2014, 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:
+  distribution.  The full text of the license may be found at
-    http://opensource.org/licenses/bsd-license.php
+  http://opensource.org/licenses/bsd-license.php
 
   THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
   WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 
-  File Name:  pci30.h
-
 **/
 
 #ifndef _PCI30_H

BaseTools/Source/C/Include/Protocol/GraphicsOutput.h

@@ -3,18 +3,16 @@
 
   Abstraction of a very simple graphics device.
 
-  Copyright (c) 2006 - 2008, Intel Corporation. All rights reserved.<BR>
+  Copyright (c) 2006 - 2014, 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:
+  distribution.  The full text of the license may be found at
     http://opensource.org/licenses/bsd-license.php
 
   THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
   WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 
-  File Name: GraphicsOutput.h
-
 **/
 
 #ifndef __GRAPHICS_OUTPUT_H__

BaseTools/Source/C/Include/Protocol/GuidedSectionExtraction.h

@@ -5,22 +5,20 @@
   section. There may be multiple different GUIDs associated with the GUIDed
   section extraction protocol. That is, all instances of the GUIDed section
   extraction protocol must have the same interface structure.
-
+  
-  Copyright (c) 2006 - 2008, Intel Corporation. All rights reserved.<BR>
+  @par Revision Reference: PI
+  Version 1.00.
+  
+  Copyright (c) 2006 - 2014, 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:
+  distribution.  The full text of the license may be found at
-    http://opensource.org/licenses/bsd-license.php
+  http://opensource.org/licenses/bsd-license.php
 
   THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
   WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 
-  File Name: EfiGuidedSectionExtraction.h
-
-  @par Revision Reference: PI
-  Version 1.00.
-
 **/
 
 #ifndef __EFI_GUIDED_SECTION_EXTRACTION_PROTOCOL_H__

BaseTools/Source/C/Include/Protocol/HiiFramework.h

@@ -2,22 +2,20 @@
   This file defines the Human Interface Infrastructure protocol which will
   be used by resources which want to publish IFR/Font/String data and have it
   collected by the Configuration engine.
+  
+  @par Revision Reference:
+  This protocol is defined in HII spec 0.92.
 
-  Copyright (c) 2007, Intel Corporation. All rights reserved.<BR>
+  Copyright (c) 2007 - 2014, 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:
+  distribution.  The full text of the license may be found at
     http://opensource.org/licenses/bsd-license.php
 
   THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
   WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 
-  File Name:  HiiFramework.h
-
-  @par Revision Reference:
-  This protocol is defined in HII spec 0.92.
-
 **/
 
 #ifndef _FRAMEWORK_HII_H_

BaseTools/Source/C/Include/Protocol/UgaDraw.h

@@ -3,18 +3,16 @@
 
   Abstraction of a very simple graphics device.
 
-  Copyright (c) 2006 - 2008, Intel Corporation. All rights reserved.<BR>
+  Copyright (c) 2006 - 2014, 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:
+  distribution.  The full text of the license may be found at
   http://opensource.org/licenses/bsd-license.php
 
   THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
   WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 
-  File name: UgaDraw.h
-
 **/
 
 #ifndef __UGA_DRAW_H__

BaseTools/Source/C/Include/X64/ProcessorBind.h

@@ -1,18 +1,16 @@
 /** @file
   Processor or Compiler specific defines and types x64 (Intel(r) EM64T, AMD64).
 
-  Copyright (c) 2006 - 2012, Intel Corporation. All rights reserved.<BR>
+  Copyright (c) 2006 - 2014, 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:
+  distribution.  The full text of the license may be found at
     http://opensource.org/licenses/bsd-license.php
 
   THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
   WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 
-  File Name:  ProcessorBind.h
-
 **/
 
 #ifndef __PROCESSOR_BIND_H__

BaseTools/Source/C/LzmaCompress/LzmaF86Compress.bat

@@ -1,7 +1,8 @@
+@REM @file
+@REM This script will exec LzmaCompress tool with --f86 option that enables 
+@REM converter for x86 code.
 @REM
-@REM This script will exec LzmaCompress tool with --f86 option that enables converter for x86 code.
+@REM Copyright (c) 2012 - 2014, Intel Corporation. All rights reserved.<BR>
-@REM
-@REM Copyright (c) 2012, Intel Corporation. All rights reserved.<BR>
 @REM This program and the accompanying materials
 @REM are licensed and made available under the terms and conditions of the BSD License
 @REM which accompanies this distribution.  The full text of the license may be found at

BaseTools/Source/C/Makefiles/NmakeSubdirs.bat

@@ -1,6 +1,7 @@
 @REM ## @file
+@REM # Makefile
 @REM #
-@REM # Copyright (c) 2007 - 2010, Intel Corporation. All rights reserved.<BR>
+@REM # Copyright (c) 2007 - 2014, Intel Corporation. All rights reserved.<BR>
 @REM # This program and the accompanying materials
 @REM # are licensed and made available under the terms and conditions of the BSD License
 @REM # which accompanies this distribution.    The full text of the license may be found at
@@ -8,9 +9,10 @@
 @REM #
 @REM # THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
 @REM # WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
-
+@REM # 
 
 @echo off
+@set TOOL_ERROR=0
 setlocal
 SET NMAKE_COMMAND=%1
 SHIFT
@@ -21,7 +23,10 @@ if "%1"=="" goto success
 ECHO Building %1
 pushd %1
 nmake %NMAKE_COMMAND%
-if ERRORLEVEL 1 goto error
+if ERRORLEVEL 1 (
+  set /A TOOL_ERROR= %TOOL_ERROR% + %ERRORLEVEL%
+  goto error
+)
 ECHO %1 built successfully (%NMAKE_COMMAND%)
 ECHO.
 shift
@@ -33,8 +38,10 @@ goto exit
 
 :error
 popd
+set /A TOOL_ERROR=%TOOL_ERROR%+%ERRORLEVEL%
 ENDLOCAL
 ECHO Error while making %1!
 VERIFY OTHER 2>NUL
 
 :exit
+exit /B %TOOL_ERROR%

BaseTools/Source/C/Makefiles/app.makefile

@@ -1,6 +1,7 @@
 ## @file
+# Makefiles
 #
-# Copyright (c) 2007 - 2010, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2007 - 2014, 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

BaseTools/Source/C/Makefiles/footer.makefile

@@ -1,6 +1,7 @@
 ## @file
+# Makefile
 #
-# Copyright (c) 2007 - 2010, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2007 - 2014, 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
@@ -8,6 +9,7 @@
 #
 # THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
 # WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+#
 
 DEPFILES = $(OBJECTS:%.o=%.d)
 

BaseTools/Source/C/Makefiles/lib.makefile

@@ -1,6 +1,7 @@
 ## @file
+# Makefiles
 #
-# Copyright (c) 2007 - 2010, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2007 - 2014, 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
@@ -8,6 +9,7 @@
 #
 # THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
 # WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+#
 
 include $(MAKEROOT)/Makefiles/header.makefile
 

BaseTools/Source/C/Makefiles/ms.app

@@ -1,4 +1,5 @@
 ## @file
+# Makefile
 #
 # Copyright (c) 2007 - 2014, Intel Corporation. All rights reserved.<BR>
 # This program and the accompanying materials
@@ -8,6 +9,7 @@
 #
 # THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
 # WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+#
 
 !INCLUDE ..\Makefiles\ms.common
 

BaseTools/Source/C/Makefiles/ms.common

@@ -1,6 +1,7 @@
 ## @file
+# Makefile
 #
-# Copyright (c) 2007 - 2010, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2007 - 2014, 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
@@ -8,6 +9,7 @@
 #
 # THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
 # WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+#
 
 !IFNDEF EDK_TOOLS_PATH
 !ERROR "Please set your EDK_TOOLS_PATH!"

BaseTools/Source/C/Makefiles/ms.rule

@@ -1,6 +1,7 @@
 ## @file
+# Makefile
 #
-# Copyright (c) 2007 - 2010, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2007 - 2014, 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
@@ -8,6 +9,7 @@
 #
 # THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
 # WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+#
 
 #DEPFILES = $(OBJECTS:%.o=%.d)
 

BaseTools/Source/C/PyEfiCompressor/EfiCompressor.c

@@ -1,6 +1,7 @@
 /** @file
+Efi Compressor
 
-Copyright (c) 2009 - 2010, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2009 - 2014, 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

BaseTools/Source/C/PyEfiCompressor/Makefile

@@ -1,6 +1,7 @@
 ## @file
+# Makefile
 #
-# Copyright (c) 2007 - 2010, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2007 - 2014, 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

BaseTools/Source/C/PyUtility/Makefile

@@ -1,6 +1,7 @@
 ## @file
+# Makefile
 #
-# Copyright (c) 2007 - 2010, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2007 - 2014, 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
@@ -8,6 +9,7 @@
 #
 # THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
 # WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+#
 
 !INCLUDE ..\Makefiles\ms.common
 

BaseTools/Source/C/PyUtility/PyUtility.c

@@ -1,6 +1,7 @@
 /** @file
+Python Utility
 
-Copyright (c) 2009 - 2010, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2009 - 2014, 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