EmulatorPkg: Removing ipf which is no longer supported from edk2.

Removing rules for Ipf sources file:
* Remove the source file which path with "ipf" and also listed in
  [Sources.IPF] section of INF file.
* Remove the source file which listed in [Components.IPF] section
  of DSC file and not listed in any other [Components] section.
* Remove the embedded Ipf code for MDE_CPU_IPF.

Removing rules for Inf file:
* Remove IPF from VALID_ARCHITECTURES comments.
* Remove DXE_SAL_DRIVER from LIBRARY_CLASS in [Defines] section.
* Remove the INF which only listed in [Components.IPF] section in DSC.
* Remove statements from [BuildOptions] that provide IPF specific flags.
* Remove any IPF sepcific sections.

Removing rules for Dec file:
* Remove [Includes.IPF] section from Dec.

Removing rules for Dsc file:
* Remove IPF from SUPPORTED_ARCHITECTURES in [Defines] section of DSC.
* Remove any IPF specific sections.
* Remove statements from [BuildOptions] that provide IPF specific flags.

Cc: Jordan Justen <jordan.l.justen@intel.com>
Cc: Andrew Fish <afish@apple.com>
Cc: Michael D Kinney <michael.d.kinney@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Chen A Chen <chen.a.chen@intel.com>
Reviewed-by: Jordan Justen <jordan.l.justen@intel.com>

31 files changed, 63 insertions, 62 deletions

diff --git a/EmulatorPkg/AutoScanPei/AutoScanPei.inf b/EmulatorPkg/AutoScanPei/AutoScanPei.inf
index 0a5d5f52e8..7a2edfabfc 100644
--- a/EmulatorPkg/AutoScanPei/AutoScanPei.inf
+++ b/EmulatorPkg/AutoScanPei/AutoScanPei.inf
@@ -2,7 +2,7 @@
 # Component description file for EmuAutoScan module

 #

 # This module abstracts memory auto-scan in a Emu environment.

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

+# Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>

 # Portions copyright (c) 2011, Apple Inc. All rights reserved.

 #

 #  This program and the accompanying materials

@@ -27,7 +27,7 @@
 #

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

 #

-#  VALID_ARCHITECTURES           = IA32 X64 IPF EBC

+#  VALID_ARCHITECTURES           = IA32 X64 EBC

 #

 

 [Sources]

diff --git a/EmulatorPkg/BootModePei/BootModePei.inf b/EmulatorPkg/BootModePei/BootModePei.inf
index b7d17da97e..ea645c2019 100644
--- a/EmulatorPkg/BootModePei/BootModePei.inf
+++ b/EmulatorPkg/BootModePei/BootModePei.inf
@@ -2,7 +2,7 @@
 # Component description file for BootMode module

 #

 # This module provides platform specific function to detect boot mode.

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

+# Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>

 # Portions copyright (c) 2011, Apple Inc. All rights reserved.

 #

 #  This program and the accompanying materials

@@ -27,7 +27,7 @@
 #

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

 #

-#  VALID_ARCHITECTURES           = IA32 X64 IPF EBC

+#  VALID_ARCHITECTURES           = IA32 X64 EBC

 #

 

 [Sources]

diff --git a/EmulatorPkg/CpuRuntimeDxe/Cpu.inf b/EmulatorPkg/CpuRuntimeDxe/Cpu.inf
index b8e8ebd8e2..2234b206bc 100644
--- a/EmulatorPkg/CpuRuntimeDxe/Cpu.inf
+++ b/EmulatorPkg/CpuRuntimeDxe/Cpu.inf
@@ -3,7 +3,7 @@
 #

 # This CPU module abstracts the interrupt subsystem of a platform and the CPU-specific setjump-long pair.

 #

-# Copyright (c) 2006 - 2011, Intel Corporation. All rights reserved.<BR>

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

@@ -27,7 +27,7 @@
 #

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

 #

-#  VALID_ARCHITECTURES           = IA32 X64 IPF EBC

+#  VALID_ARCHITECTURES           = IA32 X64 EBC

 #

 

 [Sources]

diff --git a/EmulatorPkg/EmuBlockIoDxe/EmuBlockIoDxe.inf b/EmulatorPkg/EmuBlockIoDxe/EmuBlockIoDxe.inf
index 436afd975c..92624c1267 100644
--- a/EmulatorPkg/EmuBlockIoDxe/EmuBlockIoDxe.inf
+++ b/EmulatorPkg/EmuBlockIoDxe/EmuBlockIoDxe.inf
@@ -4,7 +4,7 @@
 # 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. All rights reserved.<BR>

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

