Update the copyright notice format

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@10437 6f19259b-4bc3-4df7-8a09-765794883524
author: hhtian <hhtian@6f19259b-4bc3-4df7-8a09-765794883524> 2010-04-28 12:31:45 +0000
committer: hhtian <hhtian@6f19259b-4bc3-4df7-8a09-765794883524> 2010-04-28 12:31:45 +0000
commit: f9b8ab563212511e9b46d5e73f9544f9b17d2fea (patch)
tree: f13854fe1906731f150bf5fd581f1d3e4cd657a4 /UnixPkg
parent: 8f2a5f8012e3a6de30f5b12ce3a218efae9eaedd (diff)
154 files changed, 309 insertions, 297 deletions
diff --git a/UnixPkg/BootModePei/BootModePei.c b/UnixPkg/BootModePei/BootModePei.c
index de76d36bf..6427da83d 100644
--- a/UnixPkg/BootModePei/BootModePei.c
+++ b/UnixPkg/BootModePei/BootModePei.c
@@ -1,7 +1,7 @@
 /**@file
 
-Copyright (c) 2006 - 2008, Intel Corporation                                                         
-All rights reserved. This program and the accompanying materials                          
+Copyright (c) 2006 - 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/UnixPkg/BootModePei/BootModePei.inf b/UnixPkg/BootModePei/BootModePei.inf
index 762fc1935..49302a59c 100644
--- a/UnixPkg/BootModePei/BootModePei.inf
+++ b/UnixPkg/BootModePei/BootModePei.inf
@@ -2,9 +2,9 @@
 # Component description file for BootMode module
 #
 # This module provides platform specific function to detect boot mode.
-# 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/UnixPkg/CpuRuntimeDxe/Cpu.c b/UnixPkg/CpuRuntimeDxe/Cpu.c
index cfd5c0086..0cc913abf 100644
--- a/UnixPkg/CpuRuntimeDxe/Cpu.c
+++ b/UnixPkg/CpuRuntimeDxe/Cpu.c
@@ -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/UnixPkg/CpuRuntimeDxe/Cpu.inf b/UnixPkg/CpuRuntimeDxe/Cpu.inf
index fef127991..1c2e9d2f5 100644
--- a/UnixPkg/CpuRuntimeDxe/Cpu.inf
+++ b/UnixPkg/CpuRuntimeDxe/Cpu.inf
@@ -2,9 +2,9 @@
 # Component description file for Cpu module.
 #
 # This CPU module abstracts the interrupt subsystem of a platform and the CPU-specific setjump-long pair.
-# 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/UnixPkg/CpuRuntimeDxe/CpuDriver.h b/UnixPkg/CpuRuntimeDxe/CpuDriver.h
index ad6ded97b..7bd59df8d 100644
--- a/UnixPkg/CpuRuntimeDxe/CpuDriver.h
+++ b/UnixPkg/CpuRuntimeDxe/CpuDriver.h
@@ -1,7 +1,7 @@
 /*++
 
-Copyright (c) 2006, Intel Corporation                                                         
-All rights reserved. This program and the accompanying materials                          
+Copyright (c) 2006, 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/UnixPkg/CpuRuntimeDxe/CpuIo.c b/UnixPkg/CpuRuntimeDxe/CpuIo.c
index 4b2ae51ba..1a7f4f4ef 100644
--- a/UnixPkg/CpuRuntimeDxe/CpuIo.c
+++ b/UnixPkg/CpuRuntimeDxe/CpuIo.c
@@ -1,7 +1,7 @@
 /*++
 
-Copyright (c) 2006, Intel Corporation                                                         
-All rights reserved. This program and the accompanying materials                          
+Copyright (c) 2006, 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/UnixPkg/CpuRuntimeDxe/Strings.uni b/UnixPkg/CpuRuntimeDxe/Strings.uni
index d2cdfde0c..66edf8b72 100644
--- a/UnixPkg/CpuRuntimeDxe/Strings.uni
+++ b/UnixPkg/CpuRuntimeDxe/Strings.uni
diff --git a/UnixPkg/FvbServicesRuntimeDxe/FWBlockService.c b/UnixPkg/FvbServicesRuntimeDxe/FWBlockService.c
index c316d7c2a..c3e4df2f8 100644
--- a/UnixPkg/FvbServicesRuntimeDxe/FWBlockService.c
+++ b/UnixPkg/FvbServicesRuntimeDxe/FWBlockService.c
@@ -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/UnixPkg/FvbServicesRuntimeDxe/FvbInfo.c b/UnixPkg/FvbServicesRuntimeDxe/FvbInfo.c
index b8399edf9..ebfa28dd9 100644
--- a/UnixPkg/FvbServicesRuntimeDxe/FvbInfo.c
+++ b/UnixPkg/FvbServicesRuntimeDxe/FvbInfo.c
@@ -1,7 +1,7 @@
 /*++
 
-Copyright (c) 2006 - 2008, Intel Corporation                                                         
-All rights reserved. This program and the accompanying materials                          
+Copyright (c) 2006 - 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/UnixPkg/FvbServicesRuntimeDxe/FwBlockService.h b/UnixPkg/FvbServicesRuntimeDxe/FwBlockService.h
index 5c9fc9f86..b6d0c2e5d 100644
--- a/UnixPkg/FvbServicesRuntimeDxe/FwBlockService.h
+++ b/UnixPkg/FvbServicesRuntimeDxe/FwBlockService.h
@@ -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/UnixPkg/FvbServicesRuntimeDxe/UnixFwh.inf b/UnixPkg/FvbServicesRuntimeDxe/UnixFwh.inf
index df0c37c34..5f350b8f7 100644
--- a/UnixPkg/FvbServicesRuntimeDxe/UnixFwh.inf
+++ b/UnixPkg/FvbServicesRuntimeDxe/UnixFwh.inf
@@ -3,9 +3,9 @@
 #
 # This DXE runtime driver implements and produces the Fimware Volue Block Protocol on 
 #  Unix emulator.
-# Copyright (c) 2008 - 2010, Intel Corporation
+# Copyright (c) 2008 - 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/UnixPkg/Include/Common/UnixInclude.h b/UnixPkg/Include/Common/UnixInclude.h
index 487386f9c..cc02353cd 100644
--- a/UnixPkg/Include/Common/UnixInclude.h
+++ b/UnixPkg/Include/Common/UnixInclude.h
@@ -1,8 +1,8 @@
 /*++
 
-Copyright (c) 2006 - 2009, Intel Corporation
-Portions copyright (c) 2008-2009 Apple Inc.
-All rights reserved. This program and the accompanying materials
+Copyright (c) 2006 - 2009, Intel Corporation. All rights reserved.<BR>
+Portions copyright (c) 2008 - 2009, Apple Inc. 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/UnixPkg/Include/FlashLayout.h b/UnixPkg/Include/FlashLayout.h
index 1a13f16c5..5fa197b8f 100644
--- a/UnixPkg/Include/FlashLayout.h
+++ b/UnixPkg/Include/FlashLayout.h
@@ -1,7 +1,7 @@
 /*++
 
-Copyright (c) 2006, Intel Corporation                                                         
-All rights reserved. This program and the accompanying materials                          
+Copyright (c) 2006, 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/UnixPkg/Include/Guid/UnixSystemConfig.h b/UnixPkg/Include/Guid/UnixSystemConfig.h
index 99428d991..dc56bebdb 100644
--- a/UnixPkg/Include/Guid/UnixSystemConfig.h
+++ b/UnixPkg/Include/Guid/UnixSystemConfig.h
@@ -1,8 +1,8 @@
 /**@file
   Setup Variable data structure for Unix platform.
 
-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/UnixPkg/Include/Library/UnixLib.h b/UnixPkg/Include/Library/UnixLib.h
index 9797093b9..32ed2e510 100644
--- a/UnixPkg/Include/Library/UnixLib.h
+++ b/UnixPkg/Include/Library/UnixLib.h
@@ -1,7 +1,7 @@
 /*++
 
-Copyright (c) 2006, Intel Corporation                                                         
-All rights reserved. This program and the accompanying materials                          
+Copyright (c) 2006, 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/UnixPkg/Include/Ppi/UnixAutoScan.h b/UnixPkg/Include/Ppi/UnixAutoScan.h
index 9660796ef..577fd719e 100644
--- a/UnixPkg/Include/Ppi/UnixAutoScan.h
+++ b/UnixPkg/Include/Ppi/UnixAutoScan.h
@@ -1,7 +1,7 @@
 /*++
 
-Copyright (c) 2006, Intel Corporation                                                         
-All rights reserved. This program and the accompanying materials                          
+Copyright (c) 2006, 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/UnixPkg/Include/Ppi/UnixFwh.h b/UnixPkg/Include/Ppi/UnixFwh.h
index a989c8a0a..1befccf25 100644
--- a/UnixPkg/Include/Ppi/UnixFwh.h
+++ b/UnixPkg/Include/Ppi/UnixFwh.h
@@ -1,7 +1,7 @@
 /*++
 
-Copyright (c) 2006, Intel Corporation                                                         
-All rights reserved. This program and the accompanying materials                          
+Copyright (c) 2006, 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/UnixPkg/Include/Ppi/UnixPeiLoadFile.h b/UnixPkg/Include/Ppi/UnixPeiLoadFile.h
index cfd58fdb3..f1de509de 100644
--- a/UnixPkg/Include/Ppi/UnixPeiLoadFile.h
+++ b/UnixPkg/Include/Ppi/UnixPeiLoadFile.h
@@ -1,7 +1,7 @@
 /*++
 
-Copyright (c) 2006, Intel Corporation                                                         
-All rights reserved. This program and the accompanying materials                          
+Copyright (c) 2006, 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/UnixPkg/Include/Ppi/UnixThunk.h b/UnixPkg/Include/Ppi/UnixThunk.h
index ba4d41313..96076a3ea 100644
--- a/UnixPkg/Include/Ppi/UnixThunk.h
+++ b/UnixPkg/Include/Ppi/UnixThunk.h
@@ -1,7 +1,7 @@
 /*++
 
-Copyright (c) 2006, Intel Corporation                                                         
-All rights reserved. This program and the accompanying materials                          
+Copyright (c) 2006, 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/UnixPkg/Include/Protocol/UnixIo.h b/UnixPkg/Include/Protocol/UnixIo.h
index c25b06f07..7bb9a4655 100644
--- a/UnixPkg/Include/Protocol/UnixIo.h
+++ b/UnixPkg/Include/Protocol/UnixIo.h
@@ -1,7 +1,7 @@
 /*++
 
-Copyright (c) 2004 - 2006, Intel Corporation                                                         
-All rights reserved. This program and the accompanying materials                          
+Copyright (c) 2004 - 2006, 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/UnixPkg/Include/Protocol/UnixThunk.h b/UnixPkg/Include/Protocol/UnixThunk.h
index 93e77e8f5..67bf53761 100644
--- a/UnixPkg/Include/Protocol/UnixThunk.h
+++ b/UnixPkg/Include/Protocol/UnixThunk.h
@@ -1,8 +1,8 @@
 /*++
 
-Copyright (c) 2004 - 2009, Intel Corporation                                                         
-Portions copyright (c) 2008-2009 Apple Inc.<BR>
-All rights reserved. This program and the accompanying materials                          
+Copyright (c) 2004 - 2009, Intel Corporation. All rights reserved.<BR>
+Portions copyright (c) 2008 - 2009, Apple Inc. 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/UnixPkg/Include/Protocol/UnixUgaIo.h b/UnixPkg/Include/Protocol/UnixUgaIo.h
index 63e80bea3..4a4798234 100644
--- a/UnixPkg/Include/Protocol/UnixUgaIo.h
+++ b/UnixPkg/Include/Protocol/UnixUgaIo.h
@@ -1,7 +1,7 @@
 /*++
 
-Copyright (c) 2006, Tristan Gingold
-All rights reserved. This program and the accompanying materials
+Copyright (c) 2006, Tristan Gingold. 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/UnixPkg/Include/UnixDxe.h b/UnixPkg/Include/UnixDxe.h
index 7ab91b900..29cde565a 100644
--- a/UnixPkg/Include/UnixDxe.h
+++ b/UnixPkg/Include/UnixDxe.h
@@ -1,7 +1,7 @@
 /*++
 
-Copyright (c) 2006, Intel Corporation                                                         
-All rights reserved. This program and the accompanying materials                          
+Copyright (c) 2006, 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/UnixPkg/Include/UnixPeim.h b/UnixPkg/Include/UnixPeim.h
index 4ddda91cb..af91d3f86 100644
--- a/UnixPkg/Include/UnixPeim.h
+++ b/UnixPkg/Include/UnixPeim.h
@@ -1,7 +1,7 @@
 /*++
 
-Copyright (c) 2006, Intel Corporation                                                         
-All rights reserved. This program and the accompanying materials                          
+Copyright (c) 2006, 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/UnixPkg/Library/DxeUnixLib/DxeUnixLib.inf b/UnixPkg/Library/DxeUnixLib/DxeUnixLib.inf
index b56d95747..432dc59da 100644
--- a/UnixPkg/Library/DxeUnixLib/DxeUnixLib.inf
+++ b/UnixPkg/Library/DxeUnixLib/DxeUnixLib.inf
@@ -2,9 +2,9 @@
 # A library to produce the global variable 'gUnix'
 #
 # This library contains a single global variable 'gUnix' along with a constructor to initialize that global.
-# 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/UnixPkg/Library/DxeUnixLib/UnixLib.c b/UnixPkg/Library/DxeUnixLib/UnixLib.c
index 98bf0442c..c000f7bec 100644
--- a/UnixPkg/Library/DxeUnixLib/UnixLib.c
+++ b/UnixPkg/Library/DxeUnixLib/UnixLib.c
@@ -1,7 +1,7 @@
 /*++
 
-Copyright (c) 2006 - 2008, Intel Corporation                                                         
-All rights reserved. This program and the accompanying materials                          
+Copyright (c) 2006 - 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/UnixPkg/Library/DxeUnixOemHookStatusCodeLib/DxeUnixOemHookStatusCodeLib.inf b/UnixPkg/Library/DxeUnixOemHookStatusCodeLib/DxeUnixOemHookStatusCodeLib.inf
index 12b3b998a..f07d494f5 100644
--- a/UnixPkg/Library/DxeUnixOemHookStatusCodeLib/DxeUnixOemHookStatusCodeLib.inf
+++ b/UnixPkg/Library/DxeUnixOemHookStatusCodeLib/DxeUnixOemHookStatusCodeLib.inf
@@ -3,8 +3,8 @@
 #
 # Lib to provide memory journal status code reporting Routines
 #
-# 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/UnixPkg/Library/DxeUnixOemHookStatusCodeLib/UnixOemHookStatusCodeLib.c b/UnixPkg/Library/DxeUnixOemHookStatusCodeLib/UnixOemHookStatusCodeLib.c
index 7312b1054..00bedfc65 100644
--- a/UnixPkg/Library/DxeUnixOemHookStatusCodeLib/UnixOemHookStatusCodeLib.c
+++ b/UnixPkg/Library/DxeUnixOemHookStatusCodeLib/UnixOemHookStatusCodeLib.c
@@ -1,8 +1,8 @@
 /** @file
   OEM hook status code library functions with no library constructor/destructor
 
-  Copyright (c) 2006 - 2010, Intel Corporation
-  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/UnixPkg/Library/DxeUnixPeCoffExtraActionLib/DxeUnixPeCoffExtraActionLib.c b/UnixPkg/Library/DxeUnixPeCoffExtraActionLib/DxeUnixPeCoffExtraActionLib.c
index b700975fc..e04e580f6 100644
--- a/UnixPkg/Library/DxeUnixPeCoffExtraActionLib/DxeUnixPeCoffExtraActionLib.c
+++ b/UnixPkg/Library/DxeUnixPeCoffExtraActionLib/DxeUnixPeCoffExtraActionLib.c
@@ -1,8 +1,8 @@
 /**@file
 
-Copyright (c) 2006 - 2009, Intel Corporation
-Portions copyright (c) 2008-2009 Apple Inc. All rights reserved.
-All rights reserved. This program and the accompanying materials
+Copyright (c) 2006 - 2009, Intel Corporation. All rights reserved.<BR>
+Portions copyright (c) 2008 - 2009, Apple Inc. 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/UnixPkg/Library/DxeUnixPeCoffExtraActionLib/DxeUnixPeCoffExtraActionLib.inf b/UnixPkg/Library/DxeUnixPeCoffExtraActionLib/DxeUnixPeCoffExtraActionLib.inf
index c015bbc84..6b8a89d21 100644
--- a/UnixPkg/Library/DxeUnixPeCoffExtraActionLib/DxeUnixPeCoffExtraActionLib.inf
+++ b/UnixPkg/Library/DxeUnixPeCoffExtraActionLib/DxeUnixPeCoffExtraActionLib.inf
@@ -2,8 +2,8 @@
 # PeCoff extra action libary for DXE phase that run Unix emulator.
 #
 # Lib to provide memory journal status code reporting Routines
-# Copyright (c) 2007 - 2010, Intel Corporation
-# All rights reserved. This program and the accompanying materials
+# Copyright (c) 2007 - 2010, Intel Corporation. All rights reserved.<BR>
+# This program and the accompanying materials
 # are licensed and made available under the terms and conditions of the BSD License
 # which accompanies this distribution.  The full text of the license may be found at
 # http://opensource.org/licenses/bsd-license.php
diff --git a/UnixPkg/Library/EdkUnixPeiPeCoffGetEntryPointLib/EdkUnixPeiPeCoffGetEntryPointLib.inf b/UnixPkg/Library/EdkUnixPeiPeCoffGetEntryPointLib/EdkUnixPeiPeCoffGetEntryPointLib.inf
index 01e4db644..24e0b468d 100644
--- a/UnixPkg/Library/EdkUnixPeiPeCoffGetEntryPointLib/EdkUnixPeiPeCoffGetEntryPointLib.inf
+++ b/UnixPkg/Library/EdkUnixPeiPeCoffGetEntryPointLib/EdkUnixPeiPeCoffGetEntryPointLib.inf
@@ -2,9 +2,9 @@
 # Component description file for the EdkNt32PeiPeCoffGetEntryPointLib library.
 #
 # PeCoffGetEntryPointLib library class for NT32 instance implemented by use NTPeiLoadFile PPI.
-# Copyright (c) 2008 - 2010, Intel Corporation
+# Copyright (c) 2008 - 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/UnixPkg/Library/EdkUnixPeiPeCoffGetEntryPointLib/PeCoffGetEntryPoint.c b/UnixPkg/Library/EdkUnixPeiPeCoffGetEntryPointLib/PeCoffGetEntryPoint.c
index ef41105be..40715ec8f 100644
--- a/UnixPkg/Library/EdkUnixPeiPeCoffGetEntryPointLib/PeCoffGetEntryPoint.c
+++ b/UnixPkg/Library/EdkUnixPeiPeCoffGetEntryPointLib/PeCoffGetEntryPoint.c
@@ -1,8 +1,8 @@
 /*++
 
-Copyright (c) 2006 - 2010, Intel Corporation
-Portions copyright (c) 2008-2009 Apple Inc. All rights reserved.
-All rights reserved. This program and the accompanying materials
+Copyright (c) 2006 - 2010, Intel Corporation. All rights reserved.<BR>
+Portions copyright (c) 2008 - 2009, Apple Inc. 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/UnixPkg/Library/PeiUnixOemHookStatusCodeLib/PeiUnixOemHookStatusCodeLib.inf b/UnixPkg/Library/PeiUnixOemHookStatusCodeLib/PeiUnixOemHookStatusCodeLib.inf
index c184a49aa..792dfa8cf 100644
--- a/UnixPkg/Library/PeiUnixOemHookStatusCodeLib/PeiUnixOemHookStatusCodeLib.inf
+++ b/UnixPkg/Library/PeiUnixOemHookStatusCodeLib/PeiUnixOemHookStatusCodeLib.inf
@@ -2,8 +2,8 @@
 # Memory Status Code Library for UEFI drivers
 #
 # Lib to provide memory journal status code reporting Routines
-# 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/UnixPkg/Library/PeiUnixOemHookStatusCodeLib/UnixOemHookStatusCodeLib.c b/UnixPkg/Library/PeiUnixOemHookStatusCodeLib/UnixOemHookStatusCodeLib.c
index 69525a59d..2945b08b5 100644
--- a/UnixPkg/Library/PeiUnixOemHookStatusCodeLib/UnixOemHookStatusCodeLib.c
+++ b/UnixPkg/Library/PeiUnixOemHookStatusCodeLib/UnixOemHookStatusCodeLib.c
@@ -1,8 +1,8 @@
 /** @file
   OEM hook status code library functions with no library constructor/destructor
 
-  Copyright (c) 2006 - 2010, Intel Corporation
-  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/UnixPkg/Library/PeiUnixPeCoffExtraActionLib/PeiUnixPeCoffExtraActionLib.c b/UnixPkg/Library/PeiUnixPeCoffExtraActionLib/PeiUnixPeCoffExtraActionLib.c
index f3a481b3d..e3a3c7ca3 100644
--- a/UnixPkg/Library/PeiUnixPeCoffExtraActionLib/PeiUnixPeCoffExtraActionLib.c
+++ b/UnixPkg/Library/PeiUnixPeCoffExtraActionLib/PeiUnixPeCoffExtraActionLib.c
@@ -1,8 +1,8 @@
 /**@file
 
-Copyright (c) 2006 - 2009, Intel Corporation
-Portions copyright (c) 2008-2009 Apple Inc. All rights reserved.
-All rights reserved. This program and the accompanying materials
+Copyright (c) 2006 - 2009, Intel Corporation. All rights reserved.<BR>
+Portions copyright (c) 2008 - 2009, Apple Inc. 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/UnixPkg/Library/PeiUnixPeCoffExtraActionLib/PeiUnixPeCoffExtraActionLib.inf b/UnixPkg/Library/PeiUnixPeCoffExtraActionLib/PeiUnixPeCoffExtraActionLib.inf
index 083cdbf38..054557483 100644
--- a/UnixPkg/Library/PeiUnixPeCoffExtraActionLib/PeiUnixPeCoffExtraActionLib.inf
+++ b/UnixPkg/Library/PeiUnixPeCoffExtraActionLib/PeiUnixPeCoffExtraActionLib.inf
@@ -2,8 +2,8 @@
 # PeCoff extra action libary for Pei phase that run UNIX emulator.
 #
 # Lib to provide memory journal status code reporting Routines
-# Copyright (c) 2007 - 2010, Intel Corporation
-# All rights reserved. This program and the accompanying materials
+# Copyright (c) 2007 - 2010, Intel Corporation. All rights reserved.<BR>
+# This program and the accompanying materials
 # are licensed and made available under the terms and conditions of the BSD License
 # which accompanies this distribution.  The full text of the license may be found at
 # http://opensource.org/licenses/bsd-license.php
diff --git a/UnixPkg/Library/UnixBdsLib/BdsPlatform.c b/UnixPkg/Library/UnixBdsLib/BdsPlatform.c
index ad080863c..671ff954f 100644
--- a/UnixPkg/Library/UnixBdsLib/BdsPlatform.c
+++ b/UnixPkg/Library/UnixBdsLib/BdsPlatform.c
@@ -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/UnixPkg/Library/UnixBdsLib/BdsPlatform.h b/UnixPkg/Library/UnixBdsLib/BdsPlatform.h
index 3f853152d..d83923a6a 100644
--- a/UnixPkg/Library/UnixBdsLib/BdsPlatform.h
+++ b/UnixPkg/Library/UnixBdsLib/BdsPlatform.h
@@ -1,7 +1,7 @@
 /*++
 
-Copyright (c) 2006, Intel Corporation                                                         
-All rights reserved. This program and the accompanying materials                          
+Copyright (c) 2006, 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/UnixPkg/Library/UnixBdsLib/PlatformBds.inf b/UnixPkg/Library/UnixBdsLib/PlatformBds.inf
index be94ea8e6..6974827e0 100644
--- a/UnixPkg/Library/UnixBdsLib/PlatformBds.inf
+++ b/UnixPkg/Library/UnixBdsLib/PlatformBds.inf
@@ -2,9 +2,9 @@
 # Platfrom BDS driver
 #
 # Do platform action customized by IBV/OEM.
-# 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/UnixPkg/Library/UnixBdsLib/PlatformData.c b/UnixPkg/Library/UnixBdsLib/PlatformData.c
index df60c1c96..bbeeb8172 100644
--- a/UnixPkg/Library/UnixBdsLib/PlatformData.c
+++ b/UnixPkg/Library/UnixBdsLib/PlatformData.c
@@ -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/UnixPkg/Library/UnixPeCoffLoaderLib/UnixPeCoffLoader.c b/UnixPkg/Library/UnixPeCoffLoaderLib/UnixPeCoffLoader.c
index 28ce4ef76..48e646148 100644
--- a/UnixPkg/Library/UnixPeCoffLoaderLib/UnixPeCoffLoader.c
+++ b/UnixPkg/Library/UnixPeCoffLoaderLib/UnixPeCoffLoader.c
@@ -1,7 +1,7 @@
 /*++
 
-Copyright (c) 2006 - 2008, Intel Corporation
-All rights reserved. This program and the accompanying materials
+Copyright (c) 2006 - 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/UnixPkg/Library/UnixPeCoffLoaderLib/UnixPeCoffLoaderLib.inf b/UnixPkg/Library/UnixPeCoffLoaderLib/UnixPeCoffLoaderLib.inf
index f92650fb2..ca2bad61b 100644
--- a/UnixPkg/Library/UnixPeCoffLoaderLib/UnixPeCoffLoaderLib.inf
+++ b/UnixPkg/Library/UnixPeCoffLoaderLib/UnixPeCoffLoaderLib.inf
@@ -2,9 +2,9 @@
 # Component description file for the Nt32PeCoffLoaderLib library.
 #
 # EdkPeCoffLoaderLib library class for NT32 instance implemented by PeiPeCoffLoader PPI.
-# 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/UnixPkg/MetronomeDxe/Metronome.c b/UnixPkg/MetronomeDxe/Metronome.c
index f018e7f40..be2b7e7c7 100644
--- a/UnixPkg/MetronomeDxe/Metronome.c
+++ b/UnixPkg/MetronomeDxe/Metronome.c
@@ -1,7 +1,7 @@
 /*++
 
-Copyright (c) 2006 - 2008, Intel Corporation
-All rights reserved. This program and the accompanying materials
+Copyright (c) 2006 - 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/UnixPkg/MetronomeDxe/Metronome.h b/UnixPkg/MetronomeDxe/Metronome.h
index 10e6dc9b8..9f9c11fa2 100644
--- a/UnixPkg/MetronomeDxe/Metronome.h
+++ b/UnixPkg/MetronomeDxe/Metronome.h
@@ -1,7 +1,7 @@
 /*++
 
-Copyright (c) 2006, Intel Corporation                                                         
-All rights reserved. This program and the accompanying materials                          
+Copyright (c) 2006, 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/UnixPkg/MetronomeDxe/Metronome.inf b/UnixPkg/MetronomeDxe/Metronome.inf
index 1122782db..95cd6f1a9 100644
--- a/UnixPkg/MetronomeDxe/Metronome.inf
+++ b/UnixPkg/MetronomeDxe/Metronome.inf
@@ -2,9 +2,9 @@
 # Unix Emulation Metronome Architectural Protocol Driver as defined in DXE CIS
 #
 # This metronome module simulates metronome by Sleep WinAPI.
-# 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/UnixPkg/MiscSubClassPlatformDxe/MiscBaseBoardManufacturer.uni b/UnixPkg/MiscSubClassPlatformDxe/MiscBaseBoardManufacturer.uni
index 18b46e20e..c25533491 100644
--- a/UnixPkg/MiscSubClassPlatformDxe/MiscBaseBoardManufacturer.uni
+++ b/UnixPkg/MiscSubClassPlatformDxe/MiscBaseBoardManufacturer.uni
diff --git a/UnixPkg/MiscSubClassPlatformDxe/MiscBaseBoardManufacturerData.c b/UnixPkg/MiscSubClassPlatformDxe/MiscBaseBoardManufacturerData.c
index 89f665327..373781aad 100644
--- a/UnixPkg/MiscSubClassPlatformDxe/MiscBaseBoardManufacturerData.c
+++ b/UnixPkg/MiscSubClassPlatformDxe/MiscBaseBoardManufacturerData.c
@@ -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/UnixPkg/MiscSubClassPlatformDxe/MiscBaseBoardManufacturerFunction.c b/UnixPkg/MiscSubClassPlatformDxe/MiscBaseBoardManufacturerFunction.c
index 9c3c0da42..04f5a1edc 100644
--- a/UnixPkg/MiscSubClassPlatformDxe/MiscBaseBoardManufacturerFunction.c
+++ b/UnixPkg/MiscSubClassPlatformDxe/MiscBaseBoardManufacturerFunction.c
@@ -2,8 +2,8 @@
   BaseBoard manufacturer information boot time changes.
   SMBIOS type 2.
 
-  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/UnixPkg/MiscSubClassPlatformDxe/MiscBiosVendor.uni b/UnixPkg/MiscSubClassPlatformDxe/MiscBiosVendor.uni
index 23d9b3b87..96f4fd4ad 100644
--- a/UnixPkg/MiscSubClassPlatformDxe/MiscBiosVendor.uni
+++ b/UnixPkg/MiscSubClassPlatformDxe/MiscBiosVendor.uni
diff --git a/UnixPkg/MiscSubClassPlatformDxe/MiscBiosVendorData.c b/UnixPkg/MiscSubClassPlatformDxe/MiscBiosVendorData.c
index a032b482b..5b86b8d43 100644
--- a/UnixPkg/MiscSubClassPlatformDxe/MiscBiosVendorData.c
+++ b/UnixPkg/MiscSubClassPlatformDxe/MiscBiosVendorData.c
@@ -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/UnixPkg/MiscSubClassPlatformDxe/MiscBiosVendorFunction.c b/UnixPkg/MiscSubClassPlatformDxe/MiscBiosVendorFunction.c
index 2cbd13af2..6d64ef463 100644
--- a/UnixPkg/MiscSubClassPlatformDxe/MiscBiosVendorFunction.c
+++ b/UnixPkg/MiscSubClassPlatformDxe/MiscBiosVendorFunction.c
@@ -3,8 +3,8 @@
   Misc. subclass type 2.
   SMBIOS type 0.
 
-  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/UnixPkg/MiscSubClassPlatformDxe/MiscBootInformationData.c b/UnixPkg/MiscSubClassPlatformDxe/MiscBootInformationData.c
index 8e2153d5e..86fb2de4a 100644
--- a/UnixPkg/MiscSubClassPlatformDxe/MiscBootInformationData.c
+++ b/UnixPkg/MiscSubClassPlatformDxe/MiscBootInformationData.c
@@ -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/UnixPkg/MiscSubClassPlatformDxe/MiscBootInformationFunction.c b/UnixPkg/MiscSubClassPlatformDxe/MiscBootInformationFunction.c
index 9c42ab51e..65c9792a9 100644
--- a/UnixPkg/MiscSubClassPlatformDxe/MiscBootInformationFunction.c
+++ b/UnixPkg/MiscSubClassPlatformDxe/MiscBootInformationFunction.c
@@ -2,8 +2,8 @@
   boot information boot time changes.
   SMBIOS type 32.
 
-  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/UnixPkg/MiscSubClassPlatformDxe/MiscChassisManufacturer.uni b/UnixPkg/MiscSubClassPlatformDxe/MiscChassisManufacturer.uni
index 0699973cd..711d23329 100644
--- a/UnixPkg/MiscSubClassPlatformDxe/MiscChassisManufacturer.uni
+++ b/UnixPkg/MiscSubClassPlatformDxe/MiscChassisManufacturer.uni
diff --git a/UnixPkg/MiscSubClassPlatformDxe/MiscChassisManufacturerData.c b/UnixPkg/MiscSubClassPlatformDxe/MiscChassisManufacturerData.c
index 2598b19f0..4883f6751 100644
--- a/UnixPkg/MiscSubClassPlatformDxe/MiscChassisManufacturerData.c
+++ b/UnixPkg/MiscSubClassPlatformDxe/MiscChassisManufacturerData.c
@@ -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/UnixPkg/MiscSubClassPlatformDxe/MiscChassisManufacturerFunction.c b/UnixPkg/MiscSubClassPlatformDxe/MiscChassisManufacturerFunction.c
index 0483aaf14..fd1262b19 100644
--- a/UnixPkg/MiscSubClassPlatformDxe/MiscChassisManufacturerFunction.c
+++ b/UnixPkg/MiscSubClassPlatformDxe/MiscChassisManufacturerFunction.c
@@ -2,8 +2,8 @@
   Chassis manufacturer information boot time changes.
   SMBIOS type 3.
 
-  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/UnixPkg/MiscSubClassPlatformDxe/MiscDevicePath.h b/UnixPkg/MiscSubClassPlatformDxe/MiscDevicePath.h
index ae0e6337f..f9f64a16c 100644
--- a/UnixPkg/MiscSubClassPlatformDxe/MiscDevicePath.h
+++ b/UnixPkg/MiscSubClassPlatformDxe/MiscDevicePath.h
@@ -1,7 +1,7 @@
 /*++
  
-Copyright (c) 2006, Intel Corporation                                                         
-All rights reserved. This program and the accompanying materials                          
+Copyright (c) 2006, 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/UnixPkg/MiscSubClassPlatformDxe/MiscNumberOfInstallableLanguagesData.c b/UnixPkg/MiscSubClassPlatformDxe/MiscNumberOfInstallableLanguagesData.c
index ea43af032..4ebb63313 100644
--- a/UnixPkg/MiscSubClassPlatformDxe/MiscNumberOfInstallableLanguagesData.c
+++ b/UnixPkg/MiscSubClassPlatformDxe/MiscNumberOfInstallableLanguagesData.c
@@ -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/UnixPkg/MiscSubClassPlatformDxe/MiscNumberOfInstallableLanguagesFunction.c b/UnixPkg/MiscSubClassPlatformDxe/MiscNumberOfInstallableLanguagesFunction.c
index 77141e1a9..288848d0d 100644
--- a/UnixPkg/MiscSubClassPlatformDxe/MiscNumberOfInstallableLanguagesFunction.c
+++ b/UnixPkg/MiscSubClassPlatformDxe/MiscNumberOfInstallableLanguagesFunction.c
@@ -2,8 +2,8 @@
   This driver parses the mSmbiosMiscDataTable structure and reports
   any generated data.
 
-  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/UnixPkg/MiscSubClassPlatformDxe/MiscOemString.uni b/UnixPkg/MiscSubClassPlatformDxe/MiscOemString.uni
index 8a3cf1c23..3f8ae3578 100644
--- a/UnixPkg/MiscSubClassPlatformDxe/MiscOemString.uni
+++ b/UnixPkg/MiscSubClassPlatformDxe/MiscOemString.uni
diff --git a/UnixPkg/MiscSubClassPlatformDxe/MiscOemStringData.c b/UnixPkg/MiscSubClassPlatformDxe/MiscOemStringData.c
index 76c2a761c..0ec8d35d3 100644
--- a/UnixPkg/MiscSubClassPlatformDxe/MiscOemStringData.c
+++ b/UnixPkg/MiscSubClassPlatformDxe/MiscOemStringData.c
@@ -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/UnixPkg/MiscSubClassPlatformDxe/MiscOemStringFunction.c b/UnixPkg/MiscSubClassPlatformDxe/MiscOemStringFunction.c
index 153a0a2a0..94fc71c23 100644
--- a/UnixPkg/MiscSubClassPlatformDxe/MiscOemStringFunction.c
+++ b/UnixPkg/MiscSubClassPlatformDxe/MiscOemStringFunction.c
@@ -2,8 +2,8 @@
   boot information boot time changes.
   SMBIOS type 11.
 
-  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/UnixPkg/MiscSubClassPlatformDxe/MiscPortInternalConnectorDesignator.uni b/UnixPkg/MiscSubClassPlatformDxe/MiscPortInternalConnectorDesignator.uni
index bb091ff79..28283978a 100644
--- a/UnixPkg/MiscSubClassPlatformDxe/MiscPortInternalConnectorDesignator.uni
+++ b/UnixPkg/MiscSubClassPlatformDxe/MiscPortInternalConnectorDesignator.uni
diff --git a/UnixPkg/MiscSubClassPlatformDxe/MiscPortInternalConnectorDesignatorData.c b/UnixPkg/MiscSubClassPlatformDxe/MiscPortInternalConnectorDesignatorData.c
index 7ebc612d2..354a7d1ac 100644
--- a/UnixPkg/MiscSubClassPlatformDxe/MiscPortInternalConnectorDesignatorData.c
+++ b/UnixPkg/MiscSubClassPlatformDxe/MiscPortInternalConnectorDesignatorData.c
@@ -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/UnixPkg/MiscSubClassPlatformDxe/MiscPortInternalConnectorDesignatorFunction.c b/UnixPkg/MiscSubClassPlatformDxe/MiscPortInternalConnectorDesignatorFunction.c
index 8a88804ea..8f240a408 100644
--- a/UnixPkg/MiscSubClassPlatformDxe/MiscPortInternalConnectorDesignatorFunction.c
+++ b/UnixPkg/MiscSubClassPlatformDxe/MiscPortInternalConnectorDesignatorFunction.c
@@ -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/UnixPkg/MiscSubClassPlatformDxe/MiscResetCapabilitiesData.c b/UnixPkg/MiscSubClassPlatformDxe/MiscResetCapabilitiesData.c
index 56c30d27d..33f0f6be7 100644
--- a/UnixPkg/MiscSubClassPlatformDxe/MiscResetCapabilitiesData.c
+++ b/UnixPkg/MiscSubClassPlatformDxe/MiscResetCapabilitiesData.c
@@ -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/UnixPkg/MiscSubClassPlatformDxe/MiscResetCapabilitiesFunction.c b/UnixPkg/MiscSubClassPlatformDxe/MiscResetCapabilitiesFunction.c
index ba183aa23..8303c5a29 100644
--- a/UnixPkg/MiscSubClassPlatformDxe/MiscResetCapabilitiesFunction.c
+++ b/UnixPkg/MiscSubClassPlatformDxe/MiscResetCapabilitiesFunction.c
@@ -2,8 +2,8 @@
   ResetCapabilities.
   SMBIOS type 23.
 
-  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/UnixPkg/MiscSubClassPlatformDxe/MiscSubClassDriver.h b/UnixPkg/MiscSubClassPlatformDxe/MiscSubClassDriver.h
index afbec40ee..b38123cf4 100644
--- a/UnixPkg/MiscSubClassPlatformDxe/MiscSubClassDriver.h
+++ b/UnixPkg/MiscSubClassPlatformDxe/MiscSubClassDriver.h
@@ -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/UnixPkg/MiscSubClassPlatformDxe/MiscSubClassDriver.inf b/UnixPkg/MiscSubClassPlatformDxe/MiscSubClassDriver.inf
index bc5439f17..bb7dab6eb 100644
--- a/UnixPkg/MiscSubClassPlatformDxe/MiscSubClassDriver.inf
+++ b/UnixPkg/MiscSubClassPlatformDxe/MiscSubClassDriver.inf
@@ -5,9 +5,9 @@
 #  All .uni file who tagged with "ToolCode="DUMMY"" in following file list is included by
 #  MiscSubclassDriver.uni file, the StrGather tool will expand MiscSubclassDriver.uni file 
 #  and parse all .uni file.
-# 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/UnixPkg/MiscSubClassPlatformDxe/MiscSubClassDriver.uni b/UnixPkg/MiscSubClassPlatformDxe/MiscSubClassDriver.uni
index c2950a933..00b863d39 100644
--- a/UnixPkg/MiscSubClassPlatformDxe/MiscSubClassDriver.uni
+++ b/UnixPkg/MiscSubClassPlatformDxe/MiscSubClassDriver.uni
diff --git a/UnixPkg/MiscSubClassPlatformDxe/MiscSubclassDriverDataTable.c b/UnixPkg/MiscSubClassPlatformDxe/MiscSubclassDriverDataTable.c
index 7b5f97a66..1d0df8e22 100644
--- a/UnixPkg/MiscSubClassPlatformDxe/MiscSubclassDriverDataTable.c
+++ b/UnixPkg/MiscSubClassPlatformDxe/MiscSubclassDriverDataTable.c
@@ -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/UnixPkg/MiscSubClassPlatformDxe/MiscSubclassDriverEntryPoint.c b/UnixPkg/MiscSubClassPlatformDxe/MiscSubclassDriverEntryPoint.c
index 0a0196730..a2c14e7a7 100644
--- a/UnixPkg/MiscSubClassPlatformDxe/MiscSubclassDriverEntryPoint.c
+++ b/UnixPkg/MiscSubClassPlatformDxe/MiscSubclassDriverEntryPoint.c
@@ -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/UnixPkg/MiscSubClassPlatformDxe/MiscSystemLanguageString.uni b/UnixPkg/MiscSubClassPlatformDxe/MiscSystemLanguageString.uni
index e107e8665..04c9105cf 100644
--- a/UnixPkg/MiscSubClassPlatformDxe/MiscSystemLanguageString.uni
+++ b/UnixPkg/MiscSubClassPlatformDxe/MiscSystemLanguageString.uni
diff --git a/UnixPkg/MiscSubClassPlatformDxe/MiscSystemLanguageStringData.c b/UnixPkg/MiscSubClassPlatformDxe/MiscSystemLanguageStringData.c
index a88259527..e6c7b2376 100644
--- a/UnixPkg/MiscSubClassPlatformDxe/MiscSystemLanguageStringData.c
+++ b/UnixPkg/MiscSubClassPlatformDxe/MiscSystemLanguageStringData.c
@@ -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/UnixPkg/MiscSubClassPlatformDxe/MiscSystemLanguageStringFunction.c b/UnixPkg/MiscSubClassPlatformDxe/MiscSystemLanguageStringFunction.c
index 5672ded83..3e10c63ca 100644
--- a/UnixPkg/MiscSubClassPlatformDxe/MiscSystemLanguageStringFunction.c
+++ b/UnixPkg/MiscSubClassPlatformDxe/MiscSystemLanguageStringFunction.c
@@ -2,8 +2,8 @@
   ResetCapabilities.
   SMBIOS type 23.
 
-  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/UnixPkg/MiscSubClassPlatformDxe/MiscSystemManufacturer.uni b/UnixPkg/MiscSubClassPlatformDxe/MiscSystemManufacturer.uni
index 38aa62e3f..cf22bdc34 100644
--- a/UnixPkg/MiscSubClassPlatformDxe/MiscSystemManufacturer.uni
+++ b/UnixPkg/MiscSubClassPlatformDxe/MiscSystemManufacturer.uni
diff --git a/UnixPkg/MiscSubClassPlatformDxe/MiscSystemManufacturerData.c b/UnixPkg/MiscSubClassPlatformDxe/MiscSystemManufacturerData.c
index afe89edad..a253ccac4 100644
--- a/UnixPkg/MiscSubClassPlatformDxe/MiscSystemManufacturerData.c
+++ b/UnixPkg/MiscSubClassPlatformDxe/MiscSystemManufacturerData.c
@@ -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/UnixPkg/MiscSubClassPlatformDxe/MiscSystemManufacturerFunction.c b/UnixPkg/MiscSubClassPlatformDxe/MiscSystemManufacturerFunction.c
index 38a35c68e..1483ace35 100644
--- a/UnixPkg/MiscSubClassPlatformDxe/MiscSystemManufacturerFunction.c
+++ b/UnixPkg/MiscSubClassPlatformDxe/MiscSystemManufacturerFunction.c
@@ -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/UnixPkg/MiscSubClassPlatformDxe/MiscSystemOptionString.uni b/UnixPkg/MiscSubClassPlatformDxe/MiscSystemOptionString.uni
index 7294809fb..6d8f4992b 100644
--- a/UnixPkg/MiscSubClassPlatformDxe/MiscSystemOptionString.uni
+++ b/UnixPkg/MiscSubClassPlatformDxe/MiscSystemOptionString.uni
diff --git a/UnixPkg/MiscSubClassPlatformDxe/MiscSystemOptionStringData.c b/UnixPkg/MiscSubClassPlatformDxe/MiscSystemOptionStringData.c
index 3dc659c93..edda87509 100644
--- a/UnixPkg/MiscSubClassPlatformDxe/MiscSystemOptionStringData.c
+++ b/UnixPkg/MiscSubClassPlatformDxe/MiscSystemOptionStringData.c
@@ -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/UnixPkg/MiscSubClassPlatformDxe/MiscSystemOptionStringFunction.c b/UnixPkg/MiscSubClassPlatformDxe/MiscSystemOptionStringFunction.c
index 4e6f52c6c..a910634f0 100644
--- a/UnixPkg/MiscSubClassPlatformDxe/MiscSystemOptionStringFunction.c
+++ b/UnixPkg/MiscSubClassPlatformDxe/MiscSystemOptionStringFunction.c
@@ -2,8 +2,8 @@
   BIOS system option string boot time changes.
   SMBIOS type 12.
 
-  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/UnixPkg/MiscSubClassPlatformDxe/MiscSystemSlotDesignation.uni b/UnixPkg/MiscSubClassPlatformDxe/MiscSystemSlotDesignation.uni
index 93558abb9..d43c09c14 100644
--- a/UnixPkg/MiscSubClassPlatformDxe/MiscSystemSlotDesignation.uni
+++ b/UnixPkg/MiscSubClassPlatformDxe/MiscSystemSlotDesignation.uni
diff --git a/UnixPkg/MiscSubClassPlatformDxe/MiscSystemSlotDesignationData.c b/UnixPkg/MiscSubClassPlatformDxe/MiscSystemSlotDesignationData.c
index aa5e5b540..760138f43 100644
--- a/UnixPkg/MiscSubClassPlatformDxe/MiscSystemSlotDesignationData.c
+++ b/UnixPkg/MiscSubClassPlatformDxe/MiscSystemSlotDesignationData.c
@@ -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/UnixPkg/MiscSubClassPlatformDxe/MiscSystemSlotDesignationFunction.c b/UnixPkg/MiscSubClassPlatformDxe/MiscSystemSlotDesignationFunction.c
index fc7b2b7d9..72c4137c6 100644
--- a/UnixPkg/MiscSubClassPlatformDxe/MiscSystemSlotDesignationFunction.c
+++ b/UnixPkg/MiscSubClassPlatformDxe/MiscSystemSlotDesignationFunction.c
@@ -2,8 +2,8 @@
   BIOS system slot designator information boot time changes.
   SMBIOS type 9.
 
-  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/UnixPkg/RealTimeClockRuntimeDxe/RealTimeClock.c b/UnixPkg/RealTimeClockRuntimeDxe/RealTimeClock.c
index d34f6eeaa..7ab629cbf 100644
--- a/UnixPkg/RealTimeClockRuntimeDxe/RealTimeClock.c
+++ b/UnixPkg/RealTimeClockRuntimeDxe/RealTimeClock.c
@@ -1,7 +1,7 @@
 /*++
 
-Copyright (c) 2004 - 2008, Intel Corporation                                                         
-All rights reserved. This program and the accompanying materials                          
+Copyright (c) 2004 - 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/UnixPkg/RealTimeClockRuntimeDxe/RealTimeClock.inf b/UnixPkg/RealTimeClockRuntimeDxe/RealTimeClock.inf
index 63d4fdf52..256d74f18 100644
--- a/UnixPkg/RealTimeClockRuntimeDxe/RealTimeClock.inf
+++ b/UnixPkg/RealTimeClockRuntimeDxe/RealTimeClock.inf
@@ -2,9 +2,9 @@
 # Unix Emulation Real time clock Architectural Protocol Driver as defined in TIANO
 #
 # This real time clock module simulates virtual device by time WinAPI.
-# 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/UnixPkg/ResetRuntimeDxe/Reset.c b/UnixPkg/ResetRuntimeDxe/Reset.c
index 329ca0a89..a67d82cad 100644
--- a/UnixPkg/ResetRuntimeDxe/Reset.c
+++ b/UnixPkg/ResetRuntimeDxe/Reset.c
@@ -1,7 +1,7 @@
 /*++
 
-Copyright (c) 2004 - 2009, Intel Corporation                                                         
-All rights reserved. This program and the accompanying materials                          
+Copyright (c) 2004 - 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/UnixPkg/ResetRuntimeDxe/Reset.inf b/UnixPkg/ResetRuntimeDxe/Reset.inf
index 52213e9bd..d367dff90 100644
--- a/UnixPkg/ResetRuntimeDxe/Reset.inf
+++ b/UnixPkg/ResetRuntimeDxe/Reset.inf
@@ -2,9 +2,9 @@
 # Unix Emulation Reset Architectural Protocol Driver as defined in TIANO
 #
 # This Reset module simulates system reset by process exit on NT.
-# 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/UnixPkg/Sec/FwVol.c b/UnixPkg/Sec/FwVol.c
index 7206e00fb..6723148bd 100644
--- a/UnixPkg/Sec/FwVol.c
+++ b/UnixPkg/Sec/FwVol.c
@@ -1,7 +1,7 @@
 /*++
 
-Copyright (c) 2006, Intel Corporation                                                         
-All rights reserved. This program and the accompanying materials                          
+Copyright (c) 2006, 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/UnixPkg/Sec/Gasket.c b/UnixPkg/Sec/Gasket.c
index 6c7b92fb5..9dd5bb20f 100644
--- a/UnixPkg/Sec/Gasket.c
+++ b/UnixPkg/Sec/Gasket.c
@@ -1,8 +1,8 @@
 /** @file
 
-  Copyright (c) 2008-2009, Apple Inc. All rights reserved.
+  Copyright (c) 2008 - 2009, Apple Inc. 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/UnixPkg/Sec/Gasket.h b/UnixPkg/Sec/Gasket.h
index 8343de7fe..f46a66383 100644
--- a/UnixPkg/Sec/Gasket.h
+++ b/UnixPkg/Sec/Gasket.h
@@ -1,3 +1,16 @@
+/** @file
+
+  Copyright (c) 2008 - 2009, Apple Inc. 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.
+
+**/
 
 #ifndef _GASKET_H_
 #define _GASKET_H_
