28 files changed, 53 insertions, 35 deletions
diff --git a/EmbeddedPkg/DebugSupportDxe/DebugSupportDxe.inf b/EmbeddedPkg/DebugSupportDxe/DebugSupportDxe.inf
index d3dab66ab7..6ed8a4ede0 100644
--- a/EmbeddedPkg/DebugSupportDxe/DebugSupportDxe.inf
+++ b/EmbeddedPkg/DebugSupportDxe/DebugSupportDxe.inf
@@ -1,4 +1,16 @@
-#%HEADER%
+#/** @file
+#  
+#  Copyright (c) 2008 - 2010, Apple Inc. All rights reserved.
+#  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
+#  
+#  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+#  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+#  
+#**/
+
 [Defines]
   INF_VERSION                    = 0x00010005
   BASE_NAME                      = ArmDebugSupportDxe
diff --git a/EmbeddedPkg/Ebl/Ebl.inf b/EmbeddedPkg/Ebl/Ebl.inf
index f3413546be..6e8f7cf56f 100644
--- a/EmbeddedPkg/Ebl/Ebl.inf
+++ b/EmbeddedPkg/Ebl/Ebl.inf
@@ -1,4 +1,3 @@
-#%HEADER%
 #/** @file
 # EBL Applicaiton
 #
diff --git a/EmbeddedPkg/EmbeddedMonotonicCounter/EmbeddedMonotonicCounter.inf b/EmbeddedPkg/EmbeddedMonotonicCounter/EmbeddedMonotonicCounter.inf
index 8508ac53a3..f55220bd05 100644
--- a/EmbeddedPkg/EmbeddedMonotonicCounter/EmbeddedMonotonicCounter.inf
+++ b/EmbeddedPkg/EmbeddedMonotonicCounter/EmbeddedMonotonicCounter.inf
@@ -1,4 +1,16 @@
-#%HEADER%
+#/** @file
+#  
+#  Copyright (c) 2008 - 2010, Apple Inc. All rights reserved.
+#  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
+#  
+#  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+#  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+#  
+#**/
+
 [Defines]
   INF_VERSION                    = 0x00010005
   BASE_NAME                      = EmbeddedMonotonicCounter
diff --git a/EmbeddedPkg/EmbeddedPkg.dec b/EmbeddedPkg/EmbeddedPkg.dec
index 22ee365e7b..a7882ef4f3 100644
--- a/EmbeddedPkg/EmbeddedPkg.dec
+++ b/EmbeddedPkg/EmbeddedPkg.dec
@@ -1,4 +1,3 @@
-#%HEADER%
 #/** @file
 # Framework Module Development Environment Industry Standards
 #
diff --git a/EmbeddedPkg/EmbeddedPkg.dsc b/EmbeddedPkg/EmbeddedPkg.dsc
index d1a4ed8da3..a9ba337307 100644
--- a/EmbeddedPkg/EmbeddedPkg.dsc
+++ b/EmbeddedPkg/EmbeddedPkg.dsc
@@ -1,4 +1,3 @@
-#%HEADER%
 #/** @file
 # Embedded Package
 #
diff --git a/EmbeddedPkg/GdbStub/GdbStub.inf b/EmbeddedPkg/GdbStub/GdbStub.inf
index 2b54f0abef..c1fa46c1cb 100644
--- a/EmbeddedPkg/GdbStub/GdbStub.inf
+++ b/EmbeddedPkg/GdbStub/GdbStub.inf
@@ -1,4 +1,3 @@
-#%HEADER%
 #/** @file
 # UEFI GDB stub
 #
diff --git a/EmbeddedPkg/Library/EblAddExternalCommandLib/EblAddExternalCommandLib.inf b/EmbeddedPkg/Library/EblAddExternalCommandLib/EblAddExternalCommandLib.inf
index 5b0af6e75a..fbb021283e 100644
--- a/EmbeddedPkg/Library/EblAddExternalCommandLib/EblAddExternalCommandLib.inf
+++ b/EmbeddedPkg/Library/EblAddExternalCommandLib/EblAddExternalCommandLib.inf
@@ -1,4 +1,3 @@
-#%HEADER%
 #/** @file
 # Component description file for the entry point to a EFIDXE Drivers
 #