@@ -28,7 +28,7 @@
 #

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

 #

-#  VALID_ARCHITECTURES           = IA32 X64 IPF EBC

+#  VALID_ARCHITECTURES           = IA32 X64 EBC

 #

 #  DRIVER_BINDING                =  gUnixBlockIoDriverBinding

 #  COMPONENT_NAME                =  gUnixBlockIoComponentName

diff --git a/EmulatorPkg/EmuBusDriverDxe/EmuBusDriverDxe.inf b/EmulatorPkg/EmuBusDriverDxe/EmuBusDriverDxe.inf
index 861bc9fa47..5fb563ad6b 100644
--- a/EmulatorPkg/EmuBusDriverDxe/EmuBusDriverDxe.inf
+++ b/EmulatorPkg/EmuBusDriverDxe/EmuBusDriverDxe.inf
@@ -1,7 +1,7 @@
 ## @file

 # Emu Bus driver

 #

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

+# Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>

 # Portions copyright (c) 2011, Apple Inc. All rights reserved.

 #

 #  This program and the accompanying materials

@@ -26,7 +26,7 @@
 #

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

 #

-#  VALID_ARCHITECTURES           = IA32 X64 IPF EBC

+#  VALID_ARCHITECTURES           = IA32 X64 EBC

 #

 #  DRIVER_BINDING                =  gEmuBusDriverBinding

 #  COMPONENT_NAME                =  gEmuBusDriverComponentName

diff --git a/EmulatorPkg/EmuGopDxe/EmuGopDxe.inf b/EmulatorPkg/EmuGopDxe/EmuGopDxe.inf
index 97ebc60f51..8589a63913 100644
--- a/EmulatorPkg/EmuGopDxe/EmuGopDxe.inf
+++ b/EmulatorPkg/EmuGopDxe/EmuGopDxe.inf
@@ -1,7 +1,7 @@
 ## @file

 # GOP driver

 #

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

+# Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>

 # Portions copyright (c) 2011, Apple Inc. All rights reserved.

 #

 #  This program and the accompanying materials

@@ -26,7 +26,7 @@
 #

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

 #

-#  VALID_ARCHITECTURES           = IA32 X64 IPF EBC

+#  VALID_ARCHITECTURES           = IA32 X64 EBC

 #

 #  DRIVER_BINDING                =  gEmuGopDriverBinding

 #  COMPONENT_NAME                =  gEmuGopComponentName

diff --git a/EmulatorPkg/EmuSnpDxe/EmuSnpDxe.inf b/EmulatorPkg/EmuSnpDxe/EmuSnpDxe.inf
index 5360e2463c..17621e76af 100644
--- a/EmulatorPkg/EmuSnpDxe/EmuSnpDxe.inf
+++ b/EmulatorPkg/EmuSnpDxe/EmuSnpDxe.inf
@@ -1,6 +1,7 @@
 #/** @file

 # Component name for module EmuSnpDxe

 #

+#  Copyright (c) 2018, Intel Corporation. All rights reserved.<BR>

 # Copyright (c) 2010, Apple, Inc. All rights reserved.<BR>

 #

 #    This program and the accompanying materials

@@ -27,7 +28,7 @@
 #

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

 #

-#  VALID_ARCHITECTURES           = IA32 X64 IPF EBC

+#  VALID_ARCHITECTURES           = IA32 X64 EBC

 #

 

 [Sources.common]

diff --git a/EmulatorPkg/EmuThunkDxe/EmuThunk.inf b/EmulatorPkg/EmuThunkDxe/EmuThunk.inf
index 4e798eef8d..6e7c2df363 100644
--- a/EmulatorPkg/EmuThunkDxe/EmuThunk.inf
+++ b/EmulatorPkg/EmuThunkDxe/EmuThunk.inf
@@ -1,7 +1,7 @@
 ## @file

 #   A DXE driver to produce EMU_THUNK_PROTOCOL

 #

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

+# Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>

 # Portions copyright (c) 2011, Apple Inc. All rights reserved.

 #

 #  This program and the accompanying materials

@@ -26,7 +26,7 @@
 #

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

 #

-#  VALID_ARCHITECTURES           = IA32 X64 IPF EBC

+#  VALID_ARCHITECTURES           = IA32 X64 EBC

 #

 

 [Sources]

