1. EDK_RELEASE_VERSION removed;

2. INF file header description reviewed;
3. remove useless #include ;

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

31 files changed, 72 insertions, 129 deletions

diff --git a/IntelFrameworkModulePkg/Bus/Isa/IsaBusDxe/IsaBusDxe.inf b/IntelFrameworkModulePkg/Bus/Isa/IsaBusDxe/IsaBusDxe.inf
index 2beb13b..4ef4314 100644
--- a/IntelFrameworkModulePkg/Bus/Isa/IsaBusDxe/IsaBusDxe.inf
+++ b/IntelFrameworkModulePkg/Bus/Isa/IsaBusDxe/IsaBusDxe.inf
@@ -8,7 +8,7 @@
 # manner, and informs a ISA Device Driver when it is to start managing an ISA

 # Controller.

 #

-# Copyright (c) 2007, Intel Corporation

+# Copyright (c) 2007 - 2009, Intel Corporation

 #

 # All rights reserved. This program and the accompanying materials

 # are licensed and made available under the terms and conditions of the BSD License

@@ -25,9 +25,7 @@
   FILE_GUID                      = 240612B5-A063-11d4-9A3A-0090273FC14D

   MODULE_TYPE                    = UEFI_DRIVER

   VERSION_STRING                 = 1.0

-  EDK_RELEASE_VERSION            = 0x00020000

   EFI_SPECIFICATION_VERSION      = 0x00020000

-

   ENTRY_POINT                    = InitializeIsaBus

 

 #  VALID_ARCHITECTURES           = IA32 X64 IPF EBC

diff --git a/IntelFrameworkModulePkg/Bus/Isa/IsaFloppyDxe/IsaFloppyDxe.inf b/IntelFrameworkModulePkg/Bus/Isa/IsaFloppyDxe/IsaFloppyDxe.inf
index 0e1438b..f36bb6c 100644
--- a/IntelFrameworkModulePkg/Bus/Isa/IsaFloppyDxe/IsaFloppyDxe.inf
+++ b/IntelFrameworkModulePkg/Bus/Isa/IsaFloppyDxe/IsaFloppyDxe.inf
@@ -11,7 +11,7 @@
 # 

 #  Conforming to EFI driver model

 #

-# Copyright (c) 2007, Intel Corporation

+# Copyright (c) 2007 - 2009, Intel Corporation

 #

 # All rights reserved. This program and the accompanying materials

 # are licensed and made available under the terms and conditions of the BSD License

@@ -29,9 +29,7 @@
   FILE_GUID                      = 0abd8284-6da3-4616-971a-83a5148067ba

   MODULE_TYPE                    = UEFI_DRIVER

   VERSION_STRING                 = 1.0

-  EDK_RELEASE_VERSION            = 0x00020000

   EFI_SPECIFICATION_VERSION      = 0x00020000

-

   ENTRY_POINT                    = InitializeIsaFloppy

 

 #  VALID_ARCHITECTURES           = IA32 X64 IPF EBC

diff --git a/IntelFrameworkModulePkg/Bus/Isa/IsaSerialDxe/IsaSerialDxe.inf b/IntelFrameworkModulePkg/Bus/Isa/IsaSerialDxe/IsaSerialDxe.inf
index b3cfdae..5d075c9 100644
--- a/IntelFrameworkModulePkg/Bus/Isa/IsaSerialDxe/IsaSerialDxe.inf
+++ b/IntelFrameworkModulePkg/Bus/Isa/IsaSerialDxe/IsaSerialDxe.inf
@@ -2,7 +2,7 @@
 # Component description file for IsaSerial module.

 #

 # Serial driver for standard UARTS on an ISA bus.

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

+# Copyright (c) 2007 - 2009, Intel Corporation

 #

 # All rights reserved. This program and the accompanying materials

 # are licensed and made available under the terms and conditions of the BSD License

@@ -20,7 +20,6 @@
   FILE_GUID                      = 93B80003-9FB3-11d4-9A3A-0090273FC14D

   MODULE_TYPE                    = UEFI_DRIVER

   VERSION_STRING                 = 1.0

-  EDK_RELEASE_VERSION            = 0x00020000

   EFI_SPECIFICATION_VERSION      = 0x00020000

   ENTRY_POINT                    = InitializeIsaSerial

 

diff --git a/IntelFrameworkModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2keyboardDxe.inf b/IntelFrameworkModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2keyboardDxe.inf
index b676440..11dceae 100644
--- a/IntelFrameworkModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2keyboardDxe.inf
+++ b/IntelFrameworkModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2keyboardDxe.inf
@@ -2,9 +2,8 @@
 # Ps2 Keyboard Driver

 #

 # This dirver directly uses IsaIo protocol service to support KeyBoard work.

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

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

 #

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

 # 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

@@ -22,9 +21,7 @@
   FILE_GUID                      = 3DC82376-637B-40a6-A8FC-A565417F2C38

   MODULE_TYPE                    = UEFI_DRIVER

   VERSION_STRING                 = 1.0

