From 8d27b54baec211f628fb90fb045ed536be1ce368 Mon Sep 17 00:00:00 2001 From: Chen A Chen Date: Fri, 29 Jun 2018 11:29:48 +0800 Subject: [PATCH] OptionRomPkg: 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: Ruiyu Ni Cc: Michael D Kinney Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Chen A Chen Reviewed-by: Ruiyu Ni --- OptionRomPkg/Application/BltLibSample/BltLibSample.c | 4 +--- OptionRomPkg/AtapiPassThruDxe/AtapiPassThruDxe.inf | 4 ++-- OptionRomPkg/Bus/Usb/FtdiUsbSerialDxe/FtdiUsbSerialDxe.inf | 4 ++-- OptionRomPkg/Bus/Usb/UsbNetworking/Ax88772/Ax88772.inf | 4 ++-- OptionRomPkg/Bus/Usb/UsbNetworking/Ax88772b/Ax88772b.inf | 4 ++-- OptionRomPkg/CirrusLogic5430Dxe/CirrusLogic5430Dxe.inf | 4 ++-- OptionRomPkg/OptionRomPkg.dsc | 6 +++--- OptionRomPkg/UndiRuntimeDxe/UndiRuntimeDxe.inf | 4 ++-- 8 files changed, 16 insertions(+), 18 deletions(-) diff --git a/OptionRomPkg/Application/BltLibSample/BltLibSample.c b/OptionRomPkg/Application/BltLibSample/BltLibSample.c index c21eb7a49c..886314d630 100644 --- a/OptionRomPkg/Application/BltLibSample/BltLibSample.c +++ b/OptionRomPkg/Application/BltLibSample/BltLibSample.c @@ -1,7 +1,7 @@ /** @file Example program using BltLib - Copyright (c) 2006 - 2011, Intel Corporation. All rights reserved.
+ Copyright (c) 2006 - 2018, 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 @@ -27,8 +27,6 @@ ReadTimestamp ( { #if defined (MDE_CPU_IA32) || defined (MDE_CPU_X64) return AsmReadTsc (); -#elif defined (MDE_CPU_IPF) - return AsmReadItc (); #else #error ReadTimestamp not supported for this architecture! #endif diff --git a/OptionRomPkg/AtapiPassThruDxe/AtapiPassThruDxe.inf b/OptionRomPkg/AtapiPassThruDxe/AtapiPassThruDxe.inf index 8709f1583d..570b80013c 100644 --- a/OptionRomPkg/AtapiPassThruDxe/AtapiPassThruDxe.inf +++ b/OptionRomPkg/AtapiPassThruDxe/AtapiPassThruDxe.inf @@ -3,7 +3,7 @@ # # This driver simulates SCSI devices with Atapi devices to test the SCSI io # protocol. -# Copyright (c) 2007 - 2010, Intel Corporation. All rights reserved.
+# Copyright (c) 2007 - 2018, 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 @@ -32,7 +32,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 = gAtapiScsiPassThruDriverBinding # COMPONENT_NAME = gAtapiScsiPassThruComponentName diff --git a/OptionRomPkg/Bus/Usb/FtdiUsbSerialDxe/FtdiUsbSerialDxe.inf b/OptionRomPkg/Bus/Usb/FtdiUsbSerialDxe/FtdiUsbSerialDxe.inf index e0381b1c44..c04c5f25f7 100644 --- a/OptionRomPkg/Bus/Usb/FtdiUsbSerialDxe/FtdiUsbSerialDxe.inf +++ b/OptionRomPkg/Bus/Usb/FtdiUsbSerialDxe/FtdiUsbSerialDxe.inf @@ -8,7 +8,7 @@ # This module refers to following specifications: # 1. UEFI Specification, v2.1 # -# Copyright (c) 2006 - 2013, Intel Corporation. All rights reserved.
+# Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.
# # This program and the accompanying materials # are licensed and made available under the terms and conditions of the BSD @@ -30,7 +30,7 @@ UNLOAD_IMAGE = FtdiUsbSerialUnload # -# VALID_ARCHITECTURES = IA32 X64 IPF EBC +# VALID_ARCHITECTURES = IA32 X64 EBC # [Sources] diff --git a/OptionRomPkg/Bus/Usb/UsbNetworking/Ax88772/Ax88772.inf b/OptionRomPkg/Bus/Usb/UsbNetworking/Ax88772/Ax88772.inf index 5507cbbf3b..76dab97585 100644 --- a/OptionRomPkg/Bus/Usb/UsbNetworking/Ax88772/Ax88772.inf +++ b/OptionRomPkg/Bus/Usb/UsbNetworking/Ax88772/Ax88772.inf @@ -2,7 +2,7 @@ # Component description file for ASIX AX88772 USB/Ethernet driver. # # This module provides support for the ASIX AX88772 USB/Ethernet adapter. -# Copyright (c) 2011-2013, Intel Corporation. All rights reserved.
+# Copyright (c) 2011 - 2018, 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 @@ -24,7 +24,7 @@ ENTRY_POINT = EntryPoint # -# VALID_ARCHITECTURES = IA32 X64 IPF EBC +# VALID_ARCHITECTURES = IA32 X64 EBC # [Sources.common] diff --git a/OptionRomPkg/Bus/Usb/UsbNetworking/Ax88772b/Ax88772b.inf b/OptionRomPkg/Bus/Usb/UsbNetworking/Ax88772b/Ax88772b.inf index 32a62f620d..87f453d8bd 100644 --- a/OptionRomPkg/Bus/Usb/UsbNetworking/Ax88772b/Ax88772b.inf +++ b/OptionRomPkg/Bus/Usb/UsbNetworking/Ax88772b/Ax88772b.inf @@ -2,7 +2,7 @@ # Component description file for ASIX AX88772 USB/Ethernet driver. # # This module provides support for the ASIX AX88772 USB/Ethernet adapter. -# Copyright (c) 2011-2013, Intel Corporation. All rights reserved.
+# Copyright (c) 2011 - 2018, 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 @@ -24,7 +24,7 @@ ENTRY_POINT = EntryPoint # -# VALID_ARCHITECTURES = IA32 X64 IPF EBC +# VALID_ARCHITECTURES = IA32 X64 EBC # [Sources.common] diff --git a/OptionRomPkg/CirrusLogic5430Dxe/CirrusLogic5430Dxe.inf b/OptionRomPkg/CirrusLogic5430Dxe/CirrusLogic5430Dxe.inf index fd380d1e81..abfe81929f 100644 --- a/OptionRomPkg/CirrusLogic5430Dxe/CirrusLogic5430Dxe.inf +++ b/OptionRomPkg/CirrusLogic5430Dxe/CirrusLogic5430Dxe.inf @@ -9,7 +9,7 @@ # requires both the UGA Draw and the UGA I/O Protocol. Please refer to Microsoft's # documentation on UGA for details on how to write a UGA driver that is able # to function both in the EFI pre-boot environment and from the OS runtime. -# Copyright (c) 2006 - 2011, Intel Corporation. All rights reserved.
+# Copyright (c) 2006 - 2018, 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 @@ -39,7 +39,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 = gCirrusLogic5430DriverBinding # COMPONENT_NAME = gCirrusLogic5430ComponentName diff --git a/OptionRomPkg/OptionRomPkg.dsc b/OptionRomPkg/OptionRomPkg.dsc index 3365556710..87b9fa1647 100644 --- a/OptionRomPkg/OptionRomPkg.dsc +++ b/OptionRomPkg/OptionRomPkg.dsc @@ -6,7 +6,7 @@ # Option ROM image for all CPU architectures, including EBC target. # A single driver can support mixes of EFI 1.1, UEFI 2.0 and UEFI 2.1. # -# Copyright (c) 2007 - 2013, Intel Corporation. All rights reserved.
+# Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.
# Copyright (c) 2016, Linaro Ltd. All rights reserved.
# # This program and the accompanying materials @@ -30,7 +30,7 @@ PLATFORM_VERSION = 0.1 DSC_SPECIFICATION = 0x00010005 OUTPUT_DIRECTORY = Build/OptionRomPkg - SUPPORTED_ARCHITECTURES = IA32|IPF|X64|EBC|ARM|AARCH64 + SUPPORTED_ARCHITECTURES = IA32|X64|EBC|ARM|AARCH64 BUILD_TARGETS = DEBUG|RELEASE SKUID_IDENTIFIER = DEFAULT @@ -115,5 +115,5 @@ OptionRomPkg/Bus/Usb/UsbNetworking/Ax88772/Ax88772.inf OptionRomPkg/Bus/Usb/UsbNetworking/Ax88772b/Ax88772b.inf -[Components.IA32, Components.X64, Components.IPF] +[Components.IA32, Components.X64] OptionRomPkg/Application/BltLibSample/BltLibSample.inf diff --git a/OptionRomPkg/UndiRuntimeDxe/UndiRuntimeDxe.inf b/OptionRomPkg/UndiRuntimeDxe/UndiRuntimeDxe.inf index b07c04e2cf..a475bd2627 100644 --- a/OptionRomPkg/UndiRuntimeDxe/UndiRuntimeDxe.inf +++ b/OptionRomPkg/UndiRuntimeDxe/UndiRuntimeDxe.inf @@ -4,7 +4,7 @@ # This module provides support for Universal Network Driver Interface. # Notes: this module is no longer regular maintained/validated. # -# Copyright (c) 2006 - 2015, Intel Corporation. All rights reserved.
+# Copyright (c) 2006 - 2018, 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,7 +26,7 @@ ENTRY_POINT = InitializeUndi # -# VALID_ARCHITECTURES = IA32 X64 IPF EBC +# VALID_ARCHITECTURES = IA32 X64 EBC # [Sources] -- 2.39.2