diff --git a/EmulatorPkg/FirmwareVolumePei/FirmwareVolumePei.inf b/EmulatorPkg/FirmwareVolumePei/FirmwareVolumePei.inf
index 38483918e5..89eb3395ac 100644
--- a/EmulatorPkg/FirmwareVolumePei/FirmwareVolumePei.inf
+++ b/EmulatorPkg/FirmwareVolumePei/FirmwareVolumePei.inf
@@ -3,7 +3,7 @@
 #

 # This PEIM will produce the HOB to describe Firmware Volume, Firmware Devices

 #  on the Emu emulator.

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

+# Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>

 # Portions copyright (c) 2011, Apple Inc. All rights reserved.

 #

 #  This program and the accompanying materials

@@ -27,7 +27,7 @@
 #

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

 #

-#  VALID_ARCHITECTURES           = IA32 X64 IPF EBC

+#  VALID_ARCHITECTURES           = IA32 X64 EBC

 #

 

 [Sources]

diff --git a/EmulatorPkg/FlashMapPei/FlashMapPei.inf b/EmulatorPkg/FlashMapPei/FlashMapPei.inf
index 1028e5f579..6c0887119c 100644
--- a/EmulatorPkg/FlashMapPei/FlashMapPei.inf
+++ b/EmulatorPkg/FlashMapPei/FlashMapPei.inf
@@ -2,7 +2,7 @@
 # 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. All rights reserved.<BR>

+# Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>

 # Portions copyright (c) 2011, Apple Inc. All rights reserved.

 #

 #  This program and the accompanying materials

@@ -27,7 +27,7 @@
 #

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

 #

-#  VALID_ARCHITECTURES           = IA32 X64 IPF EBC

+#  VALID_ARCHITECTURES           = IA32 X64 EBC

 #

 

 [Sources]

diff --git a/EmulatorPkg/FvbServicesRuntimeDxe/FvbServicesRuntimeDxe.inf b/EmulatorPkg/FvbServicesRuntimeDxe/FvbServicesRuntimeDxe.inf
index 00140b3cb9..e0cc1fbeb1 100644
--- a/EmulatorPkg/FvbServicesRuntimeDxe/FvbServicesRuntimeDxe.inf
+++ b/EmulatorPkg/FvbServicesRuntimeDxe/FvbServicesRuntimeDxe.inf
@@ -3,7 +3,7 @@
 #

 # This DXE runtime driver implements and produces the Fimware Volue Block Protocol on

 #  Emu emulator.

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

+# Copyright (c) 2008 - 2018, Intel Corporation. All rights reserved.<BR>

 # Portions copyright (c) 2011, Apple Inc. All rights reserved.

 #

 #  This program and the accompanying materials

@@ -27,7 +27,7 @@
 #

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

 #

-#  VALID_ARCHITECTURES           = IA32 X64 IPF EBC

+#  VALID_ARCHITECTURES           = IA32 X64 EBC

 #

 

 [Sources]

diff --git a/EmulatorPkg/Library/DevicePathTextLib/DevicePathTextLib.inf b/EmulatorPkg/Library/DevicePathTextLib/DevicePathTextLib.inf
index c484f8ec16..3ca607ef68 100644
--- a/EmulatorPkg/Library/DevicePathTextLib/DevicePathTextLib.inf
+++ b/EmulatorPkg/Library/DevicePathTextLib/DevicePathTextLib.inf
@@ -1,7 +1,7 @@
 ## @file

 #  Null DevicePathToText library.

 #

-#  Copyright (c) 2010 - 2011, Intel Corporation. All rights reserved.<BR>

+#  Copyright (c) 2010 - 2018, 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

@@ -18,13 +18,13 @@
   FILE_GUID                      = DCD1F939-1732-CA4D-81B7-C757AEC84DBC

   MODULE_TYPE                    = UEFI_DRIVER

   VERSION_STRING                 = 1.0

-  LIBRARY_CLASS                  = NULL|DXE_CORE DXE_DRIVER DXE_RUNTIME_DRIVER DXE_SAL_DRIVER DXE_SMM_DRIVER UEFI_APPLICATION UEFI_DRIVER SMM_CORE

+  LIBRARY_CLASS                  = NULL|DXE_CORE DXE_DRIVER DXE_RUNTIME_DRIVER DXE_SMM_DRIVER UEFI_APPLICATION UEFI_DRIVER SMM_CORE

   CONSTRUCTOR                    = DevicePathToTextLibConstructor

 

 #

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

 #

-#  VALID_ARCHITECTURES           = IA32 X64 IPF EBC

+#  VALID_ARCHITECTURES           = IA32 X64 EBC

 #

 

 [Sources]