-  EDK_RELEASE_VERSION            = 0x00020000

   EFI_SPECIFICATION_VERSION      = 0x00020000

-

   ENTRY_POINT                    = InitializePs2Keyboard

 

 #  VALID_ARCHITECTURES           = IA32 X64 IPF EBC

diff --git a/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseAbsolutePointerDxe/Ps2MouseAbsolutePointerDxe.inf b/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseAbsolutePointerDxe/Ps2MouseAbsolutePointerDxe.inf
index a3f1284..b7b8b4a 100644
--- a/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseAbsolutePointerDxe/Ps2MouseAbsolutePointerDxe.inf
+++ b/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseAbsolutePointerDxe/Ps2MouseAbsolutePointerDxe.inf
@@ -2,9 +2,8 @@
 # Ps2 Mouse Simulate TouchPad Driver

 #

 # This dirver directly uses IsaIo protocol service to support a faked Ps2 TouchPad work.

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

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

 #

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

 # 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

@@ -22,9 +21,7 @@
   FILE_GUID                      = 2899C94A-1FB6-4b1a-B96B-8364975303E0

   MODULE_TYPE                    = UEFI_DRIVER

   VERSION_STRING                 = 1.0

-  EDK_RELEASE_VERSION            = 0x00020000

   EFI_SPECIFICATION_VERSION      = 0x00020000

-

   ENTRY_POINT                    = InitializePs2MouseAbsolutePointer

 

 #  VALID_ARCHITECTURES           = IA32 X64 IPF EBC

diff --git a/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseDxe/Ps2MouseDxe.inf b/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseDxe/Ps2MouseDxe.inf
index d7dea0e..0afabbd 100644
--- a/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseDxe/Ps2MouseDxe.inf
+++ b/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseDxe/Ps2MouseDxe.inf
@@ -2,9 +2,8 @@
 # Ps2 Mouse Driver

 #

 # This dirver directly uses IsaIo protocol service to support Ps2 mouse work.

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

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

 #

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

 # 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

@@ -22,9 +21,7 @@
   FILE_GUID                      = 202A2B0E-9A31-4812-B291-8747DF152439

   MODULE_TYPE                    = UEFI_DRIVER

   VERSION_STRING                 = 1.0

-  EDK_RELEASE_VERSION            = 0x00020000

   EFI_SPECIFICATION_VERSION      = 0x00020000

-

   ENTRY_POINT                    = InitializePs2Mouse

 

 #  VALID_ARCHITECTURES           = IA32 X64 IPF EBC

diff --git a/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/IdeBusDxe.inf b/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/IdeBusDxe.inf
index 47f47b5..7b56d34 100644
--- a/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/IdeBusDxe.inf
+++ b/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/IdeBusDxe.inf
@@ -3,7 +3,7 @@
 #

 # IDE bus driver. This driver will enumerate IDE device and export the blockIo

 #  protocol for every device.

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

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

 #

 #  All rights reserved. This program and the accompanying materials

 #  are licensed and made available under the terms and conditions of the BSD License

@@ -21,9 +21,7 @@
   FILE_GUID                      = 69FD8E47-A161-4550-B01A-5594CEB2B2B2

   MODULE_TYPE                    = UEFI_DRIVER

   VERSION_STRING                 = 1.0

-  EDK_RELEASE_VERSION            = 0x00020000

   EFI_SPECIFICATION_VERSION      = 0x00020000

-

   ENTRY_POINT                    = InitializeIdeBus

 

 #

diff --git a/IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciBusDxe.inf b/IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciBusDxe.inf
index b5fa1e1..09548dc 100644
--- a/IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciBusDxe.inf
+++ b/IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciBusDxe.inf
@@ -1,10 +1,10 @@
 #/** @file

-# Component description file for PciBus module.

+#  Component description file for PciBus module.

 #

-# PCI bus driver. This module will probe all PCI devices and allocate MMIO and IO

+#  PCI bus driver. This module will probe all PCI devices and allocate MMIO and IO

 #  space for these devices. Please use PCD feature flag PcdPciBusHotplugDeviceSupport to enable

 #  support hot plug.

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

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

 #

 #  All rights reserved. This program and the accompanying materials

 #  are licensed and made available under the terms and conditions of the BSD License

@@ -22,9 +22,7 @@
   FILE_GUID                      = 93B80004-9FB3-11d4-9A3A-0090273FC14D

   MODULE_TYPE                    = UEFI_DRIVER

   VERSION_STRING                 = 1.0

-  EDK_RELEASE_VERSION            = 0x00020000

   EFI_SPECIFICATION_VERSION      = 0x00020000

-

   ENTRY_POINT                    = PciBusEntryPoint

 

 #

