Update the copyright notice format

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

44 files changed, 87 insertions, 88 deletions

diff --git a/UefiCpuPkg/CpuDxe/CpuDxe.c b/UefiCpuPkg/CpuDxe/CpuDxe.c
index e3b21d846..66955c3f1 100644
--- a/UefiCpuPkg/CpuDxe/CpuDxe.c
+++ b/UefiCpuPkg/CpuDxe/CpuDxe.c
@@ -1,8 +1,8 @@
 /** @file

   CPU DXE Module.

 

-  Copyright (c) 2008 - 2010, Intel Corporation

-  All rights reserved. This program and the accompanying materials

+  Copyright (c) 2008 - 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

diff --git a/UefiCpuPkg/CpuDxe/CpuDxe.h b/UefiCpuPkg/CpuDxe/CpuDxe.h
index fbf3a9830..91ae2b598 100644
--- a/UefiCpuPkg/CpuDxe/CpuDxe.h
+++ b/UefiCpuPkg/CpuDxe/CpuDxe.h
@@ -1,8 +1,8 @@
 /** @file

   CPU DXE Module.

 

-  Copyright (c) 2008 - 2009, Intel Corporation

-  All rights reserved. This program and the accompanying materials

+  Copyright (c) 2008 - 2009, 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

diff --git a/UefiCpuPkg/CpuDxe/CpuDxe.inf b/UefiCpuPkg/CpuDxe/CpuDxe.inf
index caf33da75..7790d3505 100644
--- a/UefiCpuPkg/CpuDxe/CpuDxe.inf
+++ b/UefiCpuPkg/CpuDxe/CpuDxe.inf
@@ -2,8 +2,8 @@
 #

 #    Component description file for simple CPU driver

 #

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

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

+#  Copyright (c) 2008 - 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

diff --git a/UefiCpuPkg/CpuDxe/CpuGdt.c b/UefiCpuPkg/CpuDxe/CpuGdt.c
index b6d8ffb75..188cdb52b 100644
--- a/UefiCpuPkg/CpuDxe/CpuGdt.c
+++ b/UefiCpuPkg/CpuDxe/CpuGdt.c
@@ -2,8 +2,8 @@
   C based implemention of IA32 interrupt handling only

   requiring a minimal assembly interrupt entry point.

 

-  Copyright (c) 2006 - 2009, Intel Corporation

-  All rights reserved. This program and the accompanying materials

+  Copyright (c) 2006 - 2009, 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

diff --git a/UefiCpuPkg/CpuDxe/Ia32/CpuAsm.S b/UefiCpuPkg/CpuDxe/Ia32/CpuAsm.S
index fc00f4ff2..04896578f 100644
--- a/UefiCpuPkg/CpuDxe/Ia32/CpuAsm.S
+++ b/UefiCpuPkg/CpuDxe/Ia32/CpuAsm.S
@@ -1,7 +1,7 @@
 #------------------------------------------------------------------------------

 #*

-#*   Copyright 2006 - 2009, Intel Corporation

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

+#*   Copyright (c) 2006 - 2009, 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

diff --git a/UefiCpuPkg/CpuDxe/Ia32/CpuAsm.asm b/UefiCpuPkg/CpuDxe/Ia32/CpuAsm.asm
index dfcbc0def..f54fb291c 100644
--- a/UefiCpuPkg/CpuDxe/Ia32/CpuAsm.asm
+++ b/UefiCpuPkg/CpuDxe/Ia32/CpuAsm.asm
@@ -1,8 +1,8 @@
       TITLE   CpuAsm.asm:

 ;------------------------------------------------------------------------------

 ;*

-;*   Copyright 2006 - 2009, Intel Corporation

-;*   All rights reserved. This program and the accompanying materials

+;*   Copyright (c) 2006 - 2009, 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

diff --git a/UefiCpuPkg/CpuDxe/Ia32/IvtAsm.S b/UefiCpuPkg/CpuDxe/Ia32/IvtAsm.S
index ee40b03ed..f2ddf0836 100644
--- a/UefiCpuPkg/CpuDxe/Ia32/IvtAsm.S
+++ b/UefiCpuPkg/CpuDxe/Ia32/IvtAsm.S
@@ -1,7 +1,7 @@
 #------------------------------------------------------------------------------

 #

-# Copyright (c) 2006 - 2009, Intel Corporation

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

+# Copyright (c) 2006 - 2009, 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

diff --git a/UefiCpuPkg/CpuDxe/Ia32/IvtAsm.asm b/UefiCpuPkg/CpuDxe/Ia32/IvtAsm.asm
index e5dfaace8..02003c9fa 100644
--- a/UefiCpuPkg/CpuDxe/Ia32/IvtAsm.asm
+++ b/UefiCpuPkg/CpuDxe/Ia32/IvtAsm.asm
@@ -1,8 +1,8 @@
       TITLE   IvtAsm.asm:

 ;------------------------------------------------------------------------------

 ;*

-;*   Copyright 2008 - 2009, Intel Corporation

-;*   All rights reserved. This program and the accompanying materials

+;*   Copyright (c) 2008 - 2009, 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

diff --git a/UefiCpuPkg/CpuDxe/X64/CpuAsm.S b/UefiCpuPkg/CpuDxe/X64/CpuAsm.S
index 2f84cf023..d6327325b 100644
--- a/UefiCpuPkg/CpuDxe/X64/CpuAsm.S
+++ b/UefiCpuPkg/CpuDxe/X64/CpuAsm.S
@@ -2,8 +2,8 @@
 

 #------------------------------------------------------------------------------

 #*

-#*   Copyright 2008 - 2009, Intel Corporation

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

+#*   Copyright (c) 2008 - 2009, 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

diff --git a/UefiCpuPkg/CpuDxe/X64/CpuAsm.asm b/UefiCpuPkg/CpuDxe/X64/CpuAsm.asm
index 05d9bca11..f8c650fae 100644
--- a/UefiCpuPkg/CpuDxe/X64/CpuAsm.asm
+++ b/UefiCpuPkg/CpuDxe/X64/CpuAsm.asm
@@ -1,8 +1,8 @@
       TITLE   CpuAsm.asm: 

 ;------------------------------------------------------------------------------

 ;*

-;*   Copyright 2008 - 2009, Intel Corporation                                                         

-;*   All rights reserved. This program and the accompanying materials                          

+;*   Copyright (c) 2008 - 2009, 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                                            

diff --git a/UefiCpuPkg/CpuIo2Dxe/CpuIo2Dxe.c b/UefiCpuPkg/CpuIo2Dxe/CpuIo2Dxe.c
index ee03f636a..c183748ee 100644
--- a/UefiCpuPkg/CpuIo2Dxe/CpuIo2Dxe.c
+++ b/UefiCpuPkg/CpuIo2Dxe/CpuIo2Dxe.c
@@ -1,8 +1,8 @@
 /** @file

   Produces the CPU I/O 2 Protocol.

 

-Copyright (c) 2009 - 2010, Intel Corporation

-All rights reserved. This program and the accompanying materials                          

+Copyright (c) 2009 - 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                                            

diff --git a/UefiCpuPkg/CpuIo2Dxe/CpuIo2Dxe.inf b/UefiCpuPkg/CpuIo2Dxe/CpuIo2Dxe.inf
index 0525a83a2..7698c3b69 100644
--- a/UefiCpuPkg/CpuIo2Dxe/CpuIo2Dxe.inf
+++ b/UefiCpuPkg/CpuIo2Dxe/CpuIo2Dxe.inf
@@ -3,8 +3,8 @@
 #

 #  This DXE driver produces of the CPU I/O 2 Protocol, as introduced by PI 1.2.

 #

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

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

+# Copyright (c) 2009 - 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

diff --git a/UefiCpuPkg/CpuIo2Smm/CpuIo2Smm.c b/UefiCpuPkg/CpuIo2Smm/CpuIo2Smm.c
index 8df68217b..bcf3964d8 100644
--- a/UefiCpuPkg/CpuIo2Smm/CpuIo2Smm.c
+++ b/UefiCpuPkg/CpuIo2Smm/CpuIo2Smm.c
@@ -1,8 +1,8 @@
 /** @file

   Produces the SMM CPU I/O Protocol.

 

-Copyright (c) 2009 - 2010, Intel Corporation

-All rights reserved. This program and the accompanying materials                          

+Copyright (c) 2009 - 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                                            

diff --git a/UefiCpuPkg/CpuIo2Smm/CpuIo2Smm.inf b/UefiCpuPkg/CpuIo2Smm/CpuIo2Smm.inf
index b897500ff..a95246065 100644
--- a/UefiCpuPkg/CpuIo2Smm/CpuIo2Smm.inf
+++ b/UefiCpuPkg/CpuIo2Smm/CpuIo2Smm.inf
@@ -1,8 +1,8 @@
 ## @file

 #  Module that produces the SMM CPU I/O 2 Protocol using the services of the I/O Library

 #

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

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

+#  Copyright (c) 2009 - 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

diff --git a/UefiCpuPkg/CpuIoPei/CpuIoPei.c b/UefiCpuPkg/CpuIoPei/CpuIoPei.c
index 72717d636..c94abe8e0 100644
--- a/UefiCpuPkg/CpuIoPei/CpuIoPei.c
+++ b/UefiCpuPkg/CpuIoPei/CpuIoPei.c
@@ -1,8 +1,8 @@
 /** @file

   Produces the CPU I/O PPI.

 

-Copyright (c) 2009 - 2010, Intel Corporation

-All rights reserved. This program and the accompanying materials                          

+Copyright (c) 2009 - 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                                            

diff --git a/UefiCpuPkg/CpuIoPei/CpuIoPei.inf b/UefiCpuPkg/CpuIoPei/CpuIoPei.inf
index 6bb829333..ec89a4e4e 100644
--- a/UefiCpuPkg/CpuIoPei/CpuIoPei.inf
+++ b/UefiCpuPkg/CpuIoPei/CpuIoPei.inf
@@ -3,8 +3,8 @@
 #

 #  This PEIM produces of the CPU I/O PPI.

 #

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

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

+# Copyright (c) 2009 - 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

diff --git a/UefiCpuPkg/Include/Library/MtrrLib.h b/UefiCpuPkg/Include/Library/MtrrLib.h
index b34384b14..f0c604d6b 100644
--- a/UefiCpuPkg/Include/Library/MtrrLib.h
+++ b/UefiCpuPkg/Include/Library/MtrrLib.h
@@ -1,8 +1,8 @@
 /** @file

   MTRR setting library

 

-  Copyright (c) 2008 - 2010, Intel Corporation

-  All rights reserved. This program and the accompanying materials

+  Copyright (c) 2008 - 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

diff --git a/UefiCpuPkg/Include/Library/UefiCpuLib.h b/UefiCpuPkg/Include/Library/UefiCpuLib.h
index 597c19424..561d57996 100644
--- a/UefiCpuPkg/Include/Library/UefiCpuLib.h
+++ b/UefiCpuPkg/Include/Library/UefiCpuLib.h
@@ -4,8 +4,8 @@
   This library class defines some routines that are generic for IA32 family CPU

   to be UEFI specification compliant.

 

-  Copyright (c) 2009, Intel Corporation

-  All rights reserved. This program and the accompanying materials

+  Copyright (c) 2009, 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

diff --git a/UefiCpuPkg/Library/BaseUefiCpuLib/BaseUefiCpuLib.inf b/UefiCpuPkg/Library/BaseUefiCpuLib/BaseUefiCpuLib.inf
index 90b798dca..2bc023fc2 100644
--- a/UefiCpuPkg/Library/BaseUefiCpuLib/BaseUefiCpuLib.inf
+++ b/UefiCpuPkg/Library/BaseUefiCpuLib/BaseUefiCpuLib.inf
@@ -2,8 +2,8 @@
 #  This library defines some routines that are generic for IA32 family CPU

 #  to be UEFI specification compliant.

 #

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

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

+#  Copyright (c) 2009 - 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

diff --git a/UefiCpuPkg/Library/BaseUefiCpuLib/Ia32/InitializeFpu.S b/UefiCpuPkg/Library/BaseUefiCpuLib/Ia32/InitializeFpu.S
index 1d7bd21b6..4972bc2e7 100644
--- a/UefiCpuPkg/Library/BaseUefiCpuLib/Ia32/InitializeFpu.S
+++ b/UefiCpuPkg/Library/BaseUefiCpuLib/Ia32/InitializeFpu.S
@@ -1,7 +1,7 @@
 #------------------------------------------------------------------------------

 #*

-#*   Copyright 2009 - 2010, Intel Corporation

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

+#*   Copyright (c) 2009 - 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

diff --git a/UefiCpuPkg/Library/BaseUefiCpuLib/Ia32/InitializeFpu.asm b/UefiCpuPkg/Library/BaseUefiCpuLib/Ia32/InitializeFpu.asm
index 083473311..3c31da98f 100644
--- a/UefiCpuPkg/Library/BaseUefiCpuLib/Ia32/InitializeFpu.asm
+++ b/UefiCpuPkg/Library/BaseUefiCpuLib/Ia32/InitializeFpu.asm
@@ -1,7 +1,7 @@
 ;------------------------------------------------------------------------------

 ;*

-;*   Copyright 2009, Intel Corporation

-;*   All rights reserved. This program and the accompanying materials

+;*   Copyright (c) 2009, 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

diff --git a/UefiCpuPkg/Library/BaseUefiCpuLib/X64/InitializeFpu.S b/UefiCpuPkg/Library/BaseUefiCpuLib/X64/InitializeFpu.S
index db4158729..64750afb8 100644
--- a/UefiCpuPkg/Library/BaseUefiCpuLib/X64/InitializeFpu.S
+++ b/UefiCpuPkg/Library/BaseUefiCpuLib/X64/InitializeFpu.S
@@ -1,7 +1,7 @@
 #------------------------------------------------------------------------------
 #*
-#*   Copyright 2009 - 2010, Intel Corporation
-#*   All rights reserved. This program and the accompanying materials
+#*   Copyright (c) 2009 - 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
diff --git a/UefiCpuPkg/Library/BaseUefiCpuLib/X64/InitializeFpu.asm b/UefiCpuPkg/Library/BaseUefiCpuLib/X64/InitializeFpu.asm
index 5098124a9..0a036b6ae 100644
--- a/UefiCpuPkg/Library/BaseUefiCpuLib/X64/InitializeFpu.asm
+++ b/UefiCpuPkg/Library/BaseUefiCpuLib/X64/InitializeFpu.asm
@@ -1,7 +1,7 @@
 ;------------------------------------------------------------------------------

 ;*

-;*   Copyright 2009, Intel Corporation

-;*   All rights reserved. This program and the accompanying materials

+;*   Copyright (c) 2009, 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

diff --git a/UefiCpuPkg/Library/MtrrLib/MtrrLib.c b/UefiCpuPkg/Library/MtrrLib/MtrrLib.c
index d48b6a4db..2bf0ce74b 100644
--- a/UefiCpuPkg/Library/MtrrLib/MtrrLib.c
+++ b/UefiCpuPkg/Library/MtrrLib/MtrrLib.c
@@ -1,8 +1,8 @@
 /** @file

   MTRR setting library

 

-  Copyright (c) 2008 - 2010, Intel Corporation

-  All rights reserved. This program and the accompanying materials

+  Copyright (c) 2008 - 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

diff --git a/UefiCpuPkg/Library/MtrrLib/MtrrLib.inf b/UefiCpuPkg/Library/MtrrLib/MtrrLib.inf
index 31d18bf19..f46d6cb79 100644
--- a/UefiCpuPkg/Library/MtrrLib/MtrrLib.inf
+++ b/UefiCpuPkg/Library/MtrrLib/MtrrLib.inf
@@ -1,8 +1,8 @@
 ## @file

 #  MTRR library provides API for MTRR operation

 #

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

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

+#  Copyright (c) 2006 - 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

diff --git a/UefiCpuPkg/ResetVector/Vtf0/Bin/ResetVector.inf b/UefiCpuPkg/ResetVector/Vtf0/Bin/ResetVector.inf
index 2e51f4ae7..63e1e2cf5 100644
--- a/UefiCpuPkg/ResetVector/Vtf0/Bin/ResetVector.inf
+++ b/UefiCpuPkg/ResetVector/Vtf0/Bin/ResetVector.inf
@@ -1,9 +1,9 @@
 ## @file

 #  Reset Vector binary

 #

-#  Copyright (c) 2006 - 2010, Intel Corporation.

+#  Copyright (c) 2006 - 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/UefiCpuPkg/ResetVector/Vtf0/Build.py b/UefiCpuPkg/ResetVector/Vtf0/Build.py
index ff723c8fd..dad257c16 100644
--- a/UefiCpuPkg/ResetVector/Vtf0/Build.py
+++ b/UefiCpuPkg/ResetVector/Vtf0/Build.py
@@ -1,9 +1,9 @@
 ## @file
 #  Automate the process of building the various reset vector types
 #
-#  Copyright (c) 2009, Intel Corporation
+#  Copyright (c) 2009, 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/UefiCpuPkg/ResetVector/Vtf0/CommonMacros.inc b/UefiCpuPkg/ResetVector/Vtf0/CommonMacros.inc
index c25c8663e..b46da2768 100644
--- a/UefiCpuPkg/ResetVector/Vtf0/CommonMacros.inc
+++ b/UefiCpuPkg/ResetVector/Vtf0/CommonMacros.inc
@@ -2,8 +2,8 @@
 ; @file

 ; Common macros used in the ResetVector VTF module.

 ;

-; Copyright (c) 2008, Intel Corporation

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

+; Copyright (c) 2008, 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

diff --git a/UefiCpuPkg/ResetVector/Vtf0/DebugDisabled.asm b/UefiCpuPkg/ResetVector/Vtf0/DebugDisabled.asm
index 78389f4e4..883cef03e 100644
--- a/UefiCpuPkg/ResetVector/Vtf0/DebugDisabled.asm
+++ b/UefiCpuPkg/ResetVector/Vtf0/DebugDisabled.asm
@@ -2,8 +2,8 @@
 ; @file

 ; Debug disabled

 ;

-; Copyright (c) 2009, Intel Corporation

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

+; Copyright (c) 2009, 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

diff --git a/UefiCpuPkg/ResetVector/Vtf0/Ia16/16RealTo32Flat.asm b/UefiCpuPkg/ResetVector/Vtf0/Ia16/16RealTo32Flat.asm
index 3139ff50c..146df600a 100644
--- a/UefiCpuPkg/ResetVector/Vtf0/Ia16/16RealTo32Flat.asm
+++ b/UefiCpuPkg/ResetVector/Vtf0/Ia16/16RealTo32Flat.asm
@@ -2,8 +2,8 @@
 ; @file

 ; Transition from 16 bit real mode into 32 bit flat protected mode

 ;

-; Copyright (c) 2008 - 2010, Intel Corporation

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

+; Copyright (c) 2008 - 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

diff --git a/UefiCpuPkg/ResetVector/Vtf0/Ia16/Init16.asm b/UefiCpuPkg/ResetVector/Vtf0/Ia16/Init16.asm
index 3d3d8b026..226c49f22 100644
--- a/UefiCpuPkg/ResetVector/Vtf0/Ia16/Init16.asm
+++ b/UefiCpuPkg/ResetVector/Vtf0/Ia16/Init16.asm
@@ -2,8 +2,8 @@
 ; @file

 ; 16-bit initialization code

 ;

-; Copyright (c) 2008 - 2009, Intel Corporation

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

+; Copyright (c) 2008 - 2009, 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

diff --git a/UefiCpuPkg/ResetVector/Vtf0/Ia16/ResetVectorVtf0.asm b/UefiCpuPkg/ResetVector/Vtf0/Ia16/ResetVectorVtf0.asm
index 0eff74318..3764b4ac8 100644
--- a/UefiCpuPkg/ResetVector/Vtf0/Ia16/ResetVectorVtf0.asm
+++ b/UefiCpuPkg/ResetVector/Vtf0/Ia16/ResetVectorVtf0.asm
@@ -2,8 +2,8 @@
 ; @file

 ; First code exectuted by processor after resetting.

 ;

-; Copyright (c) 2008 - 2009, Intel Corporation

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

+; Copyright (c) 2008 - 2009, 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

diff --git a/UefiCpuPkg/ResetVector/Vtf0/Ia32/32FlatTo64Flat.asm b/UefiCpuPkg/ResetVector/Vtf0/Ia32/32FlatTo64Flat.asm
index a97f9cc70..9eba864c2 100644
--- a/UefiCpuPkg/ResetVector/Vtf0/Ia32/32FlatTo64Flat.asm
+++ b/UefiCpuPkg/ResetVector/Vtf0/Ia32/32FlatTo64Flat.asm
@@ -2,8 +2,8 @@
 ; @file

 ; Transition from 32 bit flat protected mode into 64 bit flat protected mode

 ;

-; Copyright (c) 2008 - 2009, Intel Corporation

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

+; Copyright (c) 2008 - 2009, 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

diff --git a/UefiCpuPkg/ResetVector/Vtf0/Ia32/SearchForBfvBase.asm b/UefiCpuPkg/ResetVector/Vtf0/Ia32/SearchForBfvBase.asm
index 21b64f46e..d0c2d8c39 100644
--- a/UefiCpuPkg/ResetVector/Vtf0/Ia32/SearchForBfvBase.asm
+++ b/UefiCpuPkg/ResetVector/Vtf0/Ia32/SearchForBfvBase.asm
@@ -2,8 +2,8 @@
 ; @file

 ; Search for the Boot Firmware Volume (BFV) base address

 ;

-; Copyright (c) 2008 - 2009, Intel Corporation

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

+; Copyright (c) 2008 - 2009, 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

diff --git a/UefiCpuPkg/ResetVector/Vtf0/Ia32/SearchForSecEntry.asm b/UefiCpuPkg/ResetVector/Vtf0/Ia32/SearchForSecEntry.asm
index 01d051918..9558b9d35 100644
--- a/UefiCpuPkg/ResetVector/Vtf0/Ia32/SearchForSecEntry.asm
+++ b/UefiCpuPkg/ResetVector/Vtf0/Ia32/SearchForSecEntry.asm
@@ -2,8 +2,8 @@
 ; @file

 ; Search for the SEC Core entry point

 ;

-; Copyright (c) 2008 - 2009, Intel Corporation

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

+; Copyright (c) 2008 - 2009, 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

diff --git a/UefiCpuPkg/ResetVector/Vtf0/Main.asm b/UefiCpuPkg/ResetVector/Vtf0/Main.asm
index bc2a3b168..ebfb9015d 100644
--- a/UefiCpuPkg/ResetVector/Vtf0/Main.asm
+++ b/UefiCpuPkg/ResetVector/Vtf0/Main.asm
@@ -2,8 +2,8 @@
 ; @file

 ; Main routine of the pre-SEC code up through the jump into SEC

 ;

-; Copyright (c) 2008 - 2009, Intel Corporation

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

+; Copyright (c) 2008 - 2009, 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

diff --git a/UefiCpuPkg/ResetVector/Vtf0/Makefile b/UefiCpuPkg/ResetVector/Vtf0/Makefile
index a4c3f789d..bc21d7175 100644
--- a/UefiCpuPkg/ResetVector/Vtf0/Makefile
+++ b/UefiCpuPkg/ResetVector/Vtf0/Makefile
@@ -1,9 +1,9 @@
 ## @file
 #  Makefile to create FFS Raw sections for VTF images.
 #
-#  Copyright (c) 2008, Intel Corporation
+#  Copyright (c) 2008, 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/UefiCpuPkg/ResetVector/Vtf0/Port80Debug.asm b/UefiCpuPkg/ResetVector/Vtf0/Port80Debug.asm
index 2f9d0862e..4b13c4860 100644
--- a/UefiCpuPkg/ResetVector/Vtf0/Port80Debug.asm
+++ b/UefiCpuPkg/ResetVector/Vtf0/Port80Debug.asm
@@ -2,8 +2,8 @@
 ; @file

 ; Port 0x80 debug support macros

 ;

-; Copyright (c) 2009, Intel Corporation

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

+; Copyright (c) 2009, 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

diff --git a/UefiCpuPkg/ResetVector/Vtf0/PostCodes.inc b/UefiCpuPkg/ResetVector/Vtf0/PostCodes.inc
index 2556aed87..62eda5d99 100644
--- a/UefiCpuPkg/ResetVector/Vtf0/PostCodes.inc
+++ b/UefiCpuPkg/ResetVector/Vtf0/PostCodes.inc
@@ -2,8 +2,8 @@
 ; @file

 ; Definitions of POST CODES for the reset vector module

 ;

-; Copyright (c) 2009, Intel Corporation

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

+; Copyright (c) 2009, 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

diff --git a/UefiCpuPkg/ResetVector/Vtf0/ResetVectorCode.asm b/UefiCpuPkg/ResetVector/Vtf0/ResetVectorCode.asm
index 8b1394230..a0afbf02d 100644
--- a/UefiCpuPkg/ResetVector/Vtf0/ResetVectorCode.asm
+++ b/UefiCpuPkg/ResetVector/Vtf0/ResetVectorCode.asm
@@ -2,8 +2,8 @@
 ; @file

 ; This file includes all other code files to assemble the reset vector code

 ;

-; Copyright (c) 2008 - 2009, Intel Corporation

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

+; Copyright (c) 2008 - 2009, 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

diff --git a/UefiCpuPkg/ResetVector/Vtf0/SerialDebug.asm b/UefiCpuPkg/ResetVector/Vtf0/SerialDebug.asm
index 8c2ffc66d..ebd0910f4 100644
--- a/UefiCpuPkg/ResetVector/Vtf0/SerialDebug.asm
+++ b/UefiCpuPkg/ResetVector/Vtf0/SerialDebug.asm
@@ -2,8 +2,8 @@
 ; @file

 ; Serial port debug support macros

 ;

-; Copyright (c) 2008 - 2009, Intel Corporation

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

+; Copyright (c) 2008 - 2009, 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

diff --git a/UefiCpuPkg/ResetVector/Vtf0/Tools/FixupForRawSection.py b/UefiCpuPkg/ResetVector/Vtf0/Tools/FixupForRawSection.py
index a4c379964..7833f4b76 100644
--- a/UefiCpuPkg/ResetVector/Vtf0/Tools/FixupForRawSection.py
+++ b/UefiCpuPkg/ResetVector/Vtf0/Tools/FixupForRawSection.py
@@ -1,9 +1,9 @@
 ## @file
 #  Apply fixup to VTF binary image for FFS Raw section
 #
-#  Copyright (c) 2008, Intel Corporation
+#  Copyright (c) 2008, 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/UefiCpuPkg/UefiCpuPkg.dec b/UefiCpuPkg/UefiCpuPkg.dec
index 6e24ff198..f4460c751 100644
--- a/UefiCpuPkg/UefiCpuPkg.dec
+++ b/UefiCpuPkg/UefiCpuPkg.dec
@@ -2,9 +2,8 @@
 #
 # This Package provides UEFI compatible CPU modules and libraries.
 #
-# 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 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
diff --git a/UefiCpuPkg/UefiCpuPkg.dsc b/UefiCpuPkg/UefiCpuPkg.dsc
index bbd2a1c1f..8fe51bc46 100644
--- a/UefiCpuPkg/UefiCpuPkg.dsc
+++ b/UefiCpuPkg/UefiCpuPkg.dsc
@@ -1,9 +1,9 @@
 ## @file

 #  UefiCpuPkg Package

 #

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