diff --git a/EmulatorPkg/Library/DxeCoreTimerLib/DxeCoreTimerLib.inf b/EmulatorPkg/Library/DxeCoreTimerLib/DxeCoreTimerLib.inf
index 88ce324c19..a12a81e752 100644
--- a/EmulatorPkg/Library/DxeCoreTimerLib/DxeCoreTimerLib.inf
+++ b/EmulatorPkg/Library/DxeCoreTimerLib/DxeCoreTimerLib.inf
@@ -6,7 +6,7 @@
 #  also be used to test build DXE, Runtime, DXE SAL, and DXE SMM modules that require timer

 #  services as well as EBC modules that require timer services.

 #

-#  Copyright (c) 2007 - 2010, Intel Corporation. All rights reserved.<BR>

+#  Copyright (c) 2007 - 2018, 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

@@ -27,7 +27,7 @@
   LIBRARY_CLASS                  = TimerLib|DXE_CORE DXE_DRIVER DXE_RUNTIME_DRIVER UEFI_DRIVER UEFI_APPLICATION

 

 #

-#  VALID_ARCHITECTURES           = IA32 X64 IPF EBC

+#  VALID_ARCHITECTURES           = IA32 X64 EBC

 #

 

 [Sources]

diff --git a/EmulatorPkg/Library/DxeEmuSerialPortLib/DxeEmuSerialPortLib.inf b/EmulatorPkg/Library/DxeEmuSerialPortLib/DxeEmuSerialPortLib.inf
index 119028d465..125f19fb57 100644
--- a/EmulatorPkg/Library/DxeEmuSerialPortLib/DxeEmuSerialPortLib.inf
+++ b/EmulatorPkg/Library/DxeEmuSerialPortLib/DxeEmuSerialPortLib.inf
@@ -1,7 +1,7 @@
 ## @file

 #  Write only instance of Serial Port Library with empty functions.

 #

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

+#  Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>

 #  Portions copyright (c) 2011, Apple Inc. All rights reserved.

 #

 #  This program and the accompanying materials

@@ -20,7 +20,7 @@
   FILE_GUID                      = DF08A29A-F60B-E649-AA79-A1490E863A5D

   MODULE_TYPE                    = PEIM

   VERSION_STRING                 = 1.0

-  LIBRARY_CLASS                  = SerialPortLib| DXE_CORE DXE_DRIVER DXE_RUNTIME_DRIVER DXE_SAL_DRIVER DXE_SMM_DRIVER SMM_CORE UEFI_APPLICATION UEFI_DRIVE

+  LIBRARY_CLASS                  = SerialPortLib| DXE_CORE DXE_DRIVER DXE_RUNTIME_DRIVER DXE_SMM_DRIVER SMM_CORE UEFI_APPLICATION UEFI_DRIVE

 

 

 [Sources]

diff --git a/EmulatorPkg/Library/DxeEmuStdErrSerialPortLib/DxeEmuStdErrSerialPortLib.inf b/EmulatorPkg/Library/DxeEmuStdErrSerialPortLib/DxeEmuStdErrSerialPortLib.inf
index c1514d0b5f..0de85bb48d 100644
--- a/EmulatorPkg/Library/DxeEmuStdErrSerialPortLib/DxeEmuStdErrSerialPortLib.inf
+++ b/EmulatorPkg/Library/DxeEmuStdErrSerialPortLib/DxeEmuStdErrSerialPortLib.inf
@@ -1,7 +1,7 @@
 ## @file

 #  Write only instance of Serial Port Library with empty functions.

 #

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

+#  Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>

 #  Portions copyright (c) 2011, Apple Inc. All rights reserved.

 #

 #  This program and the accompanying materials

@@ -20,7 +20,7 @@
   FILE_GUID                      = 4EED5138-C512-9E4F-AB13-149B87D40453

   MODULE_TYPE                    = PEIM

   VERSION_STRING                 = 1.0

-  LIBRARY_CLASS                  = SerialPortLib| DXE_CORE DXE_DRIVER DXE_RUNTIME_DRIVER DXE_SAL_DRIVER DXE_SMM_DRIVER SMM_CORE UEFI_APPLICATION UEFI_DRIVE

+  LIBRARY_CLASS                  = SerialPortLib| DXE_CORE DXE_DRIVER DXE_RUNTIME_DRIVER DXE_SMM_DRIVER SMM_CORE UEFI_APPLICATION UEFI_DRIVE

 

 

 [Sources]