diff --git a/IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciEnumerator.c b/IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciEnumerator.c
index 2265039..43e7cb0 100644
--- a/IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciEnumerator.c
+++ b/IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciEnumerator.c
@@ -14,7 +14,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 

 #include "PciBus.h"

 #include "PciEnumerator.h"

-#include "PciResourceSupport.h"

 #include "PciOptionRomSupport.h"

 

 /**

diff --git a/IntelFrameworkModulePkg/Bus/Pci/VgaMiniPortDxe/VgaMiniPortDxe.inf b/IntelFrameworkModulePkg/Bus/Pci/VgaMiniPortDxe/VgaMiniPortDxe.inf
index 09757f9..6b8e5b6 100644
--- a/IntelFrameworkModulePkg/Bus/Pci/VgaMiniPortDxe/VgaMiniPortDxe.inf
+++ b/IntelFrameworkModulePkg/Bus/Pci/VgaMiniPortDxe/VgaMiniPortDxe.inf
@@ -2,7 +2,7 @@
 # Component name for module VgaMiniPort

 #

 # FIX ME!

-# Copyright (c) 2006, Intel Corporation.

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

 #

 #  All rights reserved. This program and the accompanying materials

 #  are licensed and made available under the terms and conditions of the BSD License

@@ -21,9 +21,7 @@
   FILE_GUID                      = 15C5E761-58D8-461a-9173-CAB020916264

   MODULE_TYPE                    = UEFI_DRIVER

   VERSION_STRING                 = 1.0

-  EDK_RELEASE_VERSION            = 0x00020000

   EFI_SPECIFICATION_VERSION      = 0x00020000

-

   ENTRY_POINT                    = PciVgaMiniPortDriverEntryPoint

 

 #

diff --git a/IntelFrameworkModulePkg/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTianoCustomDecompressLib.inf b/IntelFrameworkModulePkg/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTianoCustomDecompressLib.inf
index 9cc71bc..f406c9b 100644
--- a/IntelFrameworkModulePkg/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTianoCustomDecompressLib.inf
+++ b/IntelFrameworkModulePkg/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTianoCustomDecompressLib.inf
@@ -1,8 +1,8 @@
 #/** @file

-# Uefi Tiano Decomression Library

+#  Uefi Tiano Decomression Library

 #

-# Uefi Decompression library instance

-# Copyright (c) 2006, Intel Corporation.

+#  Uefi Decompression library instance

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

 #

 #  All rights reserved. This program and the accompanying materials

 #  are licensed and made available under the terms and conditions of the BSD License

@@ -21,9 +21,7 @@
   MODULE_TYPE                    = BASE

   VERSION_STRING                 = 1.0

   LIBRARY_CLASS                  = UefiDecompressLib

-  EDK_RELEASE_VERSION            = 0x00020000

   EFI_SPECIFICATION_VERSION      = 0x00020000

-

   CONSTRUCTOR                    = TianoDecompressLibConstructor

 

 #

diff --git a/IntelFrameworkModulePkg/Library/DxeReportStatusCodeLibFramework/DxeReportStatusCodeLib.inf b/IntelFrameworkModulePkg/Library/DxeReportStatusCodeLibFramework/DxeReportStatusCodeLib.inf
index b476fc6..773db9b 100644
--- a/IntelFrameworkModulePkg/Library/DxeReportStatusCodeLibFramework/DxeReportStatusCodeLib.inf
+++ b/IntelFrameworkModulePkg/Library/DxeReportStatusCodeLibFramework/DxeReportStatusCodeLib.inf
@@ -1,8 +1,8 @@
 #/** @file

-# DXE report status code library

+#  DXE report status code library

 #

-# Retrieve status code and report status code in DXE phase

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

+#  Retrieve status code and report status code in DXE phase

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

 #

 #  All rights reserved. This program and the accompanying materials

 #  are licensed and made available under the terms and conditions of the BSD License

@@ -21,10 +21,8 @@
   MODULE_TYPE                    = DXE_DRIVER

   VERSION_STRING                 = 1.0

   LIBRARY_CLASS                  = ReportStatusCodeLib|DXE_CORE DXE_DRIVER DXE_RUNTIME_DRIVER DXE_SAL_DRIVER DXE_SMM_DRIVER UEFI_APPLICATION UEFI_DRIVER

-  EDK_RELEASE_VERSION            = 0x00020000

   EFI_SPECIFICATION_VERSION      = 0x00020000

 

-

 #

 # The following information is for reference only and not required by the build tools.

 #

diff --git a/IntelFrameworkModulePkg/Library/OemHookStatusCodeLibNull/OemHookStatusCodeLibNull.c b/IntelFrameworkModulePkg/Library/OemHookStatusCodeLibNull/OemHookStatusCodeLibNull.c
index 4da04ad..519d023 100644
--- a/IntelFrameworkModulePkg/Library/OemHookStatusCodeLibNull/OemHookStatusCodeLibNull.c
+++ b/IntelFrameworkModulePkg/Library/OemHookStatusCodeLibNull/OemHookStatusCodeLibNull.c
@@ -12,7 +12,6 @@
 

 **/

 

