tyler.durden
/
audk
mirror of https://github.com/acidanthera/audk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

OvmfPkg, ArmVirtualizationPkg: clean up XenHypercallLib names 

Perform the following renames in order to stick with edk2 tradition more
closely:

  XenHypercallLibArm, XenHypercallLibIntel  ->  XenHypercallLib
  XenHypercallIntel                         ->  X86XenHypercall

In addition, we unify the INF files.

This patch modifies ArmVirtualizationPkg and OvmfPkg at once, in order to
keep both bisectable (client code shouldn't break).

Suggested-by: Jordan Justen <jordan.l.justen@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
Reviewed-by: Jordan Justen <jordan.l.justen@intel.com>
Reviewed-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Tested-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>

git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@16998 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
Laszlo Ersek 2015-03-03 08:13:09 +00:00 committed by lersek
parent 447cb9135c
commit df040c00ae
7 changed files with 24 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ArmPlatformPkg/ArmVirtualizationPkg/ArmVirtualizationXen.dsc
View File

@ -33,7 +33,7 @@
[LibraryClasses] [LibraryClasses]
SerialPortLib|OvmfPkg/Library/XenConsoleSerialPortLib/XenConsoleSerialPortLib.inf SerialPortLib|OvmfPkg/Library/XenConsoleSerialPortLib/XenConsoleSerialPortLib.inf
RealTimeClockLib|ArmPlatformPkg/ArmVirtualizationPkg/Library/XenRealTimeClockLib/XenRealTimeClockLib.inf RealTimeClockLib|ArmPlatformPkg/ArmVirtualizationPkg/Library/XenRealTimeClockLib/XenRealTimeClockLib.inf
XenHypercallLib|OvmfPkg/Library/XenHypercallLib/XenHypercallLibArm.inf XenHypercallLib|OvmfPkg/Library/XenHypercallLib/XenHypercallLib.inf
[LibraryClasses.AARCH64] [LibraryClasses.AARCH64]
ArmLib|ArmPkg/Library/ArmLib/AArch64/AArch64Lib.inf ArmLib|ArmPkg/Library/ArmLib/AArch64/AArch64Lib.inf

2
OvmfPkg/Library/XenHypercallLib/XenHypercallIntel.c → OvmfPkg/Library/XenHypercallLib/X86XenHypercall.c
View File

@ -37,7 +37,7 @@ __XenHypercall2 (
RETURN_STATUS RETURN_STATUS
EFIAPI EFIAPI
XenHypercallLibIntelInit ( XenHypercallLibInit (
VOID VOID
) )
{ {

27
OvmfPkg/Library/XenHypercallLib/XenHypercallLibIntel.inf → OvmfPkg/Library/XenHypercallLib/XenHypercallLib.inf
View File

@ -1,5 +1,5 @@
## @file ## @file
# Xen Hypercall abstraction lib for Intel architecture # Xen Hypercall abstraction lib for Intel and ARM architectures
# #
# Copyright (c) 2014, Linaro Ltd. All rights reserved.<BR> # Copyright (c) 2014, Linaro Ltd. All rights reserved.<BR>
# This program and the accompanying materials # This program and the accompanying materials
@ -14,21 +14,26 @@
[Defines] [Defines]
INF_VERSION = 0x00010005 INF_VERSION = 0x00010005
BASE_NAME = XenHypercallLibIntel BASE_NAME = XenHypercallLib
FILE_GUID = B5EE9A32-CA5A-49A8-82E3-ADA4CCB77C7C FILE_GUID = B5EE9A32-CA5A-49A8-82E3-ADA4CCB77C7C
MODULE_TYPE = BASE MODULE_TYPE = BASE
VERSION_STRING = 1.0 VERSION_STRING = 1.0
[Defines.IA32, Defines.X64]
LIBRARY_CLASS = XenHypercallLib|DXE_DRIVER UEFI_DRIVER LIBRARY_CLASS = XenHypercallLib|DXE_DRIVER UEFI_DRIVER
CONSTRUCTOR = XenHypercallLibIntelInit CONSTRUCTOR = XenHypercallLibInit
[Defines.ARM, Defines.AARCH64]
LIBRARY_CLASS = XenHypercallLib
# #
# 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 # VALID_ARCHITECTURES = IA32 X64 ARM AARCH64
# #
[Sources] [Sources.IA32, Sources.X64]
XenHypercallIntel.c X86XenHypercall.c
[Sources.IA32] [Sources.IA32]
Ia32/hypercall.nasm Ia32/hypercall.nasm
@ -36,6 +41,12 @@
[Sources.X64] [Sources.X64]
X64/hypercall.nasm X64/hypercall.nasm
[Sources.ARM]
Arm/Hypercall.S
[Sources.AARCH64]
Aarch64/Hypercall.S
[Sources] [Sources]
XenHypercall.c XenHypercall.c
@ -43,10 +54,10 @@
MdePkg/MdePkg.dec MdePkg/MdePkg.dec
OvmfPkg/OvmfPkg.dec OvmfPkg/OvmfPkg.dec
[LibraryClasses] [LibraryClasses.IA32, LibraryClasses.X64]
BaseLib BaseLib
HobLib HobLib
DebugLib DebugLib
[Guids] [Guids.IA32, Guids.X64]
gEfiXenInfoGuid gEfiXenInfoGuid

40
OvmfPkg/Library/XenHypercallLib/XenHypercallLibArm.inf
View File

@ -1,40 +0,0 @@
## @file
# Xen Hypercall abstraction lib for ARM architecture
#
# Copyright (c) 2014, Linaro Ltd. 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.
#
##
[Defines]
INF_VERSION = 0x00010005
BASE_NAME = XenHypercallLibArm
FILE_GUID = 9607AC2E-FCB9-499B-9475-612282019568
MODULE_TYPE = BASE
VERSION_STRING = 1.0
LIBRARY_CLASS = XenHypercallLib
#
# The following information is for reference only and not required by the build tools.
#
# VALID_ARCHITECTURES = ARM AARCH64
#
[Sources.ARM]
Arm/Hypercall.S
[Sources.AARCH64]
Aarch64/Hypercall.S
[Sources]
XenHypercall.c
[Packages]
MdePkg/MdePkg.dec
OvmfPkg/OvmfPkg.dec

2
OvmfPkg/OvmfPkgIa32.dsc
View File

@ -128,7 +128,7 @@
S3BootScriptLib|MdeModulePkg/Library/PiDxeS3BootScriptLib/DxeS3BootScriptLib.inf S3BootScriptLib|MdeModulePkg/Library/PiDxeS3BootScriptLib/DxeS3BootScriptLib.inf
SmbusLib|MdePkg/Library/BaseSmbusLibNull/BaseSmbusLibNull.inf SmbusLib|MdePkg/Library/BaseSmbusLibNull/BaseSmbusLibNull.inf
OrderedCollectionLib|MdePkg/Library/BaseOrderedCollectionRedBlackTreeLib/BaseOrderedCollectionRedBlackTreeLib.inf OrderedCollectionLib|MdePkg/Library/BaseOrderedCollectionRedBlackTreeLib/BaseOrderedCollectionRedBlackTreeLib.inf
XenHypercallLib|OvmfPkg/Library/XenHypercallLib/XenHypercallLibIntel.inf XenHypercallLib|OvmfPkg/Library/XenHypercallLib/XenHypercallLib.inf
[LibraryClasses.common] [LibraryClasses.common]
!if $(SECURE_BOOT_ENABLE) == TRUE !if $(SECURE_BOOT_ENABLE) == TRUE

2
OvmfPkg/OvmfPkgIa32X64.dsc
View File

@ -133,7 +133,7 @@
S3BootScriptLib|MdeModulePkg/Library/PiDxeS3BootScriptLib/DxeS3BootScriptLib.inf S3BootScriptLib|MdeModulePkg/Library/PiDxeS3BootScriptLib/DxeS3BootScriptLib.inf
SmbusLib|MdePkg/Library/BaseSmbusLibNull/BaseSmbusLibNull.inf SmbusLib|MdePkg/Library/BaseSmbusLibNull/BaseSmbusLibNull.inf
OrderedCollectionLib|MdePkg/Library/BaseOrderedCollectionRedBlackTreeLib/BaseOrderedCollectionRedBlackTreeLib.inf OrderedCollectionLib|MdePkg/Library/BaseOrderedCollectionRedBlackTreeLib/BaseOrderedCollectionRedBlackTreeLib.inf
XenHypercallLib|OvmfPkg/Library/XenHypercallLib/XenHypercallLibIntel.inf XenHypercallLib|OvmfPkg/Library/XenHypercallLib/XenHypercallLib.inf
[LibraryClasses.common] [LibraryClasses.common]
!if $(SECURE_BOOT_ENABLE) == TRUE !if $(SECURE_BOOT_ENABLE) == TRUE

2
OvmfPkg/OvmfPkgX64.dsc
View File

@ -133,7 +133,7 @@
S3BootScriptLib|MdeModulePkg/Library/PiDxeS3BootScriptLib/DxeS3BootScriptLib.inf S3BootScriptLib|MdeModulePkg/Library/PiDxeS3BootScriptLib/DxeS3BootScriptLib.inf
SmbusLib|MdePkg/Library/BaseSmbusLibNull/BaseSmbusLibNull.inf SmbusLib|MdePkg/Library/BaseSmbusLibNull/BaseSmbusLibNull.inf
OrderedCollectionLib|MdePkg/Library/BaseOrderedCollectionRedBlackTreeLib/BaseOrderedCollectionRedBlackTreeLib.inf OrderedCollectionLib|MdePkg/Library/BaseOrderedCollectionRedBlackTreeLib/BaseOrderedCollectionRedBlackTreeLib.inf
XenHypercallLib|OvmfPkg/Library/XenHypercallLib/XenHypercallLibIntel.inf XenHypercallLib|OvmfPkg/Library/XenHypercallLib/XenHypercallLib.inf
[LibraryClasses.common] [LibraryClasses.common]
!if $(SECURE_BOOT_ENABLE) == TRUE !if $(SECURE_BOOT_ENABLE) == TRUE