diff --git a/UnixPkg/Sec/Ia32/Gasket.S b/UnixPkg/Sec/Ia32/Gasket.S
index a89f5dbf7..f9a2b53fa 100644
--- a/UnixPkg/Sec/Ia32/Gasket.S
+++ b/UnixPkg/Sec/Ia32/Gasket.S
@@ -16,8 +16,8 @@
 # on Leopard and _stat$INDOE64 on Snow Leopard. That is why we pass stat()
 # into one of these gaskets from C code.
 #
-# Copyright (c) 2008 - 2009 Apple Inc. All rights reserved.
-# All rights reserved. This program and the accompanying materials
+# Copyright (c) 2008 - 2009, Apple Inc. 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/UnixPkg/Sec/Ia32/GasketTemplate.c b/UnixPkg/Sec/Ia32/GasketTemplate.c
index 3b88135a5..e4847ae72 100644
--- a/UnixPkg/Sec/Ia32/GasketTemplate.c
+++ b/UnixPkg/Sec/Ia32/GasketTemplate.c
@@ -6,9 +6,9 @@
   Gasket.S. You still have to add the extra stack alignment code to 
   the assembly functions. 
 
-Copyright (c) 2006 - 2009, Intel Corporation<BR>
-Portions copyright (c) 2008-2009 Apple Inc. All rights reserved.<BR>
-All rights reserved. This program and the accompanying materials
+Copyright (c) 2006 - 2009, Intel Corporation. All rights reserved.<BR>
+Portions copyright (c) 2008 - 2009, Apple Inc. 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/UnixPkg/Sec/Ia32/Stack.S b/UnixPkg/Sec/Ia32/Stack.S
index 4716af9a9..ff5a77f8b 100644
--- a/UnixPkg/Sec/Ia32/Stack.S
+++ b/UnixPkg/Sec/Ia32/Stack.S
@@ -1,8 +1,8 @@
 #------------------------------------------------------------------------------
 #