diff --git a/EmulatorPkg/Library/DxeTimerLib/DxeTimerLib.inf b/EmulatorPkg/Library/DxeTimerLib/DxeTimerLib.inf
index 19f133e952..b46fa10264 100644
--- a/EmulatorPkg/Library/DxeTimerLib/DxeTimerLib.inf
+++ b/EmulatorPkg/Library/DxeTimerLib/DxeTimerLib.inf
@@ -6,7 +6,7 @@
 #  also be used to test build DXE, Runtime, DXE SAL, and DXE SMM modules that require timer

 #  services as well as EBC modules that require timer services.

 #

-#  Copyright (c) 2007 - 2010, Intel Corporation. All rights reserved.<BR>

+#  Copyright (c) 2007 - 2018, 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

@@ -29,7 +29,7 @@
   CONSTRUCTOR                    = DxeTimerLibConstructor

 

 #

-#  VALID_ARCHITECTURES           = IA32 X64 IPF EBC

+#  VALID_ARCHITECTURES           = IA32 X64 EBC

 #

 

 [Sources]

diff --git a/EmulatorPkg/Library/GuardUefiMemoryAllocationLib/GuardUefiMemoryAllocationLib.inf b/EmulatorPkg/Library/GuardUefiMemoryAllocationLib/GuardUefiMemoryAllocationLib.inf
index 3b008ccb56..d52d237b91 100644
--- a/EmulatorPkg/Library/GuardUefiMemoryAllocationLib/GuardUefiMemoryAllocationLib.inf
+++ b/EmulatorPkg/Library/GuardUefiMemoryAllocationLib/GuardUefiMemoryAllocationLib.inf
@@ -4,7 +4,7 @@
 # Memory Allocation Library that uses EFI Boot Services to allocate

 #  and free memory. Calls OS malloc to enable OS based debug tools

 #

-# Copyright (c) 2007 - 2010, Intel Corporation. All rights reserved.<BR>

+# Copyright (c) 2007 - 2018, 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

@@ -22,10 +22,10 @@
   FILE_GUID                      = DB290230-3EFA-064F-A317-E146925684FE

   MODULE_TYPE                    = UEFI_DRIVER

   VERSION_STRING                 = 1.0

-  LIBRARY_CLASS                  = MemoryAllocationLib|DXE_DRIVER DXE_RUNTIME_DRIVER DXE_SAL_DRIVER DXE_SMM_DRIVER UEFI_APPLICATION UEFI_DRIVER DXE_CORE

+  LIBRARY_CLASS                  = MemoryAllocationLib|DXE_DRIVER DXE_RUNTIME_DRIVER DXE_SMM_DRIVER UEFI_APPLICATION UEFI_DRIVER DXE_CORE

 

 #

-#  VALID_ARCHITECTURES           = IA32 X64 IPF EBC

+#  VALID_ARCHITECTURES           = IA32 X64 EBC

 #

 

 [Sources]

diff --git a/EmulatorPkg/Library/PeiCoreServicesTablePointerLib/PeiCoreServicesTablePointerLib.inf b/EmulatorPkg/Library/PeiCoreServicesTablePointerLib/PeiCoreServicesTablePointerLib.inf
index f50f8a46de..8c670a5d1e 100644
--- a/EmulatorPkg/Library/PeiCoreServicesTablePointerLib/PeiCoreServicesTablePointerLib.inf
+++ b/EmulatorPkg/Library/PeiCoreServicesTablePointerLib/PeiCoreServicesTablePointerLib.inf
@@ -5,7 +5,7 @@
 #  PEI Services Table from a global variable. Not available to modules that execute from

 #  read-only memory.

 #

-# Copyright (c) 2007 - 2010, Intel Corporation. All rights reserved.<BR>

+# Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.<BR>

 #  Portions copyright (c) 2011, Apple Inc. All rights reserved.

 #

 #  This program and the accompanying materials

@@ -27,7 +27,7 @@
   LIBRARY_CLASS                  = PeiServicesTablePointerLib|PEI_CORE

 

 #

-#  VALID_ARCHITECTURES           = IA32 X64 IPF EBC (EBC is for build only)

+#  VALID_ARCHITECTURES           = IA32 X64 EBC (EBC is for build only)

 #

 

 [Sources]