diff --git a/EmbeddedPkg/Library/EblCmdLibNull/EblCmdLibNull.inf b/EmbeddedPkg/Library/EblCmdLibNull/EblCmdLibNull.inf
index b40935b838..d3ac1574e6 100644
--- a/EmbeddedPkg/Library/EblCmdLibNull/EblCmdLibNull.inf
+++ b/EmbeddedPkg/Library/EblCmdLibNull/EblCmdLibNull.inf
@@ -1,4 +1,3 @@
-#%HEADER%
 #/** @file
 # Component description file for the entry point to a EFIDXE Drivers
 #
diff --git a/EmbeddedPkg/Library/EblNetworkLib/EblNetworkLib.inf b/EmbeddedPkg/Library/EblNetworkLib/EblNetworkLib.inf
index f46242fc62..db8b9135fb 100644
--- a/EmbeddedPkg/Library/EblNetworkLib/EblNetworkLib.inf
+++ b/EmbeddedPkg/Library/EblNetworkLib/EblNetworkLib.inf
@@ -1,9 +1,15 @@
-#%HEADER%
-#
-# Copyright (c) 2005 - 2009 Apple Computer, Inc.  All rights reserved.
-#
-# 
-#
+#/** @file
+#  
+#  Copyright (c) 2008 - 2010, Apple Inc. All rights reserved.
+#  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
+#  
+#  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+#  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+#  
+#**/
 
 [Defines]
   INF_VERSION                    = 0x00010005
diff --git a/EmbeddedPkg/Library/EfiFileLib/EfiFileLib.inf b/EmbeddedPkg/Library/EfiFileLib/EfiFileLib.inf
index a69fb0c423..51bd74e716 100644
--- a/EmbeddedPkg/Library/EfiFileLib/EfiFileLib.inf
+++ b/EmbeddedPkg/Library/EfiFileLib/EfiFileLib.inf
@@ -1,4 +1,3 @@
-#%HEADER%
 #/** @file
 # Component description file for the entry point to a EFIDXE Drivers
 #
diff --git a/EmbeddedPkg/Library/GdbSerialDebugPortLib/GdbSerialDebugPortLib.inf b/EmbeddedPkg/Library/GdbSerialDebugPortLib/GdbSerialDebugPortLib.inf
index 42a7caaa91..87b07cd4bf 100644
--- a/EmbeddedPkg/Library/GdbSerialDebugPortLib/GdbSerialDebugPortLib.inf
+++ b/EmbeddedPkg/Library/GdbSerialDebugPortLib/GdbSerialDebugPortLib.inf
@@ -1,4 +1,3 @@
-#%HEADER%
 #/** @file
 # Component description file for Base PCI Cf8 Library.
 #
diff --git a/EmbeddedPkg/Library/GdbSerialLib/GdbSerialLib.inf b/EmbeddedPkg/Library/GdbSerialLib/GdbSerialLib.inf
index 0c8d0e6a69..10f7effe00 100644
--- a/EmbeddedPkg/Library/GdbSerialLib/GdbSerialLib.inf
+++ b/EmbeddedPkg/Library/GdbSerialLib/GdbSerialLib.inf
@@ -1,4 +1,3 @@
-#%HEADER%
 #/** @file
 # Component description file for Base PCI Cf8 Library.
 #
diff --git a/EmbeddedPkg/Library/PrePiExtractGuidedSectionLib/PrePiExtractGuidedSectionLib.inf b/EmbeddedPkg/Library/PrePiExtractGuidedSectionLib/PrePiExtractGuidedSectionLib.inf
index bffe5b250a..5ec097f0e4 100644
--- a/EmbeddedPkg/Library/PrePiExtractGuidedSectionLib/PrePiExtractGuidedSectionLib.inf
+++ b/EmbeddedPkg/Library/PrePiExtractGuidedSectionLib/PrePiExtractGuidedSectionLib.inf
@@ -1,4 +1,16 @@
-#%HEADER%
+#/** @file
+#  
+#  Copyright (c) 2008 - 2010, Apple Inc. All rights reserved.
+#  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
+#  
+#  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+#  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+#  
+#**/
+
 [Defines]
   INF_VERSION                    = 0x00010005
   BASE_NAME                      = PrePiExtractGuidedSectionLib
diff --git a/EmbeddedPkg/Library/PrePiLib/PrePiLib.inf b/EmbeddedPkg/Library/PrePiLib/PrePiLib.inf
index 278ee44722..8e4f796bb2 100644
--- a/EmbeddedPkg/Library/PrePiLib/PrePiLib.inf
+++ b/EmbeddedPkg/Library/PrePiLib/PrePiLib.inf
@@ -1,4 +1,3 @@
-#%HEADER%
 #/** @file
 # Component description file for Apple Pre PI Library
 #
