Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Ruiyu Ni <[email protected]>
Cc: Feng Tian <[email protected]>
Cc: Laszlo Ersek <[email protected]>
Cc: Jordan Justen <[email protected]>
---
.../Include/Library/FrameBufferBltLib.h | 0
.../Library/FrameBufferBltLib/FrameBufferBltLib.c | 0
.../Library/FrameBufferBltLib/FrameBufferBltLib.inf | 2 +-
MdeModulePkg/MdeModulePkg.dec | 4 ++++
MdeModulePkg/MdeModulePkg.dsc | 1 +
OptionRomPkg/OptionRomPkg.dec | 9 ---------
OptionRomPkg/OptionRomPkg.dsc | 6 ++----
7 files changed, 8 insertions(+), 14 deletions(-)
rename {OptionRomPkg => MdeModulePkg}/Include/Library/FrameBufferBltLib.h
(100%)
rename {OptionRomPkg =>
MdeModulePkg}/Library/FrameBufferBltLib/FrameBufferBltLib.c (100%)
rename {OptionRomPkg =>
MdeModulePkg}/Library/FrameBufferBltLib/FrameBufferBltLib.inf (93%)
diff --git a/OptionRomPkg/Include/Library/FrameBufferBltLib.h
b/MdeModulePkg/Include/Library/FrameBufferBltLib.h
similarity index 100%
rename from OptionRomPkg/Include/Library/FrameBufferBltLib.h
rename to MdeModulePkg/Include/Library/FrameBufferBltLib.h
diff --git a/OptionRomPkg/Library/FrameBufferBltLib/FrameBufferBltLib.c
b/MdeModulePkg/Library/FrameBufferBltLib/FrameBufferBltLib.c
similarity index 100%
rename from OptionRomPkg/Library/FrameBufferBltLib/FrameBufferBltLib.c
rename to MdeModulePkg/Library/FrameBufferBltLib/FrameBufferBltLib.c
diff --git a/OptionRomPkg/Library/FrameBufferBltLib/FrameBufferBltLib.inf
b/MdeModulePkg/Library/FrameBufferBltLib/FrameBufferBltLib.inf
similarity index 93%
rename from OptionRomPkg/Library/FrameBufferBltLib/FrameBufferBltLib.inf
rename to MdeModulePkg/Library/FrameBufferBltLib/FrameBufferBltLib.inf
index d2861df..621e11d 100644
--- a/OptionRomPkg/Library/FrameBufferBltLib/FrameBufferBltLib.inf
+++ b/MdeModulePkg/Library/FrameBufferBltLib/FrameBufferBltLib.inf
@@ -31,4 +31,4 @@ [LibraryClasses]
[Packages]
MdePkg/MdePkg.dec
- OptionRomPkg/OptionRomPkg.dec
+ MdeModulePkg/MdeModulePkg.dec
diff --git a/MdeModulePkg/MdeModulePkg.dec b/MdeModulePkg/MdeModulePkg.dec
index 27efb37..eb1ca0d 100644
--- a/MdeModulePkg/MdeModulePkg.dec
+++ b/MdeModulePkg/MdeModulePkg.dec
@@ -153,6 +153,10 @@ [LibraryClasses]
#
PciHostBridgeLib|Include/Library/PciHostBridgeLib.h
+ ## @libraryclass Provides an interface for performing UEFI Graphics Output
Protocol Video blt operations.
+ ##
+ FrameBufferBltLib|Include/Library/FrameBufferBltLib.h
+
[Guids]
## MdeModule package token space guid
# Include/Guid/MdeModulePkgTokenSpace.h
diff --git a/MdeModulePkg/MdeModulePkg.dsc b/MdeModulePkg/MdeModulePkg.dsc
index abce62d..63e1f91 100644
--- a/MdeModulePkg/MdeModulePkg.dsc
+++ b/MdeModulePkg/MdeModulePkg.dsc
@@ -306,6 +306,7 @@ [Components]
MdeModulePkg/Library/DxeIpmiLibIpmiProtocol/DxeIpmiLibIpmiProtocol.inf
MdeModulePkg/Library/PeiIpmiLibIpmiPpi/PeiIpmiLibIpmiPpi.inf
MdeModulePkg/Library/SmmIpmiLibSmmIpmiProtocol/SmmIpmiLibSmmIpmiProtocol.inf
+ MdeModulePkg/Library/FrameBufferBltLib/FrameBufferBltLib.inf
MdeModulePkg/Universal/BdsDxe/BdsDxe.inf
MdeModulePkg/Application/BootManagerMenuApp/BootManagerMenuApp.inf
diff --git a/OptionRomPkg/OptionRomPkg.dec b/OptionRomPkg/OptionRomPkg.dec
index 09d208e..a8a4c9b 100644
--- a/OptionRomPkg/OptionRomPkg.dec
+++ b/OptionRomPkg/OptionRomPkg.dec
@@ -24,15 +24,6 @@ [Defines]
PACKAGE_GUID = AA3865E8-7F30-4f59-8696-99F560101852
PACKAGE_VERSION = 0.1
-[Includes]
- Include
-
-[LibraryClasses]
- ## @libraryclass Provides an interface for performing UEFI Graphics
- ## Output Protocol Video blt operations
- ##
- FrameBufferBltLib|Include/Library/FrameBufferBltLib.h
-
[Guids]
gOptionRomPkgTokenSpaceGuid = { 0x1e43298f, 0x3478, 0x41a7, { 0xb5, 0x77,
0x86, 0x6, 0x46, 0x35, 0xc7, 0x28 } }
diff --git a/OptionRomPkg/OptionRomPkg.dsc b/OptionRomPkg/OptionRomPkg.dsc
index 97b21b3..4cd9d08 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.<BR>
+# Copyright (c) 2007 - 2016, 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
@@ -47,7 +47,7 @@ [LibraryClasses]
DebugPrintErrorLevelLib|MdePkg/Library/BaseDebugPrintErrorLevelLib/BaseDebugPrintErrorLevelLib.inf
BaseLib|MdePkg/Library/BaseLib/BaseLib.inf
BaseMemoryLib|MdePkg/Library/BaseMemoryLib/BaseMemoryLib.inf
- BltLib|OptionRomPkg/Library/FrameBufferBltLib/FrameBufferBltLib.inf
+
FrameBufferBltLib|MdeModulePkg/Library/FrameBufferBltLib/FrameBufferBltLib.inf
PrintLib|MdePkg/Library/BasePrintLib/BasePrintLib.inf
TimerLib|MdePkg/Library/BaseTimerLibNullTemplate/BaseTimerLibNullTemplate.inf
UefiBootServicesTableLib|MdePkg/Library/UefiBootServicesTableLib/UefiBootServicesTableLib.inf
@@ -98,8 +98,6 @@ [PcdsFixedAtBuild]
###################################################################################################
[Components]
- OptionRomPkg/Library/FrameBufferBltLib/FrameBufferBltLib.inf
-
OptionRomPkg/AtapiPassThruDxe/AtapiPassThruDxe.inf
OptionRomPkg/CirrusLogic5430Dxe/CirrusLogic5430Dxe.inf
OptionRomPkg/UndiRuntimeDxe/UndiRuntimeDxe.inf
--
2.8.3.windows.1
_______________________________________________
edk2-devel mailing list
[email protected]
https://lists.01.org/mailman/listinfo/edk2-devel