-#include <PiPei.h>

 

 /**

 

diff --git a/IntelFrameworkModulePkg/Library/OemHookStatusCodeLibNull/OemHookStatusCodeLibNull.inf b/IntelFrameworkModulePkg/Library/OemHookStatusCodeLibNull/OemHookStatusCodeLibNull.inf
index 43699aa..a845c9c 100644
--- a/IntelFrameworkModulePkg/Library/OemHookStatusCodeLibNull/OemHookStatusCodeLibNull.inf
+++ b/IntelFrameworkModulePkg/Library/OemHookStatusCodeLibNull/OemHookStatusCodeLibNull.inf
@@ -1,8 +1,8 @@
 #/** @file

-# Memory Status Code Library for UEFI drivers

+#  Memory Status Code Library for UEFI drivers

 #

-# Lib to provide memory journal status code reporting Routines

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

+#  Lib to provide memory journal status code reporting Routines

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

 #

 #  All rights reserved. This program and the accompanying materials

 #  are licensed and made available under the terms and conditions of the BSD License

@@ -21,10 +21,8 @@
   MODULE_TYPE                    = PEIM

   VERSION_STRING                 = 1.0

   LIBRARY_CLASS                  = OemHookStatusCodeLib 

-  EDK_RELEASE_VERSION            = 0x00020000

   EFI_SPECIFICATION_VERSION      = 0x00020000

 

-

 #

 # The following information is for reference only and not required by the build tools.

 #

diff --git a/IntelFrameworkModulePkg/Library/PciIncompatibleDeviceSupportLib/IncompatiblePciDeviceList.h b/IntelFrameworkModulePkg/Library/PciIncompatibleDeviceSupportLib/IncompatiblePciDeviceList.h
index a21c219..629c5f5 100644
--- a/IntelFrameworkModulePkg/Library/PciIncompatibleDeviceSupportLib/IncompatiblePciDeviceList.h
+++ b/IntelFrameworkModulePkg/Library/PciIncompatibleDeviceSupportLib/IncompatiblePciDeviceList.h
@@ -15,9 +15,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #ifndef _EFI_INCOMPATIBLE_PCI_DEVICE_LIST_H

 #define _EFI_INCOMPATIBLE_PCI_DEVICE_LIST_H

 

-

-#include <PiDxe.h>

-

 #include <Library/PciIncompatibleDeviceSupportLib.h>

 #include <Library/MemoryAllocationLib.h>

 #include <Library/DebugLib.h>

diff --git a/IntelFrameworkModulePkg/Library/PciIncompatibleDeviceSupportLib/PciIncompatibleDeviceSupportLib.inf b/IntelFrameworkModulePkg/Library/PciIncompatibleDeviceSupportLib/PciIncompatibleDeviceSupportLib.inf
index 79bf05e..b5f7cc6 100644
--- a/IntelFrameworkModulePkg/Library/PciIncompatibleDeviceSupportLib/PciIncompatibleDeviceSupportLib.inf
+++ b/IntelFrameworkModulePkg/Library/PciIncompatibleDeviceSupportLib/PciIncompatibleDeviceSupportLib.inf
@@ -1,8 +1,8 @@
 #/** @file

-# PCI Incompatible device support Library

+#  PCI Incompatible device support Library

 #

-# Check PCI incompatible devices and set necessary configuration

-# Copyright (c) 2007 - 2008, Intel Corporation.

+#  Check PCI incompatible devices and set necessary configuration

+#  Copyright (c) 2007 - 2009, Intel Corporation.

 #

 #  All rights reserved. This program and the accompanying materials

 #  are licensed and made available under the terms and conditions of the BSD License

@@ -21,10 +21,8 @@
   MODULE_TYPE                    = DXE_DRIVER

   VERSION_STRING                 = 1.0

   LIBRARY_CLASS                  = PciIncompatibleDeviceSupportLib|DXE_DRIVER UEFI_DRIVER

-  EDK_RELEASE_VERSION            = 0x00020000

   EFI_SPECIFICATION_VERSION      = 0x00020000

 

-

 #

 # The following information is for reference only and not required by the build tools.

 #

diff --git a/IntelFrameworkModulePkg/Library/PeiDxeDebugLibReportStatusCode/PeiDxeDebugLibReportStatusCode.inf b/IntelFrameworkModulePkg/Library/PeiDxeDebugLibReportStatusCode/PeiDxeDebugLibReportStatusCode.inf
index 6890959..decf82c 100644
--- a/IntelFrameworkModulePkg/Library/PeiDxeDebugLibReportStatusCode/PeiDxeDebugLibReportStatusCode.inf
+++ b/IntelFrameworkModulePkg/Library/PeiDxeDebugLibReportStatusCode/PeiDxeDebugLibReportStatusCode.inf
@@ -1,8 +1,8 @@
 #/** @file

-# Debug Library based on report status code library

+#  Debug Library based on report status code library

 #

-# Debug Library for PEIMs and DXE drivers that send debug messages to ReportStatusCode

-# Copyright (c) 2006, Intel Corporation.

+#  Debug Library for PEIMs and DXE drivers that send debug messages to ReportStatusCode

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

 #

 #  All rights reserved. This program and the accompanying materials

 #  are licensed and made available under the terms and conditions of the BSD License

@@ -21,10 +21,8 @@
   MODULE_TYPE                    = PEIM

   VERSION_STRING                 = 1.0

   LIBRARY_CLASS                  = DebugLib|DXE_CORE DXE_DRIVER DXE_RUNTIME_DRIVER DXE_SAL_DRIVER DXE_SMM_DRIVER PEIM SEC PEI_CORE UEFI_APPLICATION UEFI_DRIVER

-  EDK_RELEASE_VERSION            = 0x00020000

   EFI_SPECIFICATION_VERSION      = 0x00020000

 

-

 #

 # The following information is for reference only and not required by the build tools.

 #

diff --git a/IntelFrameworkModulePkg/Library/PeiRecoveryLib/PeiRecoveryLib.inf b/IntelFrameworkModulePkg/Library/PeiRecoveryLib/PeiRecoveryLib.inf
index 90fcbac..fcb4ad4 100644
--- a/IntelFrameworkModulePkg/Library/PeiRecoveryLib/PeiRecoveryLib.inf
+++ b/IntelFrameworkModulePkg/Library/PeiRecoveryLib/PeiRecoveryLib.inf
@@ -1,7 +1,7 @@
 #/** @file

-# Recovery Library for PEIM

+#  Recovery Library for PEIM

 #

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

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

 #

 #  All rights reserved. This program and the accompanying materials

 #  are licensed and made available under the terms and conditions of the BSD License

@@ -20,9 +20,6 @@
   MODULE_TYPE                    = PEIM

   VERSION_STRING                 = 1.0

   LIBRARY_CLASS                  = RecoveryLib|PEIM

-  EDK_RELEASE_VERSION            = 0x00020000

-  EFI_SPECIFICATION_VERSION      = 0x00020000

-

 

 #

 # The following information is for reference only and not required by the build tools.

diff --git a/IntelFrameworkModulePkg/Library/PeiReportStatusCodeLib/PeiReportStatusCodeLib.inf b/IntelFrameworkModulePkg/Library/PeiReportStatusCodeLib/PeiReportStatusCodeLib.inf
index 4750715..da30f25 100644
--- a/IntelFrameworkModulePkg/Library/PeiReportStatusCodeLib/PeiReportStatusCodeLib.inf
+++ b/IntelFrameworkModulePkg/Library/PeiReportStatusCodeLib/PeiReportStatusCodeLib.inf
@@ -1,8 +1,8 @@
 #/** @file

-# Report status code library

+#  Report status code library

 #

-# ReportStatusCodeLib for PEIM which depends upon Pei Services table

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

+#  ReportStatusCodeLib for PEIM which depends upon Pei Services table

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

 #

 #  All rights reserved. This program and the accompanying materials

 #  are licensed and made available under the terms and conditions of the BSD License

@@ -21,10 +21,8 @@
   MODULE_TYPE                    = PEIM

   VERSION_STRING                 = 1.0

   LIBRARY_CLASS                  = ReportStatusCodeLib|SEC PEIM PEI_CORE

-  EDK_RELEASE_VERSION            = 0x00020000

   EFI_SPECIFICATION_VERSION      = 0x00020000

-

-

+  

 #

 # The following information is for reference only and not required by the build tools.

 #

diff --git a/IntelFrameworkModulePkg/Library/PeiS3Lib/PeiS3Lib.inf b/IntelFrameworkModulePkg/Library/PeiS3Lib/PeiS3Lib.inf
index 929e230..e4851a4 100644
--- a/IntelFrameworkModulePkg/Library/PeiS3Lib/PeiS3Lib.inf
+++ b/IntelFrameworkModulePkg/Library/PeiS3Lib/PeiS3Lib.inf
@@ -1,8 +1,8 @@
 #/** @file

-# Graphics Library for UEFI drivers

+#  Graphics Library for UEFI drivers

 #

-# This library provides supports for basic graphic functions.

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

+#  This library provides supports for basic graphic functions.

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

 #

 #  All rights reserved. This program and the accompanying materials

 #  are licensed and made available under the terms and conditions of the BSD License

@@ -21,10 +21,8 @@
   MODULE_TYPE                    = PEIM

   VERSION_STRING                 = 1.0

   LIBRARY_CLASS                  = S3Lib|PEIM

-  EDK_RELEASE_VERSION            = 0x00020000

   EFI_SPECIFICATION_VERSION      = 0x00020000

 

-

 #

 # The following information is for reference only and not required by the build tools.

 #

diff --git a/IntelFrameworkModulePkg/Library/PlatformBdsLibNull/BdsPlatform.h b/IntelFrameworkModulePkg/Library/PlatformBdsLibNull/BdsPlatform.h
index 165ad3b..77b32f3 100644
--- a/IntelFrameworkModulePkg/Library/PlatformBdsLibNull/BdsPlatform.h
+++ b/IntelFrameworkModulePkg/Library/PlatformBdsLibNull/BdsPlatform.h
@@ -15,8 +15,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #ifndef _BDS_PLATFORM_H_

 #define _BDS_PLATFORM_H_

 

-#include <PiDxe.h>

-

 #include <Library/DebugLib.h>

 #include <Library/BaseMemoryLib.h>

 #include <Library/UefiBootServicesTableLib.h>

diff --git a/IntelFrameworkModulePkg/Library/PlatformBdsLibNull/PlatformBdsLibNull.inf b/IntelFrameworkModulePkg/Library/PlatformBdsLibNull/PlatformBdsLibNull.inf
index 004bd3a..f50dc2c 100644
--- a/IntelFrameworkModulePkg/Library/PlatformBdsLibNull/PlatformBdsLibNull.inf
+++ b/IntelFrameworkModulePkg/Library/PlatformBdsLibNull/PlatformBdsLibNull.inf
@@ -3,7 +3,7 @@
 #  Provide NULL implementation for PlatformBdsLib library class interfaces which

 #  should be implemented by OEM.

 #  

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

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

 #  All rights reserved. This program and the accompanying materials

 #  are licensed and made available under the terms and conditions of the BSD License

 #  which accompanies this distribution.  The full text of the license may be found at

diff --git a/IntelFrameworkModulePkg/Library/SmmRuntimeDxeReportStatusCodeLibFramework/SmmRuntimeDxeReportStatusCodeLibFramework.inf b/IntelFrameworkModulePkg/Library/SmmRuntimeDxeReportStatusCodeLibFramework/SmmRuntimeDxeReportStatusCodeLibFramework.inf
index 4e335f4..bd8006d 100644
--- a/IntelFrameworkModulePkg/Library/SmmRuntimeDxeReportStatusCodeLibFramework/SmmRuntimeDxeReportStatusCodeLibFramework.inf
+++ b/IntelFrameworkModulePkg/Library/SmmRuntimeDxeReportStatusCodeLibFramework/SmmRuntimeDxeReportStatusCodeLibFramework.inf
@@ -1,8 +1,8 @@
 #/** @file

-# DXE report status code library

+#  DXE report status code library

 #

-# Retrieve status code and report status code in DXE phase

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

+#  Retrieve status code and report status code in DXE phase

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

 #

 #  All rights reserved. This program and the accompanying materials

 #  are licensed and made available under the terms and conditions of the BSD License

@@ -21,9 +21,8 @@
   MODULE_TYPE                    = DXE_RUNTIME_DRIVER

   VERSION_STRING                 = 1.0

   LIBRARY_CLASS                  = ReportStatusCodeLib|DXE_CORE DXE_DRIVER DXE_RUNTIME_DRIVER DXE_SAL_DRIVER UEFI_APPLICATION UEFI_DRIVER DXE_SMM_DRIVER

-  EDK_RELEASE_VERSION            = 0x00020000

   EFI_SPECIFICATION_VERSION      = 0x00020000

-

+  

   CONSTRUCTOR                    = ReportStatusCodeLibConstruct

   DESTRUCTOR                     = ReportStatusCodeLibDestruct

 #

diff --git a/IntelFrameworkModulePkg/Universal/Console/VgaClassDxe/VgaClassDxe.inf b/IntelFrameworkModulePkg/Universal/Console/VgaClassDxe/VgaClassDxe.inf
index 27530bc..d278730 100644
--- a/IntelFrameworkModulePkg/Universal/Console/VgaClassDxe/VgaClassDxe.inf
+++ b/IntelFrameworkModulePkg/Universal/Console/VgaClassDxe/VgaClassDxe.inf
@@ -1,16 +1,16 @@
 #/** @file

-# Component description file for VgaClass module.

+#  Component description file for VgaClass module.

 #

-#This driver produces a VGA console.

-#Copyright (c) 2006, Intel Corporation.

+#  This driver produces a VGA console.

+#  Copyright (c) 2006, Intel Corporation.

 #

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

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

+#  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     

+#  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.   

 #

 #

 #**/