diff --git a/EmbeddedPkg/Library/SemiHostingDebugLib/SemiHostingDebugLib.inf b/EmbeddedPkg/Library/SemiHostingDebugLib/SemiHostingDebugLib.inf
index 683f03f2f3..ecce67c8e8 100644
--- a/EmbeddedPkg/Library/SemiHostingDebugLib/SemiHostingDebugLib.inf
+++ b/EmbeddedPkg/Library/SemiHostingDebugLib/SemiHostingDebugLib.inf
@@ -1,4 +1,3 @@
-#%HEADER%
 #/** @file
 # Debug Library for UEFI drivers
 #
diff --git a/EmbeddedPkg/Library/SemiHostingSerialPortLib/SemiHostingSerialPortLib.inf b/EmbeddedPkg/Library/SemiHostingSerialPortLib/SemiHostingSerialPortLib.inf
index c0a540342a..d0b7d0ad9d 100644
--- a/EmbeddedPkg/Library/SemiHostingSerialPortLib/SemiHostingSerialPortLib.inf
+++ b/EmbeddedPkg/Library/SemiHostingSerialPortLib/SemiHostingSerialPortLib.inf
@@ -1,4 +1,3 @@
-#%HEADER%
 #/** @file
 # Semihosting  serail port lib
 #
diff --git a/EmbeddedPkg/Library/TemplateRealTimeClockLib/TemplateRealTimeClockLib.inf b/EmbeddedPkg/Library/TemplateRealTimeClockLib/TemplateRealTimeClockLib.inf
index b9f39dd380..68329256af 100644
--- a/EmbeddedPkg/Library/TemplateRealTimeClockLib/TemplateRealTimeClockLib.inf
+++ b/EmbeddedPkg/Library/TemplateRealTimeClockLib/TemplateRealTimeClockLib.inf
@@ -1,4 +1,3 @@
-#%HEADER%
 #/** @file
 # Memory Status Code Library for UEFI drivers
 #
diff --git a/EmbeddedPkg/Library/TemplateResetSystemLib/TemplateResetSystemLib.inf b/EmbeddedPkg/Library/TemplateResetSystemLib/TemplateResetSystemLib.inf
index 4b6fa5bb1a..976fb50764 100644
--- a/EmbeddedPkg/Library/TemplateResetSystemLib/TemplateResetSystemLib.inf
+++ b/EmbeddedPkg/Library/TemplateResetSystemLib/TemplateResetSystemLib.inf
@@ -1,4 +1,3 @@
-#%HEADER%
 #/** @file
 # Memory Status Code Library for UEFI drivers
 #
diff --git a/EmbeddedPkg/Library/TemplateSerialPortLib/TemplateSerialPortLib.inf b/EmbeddedPkg/Library/TemplateSerialPortLib/TemplateSerialPortLib.inf
index e2a994b63e..11b4ab2157 100644
--- a/EmbeddedPkg/Library/TemplateSerialPortLib/TemplateSerialPortLib.inf
+++ b/EmbeddedPkg/Library/TemplateSerialPortLib/TemplateSerialPortLib.inf
@@ -1,4 +1,3 @@
-#%HEADER%
 #/** @file
 # Memory Status Code Library for UEFI drivers
 #
diff --git a/EmbeddedPkg/RealTimeClockRuntimeDxe/RealTimeClockRuntimeDxe.inf b/EmbeddedPkg/RealTimeClockRuntimeDxe/RealTimeClockRuntimeDxe.inf
index f0afceeb65..25f0b33bf4 100644
--- a/EmbeddedPkg/RealTimeClockRuntimeDxe/RealTimeClockRuntimeDxe.inf
+++ b/EmbeddedPkg/RealTimeClockRuntimeDxe/RealTimeClockRuntimeDxe.inf
@@ -1,6 +1,5 @@
-#%HEADER%
 #/** @file
-# NT Emulation Reset Architectural Protocol Driver as defined in TIANO
+# Reset Architectural Protocol Driver as defined in PI
 #
 # This Reset module simulates system reset by process exit on NT.
 # Copyright (c) 2006 - 2007, Intel Corporation