diff --git a/EmulatorPkg/Library/PeiEmuPeCoffGetEntryPointLib/PeiEmuPeCoffGetEntryPointLib.inf b/EmulatorPkg/Library/PeiEmuPeCoffGetEntryPointLib/PeiEmuPeCoffGetEntryPointLib.inf
index bf35a35f1e..0a18152fe4 100644
--- a/EmulatorPkg/Library/PeiEmuPeCoffGetEntryPointLib/PeiEmuPeCoffGetEntryPointLib.inf
+++ b/EmulatorPkg/Library/PeiEmuPeCoffGetEntryPointLib/PeiEmuPeCoffGetEntryPointLib.inf
@@ -2,7 +2,7 @@
 # Component description file for the EdkNt32PeiPeCoffGetEntryPointLib library.

 #

 # PeCoffGetEntryPointLib library class for NT32 instance implemented by use NTPeiLoadFile PPI.

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

+# Copyright (c) 2008 - 2018, Intel Corporation. All rights reserved.<BR>

 # Portions copyright (c) 2011, Apple Inc. All rights reserved.

 #

 #  This program and the accompanying materials

@@ -27,7 +27,7 @@
 #

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

 #

-#  VALID_ARCHITECTURES           = IA32 X64 IPF EBC

+#  VALID_ARCHITECTURES           = IA32 X64 EBC

 #

 

 [Sources]

diff --git a/EmulatorPkg/Library/PeiEmuSerialPortLib/PeiEmuSerialPortLib.inf b/EmulatorPkg/Library/PeiEmuSerialPortLib/PeiEmuSerialPortLib.inf
index d431acdb07..758c1f3288 100644
--- a/EmulatorPkg/Library/PeiEmuSerialPortLib/PeiEmuSerialPortLib.inf
+++ b/EmulatorPkg/Library/PeiEmuSerialPortLib/PeiEmuSerialPortLib.inf
@@ -1,7 +1,7 @@
 ## @file

 #  Write only instance of Serial Port Library with empty functions.

 #

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

+#  Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>

 #  Portions copyright (c) 2011, Apple Inc. All rights reserved.

 #

 #  This program and the accompanying materials

@@ -23,7 +23,7 @@
   LIBRARY_CLASS                  = SerialPortLib| PEI_CORE PEIM SEC

 

 #

-#  VALID_ARCHITECTURES           = IA32 X64 IPF EBC

+#  VALID_ARCHITECTURES           = IA32 X64 EBC

 #

 

 [Sources]

diff --git a/EmulatorPkg/Library/PeiServicesTablePointerLib/PeiServicesTablePointerLib.inf b/EmulatorPkg/Library/PeiServicesTablePointerLib/PeiServicesTablePointerLib.inf
index a4844bab09..e2a0d09296 100644
--- a/EmulatorPkg/Library/PeiServicesTablePointerLib/PeiServicesTablePointerLib.inf
+++ b/EmulatorPkg/Library/PeiServicesTablePointerLib/PeiServicesTablePointerLib.inf
@@ -5,7 +5,7 @@
 #  PEI Services Table from a global variable. Not available to modules that execute from

 #  read-only memory.

 #

-# Copyright (c) 2007 - 2010, Intel Corporation. All rights reserved.<BR>

+# Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.<BR>

 # Portions copyright (c) 2011, Apple Inc. All rights reserved.

 #

 #  This program and the accompanying materials

@@ -29,7 +29,7 @@
   CONSTRUCTOR                    = PeiServicesTablePointerLibConstructor

 

 #

-#  VALID_ARCHITECTURES           = IA32 X64 IPF EBC (EBC is for build only)

+#  VALID_ARCHITECTURES           = IA32 X64 EBC (EBC is for build only)

 #

 

 [Sources]

diff --git a/EmulatorPkg/Library/PeiServicesTablePointerLibMagicPage/PeiServicesTablePointerLibMagicPage.inf b/EmulatorPkg/Library/PeiServicesTablePointerLibMagicPage/PeiServicesTablePointerLibMagicPage.inf
index 5c42914b45..d9267044d0 100644
--- a/EmulatorPkg/Library/PeiServicesTablePointerLibMagicPage/PeiServicesTablePointerLibMagicPage.inf
+++ b/EmulatorPkg/Library/PeiServicesTablePointerLibMagicPage/PeiServicesTablePointerLibMagicPage.inf
@@ -5,7 +5,7 @@
 #  This emulates a platform SRAM. The PI mechaism does not work in the emulator due to

 #  lack of privledge.

 #

-# Copyright (c) 2007 - 2010, Intel Corporation. All rights reserved.<BR>

+# Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.<BR>

 # Portions copyright (c) 2011, Apple Inc. All rights reserved.

 #

 #  This program and the accompanying materials

@@ -27,7 +27,7 @@
   LIBRARY_CLASS                  = PeiServicesTablePointerLib|PEIM PEI_CORE SEC

 

 #