@@ -21,9 +21,7 @@
   FILE_GUID                      = BF89F10D-B205-474f-96E3-7A7BB1B4A407

   MODULE_TYPE                    = UEFI_DRIVER

   VERSION_STRING                 = 1.0

-  EDK_RELEASE_VERSION            = 0x00020000

   EFI_SPECIFICATION_VERSION      = 0x00020000

-

   ENTRY_POINT                    = InitializeVgaClass

 

 #

diff --git a/IntelFrameworkModulePkg/Universal/DataHubDxe/DataHubDxe.inf b/IntelFrameworkModulePkg/Universal/DataHubDxe/DataHubDxe.inf
index 3b2c069..7e75436 100644
--- a/IntelFrameworkModulePkg/Universal/DataHubDxe/DataHubDxe.inf
+++ b/IntelFrameworkModulePkg/Universal/DataHubDxe/DataHubDxe.inf
@@ -1,8 +1,8 @@
 #/** @file

-# Component description file for DataHub module.

+#  Component description file for DataHub module.

 #

-# This driver initializes and installs the Data Hub protocol.

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

+#  This driver initializes and installs the Data Hub protocol.

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

 #

 #  All rights reserved. This program and the accompanying materials

 #  are licensed and made available under the terms and conditions of the BSD License

@@ -20,9 +20,7 @@
   FILE_GUID                      = 53BCC14F-C24F-434C-B294-8ED2D4CC1860

   MODULE_TYPE                    = DXE_DRIVER

   VERSION_STRING                 = 1.0