diff --git a/EmbeddedPkg/ResetRuntimeDxe/ResetRuntimeDxe.inf b/EmbeddedPkg/ResetRuntimeDxe/ResetRuntimeDxe.inf
index 956aab709a..b869ebcda9 100644
--- a/EmbeddedPkg/ResetRuntimeDxe/ResetRuntimeDxe.inf
+++ b/EmbeddedPkg/ResetRuntimeDxe/ResetRuntimeDxe.inf
@@ -1,6 +1,5 @@
-#%HEADER%
 #/** @file
-# NT Emulation Reset Architectural Protocol Driver as defined in TIANO
+# Reset Architectural Protocol Driver as defined in PI
 #
 # This Reset module simulates system reset by process exit on NT.
 # Copyright (c) 2006 - 2007, Intel Corporation
diff --git a/EmbeddedPkg/SerialDxe/SerialDxe.inf b/EmbeddedPkg/SerialDxe/SerialDxe.inf
index 29c0aa8c2a..e2f46ecf1b 100644
--- a/EmbeddedPkg/SerialDxe/SerialDxe.inf
+++ b/EmbeddedPkg/SerialDxe/SerialDxe.inf
@@ -1,4 +1,3 @@
-#%HEADER%
 #/** @file
 #  
 #    Component discription file for Bds module
diff --git a/EmbeddedPkg/SimpleTextInOutSerial/SimpleTextInOutSerial.inf b/EmbeddedPkg/SimpleTextInOutSerial/SimpleTextInOutSerial.inf
index 17821d62f7..9799d550c3 100644
--- a/EmbeddedPkg/SimpleTextInOutSerial/SimpleTextInOutSerial.inf
+++ b/EmbeddedPkg/SimpleTextInOutSerial/SimpleTextInOutSerial.inf
@@ -1,4 +1,3 @@
-#%HEADER%
 #/** @file
 #  
 #    Component discription file for Bds module
diff --git a/EmbeddedPkg/TemplateBds/TemplateBds.inf b/EmbeddedPkg/TemplateBds/TemplateBds.inf
index 5a3c1b9801..0b7e7a791f 100644
--- a/EmbeddedPkg/TemplateBds/TemplateBds.inf
+++ b/EmbeddedPkg/TemplateBds/TemplateBds.inf
@@ -1,4 +1,3 @@
-#%HEADER%
 #/** @file
 #  
 #    Component discription file for Bds module
diff --git a/EmbeddedPkg/TemplateCpuDxe/TemplateCpuDxe.inf b/EmbeddedPkg/TemplateCpuDxe/TemplateCpuDxe.inf
index 67d3edc7c4..3d931cd8c9 100644
--- a/EmbeddedPkg/TemplateCpuDxe/TemplateCpuDxe.inf
+++ b/EmbeddedPkg/TemplateCpuDxe/TemplateCpuDxe.inf
@@ -1,4 +1,3 @@
-#%HEADER%
 #/** @file
 #  
 #    Component discription file for Bds module
diff --git a/EmbeddedPkg/TemplateMetronomeDxe/TemplateMetronomeDxe.inf b/EmbeddedPkg/TemplateMetronomeDxe/TemplateMetronomeDxe.inf
index 9a4e53a703..698b17c750 100644
--- a/EmbeddedPkg/TemplateMetronomeDxe/TemplateMetronomeDxe.inf
+++ b/EmbeddedPkg/TemplateMetronomeDxe/TemplateMetronomeDxe.inf
@@ -1,4 +1,3 @@
-#%HEADER%
 #/** @file
 #  
 #    Component discription file for Bds module
diff --git a/EmbeddedPkg/TemplateSec/TemplateSec.inf b/EmbeddedPkg/TemplateSec/TemplateSec.inf
index 5c62b7520e..0d6093432e 100644
--- a/EmbeddedPkg/TemplateSec/TemplateSec.inf
+++ b/EmbeddedPkg/TemplateSec/TemplateSec.inf
@@ -1,4 +1,3 @@
-#%HEADER%
 #/** @file
 #  
 #    Component description file for DxeIpl module
diff --git a/EmbeddedPkg/TemplateTimerDxe/TemplateTimerDxe.inf b/EmbeddedPkg/TemplateTimerDxe/TemplateTimerDxe.inf
index d7c1f05674..3911a08253 100644
--- a/EmbeddedPkg/TemplateTimerDxe/TemplateTimerDxe.inf
+++ b/EmbeddedPkg/TemplateTimerDxe/TemplateTimerDxe.inf
@@ -1,4 +1,3 @@
-#%HEADER%
 #/** @file
 #  
 #    Component discription file for Bds module