-#  VALID_ARCHITECTURES           = IA32 X64 IPF EBC (EBC is for build only)

+#  VALID_ARCHITECTURES           = IA32 X64 EBC (EBC is for build only)

 #

 

 [Sources]

diff --git a/EmulatorPkg/Library/PeiTimerLib/PeiTimerLib.inf b/EmulatorPkg/Library/PeiTimerLib/PeiTimerLib.inf
index 0f23178533..7ff8d4dac6 100644
--- a/EmulatorPkg/Library/PeiTimerLib/PeiTimerLib.inf
+++ b/EmulatorPkg/Library/PeiTimerLib/PeiTimerLib.inf
@@ -6,7 +6,7 @@
 #  also be used to test build DXE, Runtime, DXE SAL, and DXE SMM modules that require timer

 #  services as well as EBC modules that require timer services.

 #

-#  Copyright (c) 2007 - 2010, Intel Corporation. All rights reserved.<BR>

+#  Copyright (c) 2007 - 2018, 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

@@ -28,7 +28,7 @@
 

 

 #

-#  VALID_ARCHITECTURES           = IA32 X64 IPF EBC

+#  VALID_ARCHITECTURES           = IA32 X64 EBC

 #

 

 [Sources]

diff --git a/EmulatorPkg/Library/PlatformBmLib/PlatformBmLib.inf b/EmulatorPkg/Library/PlatformBmLib/PlatformBmLib.inf
index af074c3c4b..416815ce0a 100644
--- a/EmulatorPkg/Library/PlatformBmLib/PlatformBmLib.inf
+++ b/EmulatorPkg/Library/PlatformBmLib/PlatformBmLib.inf
@@ -25,7 +25,7 @@
 

 

 #

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

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

 #

 #  VALID_ARCHITECTURES           = IA32 X64

 #

diff --git a/EmulatorPkg/Library/SecPeiServicesLib/SecPeiServicesLib.inf b/EmulatorPkg/Library/SecPeiServicesLib/SecPeiServicesLib.inf
index 5454387eeb..abc2617f82 100644
--- a/EmulatorPkg/Library/SecPeiServicesLib/SecPeiServicesLib.inf
+++ b/EmulatorPkg/Library/SecPeiServicesLib/SecPeiServicesLib.inf
@@ -1,7 +1,7 @@
 ## @file

 # PEI Services Library implementation.

 #

-# Copyright (c) 2007 - 2010, Intel Corporation. All rights reserved.<BR>

+# Copyright (c) 2007 - 2018, 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

@@ -23,7 +23,7 @@
   PI_SPECIFICATION_VERSION       = 0x0001000A

 

 #

-#  VALID_ARCHITECTURES           = IA32 X64 IPF EBC (EBC is for build only)

+#  VALID_ARCHITECTURES           = IA32 X64 EBC (EBC is for build only)

 #

 

 [Sources]

diff --git a/EmulatorPkg/Library/SmbiosLib/SmbiosLib.inf b/EmulatorPkg/Library/SmbiosLib/SmbiosLib.inf
index 8f4d4c6307..2270c833a4 100644
--- a/EmulatorPkg/Library/SmbiosLib/SmbiosLib.inf
+++ b/EmulatorPkg/Library/SmbiosLib/SmbiosLib.inf
@@ -2,7 +2,7 @@
 # SMBIOS Library

 #

 # Copyright (c) 2012, Apple Inc. All rights reserved.

-# Portions copyright (c) 2006 - 2010, Intel Corporation. All rights reserved.<BR>

+# Portions copyright (c) 2006 - 2010, Intel Copyright (c) 2006 - 2018, 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

@@ -20,7 +20,7 @@
   FILE_GUID                      = 881863A2-09FD-3E44-8D62-7AE038D03747

   MODULE_TYPE                    = DXE_DRIVER

   VERSION_STRING                 = 1.0

-  LIBRARY_CLASS                  = SmbiosLib|DXE_CORE DXE_DRIVER DXE_RUNTIME_DRIVER DXE_SAL_DRIVER DXE_SMM_DRIVER SMM_CORE UEFI_APPLICATION UEFI_DRIVER

+  LIBRARY_CLASS                  = SmbiosLib|DXE_CORE DXE_DRIVER DXE_RUNTIME_DRIVER DXE_SMM_DRIVER SMM_CORE UEFI_APPLICATION UEFI_DRIVER

 

   CONSTRUCTOR                    = SmbiosLibConstructor

 