-  EDK_RELEASE_VERSION            = 0x00020000

   EFI_SPECIFICATION_VERSION      = 0x00020000

-

   ENTRY_POINT                    = DataHubInstall

 

 #

diff --git a/IntelFrameworkModulePkg/Universal/DataHubStdErrDxe/DataHubStdErrDxe.inf b/IntelFrameworkModulePkg/Universal/DataHubStdErrDxe/DataHubStdErrDxe.inf
index 3d222d4..03be3e8 100644
--- a/IntelFrameworkModulePkg/Universal/DataHubStdErrDxe/DataHubStdErrDxe.inf
+++ b/IntelFrameworkModulePkg/Universal/DataHubStdErrDxe/DataHubStdErrDxe.inf
@@ -1,8 +1,8 @@
 #/** @file

-# Component description file for Data Hub filter driver.

+#  Component description file for Data Hub filter driver.

 #

-# This driver takes DEBUG () info from Data Hub and writes it to StdErr if it exists.

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

+#  This driver takes DEBUG () info from Data Hub and writes it to StdErr if it exists.

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

 #

 #  All rights reserved. This program and the accompanying materials

 #  are licensed and made available under the terms and conditions of the BSD License

@@ -20,9 +20,7 @@
   FILE_GUID                      = CA515306-00CE-4032-874E-11B755FF6866

   MODULE_TYPE                    = DXE_DRIVER

   VERSION_STRING                 = 1.0