-# Copyright (c) 2008 - 2009, Intel Corporation
-# Portions copyright (c) 2008-2009 Apple Inc.
-# All rights reserved. This program and the accompanying materials
+# Copyright (c) 2008 - 2009, Intel Corporation. All rights reserved.<BR>
+# Portions copyright (c) 2008 - 2009, Apple Inc. 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/UnixPkg/Sec/SecMain.c b/UnixPkg/Sec/SecMain.c
index f19fd0c3c..05c830bda 100644
--- a/UnixPkg/Sec/SecMain.c
+++ b/UnixPkg/Sec/SecMain.c
@@ -1,8 +1,8 @@
 /*++
 
-Copyright (c) 2006 - 2010, Intel Corporation.
-Portions copyright (c) 2008-2009 Apple Inc.
-All rights reserved. This program and the accompanying materials
+Copyright (c) 2006 - 2010, Intel Corporation. All rights reserved.<BR>
+Portions copyright (c) 2008 - 2009, Apple Inc. 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/UnixPkg/Sec/SecMain.h b/UnixPkg/Sec/SecMain.h
index d862847f6..27edff873 100644
--- a/UnixPkg/Sec/SecMain.h
+++ b/UnixPkg/Sec/SecMain.h
@@ -1,8 +1,8 @@
 /*++
 
-Copyright (c) 2006 - 2010, Intel Corporation                                                         
-Portions copyright (c) 2008-2009 Apple Inc.
-All rights reserved. This program and the accompanying materials                          
+Copyright (c) 2006 - 2010, Intel Corporation. All rights reserved.<BR>
+Portions copyright (c) 2008 - 2009, Apple Inc. 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/UnixPkg/Sec/SecMain.inf b/UnixPkg/Sec/SecMain.inf
index e16fac2ca..e59d6d886 100644
--- a/UnixPkg/Sec/SecMain.inf
+++ b/UnixPkg/Sec/SecMain.inf
@@ -2,10 +2,10 @@
 # Entry Point of Unix Emulator
 #
 # Main executable file of Unix Emulator that loads PEI core after initialization finished.
-# Copyright (c) 2008 - 2010, Intel Corporation
-# Portions copyright (c) 2008-2009 Apple Inc.
+# Copyright (c) 2008 - 2010, Intel Corporation. All rights reserved.<BR>
+# Portions copyright (c) 2008 - 2009, Apple Inc. 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/UnixPkg/Sec/UgaX11.c b/UnixPkg/Sec/UgaX11.c
index 2c2fb186b..648d8c28c 100644
--- a/UnixPkg/Sec/UgaX11.c
+++ b/UnixPkg/Sec/UgaX11.c
@@ -1,8 +1,8 @@
 /*++
 
-Copyright (c) 2004 - 2009, Intel Corporation                                                         
-Portions copyright (c) 2008-2009 Apple Inc. All rights reserved.
-All rights reserved. This program and the accompanying materials                          
+Copyright (c) 2004 - 2009, Intel Corporation. All rights reserved.<BR>
+Portions copyright (c) 2008 - 2009, Apple Inc. 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/UnixPkg/Sec/UnixThunk.c b/UnixPkg/Sec/UnixThunk.c
index c0f35d072..252c7e62a 100644
--- a/UnixPkg/Sec/UnixThunk.c
+++ b/UnixPkg/Sec/UnixThunk.c
@@ -1,8 +1,8 @@
 /*++
 
-Copyright (c) 2004 - 2009, Intel Corporation                                                         
-Portions copyright (c) 2008-2009 Apple Inc. All rights reserved.
-All rights reserved. This program and the accompanying materials                          
+Copyright (c) 2004 - 2009, Intel Corporation. All rights reserved.<BR>
+Portions copyright (c) 2008 - 2009, Apple Inc. 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/UnixPkg/Sec/X64/Gasket.S b/UnixPkg/Sec/X64/Gasket.S
index bce19f3d0..f8a2e5b87 100644
--- a/UnixPkg/Sec/X64/Gasket.S
+++ b/UnixPkg/Sec/X64/Gasket.S
@@ -1,7 +1,7 @@
 #------------------------------------------------------------------------------
 #
-# Copyright (c) 2008-2009 Apple Inc. All rights reserved.
-# All rights reserved. This program and the accompanying materials
+# Copyright (c) 2008 - 2009, Apple Inc. 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/UnixPkg/TimerDxe/Timer.c b/UnixPkg/TimerDxe/Timer.c
index 7f43a368e..16105df9b 100644
--- a/UnixPkg/TimerDxe/Timer.c
+++ b/UnixPkg/TimerDxe/Timer.c
@@ -1,7 +1,7 @@
 /*++
 
-Copyright (c) 2004, Intel Corporation                                                         
-All rights reserved. This program and the accompanying materials                          
+Copyright (c) 2004, 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/UnixPkg/TimerDxe/Timer.h b/UnixPkg/TimerDxe/Timer.h
index 230fead60..c1888a434 100644
--- a/UnixPkg/TimerDxe/Timer.h
+++ b/UnixPkg/TimerDxe/Timer.h
@@ -1,7 +1,7 @@
 /*++
 
-Copyright (c) 2006, Intel Corporation                                                         
-All rights reserved. This program and the accompanying materials                          
+Copyright (c) 2006, 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/UnixPkg/TimerDxe/Timer.inf b/UnixPkg/TimerDxe/Timer.inf
index 27c444ac8..c4b9a31ba 100644
--- a/UnixPkg/TimerDxe/Timer.inf
+++ b/UnixPkg/TimerDxe/Timer.inf
@@ -4,9 +4,9 @@
 # This Timer module uses an NT Thread to simulate the timer-tick driven
 #  timer service. In the future, the Thread creation should possibly be 
 #  abstracted by the CPU architectural protocol
-# 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/UnixPkg/UnixAutoScanPei/UnixAutoScan.c b/UnixPkg/UnixAutoScanPei/UnixAutoScan.c
index 56fa31edc..4b61dc7bb 100644
--- a/UnixPkg/UnixAutoScanPei/UnixAutoScan.c
+++ b/UnixPkg/UnixAutoScanPei/UnixAutoScan.c
@@ -1,7 +1,7 @@
 /*++
 
-Copyright (c) 2006 - 2008, Intel Corporation                                                         
-All rights reserved. This program and the accompanying materials                          
+Copyright (c) 2006 - 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/UnixPkg/UnixAutoScanPei/UnixAutoScan.inf b/UnixPkg/UnixAutoScanPei/UnixAutoScan.inf
index b57256f01..efa813ae6 100644
--- a/UnixPkg/UnixAutoScanPei/UnixAutoScan.inf
+++ b/UnixPkg/UnixAutoScanPei/UnixAutoScan.inf
@@ -2,9 +2,9 @@
 # Component description file for UnixAutoScan module
 #
 # This module abstracts memory auto-scan in a Unix environment.
-# 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/UnixPkg/UnixBlockIoDxe/ComponentName.c b/UnixPkg/UnixBlockIoDxe/ComponentName.c
index 71ceb62cb..986e8c4ba 100644
--- a/UnixPkg/UnixBlockIoDxe/ComponentName.c
+++ b/UnixPkg/UnixBlockIoDxe/ComponentName.c
@@ -1,7 +1,7 @@
 /*++
 
-Copyright (c) 2004, Intel Corporation                                                         
-All rights reserved. This program and the accompanying materials                          
+Copyright (c) 2004, 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/UnixPkg/UnixBlockIoDxe/DriverConfiguration.c b/UnixPkg/UnixBlockIoDxe/DriverConfiguration.c
index d06b5fba4..245aab6bc 100644
--- a/UnixPkg/UnixBlockIoDxe/DriverConfiguration.c
+++ b/UnixPkg/UnixBlockIoDxe/DriverConfiguration.c
@@ -1,7 +1,7 @@
 /*++
 
-Copyright (c) 2004 - 2005, Intel Corporation                                                         
-All rights reserved. This program and the accompanying materials                          
+Copyright (c) 2004 - 2005, 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/UnixPkg/UnixBlockIoDxe/DriverDiagnostics.c b/UnixPkg/UnixBlockIoDxe/DriverDiagnostics.c
index e4c5df99c..0df0e3d96 100644
--- a/UnixPkg/UnixBlockIoDxe/DriverDiagnostics.c
+++ b/UnixPkg/UnixBlockIoDxe/DriverDiagnostics.c
@@ -1,7 +1,7 @@
 /*++
 
-Copyright (c) 2004 - 2005, Intel Corporation                                                         
-All rights reserved. This program and the accompanying materials                          
+Copyright (c) 2004 - 2005, 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/UnixPkg/UnixBlockIoDxe/EntryPoint.c b/UnixPkg/UnixBlockIoDxe/EntryPoint.c
index dae368790..1abe7fe13 100644
--- a/UnixPkg/UnixBlockIoDxe/EntryPoint.c
+++ b/UnixPkg/UnixBlockIoDxe/EntryPoint.c
@@ -3,8 +3,8 @@
 
   This file contains the user entry point 
 
-  Copyright (c) 2006 - 2008, Intel Corporation
-  All rights reserved. This program and the accompanying materials
+  Copyright (c) 2006 - 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/UnixPkg/UnixBlockIoDxe/UnixBlockIo.c b/UnixPkg/UnixBlockIoDxe/UnixBlockIo.c
index a223d8240..90a9acf86 100644
--- a/UnixPkg/UnixBlockIoDxe/UnixBlockIo.c
+++ b/UnixPkg/UnixBlockIoDxe/UnixBlockIo.c
@@ -1,7 +1,7 @@
 /*++
 
-Copyright (c) 2004 - 2009, Intel Corporation                                                         
-All rights reserved. This program and the accompanying materials                          
+Copyright (c) 2004 - 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/UnixPkg/UnixBlockIoDxe/UnixBlockIo.h b/UnixPkg/UnixBlockIoDxe/UnixBlockIo.h
index 693f20e55..a7e3f9645 100644
--- a/UnixPkg/UnixBlockIoDxe/UnixBlockIo.h
+++ b/UnixPkg/UnixBlockIoDxe/UnixBlockIo.h
@@ -1,7 +1,7 @@
 /*++
 
-Copyright (c) 2004 - 2008, Intel Corporation                                                         
-All rights reserved. This program and the accompanying materials                          
+Copyright (c) 2004 - 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/UnixPkg/UnixBlockIoDxe/UnixBlockIo.inf b/UnixPkg/UnixBlockIoDxe/UnixBlockIo.inf
index 3702800ed..fbdbdd713 100644
--- a/UnixPkg/UnixBlockIoDxe/UnixBlockIo.inf
+++ b/UnixPkg/UnixBlockIoDxe/UnixBlockIo.inf
@@ -4,9 +4,9 @@
 # Produce block IO abstractions for real devices on your PC using Unix APIs.
 #  The configuration of what devices to mount or emulate comes from
 #  environment variables.
-# 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/UnixPkg/UnixBusDriverDxe/ComponentName.c b/UnixPkg/UnixBusDriverDxe/ComponentName.c
index 886023ab5..432c6d87b 100644
--- a/UnixPkg/UnixBusDriverDxe/ComponentName.c
+++ b/UnixPkg/UnixBusDriverDxe/ComponentName.c
@@ -1,7 +1,7 @@
 /*++
 
-Copyright (c) 2006, Intel Corporation                                                         
-All rights reserved. This program and the accompanying materials                          
+Copyright (c) 2006, 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/UnixPkg/UnixBusDriverDxe/EntryPoint.c b/UnixPkg/UnixBusDriverDxe/EntryPoint.c
index 71a5bdaae..b226e29aa 100644
--- a/UnixPkg/UnixBusDriverDxe/EntryPoint.c
+++ b/UnixPkg/UnixBusDriverDxe/EntryPoint.c
@@ -3,8 +3,8 @@
 
   This file contains the user entry point 
 
-  Copyright (c) 2006 - 2008, Intel Corporation
-  All rights reserved. This program and the accompanying materials
+  Copyright (c) 2006 - 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/UnixPkg/UnixBusDriverDxe/UnixBusDriver.c b/UnixPkg/UnixBusDriverDxe/UnixBusDriver.c
index fa242eb17..00c041421 100644
--- a/UnixPkg/UnixBusDriverDxe/UnixBusDriver.c
+++ b/UnixPkg/UnixBusDriverDxe/UnixBusDriver.c
@@ -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/UnixPkg/UnixBusDriverDxe/UnixBusDriver.h b/UnixPkg/UnixBusDriverDxe/UnixBusDriver.h
index 0cd3d8d7e..bf3f6f937 100644
--- a/UnixPkg/UnixBusDriverDxe/UnixBusDriver.h
+++ b/UnixPkg/UnixBusDriverDxe/UnixBusDriver.h
@@ -1,7 +1,7 @@
 /*++
 
-Copyright (c) 2006, Intel Corporation                                                         
-All rights reserved. This program and the accompanying materials                          
+Copyright (c) 2006, 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/UnixPkg/UnixBusDriverDxe/UnixBusDriver.inf b/UnixPkg/UnixBusDriverDxe/UnixBusDriver.inf
index 6ce928136..bf83906cb 100644
--- a/UnixPkg/UnixBusDriverDxe/UnixBusDriver.inf
+++ b/UnixPkg/UnixBusDriverDxe/UnixBusDriver.inf
@@ -4,9 +4,9 @@
 # This following section documents the envirnoment variables for the Win NT
 #  build. These variables are used to define the (virtual) hardware
 #  configuration of the NT environment
-# 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/UnixPkg/UnixConsoleDxe/ComponentName.c b/UnixPkg/UnixConsoleDxe/ComponentName.c
index cd5a1bfaf..f9bd50982 100644
--- a/UnixPkg/UnixConsoleDxe/ComponentName.c
+++ b/UnixPkg/UnixConsoleDxe/ComponentName.c
@@ -1,7 +1,7 @@
 /*++
 
-Copyright (c) 2004, Intel Corporation                                                         
-All rights reserved. This program and the accompanying materials                          
+Copyright (c) 2004, 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/UnixPkg/UnixConsoleDxe/Console.c b/UnixPkg/UnixConsoleDxe/Console.c
index 314da93a3..d96646c59 100644
--- a/UnixPkg/UnixConsoleDxe/Console.c
+++ b/UnixPkg/UnixConsoleDxe/Console.c
@@ -1,7 +1,7 @@
 /*++
 
-Copyright (c) 2004 - 2005, Intel Corporation                                                         
-All rights reserved. This program and the accompanying materials                          
+Copyright (c) 2004 - 2005, 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/UnixPkg/UnixConsoleDxe/Console.h b/UnixPkg/UnixConsoleDxe/Console.h
index a3ab0e173..dd80a637e 100644
--- a/UnixPkg/UnixConsoleDxe/Console.h
+++ b/UnixPkg/UnixConsoleDxe/Console.h
@@ -1,7 +1,7 @@
 /*++
 
-Copyright (c) 2004 - 2008, Intel Corporation                                                         
-All rights reserved. This program and the accompanying materials                          
+Copyright (c) 2004 - 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/UnixPkg/UnixConsoleDxe/ConsoleIn.c b/UnixPkg/UnixConsoleDxe/ConsoleIn.c
index 6ab68956e..08100bc00 100644
--- a/UnixPkg/UnixConsoleDxe/ConsoleIn.c
+++ b/UnixPkg/UnixConsoleDxe/ConsoleIn.c
@@ -1,7 +1,7 @@
 /*++
 
-Copyright (c) 2004, Intel Corporation
-All rights reserved. This program and the accompanying materials
+Copyright (c) 2004, 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/UnixPkg/UnixConsoleDxe/ConsoleOut.c b/UnixPkg/UnixConsoleDxe/ConsoleOut.c
index 93ace4d80..0244e0bdc 100644
--- a/UnixPkg/UnixConsoleDxe/ConsoleOut.c
+++ b/UnixPkg/UnixConsoleDxe/ConsoleOut.c
@@ -1,7 +1,7 @@
 /*++
 
-Copyright (c) 2004, Intel Corporation                                                         
-All rights reserved. This program and the accompanying materials                          
+Copyright (c) 2004, 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/UnixPkg/UnixConsoleDxe/EntryPoint.c b/UnixPkg/UnixConsoleDxe/EntryPoint.c
index 47f425888..62d80138b 100644
--- a/UnixPkg/UnixConsoleDxe/EntryPoint.c
+++ b/UnixPkg/UnixConsoleDxe/EntryPoint.c
@@ -3,8 +3,8 @@
 
   This file contains the user entry point 
 
-  Copyright (c) 2006 - 2008, Intel Corporation
-  All rights reserved. This program and the accompanying materials
+  Copyright (c) 2006 - 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/UnixPkg/UnixConsoleDxe/UnixConsole.inf b/UnixPkg/UnixConsoleDxe/UnixConsole.inf
index 0d4ac89af..a3e131373 100644
--- a/UnixPkg/UnixConsoleDxe/UnixConsole.inf
+++ b/UnixPkg/UnixConsoleDxe/UnixConsole.inf
@@ -2,9 +2,9 @@
 # Console Dxe driver
 #
 # Simulate console with Unix API
-# 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/UnixPkg/UnixFirmwareVolumePei/UnixFwh.c b/UnixPkg/UnixFirmwareVolumePei/UnixFwh.c
index 1f588d0c9..babae5da2 100644
--- a/UnixPkg/UnixFirmwareVolumePei/UnixFwh.c
+++ b/UnixPkg/UnixFirmwareVolumePei/UnixFwh.c
@@ -1,7 +1,7 @@
 /*++
 
-Copyright (c) 2006 - 2008, Intel Corporation                                                         
-All rights reserved. This program and the accompanying materials                          
+Copyright (c) 2006 - 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/UnixPkg/UnixFirmwareVolumePei/UnixFwh.inf b/UnixPkg/UnixFirmwareVolumePei/UnixFwh.inf
index f4dfbae41..b5f68d7c9 100644
--- a/UnixPkg/UnixFirmwareVolumePei/UnixFwh.inf
+++ b/UnixPkg/UnixFirmwareVolumePei/UnixFwh.inf
@@ -3,9 +3,9 @@
 #
 # This PEIM will produce the HOB to describe Firmware Volume, Firmware Devices
 #  on the NT32 emulator.
-# 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/UnixPkg/UnixFlashMapPei/FlashMap.c b/UnixPkg/UnixFlashMapPei/FlashMap.c
index f37355d7a..5de98a43b 100644
--- a/UnixPkg/UnixFlashMapPei/FlashMap.c
+++ b/UnixPkg/UnixFlashMapPei/FlashMap.c
@@ -1,7 +1,7 @@
 /*++
 
-Copyright (c) 2006 - 2010, Intel Corporation                                                         
-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/UnixPkg/UnixFlashMapPei/FlashMap.inf b/UnixPkg/UnixFlashMapPei/FlashMap.inf
index 8ccf68aa2..ace839991 100644
--- a/UnixPkg/UnixFlashMapPei/FlashMap.inf
+++ b/UnixPkg/UnixFlashMapPei/FlashMap.inf
@@ -2,9 +2,9 @@
 # Component description file for FlashMap PEI module
 #
 # This module installs FlashMap PPI which is used to get flash layout information.
-# 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/UnixPkg/UnixPkg.dec b/UnixPkg/UnixPkg.dec
index 4c2a338e3..06c240a5a 100644
--- a/UnixPkg/UnixPkg.dec
+++ b/UnixPkg/UnixPkg.dec
@@ -3,9 +3,8 @@
 # This is the Unix Emulation Environment Platform
 #
 # Reference platform implementation using an emulator.
-# Copyright (c) 2008 - 2010, Intel Corporation.
+# Copyright (c) 2008 - 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 http://opensource.org/licenses/bsd-license.php
diff --git a/UnixPkg/UnixPkg.dsc b/UnixPkg/UnixPkg.dsc
index 1d14663af..bd710f7e2 100644
--- a/UnixPkg/UnixPkg.dsc
+++ b/UnixPkg/UnixPkg.dsc
@@ -4,9 +4,9 @@
 #
 # The Emulation Platform can be used to debug individual modules, prior to creating
 #       a real platform. This also provides an example for how an DSC is created.
-# 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/UnixPkg/UnixPkg.fdf b/UnixPkg/UnixPkg.fdf
index ba89dafd4..fd3d50662 100644
--- a/UnixPkg/UnixPkg.fdf
+++ b/UnixPkg/UnixPkg.fdf
@@ -1,9 +1,9 @@
 ## @file
 # This is Unix FDF file with UEFI HII features enabled
 #
-# Copyright (c) 2008 - 2010, Intel Corporation
+# Copyright (c) 2008 - 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/UnixPkg/UnixSerialIoDxe/ComponentName.c b/UnixPkg/UnixSerialIoDxe/ComponentName.c
index d450daac4..833be2e4a 100644
--- a/UnixPkg/UnixSerialIoDxe/ComponentName.c
+++ b/UnixPkg/UnixSerialIoDxe/ComponentName.c
@@ -1,7 +1,7 @@
 /*++
 
-Copyright (c) 2006, Intel Corporation                                                         
-All rights reserved. This program and the accompanying materials                          
+Copyright (c) 2006, 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/UnixPkg/UnixSerialIoDxe/EntryPoint.c b/UnixPkg/UnixSerialIoDxe/EntryPoint.c
index 8f2b57578..06056df1f 100644
--- a/UnixPkg/UnixSerialIoDxe/EntryPoint.c
+++ b/UnixPkg/UnixSerialIoDxe/EntryPoint.c
@@ -3,8 +3,8 @@
 
   This file contains the user entry point 
 
-  Copyright (c) 2006 - 2008, Intel Corporation
-  All rights reserved. This program and the accompanying materials
+  Copyright (c) 2006 - 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/UnixPkg/UnixSerialIoDxe/UnixSerialIo.c b/UnixPkg/UnixSerialIoDxe/UnixSerialIo.c
index 436df8ca9..7afd87bc1 100644
--- a/UnixPkg/UnixSerialIoDxe/UnixSerialIo.c
+++ b/UnixPkg/UnixSerialIoDxe/UnixSerialIo.c
@@ -1,7 +1,7 @@
 /*++
 
-Copyright (c) 2006 - 2010, Intel Corporation
-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/UnixPkg/UnixSerialIoDxe/UnixSerialIo.h b/UnixPkg/UnixSerialIoDxe/UnixSerialIo.h
index d392f95e8..f58014eaa 100644
--- a/UnixPkg/UnixSerialIoDxe/UnixSerialIo.h
+++ b/UnixPkg/UnixSerialIoDxe/UnixSerialIo.h
@@ -1,8 +1,8 @@
 /*++
 
-Copyright (c) 2006 - 2009, Intel Corporation                                                         
-Portions copyright (c) 2008-2009 Apple Inc.
-All rights reserved. This program and the accompanying materials                          
+Copyright (c) 2006 - 2009, Intel Corporation. All rights reserved.<BR>
+Portions copyright (c) 2008 - 2009, Apple Inc. 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/UnixPkg/UnixSerialIoDxe/UnixSerialIo.inf b/UnixPkg/UnixSerialIoDxe/UnixSerialIo.inf
index e951d8073..01b3d2fe9 100644
--- a/UnixPkg/UnixSerialIoDxe/UnixSerialIo.inf
+++ b/UnixPkg/UnixSerialIoDxe/UnixSerialIo.inf
@@ -3,9 +3,9 @@
 #
 # Our DriverBinding member functions operate on the handles
 #  created by the Unix Bus driver
-# 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/UnixPkg/UnixSimpleFileSystemDxe/ComponentName.c b/UnixPkg/UnixSimpleFileSystemDxe/ComponentName.c
index 3234b075c..dce6435bb 100644
--- a/UnixPkg/UnixSimpleFileSystemDxe/ComponentName.c
+++ b/UnixPkg/UnixSimpleFileSystemDxe/ComponentName.c
@@ -1,7 +1,7 @@
 /*++
 
-Copyright (c) 2006, Intel Corporation                                                         
-All rights reserved. This program and the accompanying materials                          
+Copyright (c) 2006, 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/UnixPkg/UnixSimpleFileSystemDxe/EntryPoint.c b/UnixPkg/UnixSimpleFileSystemDxe/EntryPoint.c
index 44e271bc1..4002ffd26 100644
--- a/UnixPkg/UnixSimpleFileSystemDxe/EntryPoint.c
+++ b/UnixPkg/UnixSimpleFileSystemDxe/EntryPoint.c
@@ -3,8 +3,8 @@
 
   This file contains the user entry point 
 
-  Copyright (c) 2006 - 2008, Intel Corporation
-  All rights reserved. This program and the accompanying materials
+  Copyright (c) 2006 - 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/UnixPkg/UnixSimpleFileSystemDxe/UnixSimpleFileSystem.c b/UnixPkg/UnixSimpleFileSystemDxe/UnixSimpleFileSystem.c
index a0c75f578..81065e735 100644
--- a/UnixPkg/UnixSimpleFileSystemDxe/UnixSimpleFileSystem.c
+++ b/UnixPkg/UnixSimpleFileSystemDxe/UnixSimpleFileSystem.c
@@ -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/UnixPkg/UnixSimpleFileSystemDxe/UnixSimpleFileSystem.h b/UnixPkg/UnixSimpleFileSystemDxe/UnixSimpleFileSystem.h
index 29aa91418..e4d4d3097 100644
--- a/UnixPkg/UnixSimpleFileSystemDxe/UnixSimpleFileSystem.h
+++ b/UnixPkg/UnixSimpleFileSystemDxe/UnixSimpleFileSystem.h
@@ -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/UnixPkg/UnixSimpleFileSystemDxe/UnixSimpleFileSystem.inf b/UnixPkg/UnixSimpleFileSystemDxe/UnixSimpleFileSystem.inf
index a5185c14b..44d0362d0 100644
--- a/UnixPkg/UnixSimpleFileSystemDxe/UnixSimpleFileSystem.inf
+++ b/UnixPkg/UnixSimpleFileSystemDxe/UnixSimpleFileSystem.inf
@@ -4,9 +4,9 @@
 # Produce Simple File System abstractions for directories on your PC using Unix APIs.
 #  The configuration of what devices to mount or emulate comes from
 #  environment variables.
-# 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/UnixPkg/UnixThunkDxe/UnixThunk.c b/UnixPkg/UnixThunkDxe/UnixThunk.c
index 3baa97481..d9a857d8a 100644
--- a/UnixPkg/UnixThunkDxe/UnixThunk.c
+++ b/UnixPkg/UnixThunkDxe/UnixThunk.c
@@ -1,7 +1,7 @@
 /*++
 
-Copyright (c) 2006, Intel Corporation                                                         
-All rights reserved. This program and the accompanying materials                          
+Copyright (c) 2006, 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/UnixPkg/UnixThunkDxe/UnixThunk.h b/UnixPkg/UnixThunkDxe/UnixThunk.h
index ce9a2f45d..c41f86822 100644
--- a/UnixPkg/UnixThunkDxe/UnixThunk.h
+++ b/UnixPkg/UnixThunkDxe/UnixThunk.h
@@ -1,7 +1,7 @@
 /*++
 
-Copyright (c) 2006, Intel Corporation                                                         
-All rights reserved. This program and the accompanying materials                          
+Copyright (c) 2006, 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/UnixPkg/UnixThunkDxe/UnixThunk.inf b/UnixPkg/UnixThunkDxe/UnixThunk.inf
index f41a6c9d1..67decf537 100644
--- a/UnixPkg/UnixThunkDxe/UnixThunk.inf
+++ b/UnixPkg/UnixThunkDxe/UnixThunk.inf
@@ -2,9 +2,9 @@
 # A DXE driver to produce EFI_UNIX_THUNK_PROTOCOL
 #
 # EFI_UNIX_THUNK_PROTOCOL is a table of pointers to various Unix APIs used by various drivers to accomplish certain task in a Unix emulator.
-# 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/UnixPkg/UnixThunkPpiToProtocolPei/UnixThunkPpiToProtocol.c b/UnixPkg/UnixThunkPpiToProtocolPei/UnixThunkPpiToProtocol.c
index 07b8aa56e..81cb21031 100644
--- a/UnixPkg/UnixThunkPpiToProtocolPei/UnixThunkPpiToProtocol.c
+++ b/UnixPkg/UnixThunkPpiToProtocolPei/UnixThunkPpiToProtocol.c
@@ -1,7 +1,7 @@
 /*++
 
-Copyright (c) 2006 - 2008, Intel Corporation                                                         
-All rights reserved. This program and the accompanying materials                          
+Copyright (c) 2006 - 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/UnixPkg/UnixThunkPpiToProtocolPei/UnixThunkPpiToProtocol.inf b/UnixPkg/UnixThunkPpiToProtocolPei/UnixThunkPpiToProtocol.inf
index b1762037d..79f73e771 100644
--- a/UnixPkg/UnixThunkPpiToProtocolPei/UnixThunkPpiToProtocol.inf
+++ b/UnixPkg/UnixThunkPpiToProtocolPei/UnixThunkPpiToProtocol.inf
@@ -2,9 +2,9 @@
 # Stuff driver
 #
 # Tiano PEIM to abstract construction of firmware volume in a Unix environment.
-# 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/UnixPkg/UnixUgaDxe/ComponentName.c b/UnixPkg/UnixUgaDxe/ComponentName.c
index 282c5939a..4ba081b23 100644
--- a/UnixPkg/UnixUgaDxe/ComponentName.c
+++ b/UnixPkg/UnixUgaDxe/ComponentName.c
@@ -1,7 +1,7 @@
 /*++
 
-Copyright (c) 2006, Intel Corporation                                                         
-All rights reserved. This program and the accompanying materials                          
+Copyright (c) 2006, 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/UnixPkg/UnixUgaDxe/EntryPoint.c b/UnixPkg/UnixUgaDxe/EntryPoint.c
index a2ed2414d..857f475d3 100644
--- a/UnixPkg/UnixUgaDxe/EntryPoint.c
+++ b/UnixPkg/UnixUgaDxe/EntryPoint.c
@@ -3,8 +3,8 @@
 
   This file contains the user entry point 
 
-  Copyright (c) 2006, Intel Corporation
-  All rights reserved. This program and the accompanying materials
+  Copyright (c) 2006, 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/UnixPkg/UnixUgaDxe/UnixUga.h b/UnixPkg/UnixUgaDxe/UnixUga.h
index 908e80919..b6d2a3085 100644
--- a/UnixPkg/UnixUgaDxe/UnixUga.h
+++ b/UnixPkg/UnixUgaDxe/UnixUga.h
@@ -1,7 +1,7 @@
 /*++
 
-Copyright (c) 2006 - 2008, Intel Corporation                                                         
-All rights reserved. This program and the accompanying materials                          
+Copyright (c) 2006 - 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/UnixPkg/UnixUgaDxe/UnixUga.inf b/UnixPkg/UnixUgaDxe/UnixUga.inf
index 5b1797923..707b64cef 100644
--- a/UnixPkg/UnixUgaDxe/UnixUga.inf
+++ b/UnixPkg/UnixUgaDxe/UnixUga.inf
@@ -5,9 +5,9 @@
 #  This file is a verision of UgaIo the uses UnixThunk system calls as an IO
 #  abstraction. For a PCI device UnixIo would be replaced with
 #  a PCI IO abstraction that abstracted a specific PCI device.
-# 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/UnixPkg/UnixUgaDxe/UnixUgaDriver.c b/UnixPkg/UnixUgaDxe/UnixUgaDriver.c
index 6073202bd..4d3148baa 100644
--- a/UnixPkg/UnixUgaDxe/UnixUgaDriver.c
+++ b/UnixPkg/UnixUgaDxe/UnixUgaDriver.c
@@ -1,7 +1,7 @@
 /*++
 
-Copyright (c) 2006, Intel Corporation                                                         
-All rights reserved. This program and the accompanying materials                          
+Copyright (c) 2006, 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/UnixPkg/UnixUgaDxe/UnixUgaInput.c b/UnixPkg/UnixUgaDxe/UnixUgaInput.c
index 6758d2f4e..f37c086cb 100644
--- a/UnixPkg/UnixUgaDxe/UnixUgaInput.c
+++ b/UnixPkg/UnixUgaDxe/UnixUgaInput.c
@@ -1,7 +1,7 @@
 /*++
 
-Copyright (c) 2006, Intel Corporation
-All rights reserved. This program and the accompanying materials
+Copyright (c) 2006, 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/UnixPkg/UnixUgaDxe/UnixUgaScreen.c b/UnixPkg/UnixUgaDxe/UnixUgaScreen.c
index 38bc0233f..8a2db70ce 100644
--- a/UnixPkg/UnixUgaDxe/UnixUgaScreen.c
+++ b/UnixPkg/UnixUgaDxe/UnixUgaScreen.c
@@ -1,7 +1,7 @@
 /*++
 
-Copyright (c) 2006, Intel Corporation
-All rights reserved. This program and the accompanying materials
+Copyright (c) 2006, 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/UnixPkg/build.sh b/UnixPkg/build.sh
index 851e59fef..29a844f25 100755
--- a/UnixPkg/build.sh
+++ b/UnixPkg/build.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 #
-# Copyright (c) 2008 - 2009, Apple, Inc.  All rights reserved.
-# All rights reserved. This program and the accompanying materials
+# Copyright (c) 2008 - 2009, Apple Inc. 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
author	hhtian <hhtian@6f19259b-4bc3-4df7-8a09-765794883524>	2010-04-28 12:31:45 +0000
committer	hhtian <hhtian@6f19259b-4bc3-4df7-8a09-765794883524>	2010-04-28 12:31:45 +0000
commit	f9b8ab563212511e9b46d5e73f9544f9b17d2fea (patch)
tree	f13854fe1906731f150bf5fd581f1d3e4cd657a4 /UnixPkg
parent	8f2a5f8012e3a6de30f5b12ce3a218efae9eaedd (diff)