diff --git a/EmulatorPkg/MiscSubClassPlatformDxe/MiscSubClassDriver.inf b/EmulatorPkg/MiscSubClassPlatformDxe/MiscSubClassDriver.inf
index cda0d276ee..461f6baf4b 100644
--- a/EmulatorPkg/MiscSubClassPlatformDxe/MiscSubClassDriver.inf
+++ b/EmulatorPkg/MiscSubClassPlatformDxe/MiscSubClassDriver.inf
@@ -5,7 +5,7 @@
 #  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. All rights reserved.<BR>

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

@@ -28,7 +28,7 @@
 #

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

 #

-#  VALID_ARCHITECTURES           = IA32 X64 IPF EBC

+#  VALID_ARCHITECTURES           = IA32 X64 EBC

 #

 

 [Sources]

diff --git a/EmulatorPkg/RealTimeClockRuntimeDxe/RealTimeClock.inf b/EmulatorPkg/RealTimeClockRuntimeDxe/RealTimeClock.inf
index 35712ac253..7a163eabd6 100644
--- a/EmulatorPkg/RealTimeClockRuntimeDxe/RealTimeClock.inf
+++ b/EmulatorPkg/RealTimeClockRuntimeDxe/RealTimeClock.inf
@@ -2,7 +2,7 @@
 # Emu Real time clock Architectural Protocol Driver as defined in PI

 #

 # This real time clock module simulates virtual device by time WinAPI.

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

+# Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>

 # Portions copyright (c) 2011, Apple Inc. All rights reserved.

 #

 #  This program and the accompanying materials

@@ -27,7 +27,7 @@
 #

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

 #

-#  VALID_ARCHITECTURES           = IA32 X64 IPF EBC

+#  VALID_ARCHITECTURES           = IA32 X64 EBC

 #

 

 [Sources]

diff --git a/EmulatorPkg/ResetRuntimeDxe/Reset.inf b/EmulatorPkg/ResetRuntimeDxe/Reset.inf
index f23dc46bce..aea309fa88 100644
--- a/EmulatorPkg/ResetRuntimeDxe/Reset.inf
+++ b/EmulatorPkg/ResetRuntimeDxe/Reset.inf
@@ -2,7 +2,7 @@
 # Emu Emulation Reset Architectural Protocol Driver as defined in PI

 #

 # This Reset module simulates system reset by process exit on Emulator.

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

+# Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>

 # Portions copyright (c) 2011, Apple Inc. All rights reserved.

 #

 #  This program and the accompanying materials

@@ -27,7 +27,7 @@
 #

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

 #

-#  VALID_ARCHITECTURES           = IA32 X64 IPF EBC

+#  VALID_ARCHITECTURES           = IA32 X64 EBC

 #

 

 [Sources]

diff --git a/EmulatorPkg/TimerDxe/Timer.inf b/EmulatorPkg/TimerDxe/Timer.inf
index 713f8eac0b..0a5c23ee9d 100644
--- a/EmulatorPkg/TimerDxe/Timer.inf
+++ b/EmulatorPkg/TimerDxe/Timer.inf
@@ -1,7 +1,7 @@
 ## @file

 # Emu Emulation Timer Architectural Protocol Driver as defined in DXE CIS

 #

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

+# Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>

 # Portions copyright (c) 2011, Apple Inc. All rights reserved.

 #

 #  This program and the accompanying materials

@@ -26,7 +26,7 @@
 #

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

 #

-#  VALID_ARCHITECTURES           = IA32 X64 IPF EBC

+#  VALID_ARCHITECTURES           = IA32 X64 EBC

 #

 

 [Sources]

diff --git a/EmulatorPkg/Unix/Host/Host.inf b/EmulatorPkg/Unix/Host/Host.inf
index 33990fc20e..9bcdfd8533 100644
--- a/EmulatorPkg/Unix/Host/Host.inf
+++ b/EmulatorPkg/Unix/Host/Host.inf
@@ -2,7 +2,7 @@
 # Entry Point of Emu Emulator

 #

 # Main executable file of Unix Emulator that loads PEI core after initialization finished.

-# Copyright (c) 2008 - 2011, Intel Corporation. All rights reserved.<BR>

+# Copyright (c) 2008 - 2018, Intel Corporation. All rights reserved.<BR>

 # Portions copyright (c) 2008 - 2011, Apple Inc. All rights reserved.<BR>

 #

 #  This program and the accompanying materials

@@ -25,7 +25,7 @@
 #

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

 #

-#  VALID_ARCHITECTURES           = IA32 X64 IPF EBC

+#  VALID_ARCHITECTURES           = IA32 X64 EBC

 #

 

 [Sources]