-  EDK_RELEASE_VERSION            = 0x00020000

   EFI_SPECIFICATION_VERSION      = 0x00020000

-

   ENTRY_POINT                    = DataHubStdErrInitialize

 

 #

diff --git a/IntelFrameworkModulePkg/Universal/PcatSingleSegmentPciCfgPei/PcatSingleSegmentPciCfgPei.inf b/IntelFrameworkModulePkg/Universal/PcatSingleSegmentPciCfgPei/PcatSingleSegmentPciCfgPei.inf
index 010d840..d8b04ed 100644
--- a/IntelFrameworkModulePkg/Universal/PcatSingleSegmentPciCfgPei/PcatSingleSegmentPciCfgPei.inf
+++ b/IntelFrameworkModulePkg/Universal/PcatSingleSegmentPciCfgPei/PcatSingleSegmentPciCfgPei.inf
@@ -2,7 +2,7 @@
 #  Single Segment Pci Configuration PPI

 #

 #  This file declares PciCfg PPI used to access PCI configuration space in PEI

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

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

 #

 #  All rights reserved. This program and the accompanying materials

 #  are licensed and made available under the terms and conditions of the BSD License

@@ -20,9 +20,7 @@
   FILE_GUID                      = 27A5159D-5E61-4809-919A-422E887101EF

   MODULE_TYPE                    = PEIM

   VERSION_STRING                 = 1.0

-  EDK_RELEASE_VERSION            = 0x00020000

   EFI_SPECIFICATION_VERSION      = 0x00020000

-

   ENTRY_POINT                    = PeimInitializePciCfg

 

 #

diff --git a/IntelFrameworkModulePkg/Universal/SectionExtractionDxe/SectionExtractionDxe.inf b/IntelFrameworkModulePkg/Universal/SectionExtractionDxe/SectionExtractionDxe.inf
index e8a5a99..c250c0c 100644
--- a/IntelFrameworkModulePkg/Universal/SectionExtractionDxe/SectionExtractionDxe.inf
+++ b/IntelFrameworkModulePkg/Universal/SectionExtractionDxe/SectionExtractionDxe.inf
@@ -22,10 +22,12 @@
   FILE_GUID                      = 801ADCA0-815E-46a4-84F7-657F53621A57

   MODULE_TYPE                    = DXE_DRIVER

   VERSION_STRING                 = 1.0

-  EDK_RELEASE_VERSION            = 0x00020000

+  ENTRY_POINT                    = SectionExtractionEntryPoint  

   EFI_SPECIFICATION_VERSION      = 0x00020000

-

-  ENTRY_POINT                    = SectionExtractionEntryPoint

+# The following information is for reference only and not required by the build tools.

+#

+#  VALID_ARCHITECTURES           = IA32 X64 IPF EBC

+#

 

 [Sources]

   SectionExtraction.c

diff --git a/IntelFrameworkModulePkg/Universal/StatusCode/Dxe/DxeStatusCode.inf b/IntelFrameworkModulePkg/Universal/StatusCode/Dxe/DxeStatusCode.inf
index 946f811..1fece54 100644
--- a/IntelFrameworkModulePkg/Universal/StatusCode/Dxe/DxeStatusCode.inf
+++ b/IntelFrameworkModulePkg/Universal/StatusCode/Dxe/DxeStatusCode.inf
@@ -1,10 +1,10 @@
 #/** @file

-# DXE status code driver.

+#  DXE status code driver.

 #

-# Status Code Architectural Protocol implementation as defined in Tiano

+#  Status Code Architectural Protocol implementation as defined in Tiano

 #  Architecture Specification. This driver has limited functionality

 #  at runtime and will not log to Data Hub at runtime.

-# Copyright (c) 2006, Intel Corporation.

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

 #

 #  All rights reserved. This program and the accompanying materials

 #  are licensed and made available under the terms and conditions of the BSD License

@@ -22,9 +22,7 @@
   FILE_GUID                      = FEDE0A1B-BCA2-4A9F-BB2B-D9FD7DEC2E9F

   MODULE_TYPE                    = DXE_RUNTIME_DRIVER

   VERSION_STRING                 = 1.0

-  EDK_RELEASE_VERSION            = 0x00020000

   EFI_SPECIFICATION_VERSION      = 0x00020000

-

   ENTRY_POINT                    = DxeStatusCodeDriverEntry

 

 #

diff --git a/IntelFrameworkModulePkg/Universal/StatusCode/Pei/PeiStatusCode.inf b/IntelFrameworkModulePkg/Universal/StatusCode/Pei/PeiStatusCode.inf
index f8b20c0..af9cdfc 100644
--- a/IntelFrameworkModulePkg/Universal/StatusCode/Pei/PeiStatusCode.inf
+++ b/IntelFrameworkModulePkg/Universal/StatusCode/Pei/PeiStatusCode.inf
@@ -1,8 +1,8 @@
 #/** @file

-# Generic Status code Pei driver

+#  Generic Status code Pei driver

 #

-# Customized output devices based on feature flags.

-# Copyright (c) 2006, Intel Corporation.

+#  Customized output devices based on feature flags.

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

 #

 #  All rights reserved. This program and the accompanying materials

 #  are licensed and made available under the terms and conditions of the BSD License

@@ -20,9 +20,7 @@
   FILE_GUID                      = 1EC0F53A-FDE0-4576-8F25-7A1A410F58EB

   MODULE_TYPE                    = PEIM

   VERSION_STRING                 = 1.0

-  EDK_RELEASE_VERSION            = 0x00020000

   EFI_SPECIFICATION_VERSION      = 0x00020000

-

   ENTRY_POINT                    = PeiStatusCodeDriverEntry

 

 #

diff --git a/IntelFrameworkModulePkg/Universal/VariablePei/VariablePei.inf b/IntelFrameworkModulePkg/Universal/VariablePei/VariablePei.inf
index a83c310..d4ced59 100644
--- a/IntelFrameworkModulePkg/Universal/VariablePei/VariablePei.inf
+++ b/IntelFrameworkModulePkg/Universal/VariablePei/VariablePei.inf
@@ -1,9 +1,9 @@
 #/** @file

-# Component description file for PeiVariable module.

-# This module will produce EFI_PEI_READ_ONLY_VARIABLE_PPI and EFI_PEI_READ_ONLY_VARIABLE2_PPI

-#

-# Framework PEIM to provide the Variable functionality.

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

+#  Component description file for PeiVariable module.

+#  

+#  This module will produce EFI_PEI_READ_ONLY_VARIABLE_PPI and EFI_PEI_READ_ONLY_VARIABLE2_PPI

+#  Framework PEIM to provide the Variable functionality.

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

 #

 #  All rights reserved. This program and the accompanying materials

 #  are licensed and made available under the terms and conditions of the BSD License

@@ -26,9 +26,7 @@
   FILE_GUID                      = 34C8C28F-B61C-45a2-8F2E-89E46BECC63B

   MODULE_TYPE                    = PEIM

   VERSION_STRING                 = 1.0

-  EDK_RELEASE_VERSION            = 0x00020000

   EFI_SPECIFICATION_VERSION      = 0x00020000

-

   ENTRY_POINT                    = PeimInitializeVariableServices

 

 #