[edk2-devel] [patch 0/7] Move BaseUefiTianoCustomDecompressLib from IntelFrameworkModulePkg to MdeModulePkg
We will remove IntelFrameworkModulePkg,but BaseUefiTianoCustomDecompressLib in
it
may still need to be used. So move BaseUefiTianoCustomDecompressLib from
IntelFrameworkModulePkg to MdeModulePkg firstly.
Patch 1-3 are to clean up platform unnecessary dependency on
BaseUefiTianoCustomDecompressLib
in IntelFrameworkModulePkg before the move.
Patch 4 is to move the BaseUefiTianoCustomDecompressLib from
IntelFrameworkModulePkg to MdeModulePkg.
Patch 5-7 are to update the consumer to use the
BaseUefiTianoCustomDecompressLib in MdeModulePkg after the move.
Cc: Laszlo Ersek
Cc: Julien Grall
Cc: Leif Lindholm
Cc: Ard Biesheuvel
Cc: Jordan Justen
Cc: Andrew Fish
Cc: Liming Gao
Cc: Ray Ni
Cc: Jian J Wang
Cc: Hao Wu
Cc: Michael D Kinney
Cc: Kelly Steele
Cc: Zailiang Sun
Cc: Yi Qian
Dandan Bi (7):
ArmVirtPkg: Update UefiDecompressLib instance
BeagleBoardPkg: Update UefiDecompressLib instance
EmulatorPkg: Update UefiDecompressLib instance
MdeModulePkg: Move BaseUefiTianoCustomDecompressLib to
Nt32Pkg: Update to use UefiDecompressLib in MdeModulePkg
Quark: Update to use UefiDecompressLib in MdeModulePkg
Vlv2TbltDevicePkg: Update to use UefiDecompressLib in MdeModulePkg
ArmVirtPkg/ArmVirt.dsc.inc | 4 ++--
ArmVirtPkg/ArmVirtRules.fdf.inc | 9 -
BeagleBoardPkg/BeagleBoardPkg.dsc| 4 ++--
BeagleBoardPkg/BeagleBoardPkg.fdf| 9 -
EmulatorPkg/EmulatorPkg.dsc | 2 +-
IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec | 4
IntelFrameworkModulePkg/IntelFrameworkModulePkg.dsc | 1 -
.../Include/Guid/TianoDecompress.h | 0
.../BaseUefiTianoCustomDecompressLib.c | 0
.../BaseUefiTianoCustomDecompressLib.inf | 2 +-
.../BaseUefiTianoCustomDecompressLibInternals.h | 0
.../BaseUefiTianoDecompressLib.uni | 0
MdeModulePkg/MdeModulePkg.dec| 4
MdeModulePkg/MdeModulePkg.dsc| 1 +
Nt32Pkg/Nt32Pkg.dsc | 2 +-
QuarkPlatformPkg/Quark.dsc | 2 +-
QuarkPlatformPkg/QuarkMin.dsc| 2 +-
Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc | 2 +-
Vlv2TbltDevicePkg/PlatformPkgIA32.dsc| 2 +-
Vlv2TbltDevicePkg/PlatformPkgX64.dsc | 2 +-
20 files changed, 17 insertions(+), 35 deletions(-)
rename {IntelFrameworkModulePkg =>
MdeModulePkg}/Include/Guid/TianoDecompress.h (100%)
rename {IntelFrameworkModulePkg =>
MdeModulePkg}/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTianoCustomDecompressLib.c
(100%)
rename {IntelFrameworkModulePkg =>
MdeModulePkg}/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTianoCustomDecompressLib.inf
(94%)
rename {IntelFrameworkModulePkg =>
MdeModulePkg}/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTianoCustomDecompressLibInternals.h
(100%)
rename {IntelFrameworkModulePkg =>
MdeModulePkg}/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTianoDecompressLib.uni
(100%)
--
2.18.0.windows.1
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#51): https://edk2.groups.io/g/devel/message/51
Mute This Topic: https://groups.io/mt/30896388/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[edk2-devel] [patch 1/7] ArmVirtPkg: Update UefiDecompressLib instance
REF: https://bugzilla.tianocore.org/show_bug.cgi?id=1683
BaseUefiDecompressLib in MdePkg is the
base UEFI decompress Library.
BaseUefiTianoCustomDecompressLib in IntelFrameworkModulePkg
implements the base UEFI decompress functionality and
Tiano decompress functionality.
1. TIANOCOMPRESSED rule in ArmVirtRules.fdf.inc
is not used, so remove it.
2. Platform doesn't use the TianoCompress, so do
not have to use BaseUefiTianoCustomDecompressLib,
can use the BaseUefiDecompressLib in MdePkg directly.
Cc: Laszlo Ersek
Cc: Ard Biesheuvel
Cc: Julien Grall
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Dandan Bi
---
ArmVirtPkg/ArmVirt.dsc.inc | 4 ++--
ArmVirtPkg/ArmVirtRules.fdf.inc | 9 -
2 files changed, 2 insertions(+), 11 deletions(-)
diff --git a/ArmVirtPkg/ArmVirt.dsc.inc b/ArmVirtPkg/ArmVirt.dsc.inc
index d172a082c9..556ec0dcb1 100644
--- a/ArmVirtPkg/ArmVirt.dsc.inc
+++ b/ArmVirtPkg/ArmVirt.dsc.inc
@@ -223,17 +223,17 @@
SecurityManagementLib|MdeModulePkg/Library/DxeSecurityManagementLib/DxeSecurityManagementLib.inf
PerformanceLib|MdeModulePkg/Library/DxePerformanceLib/DxePerformanceLib.inf
MemoryAllocationLib|MdePkg/Library/UefiMemoryAllocationLib/UefiMemoryAllocationLib.inf
[LibraryClasses.common.UEFI_APPLICATION]
-
UefiDecompressLib|IntelFrameworkModulePkg/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTianoCustomDecompressLib.inf
+
UefiDecompressLib|MdePkg/Library/BaseUefiDecompressLib/BaseUefiDecompressLib.inf
PerformanceLib|MdeModulePkg/Library/DxePerformanceLib/DxePerformanceLib.inf
MemoryAllocationLib|MdePkg/Library/UefiMemoryAllocationLib/UefiMemoryAllocationLib.inf
HiiLib|MdeModulePkg/Library/UefiHiiLib/UefiHiiLib.inf
[LibraryClasses.common.UEFI_DRIVER]
-
UefiDecompressLib|IntelFrameworkModulePkg/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTianoCustomDecompressLib.inf
+
UefiDecompressLib|MdePkg/Library/BaseUefiDecompressLib/BaseUefiDecompressLib.inf
ExtractGuidedSectionLib|MdePkg/Library/DxeExtractGuidedSectionLib/DxeExtractGuidedSectionLib.inf
PerformanceLib|MdeModulePkg/Library/DxePerformanceLib/DxePerformanceLib.inf
MemoryAllocationLib|MdePkg/Library/UefiMemoryAllocationLib/UefiMemoryAllocationLib.inf
[LibraryClasses.common.DXE_RUNTIME_DRIVER]
diff --git a/ArmVirtPkg/ArmVirtRules.fdf.inc b/ArmVirtPkg/ArmVirtRules.fdf.inc
index 5ff3004786..bed06364e1 100644
--- a/ArmVirtPkg/ArmVirtRules.fdf.inc
+++ b/ArmVirtPkg/ArmVirtRules.fdf.inc
@@ -56,19 +56,10 @@
PEI_DEPEX PEI_DEPEX Optional $(INF_OUTPUT)/$(MODULE_NAME).depex
TE TE Align = Auto $(INF_OUTPUT)/$(MODULE_NAME).efi
UI STRING="$(MODULE_NAME)" Optional
}
-[Rule.Common.PEIM.TIANOCOMPRESSED]
- FILE PEIM = $(NAMED_GUID) DEBUG_MYTOOLS_IA32 {
-PEI_DEPEX PEI_DEPEX Optional$(INF_OUTPUT)/$(MODULE_NAME).depex
-GUIDED A31280AD-481E-41B6-95E8-127F4C984779 PROCESSING_REQUIRED = TRUE {
- PE32 PE32$(INF_OUTPUT)/$(MODULE_NAME).efi
- UISTRING="$(MODULE_NAME)" Optional
-}
- }
-
[Rule.Common.DXE_CORE]
FILE DXE_CORE = $(NAMED_GUID) {
PE32 PE32 $(INF_OUTPUT)/$(MODULE_NAME).efi
UI STRING="$(MODULE_NAME)" Optional
}
--
2.18.0.windows.1
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#52): https://edk2.groups.io/g/devel/message/52
Mute This Topic: https://groups.io/mt/30896390/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[edk2-devel] [patch 2/7] BeagleBoardPkg: Update UefiDecompressLib instance
REF: https://bugzilla.tianocore.org/show_bug.cgi?id=1683
BaseUefiDecompressLib in MdePkg is the
base UEFI decompress Library.
BaseUefiTianoCustomDecompressLib in IntelFrameworkModulePkg
implements the base UEFI decompress functionality and
Tiano decompress functionality.
1. TIANOCOMPRESSED rule in BeagleBoardPkg.fdf
is not used, so remove it.
2. Platform doesn't use the TianoCompress, so do
not have to use BaseUefiTianoCustomDecompressLib,
can use the BaseUefiDecompressLib in MdePkg directly.
Cc: Leif Lindholm
Cc: Ard Biesheuvel
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Dandan Bi
---
BeagleBoardPkg/BeagleBoardPkg.dsc | 4 ++--
BeagleBoardPkg/BeagleBoardPkg.fdf | 9 -
2 files changed, 2 insertions(+), 11 deletions(-)
diff --git a/BeagleBoardPkg/BeagleBoardPkg.dsc
b/BeagleBoardPkg/BeagleBoardPkg.dsc
index e0fee3692f..e5fbe7eeb2 100644
--- a/BeagleBoardPkg/BeagleBoardPkg.dsc
+++ b/BeagleBoardPkg/BeagleBoardPkg.dsc
@@ -185,17 +185,17 @@
PerformanceLib|MdeModulePkg/Library/DxePerformanceLib/DxePerformanceLib.inf
NonDiscoverableDeviceRegistrationLib|MdeModulePkg/Library/NonDiscoverableDeviceRegistrationLib/NonDiscoverableDeviceRegistrationLib.inf
[LibraryClasses.common.UEFI_APPLICATION]
ReportStatusCodeLib|IntelFrameworkModulePkg/Library/DxeReportStatusCodeLibFramework/DxeReportStatusCodeLib.inf
-
UefiDecompressLib|IntelFrameworkModulePkg/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTianoCustomDecompressLib.inf
+
UefiDecompressLib|MdePkg/Library/BaseUefiDecompressLib/BaseUefiDecompressLib.inf
PerformanceLib|MdeModulePkg/Library/DxePerformanceLib/DxePerformanceLib.inf
HiiLib|MdeModulePkg/Library/UefiHiiLib/UefiHiiLib.inf
[LibraryClasses.common.UEFI_DRIVER]
ReportStatusCodeLib|IntelFrameworkModulePkg/Library/DxeReportStatusCodeLibFramework/DxeReportStatusCodeLib.inf
-
UefiDecompressLib|IntelFrameworkModulePkg/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTianoCustomDecompressLib.inf
+
UefiDecompressLib|MdePkg/Library/BaseUefiDecompressLib/BaseUefiDecompressLib.inf
ExtractGuidedSectionLib|MdePkg/Library/DxeExtractGuidedSectionLib/DxeExtractGuidedSectionLib.inf
PerformanceLib|MdeModulePkg/Library/DxePerformanceLib/DxePerformanceLib.inf
DxeServicesLib|MdePkg/Library/DxeServicesLib/DxeServicesLib.inf
[LibraryClasses.common.DXE_RUNTIME_DRIVER]
diff --git a/BeagleBoardPkg/BeagleBoardPkg.fdf
b/BeagleBoardPkg/BeagleBoardPkg.fdf
index 42d6bad0c7..9c9cecf894 100644
--- a/BeagleBoardPkg/BeagleBoardPkg.fdf
+++ b/BeagleBoardPkg/BeagleBoardPkg.fdf
@@ -262,19 +262,10 @@ READ_LOCK_STATUS = TRUE
PEI_DEPEX PEI_DEPEX Optional $(INF_OUTPUT)/$(MODULE_NAME).depex
PE32 PE32 $(INF_OUTPUT)/$(MODULE_NAME).efi
UI STRING="$(MODULE_NAME)" Optional
}
-[Rule.Common.PEIM.TIANOCOMPRESSED]
- FILE PEIM = $(NAMED_GUID) DEBUG_MYTOOLS_IA32 {
-PEI_DEPEX PEI_DEPEX Optional$(INF_OUTPUT)/$(MODULE_NAME).depex
-GUIDED A31280AD-481E-41B6-95E8-127F4C984779 PROCESSING_REQUIRED = TRUE {
- PE32 PE32$(INF_OUTPUT)/$(MODULE_NAME).efi
- UISTRING="$(MODULE_NAME)" Optional
-}
- }
-
[Rule.Common.DXE_CORE]
FILE DXE_CORE = $(NAMED_GUID) {
PE32 PE32 $(INF_OUTPUT)/$(MODULE_NAME).efi
UI STRING="$(MODULE_NAME)" Optional
}
--
2.18.0.windows.1
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#53): https://edk2.groups.io/g/devel/message/53
Mute This Topic: https://groups.io/mt/30896391/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[edk2-devel] [patch 4/7] MdeModulePkg: Move BaseUefiTianoCustomDecompressLib to
REF: https://bugzilla.tianocore.org/show_bug.cgi?id=1683
We will remove IntelFrameworkModulePkg,
but BaseUefiTianoCustomDecompressLib may still need
to be used. So move BaseUefiTianoCustomDecompressLib
from IntelFrameworkModulePkg to MdeModulePkg.
Cc: Liming Gao
Cc: Jian J Wang
Cc: Hao Wu
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Dandan Bi
---
IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec | 4
IntelFrameworkModulePkg/IntelFrameworkModulePkg.dsc | 1 -
.../Include/Guid/TianoDecompress.h| 0
.../BaseUefiTianoCustomDecompressLib.c| 0
.../BaseUefiTianoCustomDecompressLib.inf | 2 +-
.../BaseUefiTianoCustomDecompressLibInternals.h | 0
.../BaseUefiTianoDecompressLib.uni| 0
MdeModulePkg/MdeModulePkg.dec | 4
MdeModulePkg/MdeModulePkg.dsc | 1 +
9 files changed, 6 insertions(+), 6 deletions(-)
rename {IntelFrameworkModulePkg =>
MdeModulePkg}/Include/Guid/TianoDecompress.h (100%)
rename {IntelFrameworkModulePkg =>
MdeModulePkg}/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTianoCustomDecompressLib.c
(100%)
rename {IntelFrameworkModulePkg =>
MdeModulePkg}/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTianoCustomDecompressLib.inf
(94%)
rename {IntelFrameworkModulePkg =>
MdeModulePkg}/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTianoCustomDecompressLibInternals.h
(100%)
rename {IntelFrameworkModulePkg =>
MdeModulePkg}/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTianoDecompressLib.uni
(100%)
diff --git a/IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec
b/IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec
index 5557b5a1cd..0a451dd9ee 100644
--- a/IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec
+++ b/IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec
@@ -40,14 +40,10 @@
## GUID identifies Data Hub records logged by Status Code Runtime Protocol.
# Include/Guid/DataHubStatusCodeRecord.h
gEfiDataHubStatusCodeRecordGuid = { 0xD083E94C, 0x6560, 0x42E4, { 0xB6,
0xD4, 0x2D, 0xF7, 0x5A, 0xDF, 0x6A, 0x2A }}
- ## GUID indicates the tiano custom compress/decompress algorithm.
- # Include/Guid/TianoDecompress.h
- gTianoCustomDecompressGuid = { 0xA31280AD, 0x481E, 0x41B6, { 0x95, 0xE8,
0x12, 0x7F, 0x4C, 0x98, 0x47, 0x79 }}
-
## Include/Guid/AcpiVariable.h
gEfiAcpiVariableCompatiblityGuid = { 0xc020489e, 0x6db2, 0x4ef2, { 0x9a,
0xa5, 0xca, 0x6, 0xfc, 0x11, 0xd3, 0x6a }}
## Include/Guid/LegacyBios.h
gEfiLegacyBiosGuid = { 0x2E3044AC, 0x879F, 0x490F, { 0x97,
0x60, 0xBB, 0xDF, 0xAF, 0x69, 0x5F, 0x50 }}
diff --git a/IntelFrameworkModulePkg/IntelFrameworkModulePkg.dsc
b/IntelFrameworkModulePkg/IntelFrameworkModulePkg.dsc
index 949a181a7b..2afda5df79 100644
--- a/IntelFrameworkModulePkg/IntelFrameworkModulePkg.dsc
+++ b/IntelFrameworkModulePkg/IntelFrameworkModulePkg.dsc
@@ -117,11 +117,10 @@
gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x0f
gEfiMdePkgTokenSpaceGuid.PcdReportStatusCodePropertyMask|0x06
gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseAddress|0xE000
[Components]
-
IntelFrameworkModulePkg/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTianoCustomDecompressLib.inf
IntelFrameworkModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf
IntelFrameworkModulePkg/Library/PeiS3Lib/PeiS3Lib.inf
IntelFrameworkModulePkg/Library/PeiRecoveryLib/PeiRecoveryLib.inf
IntelFrameworkModulePkg/Library/DxeReportStatusCodeLibFramework/DxeReportStatusCodeLib.inf
IntelFrameworkModulePkg/Library/SmmRuntimeDxeReportStatusCodeLibFramework/SmmRuntimeDxeReportStatusCodeLibFramework.inf
diff --git a/IntelFrameworkModulePkg/Include/Guid/TianoDecompress.h
b/MdeModulePkg/Include/Guid/TianoDecompress.h
similarity index 100%
rename from IntelFrameworkModulePkg/Include/Guid/TianoDecompress.h
rename to MdeModulePkg/Include/Guid/TianoDecompress.h
diff --git
a/IntelFrameworkModulePkg/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTianoCustomDecompressLib.c
b/MdeModulePkg/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTianoCustomDecompressLib.c
similarity index 100%
rename from
IntelFrameworkModulePkg/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTianoCustomDecompressLib.c
rename to
MdeModulePkg/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTianoCustomDecompressLib.c
diff --git
a/IntelFrameworkModulePkg/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTianoCustomDecompressLib.inf
b/MdeModulePkg/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTianoCustomDecompressLib.inf
similarity index 94%
rename from
IntelFrameworkModulePkg/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTianoCustomDecompressLib.inf
rename to
MdeModulePkg/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTianoCustomDecompressLib.inf
index ee64fa0d0e..41cc48cd2
[edk2-devel] [patch 3/7] EmulatorPkg: Update UefiDecompressLib instance
REF: https://bugzilla.tianocore.org/show_bug.cgi?id=1683 BaseUefiDecompressLib in MdePkg is the base UEFI decompress Library. BaseUefiTianoCustomDecompressLib in IntelFrameworkModulePkg implements the base UEFI decompress functionality and Tiano decompress functionality. BaseUefiDecompressLib in MdePkg is the base UEFI decompress Library. BaseUefiTianoCustomDecompressLib in IntelFrameworkModulePkg implements the base UEFI decompress functionality and Tiano decompress functionality. Platform doesn't use the TianoCompress, so do not have to use BaseUefiTianoCustomDecompressLib, can use the BaseUefiDecompressLib in MdePkg directly. Cc: Jordan Justen Cc: Andrew Fish Cc: Ray Ni Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Dandan Bi --- EmulatorPkg/EmulatorPkg.dsc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/EmulatorPkg/EmulatorPkg.dsc b/EmulatorPkg/EmulatorPkg.dsc index 4097e1192e..84223b83ba 100644 --- a/EmulatorPkg/EmulatorPkg.dsc +++ b/EmulatorPkg/EmulatorPkg.dsc @@ -61,11 +61,11 @@ UefiRuntimeLib|MdePkg/Library/UefiRuntimeLib/UefiRuntimeLib.inf UefiLib|MdePkg/Library/UefiLib/UefiLib.inf UefiHiiServicesLib|MdeModulePkg/Library/UefiHiiServicesLib/UefiHiiServicesLib.inf HiiLib|MdeModulePkg/Library/UefiHiiLib/UefiHiiLib.inf DevicePathLib|MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.inf - UefiDecompressLib|IntelFrameworkModulePkg/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTianoCustomDecompressLib.inf + UefiDecompressLib|MdePkg/Library/BaseUefiDecompressLib/BaseUefiDecompressLib.inf PeiServicesLib|MdePkg/Library/PeiServicesLib/PeiServicesLib.inf DxeServicesLib|MdePkg/Library/DxeServicesLib/DxeServicesLib.inf DxeServicesTableLib|MdePkg/Library/DxeServicesTableLib/DxeServicesTableLib.inf SmbiosLib|EmulatorPkg/Library/SmbiosLib/SmbiosLib.inf -- 2.18.0.windows.1 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#54): https://edk2.groups.io/g/devel/message/54 Mute This Topic: https://groups.io/mt/30896392/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[edk2-devel] [patch 5/7] Nt32Pkg: Update to use UefiDecompressLib in MdeModulePkg
REF: https://bugzilla.tianocore.org/show_bug.cgi?id=1683 We have moved the BaseUefiTianoCustomDecompressLib from IntelFrameworkModulePkg to MdeModulePkg, so update the consumer accordingly. Cc: Ray Ni Cc: Hao Wu Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Dandan Bi --- Nt32Pkg/Nt32Pkg.dsc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Nt32Pkg/Nt32Pkg.dsc b/Nt32Pkg/Nt32Pkg.dsc index d7b78007d2..2a7218766d 100644 --- a/Nt32Pkg/Nt32Pkg.dsc +++ b/Nt32Pkg/Nt32Pkg.dsc @@ -124,11 +124,11 @@ UefiRuntimeLib|MdePkg/Library/UefiRuntimeLib/UefiRuntimeLib.inf UefiLib|MdePkg/Library/UefiLib/UefiLib.inf UefiHiiServicesLib|MdeModulePkg/Library/UefiHiiServicesLib/UefiHiiServicesLib.inf HiiLib|MdeModulePkg/Library/UefiHiiLib/UefiHiiLib.inf DevicePathLib|MdePkg/Library/UefiDevicePathLibDevicePathProtocol/UefiDevicePathLibDevicePathProtocol.inf - UefiDecompressLib|IntelFrameworkModulePkg/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTianoCustomDecompressLib.inf + UefiDecompressLib|MdeModulePkg/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTianoCustomDecompressLib.inf PeiServicesTablePointerLib|MdePkg/Library/PeiServicesTablePointerLib/PeiServicesTablePointerLib.inf PeiServicesLib|MdePkg/Library/PeiServicesLib/PeiServicesLib.inf DxeServicesLib|MdePkg/Library/DxeServicesLib/DxeServicesLib.inf DxeServicesTableLib|MdePkg/Library/DxeServicesTableLib/DxeServicesTableLib.inf UefiBootManagerLib|MdeModulePkg/Library/UefiBootManagerLib/UefiBootManagerLib.inf -- 2.18.0.windows.1 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#56): https://edk2.groups.io/g/devel/message/56 Mute This Topic: https://groups.io/mt/30896396/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[edk2-devel] [patch 7/7] Vlv2TbltDevicePkg: Update to use UefiDecompressLib in MdeModulePkg
REF: https://bugzilla.tianocore.org/show_bug.cgi?id=1683 We have moved the BaseUefiTianoCustomDecompressLib from IntelFrameworkModulePkg to MdeModulePkg, so update the consumer accordingly. Cc: Zailiang Sun Cc: Yi Qian Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Dandan Bi --- Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc | 2 +- Vlv2TbltDevicePkg/PlatformPkgIA32.dsc | 2 +- Vlv2TbltDevicePkg/PlatformPkgX64.dsc| 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc b/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc index ac401c4826..3b4c7ec579 100644 --- a/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc +++ b/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc @@ -136,11 +136,11 @@ UefiRuntimeLib|MdePkg/Library/UefiRuntimeLib/UefiRuntimeLib.inf UefiLib|MdePkg/Library/UefiLib/UefiLib.inf HiiLib|MdeModulePkg/Library/UefiHiiLib/UefiHiiLib.inf UefiHiiServicesLib|MdeModulePkg/Library/UefiHiiServicesLib/UefiHiiServicesLib.inf DevicePathLib|MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.inf - UefiDecompressLib|IntelFrameworkModulePkg/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTianoCustomDecompressLib.inf + UefiDecompressLib|MdeModulePkg/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTianoCustomDecompressLib.inf PeiServicesTablePointerLib|MdePkg/Library/PeiServicesTablePointerLibIdt/PeiServicesTablePointerLibIdt.inf PeiServicesLib|MdePkg/Library/PeiServicesLib/PeiServicesLib.inf DxeServicesLib|MdePkg/Library/DxeServicesLib/DxeServicesLib.inf DxeServicesTableLib|MdePkg/Library/DxeServicesTableLib/DxeServicesTableLib.inf UefiCpuLib|UefiCpuPkg/Library/BaseUefiCpuLib/BaseUefiCpuLib.inf diff --git a/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc b/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc index 0b5b976d61..ba5ad53293 100644 --- a/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc +++ b/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc @@ -136,11 +136,11 @@ UefiRuntimeLib|MdePkg/Library/UefiRuntimeLib/UefiRuntimeLib.inf UefiLib|MdePkg/Library/UefiLib/UefiLib.inf HiiLib|MdeModulePkg/Library/UefiHiiLib/UefiHiiLib.inf UefiHiiServicesLib|MdeModulePkg/Library/UefiHiiServicesLib/UefiHiiServicesLib.inf DevicePathLib|MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.inf - UefiDecompressLib|IntelFrameworkModulePkg/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTianoCustomDecompressLib.inf + UefiDecompressLib|MdeModulePkg/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTianoCustomDecompressLib.inf PeiServicesTablePointerLib|MdePkg/Library/PeiServicesTablePointerLibIdt/PeiServicesTablePointerLibIdt.inf PeiServicesLib|MdePkg/Library/PeiServicesLib/PeiServicesLib.inf DxeServicesLib|MdePkg/Library/DxeServicesLib/DxeServicesLib.inf DxeServicesTableLib|MdePkg/Library/DxeServicesTableLib/DxeServicesTableLib.inf UefiCpuLib|UefiCpuPkg/Library/BaseUefiCpuLib/BaseUefiCpuLib.inf diff --git a/Vlv2TbltDevicePkg/PlatformPkgX64.dsc b/Vlv2TbltDevicePkg/PlatformPkgX64.dsc index 1940aead03..c9c9ee8af6 100644 --- a/Vlv2TbltDevicePkg/PlatformPkgX64.dsc +++ b/Vlv2TbltDevicePkg/PlatformPkgX64.dsc @@ -136,11 +136,11 @@ UefiRuntimeLib|MdePkg/Library/UefiRuntimeLib/UefiRuntimeLib.inf UefiLib|MdePkg/Library/UefiLib/UefiLib.inf HiiLib|MdeModulePkg/Library/UefiHiiLib/UefiHiiLib.inf UefiHiiServicesLib|MdeModulePkg/Library/UefiHiiServicesLib/UefiHiiServicesLib.inf DevicePathLib|MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.inf - UefiDecompressLib|IntelFrameworkModulePkg/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTianoCustomDecompressLib.inf + UefiDecompressLib|MdeModulePkg/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTianoCustomDecompressLib.inf PeiServicesTablePointerLib|MdePkg/Library/PeiServicesTablePointerLibIdt/PeiServicesTablePointerLibIdt.inf PeiServicesLib|MdePkg/Library/PeiServicesLib/PeiServicesLib.inf DxeServicesLib|MdePkg/Library/DxeServicesLib/DxeServicesLib.inf DxeServicesTableLib|MdePkg/Library/DxeServicesTableLib/DxeServicesTableLib.inf UefiCpuLib|UefiCpuPkg/Library/BaseUefiCpuLib/BaseUefiCpuLib.inf -- 2.18.0.windows.1 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#58): https://edk2.groups.io/g/devel/message/58 Mute This Topic: https://groups.io/mt/30896398/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[edk2-devel] [patch 6/7] Quark: Update to use UefiDecompressLib in MdeModulePkg
REF: https://bugzilla.tianocore.org/show_bug.cgi?id=1683 We have moved the BaseUefiTianoCustomDecompressLib from IntelFrameworkModulePkg to MdeModulePkg, so update the consumer accordingly. Cc: Michael D Kinney Cc: Kelly Steele Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Dandan Bi --- QuarkPlatformPkg/Quark.dsc| 2 +- QuarkPlatformPkg/QuarkMin.dsc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/QuarkPlatformPkg/Quark.dsc b/QuarkPlatformPkg/Quark.dsc index 0e69b3c51f..226825bc05 100644 --- a/QuarkPlatformPkg/Quark.dsc +++ b/QuarkPlatformPkg/Quark.dsc @@ -117,11 +117,11 @@ UefiRuntimeLib|MdePkg/Library/UefiRuntimeLib/UefiRuntimeLib.inf UefiLib|MdePkg/Library/UefiLib/UefiLib.inf HiiLib|MdeModulePkg/Library/UefiHiiLib/UefiHiiLib.inf UefiHiiServicesLib|MdeModulePkg/Library/UefiHiiServicesLib/UefiHiiServicesLib.inf DevicePathLib|MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.inf - UefiDecompressLib|IntelFrameworkModulePkg/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTianoCustomDecompressLib.inf + UefiDecompressLib|MdeModulePkg/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTianoCustomDecompressLib.inf PeiServicesTablePointerLib|MdePkg/Library/PeiServicesTablePointerLibIdt/PeiServicesTablePointerLibIdt.inf PeiServicesLib|MdePkg/Library/PeiServicesLib/PeiServicesLib.inf DxeServicesLib|MdePkg/Library/DxeServicesLib/DxeServicesLib.inf DxeServicesTableLib|MdePkg/Library/DxeServicesTableLib/DxeServicesTableLib.inf UefiCpuLib|UefiCpuPkg/Library/BaseUefiCpuLib/BaseUefiCpuLib.inf diff --git a/QuarkPlatformPkg/QuarkMin.dsc b/QuarkPlatformPkg/QuarkMin.dsc index 04ecd096ce..afd09e3fde 100644 --- a/QuarkPlatformPkg/QuarkMin.dsc +++ b/QuarkPlatformPkg/QuarkMin.dsc @@ -105,11 +105,11 @@ UefiRuntimeLib|MdePkg/Library/UefiRuntimeLib/UefiRuntimeLib.inf UefiLib|MdePkg/Library/UefiLib/UefiLib.inf HiiLib|MdeModulePkg/Library/UefiHiiLib/UefiHiiLib.inf UefiHiiServicesLib|MdeModulePkg/Library/UefiHiiServicesLib/UefiHiiServicesLib.inf DevicePathLib|MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.inf - UefiDecompressLib|IntelFrameworkModulePkg/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTianoCustomDecompressLib.inf + UefiDecompressLib|MdeModulePkg/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTianoCustomDecompressLib.inf PeiServicesTablePointerLib|MdePkg/Library/PeiServicesTablePointerLibIdt/PeiServicesTablePointerLibIdt.inf PeiServicesLib|MdePkg/Library/PeiServicesLib/PeiServicesLib.inf DxeServicesLib|MdePkg/Library/DxeServicesLib/DxeServicesLib.inf DxeServicesTableLib|MdePkg/Library/DxeServicesTableLib/DxeServicesTableLib.inf UefiCpuLib|UefiCpuPkg/Library/BaseUefiCpuLib/BaseUefiCpuLib.inf -- 2.18.0.windows.1 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#57): https://edk2.groups.io/g/devel/message/57 Mute This Topic: https://groups.io/mt/30896397/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [edk2-devel] [patch 5/7] Nt32Pkg: Update to use UefiDecompressLib in MdeModulePkg
> -Original Message- > From: devel@edk2.groups.io [mailto:devel@edk2.groups.io] On Behalf Of > Felix Polyudov > Sent: Friday, April 05, 2019 5:22 AM > To: devel@edk2.groups.io; Bi, Dandan > Cc: Ni, Ray ; Wu, Hao A > Subject: Re: [edk2-devel] [patch 5/7] Nt32Pkg: Update to use > UefiDecompressLib in MdeModulePkg > > Dandan, > > Is there a specific reason why Nt32Pkg cannot use BaseUefiDecompressLib > and should use BaseUefiTianoCustomDecompressLib? Hi , Nt32 uses the Tiano Compress algorithm, so it needs to use BaseUefiTianoCustomDecompressLib accordingly. Thanks, Dandan > > -Original Message- > From: devel@edk2.groups.io [mailto:devel@edk2.groups.io] On Behalf Of > Dandan Bi > Sent: Thursday, April 04, 2019 9:52 AM > To: devel@edk2.groups.io > Cc: Ray Ni; Hao Wu > Subject: [edk2-devel] [patch 5/7] Nt32Pkg: Update to use > UefiDecompressLib in MdeModulePkg > > REF: https://bugzilla.tianocore.org/show_bug.cgi?id=1683 > > We have moved the BaseUefiTianoCustomDecompressLib from > IntelFrameworkModulePkg to MdeModulePkg, so update the consumer > accordingly. > > Cc: Ray Ni > Cc: Hao Wu > Contributed-under: TianoCore Contribution Agreement 1.1 > Signed-off-by: Dandan Bi > --- > Nt32Pkg/Nt32Pkg.dsc | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/Nt32Pkg/Nt32Pkg.dsc b/Nt32Pkg/Nt32Pkg.dsc index > d7b78007d2..2a7218766d 100644 > --- a/Nt32Pkg/Nt32Pkg.dsc > +++ b/Nt32Pkg/Nt32Pkg.dsc > @@ -124,11 +124,11 @@ >UefiRuntimeLib|MdePkg/Library/UefiRuntimeLib/UefiRuntimeLib.inf >UefiLib|MdePkg/Library/UefiLib/UefiLib.inf > > UefiHiiServicesLib|MdeModulePkg/Library/UefiHiiServicesLib/UefiHiiServic > esLib.inf >HiiLib|MdeModulePkg/Library/UefiHiiLib/UefiHiiLib.inf > > DevicePathLib|MdePkg/Library/UefiDevicePathLibDevicePathProtocol/Uefi > DevicePathLibDevicePathProtocol.inf > - > UefiDecompressLib|IntelFrameworkModulePkg/Library/BaseUefiTianoCust > omDecompressLib/BaseUefiTianoCustomDecompressLib.inf > + > + > UefiDecompressLib|MdeModulePkg/Library/BaseUefiTianoCustomDecompr > essLi > + b/BaseUefiTianoCustomDecompressLib.inf > > PeiServicesTablePointerLib|MdePkg/Library/PeiServicesTablePointerLib/Pei > ServicesTablePointerLib.inf >PeiServicesLib|MdePkg/Library/PeiServicesLib/PeiServicesLib.inf >DxeServicesLib|MdePkg/Library/DxeServicesLib/DxeServicesLib.inf > > DxeServicesTableLib|MdePkg/Library/DxeServicesTableLib/DxeServicesTable > Lib.inf > > UefiBootManagerLib|MdeModulePkg/Library/UefiBootManagerLib/UefiBoo > tManagerLib.inf > -- > 2.18.0.windows.1 > > > > > > Please consider the environment before printing this email. > > The information contained in this message may be confidential and > proprietary to American Megatrends, Inc. This communication is intended > to be read only by the individual or entity to whom it is addressed or by > their designee. If the reader of this message is not the intended recipient, > you are on notice that any distribution of this message, in any form, is > strictly prohibited. Please promptly notify the sender by reply e-mail or by > telephone at 770-246-8600, and then delete or destroy all copies of the > transmission. > > -=-=-=-=-=-= > Groups.io Links: You receive all messages sent to this group. > > View/Reply Online (#85): https://edk2.groups.io/g/devel/message/85 > Mute This Topic: https://groups.io/mt/30896396/1768738 > Group Owner: devel+ow...@edk2.groups.io > Unsubscribe: https://edk2.groups.io/g/devel/unsub [dandan...@intel.com] > -=-=-=-=-=-= -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#38591): https://edk2.groups.io/g/devel/message/38591 Mute This Topic: https://groups.io/mt/30896396/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [edk2-devel] [patch 4/7] MdeModulePkg: Move BaseUefiTianoCustomDecompressLib to
> -Original Message-
> From: devel@edk2.groups.io [mailto:devel@edk2.groups.io] On Behalf Of
> Felix Polyudov
> Sent: Friday, April 05, 2019 5:15 AM
> To: devel@edk2.groups.io; Bi, Dandan
> Cc: Gao, Liming ; Wang, Jian J
> ; Wu, Hao A
> Subject: Re: [edk2-devel] [patch 4/7] MdeModulePkg: Move
> BaseUefiTianoCustomDecompressLib to
>
> Dandan,
>
> Since UEFI compression and Tiano compression are just different flavors of
> the same algorithm (the same algorithm with different PBit values), I think
> it's better not to have two parallel implementation in
> BaseUefiDecompressLib.c and BaseUefiTianoCustomDecompressLib.c.
> A cleaner approach would be to share the same decompression code
> between two libraries.
Hi,
Thanks for your suggestion. I think code cleanup and sharing is good.
We can do it in next step.
It should not be covered in this move action, we need make patch clean.
Thanks,
Dandan
>
> -Original Message-
> From: devel@edk2.groups.io [mailto:devel@edk2.groups.io] On Behalf Of
> Dandan Bi
> Sent: Thursday, April 04, 2019 9:52 AM
> To: devel@edk2.groups.io
> Cc: Liming Gao; Jian J Wang; Hao Wu
> Subject: [edk2-devel] [patch 4/7] MdeModulePkg: Move
> BaseUefiTianoCustomDecompressLib to
>
> REF: https://bugzilla.tianocore.org/show_bug.cgi?id=1683
>
> We will remove IntelFrameworkModulePkg,
> but BaseUefiTianoCustomDecompressLib may still need to be used. So
> move BaseUefiTianoCustomDecompressLib from
> IntelFrameworkModulePkg to MdeModulePkg.
>
> Cc: Liming Gao
> Cc: Jian J Wang
> Cc: Hao Wu
> Contributed-under: TianoCore Contribution Agreement 1.1
> Signed-off-by: Dandan Bi
> ---
> IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec | 4
> IntelFrameworkModulePkg/IntelFrameworkModulePkg.dsc | 1 -
> .../Include/Guid/TianoDecompress.h| 0
> .../BaseUefiTianoCustomDecompressLib.c| 0
> .../BaseUefiTianoCustomDecompressLib.inf | 2 +-
> .../BaseUefiTianoCustomDecompressLibInternals.h | 0
> .../BaseUefiTianoDecompressLib.uni| 0
> MdeModulePkg/MdeModulePkg.dec | 4
> MdeModulePkg/MdeModulePkg.dsc | 1 +
> 9 files changed, 6 insertions(+), 6 deletions(-) rename
> {IntelFrameworkModulePkg =>
> MdeModulePkg}/Include/Guid/TianoDecompress.h (100%) rename
> {IntelFrameworkModulePkg =>
> MdeModulePkg}/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTia
> noCustomDecompressLib.c (100%) rename {IntelFrameworkModulePkg =>
> MdeModulePkg}/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTia
> noCustomDecompressLib.inf (94%) rename {IntelFrameworkModulePkg =>
> MdeModulePkg}/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTia
> noCustomDecompressLibInternals.h (100%) rename
> {IntelFrameworkModulePkg =>
> MdeModulePkg}/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTia
> noDecompressLib.uni (100%)
>
> diff --git a/IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec
> b/IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec
> index 5557b5a1cd..0a451dd9ee 100644
> --- a/IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec
> +++ b/IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec
> @@ -40,14 +40,10 @@
>
>## GUID identifies Data Hub records logged by Status Code Runtime
> Protocol.
># Include/Guid/DataHubStatusCodeRecord.h
>gEfiDataHubStatusCodeRecordGuid = { 0xD083E94C, 0x6560, 0x42E4,
> { 0xB6, 0xD4, 0x2D, 0xF7, 0x5A, 0xDF, 0x6A, 0x2A }}
>
> - ## GUID indicates the tiano custom compress/decompress algorithm.
> - # Include/Guid/TianoDecompress.h
> - gTianoCustomDecompressGuid = { 0xA31280AD, 0x481E, 0x41B6,
> { 0x95, 0xE8, 0x12, 0x7F, 0x4C, 0x98, 0x47, 0x79 }}
> -
>## Include/Guid/AcpiVariable.h
>gEfiAcpiVariableCompatiblityGuid = { 0xc020489e, 0x6db2, 0x4ef2,
> { 0x9a, 0xa5, 0xca, 0x6, 0xfc, 0x11, 0xd3, 0x6a }}
>
>## Include/Guid/LegacyBios.h
>gEfiLegacyBiosGuid = { 0x2E3044AC, 0x879F, 0x490F, { 0x97,
> 0x60, 0xBB, 0xDF, 0xAF, 0x69, 0x5F, 0x50 }}
> diff --git a/IntelFrameworkModulePkg/IntelFrameworkModulePkg.dsc
> b/IntelFrameworkModulePkg/IntelFrameworkModulePkg.dsc
> index 949a181a7b..2afda5df79 100644
> --- a/IntelFrameworkModulePkg/IntelFrameworkModulePkg.dsc
> +++ b/IntelFrameworkModulePkg/IntelFrameworkModulePkg.dsc
> @@ -117,11 +117,10 @@
>gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x0f
>gEfiMdePkgTokenSpaceGuid.PcdReportStatusCodePropertyMask|0x06
>gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseAddress|0xE000
>
> [Components]
> -
> IntelFrameworkModulePkg/Library/BaseU
Re: [edk2-devel] [patch 2/7] BeagleBoardPkg: Update UefiDecompressLib instance
> -Original Message-
> From: devel@edk2.groups.io [mailto:devel@edk2.groups.io] On Behalf Of
> Ard Biesheuvel
> Sent: Thursday, April 04, 2019 11:27 PM
> To: Bi, Dandan
> Cc: devel@edk2.groups.io; Leif Lindholm
> Subject: Re: [edk2-devel] [patch 2/7] BeagleBoardPkg: Update
> UefiDecompressLib instance
>
> On Thu, 4 Apr 2019 at 20:52, Dandan Bi wrote:
> >
> > REF: https://bugzilla.tianocore.org/show_bug.cgi?id=1683
> >
> > BaseUefiDecompressLib in MdePkg is the base UEFI decompress Library.
> > BaseUefiTianoCustomDecompressLib in IntelFrameworkModulePkg
> implements
> > the base UEFI decompress functionality and Tiano decompress
> > functionality.
> >
> > 1. TIANOCOMPRESSED rule in BeagleBoardPkg.fdf is not used, so remove
> > it.
> > 2. Platform doesn't use the TianoCompress, so do not have to use
> > BaseUefiTianoCustomDecompressLib, can use the BaseUefiDecompressLib
> in
> > MdePkg directly.
> >
> > Cc: Leif Lindholm
> > Cc: Ard Biesheuvel
> > Contributed-under: TianoCore Contribution Agreement 1.1
> > Signed-off-by: Dandan Bi
> > ---
> > BeagleBoardPkg/BeagleBoardPkg.dsc | 4 ++--
> > BeagleBoardPkg/BeagleBoardPkg.fdf | 9 -
> > 2 files changed, 2 insertions(+), 11 deletions(-)
> >
> > diff --git a/BeagleBoardPkg/BeagleBoardPkg.dsc
> > b/BeagleBoardPkg/BeagleBoardPkg.dsc
> > index e0fee3692f..e5fbe7eeb2 100644
> > --- a/BeagleBoardPkg/BeagleBoardPkg.dsc
> > +++ b/BeagleBoardPkg/BeagleBoardPkg.dsc
> > @@ -185,17 +185,17 @@
> >
> PerformanceLib|MdeModulePkg/Library/DxePerformanceLib/DxePerforma
> nceLib.inf
> >
> >
> NonDiscoverableDeviceRegistrationLib|MdeModulePkg/Library/NonDiscove
> ra
> > bleDeviceRegistrationLib/NonDiscoverableDeviceRegistrationLib.inf
> >
> > [LibraryClasses.common.UEFI_APPLICATION]
> >
> >
> ReportStatusCodeLib|IntelFrameworkModulePkg/Library/DxeReportStatus
> Cod
> > eLibFramework/DxeReportStatusCodeLib.inf
> > -
> >
> UefiDecompressLib|IntelFrameworkModulePkg/Library/BaseUefiTianoCust
> omD
> > ecompressLib/BaseUefiTianoCustomDecompressLib.inf
> > +
> > +
> UefiDecompressLib|MdePkg/Library/BaseUefiDecompressLib/BaseUefiDeco
> m
> > + pressLib.inf
> >
> PerformanceLib|MdeModulePkg/Library/DxePerformanceLib/DxePerforma
> nceLib.inf
> >HiiLib|MdeModulePkg/Library/UefiHiiLib/UefiHiiLib.inf
> >
> > [LibraryClasses.common.UEFI_DRIVER]
> >
> >
> ReportStatusCodeLib|IntelFrameworkModulePkg/Library/DxeReportStatus
> Cod
> > eLibFramework/DxeReportStatusCodeLib.inf
> > -
> >
> UefiDecompressLib|IntelFrameworkModulePkg/Library/BaseUefiTianoCust
> omD
> > ecompressLib/BaseUefiTianoCustomDecompressLib.inf
> > +
> > +
> UefiDecompressLib|MdePkg/Library/BaseUefiDecompressLib/BaseUefiDeco
> m
> > + pressLib.inf
> >
> ExtractGuidedSectionLib|MdePkg/Library/DxeExtractGuidedSectionLib/Dxe
> ExtractGuidedSectionLib.inf
> >
> PerformanceLib|MdeModulePkg/Library/DxePerformanceLib/DxePerforma
> nceLib.inf
> >DxeServicesLib|MdePkg/Library/DxeServicesLib/DxeServicesLib.inf
> >
> > [LibraryClasses.common.DXE_RUNTIME_DRIVER]
>
> Can we add a single UefiDecompressLib resolution to the common section
> and drop all the others?
Yes, I will cover this in V2 and pick up your Reviewed-by.
Thanks,
Dandan
>
> > diff --git a/BeagleBoardPkg/BeagleBoardPkg.fdf
> > b/BeagleBoardPkg/BeagleBoardPkg.fdf
> > index 42d6bad0c7..9c9cecf894 100644
> > --- a/BeagleBoardPkg/BeagleBoardPkg.fdf
> > +++ b/BeagleBoardPkg/BeagleBoardPkg.fdf
> > @@ -262,19 +262,10 @@ READ_LOCK_STATUS = TRUE
> > PEI_DEPEX PEI_DEPEX Optional
> $(INF_OUTPUT)/$(MODULE_NAME).depex
> > PE32 PE32 $(INF_OUTPUT)/$(MODULE_NAME).efi
> > UI STRING="$(MODULE_NAME)" Optional
> >}
> >
> > -[Rule.Common.PEIM.TIANOCOMPRESSED]
> > - FILE PEIM = $(NAMED_GUID) DEBUG_MYTOOLS_IA32 {
> > -PEI_DEPEX PEI_DEPEX Optional
> $(INF_OUTPUT)/$(MODULE_NAME).depex
> > -GUIDED A31280AD-481E-41B6-95E8-127F4C984779
> PROCESSING_REQUIRED = TRUE {
> > - PE32 PE32$(INF_OUTPUT)/$(MODULE_NAME).efi
> > - UISTRING="$(MODULE_NAME)" Optional
> > -}
> > - }
> > -
> > [Rule.Common.DXE_CORE]
> >FILE DXE_CORE = $(NAMED_GUID) {
> > PE32 PE32 $(INF_OUTPUT)/$(MODULE_NAME).efi
> > UI STRING="$(MODULE_NAME)" Optional
> >}
> > --
> > 2.18.0.windows.1
> >
>
> With the above update:
>
> Reviewed-by: Ard Biesheuvel
>
>
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#38593): https://edk2.groups.io/g/devel/message/38593
Mute This Topic: https://groups.io/mt/30896391/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [edk2-devel] [patch 1/7] ArmVirtPkg: Update UefiDecompressLib instance
> -Original Message-
> From: Laszlo Ersek [mailto:ler...@redhat.com]
> Sent: Thursday, April 04, 2019 10:58 PM
> To: Bi, Dandan ; devel@edk2.groups.io
> Cc: Ard Biesheuvel ; Julien Grall
>
> Subject: Re: [patch 1/7] ArmVirtPkg: Update UefiDecompressLib instance
>
> On 04/04/19 15:52, Dandan Bi wrote:
> > REF: https://bugzilla.tianocore.org/show_bug.cgi?id=1683
> >
> > BaseUefiDecompressLib in MdePkg is the base UEFI decompress Library.
> > BaseUefiTianoCustomDecompressLib in IntelFrameworkModulePkg
> implements
> > the base UEFI decompress functionality and Tiano decompress
> > functionality.
> >
> > 1. TIANOCOMPRESSED rule in ArmVirtRules.fdf.inc is not used, so remove
> > it.
>
> That's correct, the only FDF files that refer to any TIANOCOMPRESSED rules,
> with RuleOverride, are:
>
> - Nt32Pkg.fdf (for EnglishDxe.inf)
> - Quark.fdf (for Shell.inf)
>
> And the GUID in the rule being removed, A31280AD-481E-41B6-95E8-
> 127F4C984779, is indeed gTianoCustomDecompressGuid.
>
> > 2. Platform doesn't use the TianoCompress, so do not have to use
> > BaseUefiTianoCustomDecompressLib, can use the BaseUefiDecompressLib
> in
> > MdePkg directly.
>
> It looks like we have the following guid-ed section extractors in edk2:
>
> BrotliCustomDecompress 3D532050-5CDA-4FD0-879E-
> 0F7F630D5AFB
> EfiCertTypeRsa2048Sha256A7717414-C616-4977-9420-
> 844712A735BF
> EfiCrc32GuidedSectionExtraction FC1BCDB0-7D31-49AA-936A-
> A4600D9DD083
> LzmaCustomDecompressEE4E5898-3914-4259-9D6E-
> DC7BD79403CF
> LzmaF86CustomDecompress D42AE6BD-1352-4BFB-909A-
> CA72A6EAE889
> TianoCustomDecompress A31280AD-481E-41B6-95E8-
> 127F4C984779
>
> (with the leading "g" and trailing "Guid" stripped).
>
> In order to see whether a platform uses an algorithm for section encoding,
> we should grep that platform's FDF files for the algorithm's GUID directly...
> And, indeed, under ArmVirtPkg, the only mention of A31280AD-481E-41B6-
> 95E8-127F4C984779 is in the (unused) rule that's being removed.
>
> The one algorithm that ArmVirtPkg does use, for section encoding, is
> LzmaCustomDecompress. For that, we have
> "MdeModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecomp
> ressLib.inf" resolutions in place already.
>
> So what needs UefiDecompressLib at all? ... Aha, both of these:
> - MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf
> - MdeModulePkg/Core/Dxe/DxeMain.inf
>
> That's a good argument for preserving the lib class resolution at all.
>
> I've compared "BaseUefiTianoCustomDecompressLib.c" to
> "BaseUefiDecompressLib.c". The main differences are:
>
> * the latter has no constructor that registers a guid-ed section extractor --
> and that's fine here, because in the code modified by this patch, the lib
> instance is not hooked into another module via NULL resolution,
>
> * the following hunk:
>
>//
>// The length of the field 'Position Set Code Length Array Size' in Block
> Header.
>// For UEFI 2.0 de/compression algorithm(Version 1), mPBit = 4
> - // For Tiano de/compression algorithm(Version 2), mPBit = 5
>//
> - switch (Version) {
> -case 1 :
> - Sd->mPBit = 4;
> - break;
> -case 2 :
> - Sd->mPBit = 5;
> - break;
> -default:
> - ASSERT (FALSE);
> - }
> + Sd->mPBit = 4;
>
> So, let's see the patch:
>
> >
> > Cc: Laszlo Ersek
> > Cc: Ard Biesheuvel
> > Cc: Julien Grall
> > Contributed-under: TianoCore Contribution Agreement 1.1
> > Signed-off-by: Dandan Bi
> > ---
> > ArmVirtPkg/ArmVirt.dsc.inc | 4 ++--
> > ArmVirtPkg/ArmVirtRules.fdf.inc | 9 -
> > 2 files changed, 2 insertions(+), 11 deletions(-)
> >
> > diff --git a/ArmVirtPkg/ArmVirt.dsc.inc b/ArmVirtPkg/ArmVirt.dsc.inc
> > index d172a082c9..556ec0dcb1 100644
> > --- a/ArmVirtPkg/ArmVirt.dsc.inc
> > +++ b/ArmVirtPkg/ArmVirt.dsc.inc
> > @@ -223,17 +223,17 @@
> >
> SecurityManagementLib|MdeModulePkg/Library/DxeSecurityManagement
> Lib/DxeSecurityManagementLib.inf
> >
> PerformanceLib|MdeModulePkg/Library/DxePerformanceLib/DxePerforma
> nceLib.inf
> >
> >
> MemoryAllocationLib|MdePkg/Library/UefiMemoryAllocationLib/UefiMem
> oryA
> > llocationLib.inf
> >
> > [LibraryClasses.common.UEFI_APPLICATION]
> > -
> >
> UefiDecompressLib|IntelFrameworkModulePkg/Library/BaseUefiTianoCust
> omD
> > ecompressLib/BaseUefiTianoCustom
Re: [edk2-devel] [patch 4/7] MdeModulePkg: Move BaseUefiTianoCustomDecompressLib to
> -Original Message-
> From: Laszlo Ersek [mailto:ler...@redhat.com]
> Sent: Thursday, April 04, 2019 10:21 PM
> To: devel@edk2.groups.io; Bi, Dandan
> Cc: Gao, Liming ; Wang, Jian J
> ; Wu, Hao A
> Subject: Re: [edk2-devel] [patch 4/7] MdeModulePkg: Move
> BaseUefiTianoCustomDecompressLib to
>
> On 04/04/19 15:52, Dandan Bi wrote:
> > REF: https://bugzilla.tianocore.org/show_bug.cgi?id=1683
> >
> > We will remove IntelFrameworkModulePkg, but
> > BaseUefiTianoCustomDecompressLib may still need to be used. So move
> > BaseUefiTianoCustomDecompressLib from IntelFrameworkModulePkg to
> > MdeModulePkg.
> >
> > Cc: Liming Gao
> > Cc: Jian J Wang
> > Cc: Hao Wu
> > Contributed-under: TianoCore Contribution Agreement 1.1
> > Signed-off-by: Dandan Bi
> > ---
> > IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec | 4
> > IntelFrameworkModulePkg/IntelFrameworkModulePkg.dsc | 1 -
> > .../Include/Guid/TianoDecompress.h| 0
> > .../BaseUefiTianoCustomDecompressLib.c| 0
> > .../BaseUefiTianoCustomDecompressLib.inf | 2 +-
> > .../BaseUefiTianoCustomDecompressLibInternals.h | 0
> > .../BaseUefiTianoDecompressLib.uni| 0
> > MdeModulePkg/MdeModulePkg.dec | 4
> > MdeModulePkg/MdeModulePkg.dsc | 1 +
> > 9 files changed, 6 insertions(+), 6 deletions(-) rename
> > {IntelFrameworkModulePkg =>
> > MdeModulePkg}/Include/Guid/TianoDecompress.h (100%) rename
> > {IntelFrameworkModulePkg =>
> >
> MdeModulePkg}/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTia
> noCu
> > stomDecompressLib.c (100%) rename {IntelFrameworkModulePkg =>
> >
> MdeModulePkg}/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTia
> noCu
> > stomDecompressLib.inf (94%) rename {IntelFrameworkModulePkg =>
> >
> MdeModulePkg}/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTia
> noCu
> > stomDecompressLibInternals.h (100%) rename
> {IntelFrameworkModulePkg
> > =>
> >
> MdeModulePkg}/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTia
> noDe
> > compressLib.uni (100%)
> >
> > diff --git a/IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec
> > b/IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec
> > index 5557b5a1cd..0a451dd9ee 100644
> > --- a/IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec
> > +++ b/IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec
> > @@ -40,14 +40,10 @@
> >
> >## GUID identifies Data Hub records logged by Status Code Runtime
> Protocol.
> ># Include/Guid/DataHubStatusCodeRecord.h
> >gEfiDataHubStatusCodeRecordGuid = { 0xD083E94C, 0x6560, 0x42E4, {
> > 0xB6, 0xD4, 0x2D, 0xF7, 0x5A, 0xDF, 0x6A, 0x2A }}
> >
> > - ## GUID indicates the tiano custom compress/decompress algorithm.
> > - # Include/Guid/TianoDecompress.h
> > - gTianoCustomDecompressGuid = { 0xA31280AD, 0x481E, 0x41B6,
> { 0x95, 0xE8, 0x12, 0x7F, 0x4C, 0x98, 0x47, 0x79 }}
> > -
> >## Include/Guid/AcpiVariable.h
> >gEfiAcpiVariableCompatiblityGuid = { 0xc020489e, 0x6db2, 0x4ef2,
> { 0x9a, 0xa5, 0xca, 0x6, 0xfc, 0x11, 0xd3, 0x6a }}
> >
> >## Include/Guid/LegacyBios.h
> >gEfiLegacyBiosGuid = { 0x2E3044AC, 0x879F, 0x490F, {
> > 0x97,
> 0x60, 0xBB, 0xDF, 0xAF, 0x69, 0x5F, 0x50 }}
> > diff --git a/IntelFrameworkModulePkg/IntelFrameworkModulePkg.dsc
> > b/IntelFrameworkModulePkg/IntelFrameworkModulePkg.dsc
> > index 949a181a7b..2afda5df79 100644
> > --- a/IntelFrameworkModulePkg/IntelFrameworkModulePkg.dsc
> > +++ b/IntelFrameworkModulePkg/IntelFrameworkModulePkg.dsc
> > @@ -117,11 +117,10 @@
> >gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x0f
> >gEfiMdePkgTokenSpaceGuid.PcdReportStatusCodePropertyMask|0x06
> >gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseAddress|0xE000
> >
> > [Components]
> > -
> IntelFrameworkModulePkg/Library/BaseUefiTianoCustomDecompressLib/B
> aseUefiTianoCustomDecompressLib.inf
> >
> IntelFrameworkModulePkg/Library/LzmaCustomDecompressLib/LzmaCusto
> mDecompressLib.inf
> >IntelFrameworkModulePkg/Library/PeiS3Lib/PeiS3Lib.inf
> >IntelFrameworkModulePkg/Library/PeiRecoveryLib/PeiRecoveryLib.inf
> >
> IntelFrameworkModulePkg/Library/DxeReportStatusCodeLibFramework/Dx
> eReportStatusCodeLib.inf
> >
> >
> IntelFrameworkModulePkg/Library/SmmRuntimeDxeReportStatusCodeLibF
> ramew
> > ork/SmmRu
[edk2-devel] [patch V2 0/7] Move BaseUefiTianoCustomDecompressLib from IntelFrameworkModulePkg to MdeModulePkg
V2:
Patch 1 and patch 2: Use a common UefiDecompressLib resolution in
[LibraryClasses.common] section and drop all the others.
Other patches are the same with V1.
We will remove IntelFrameworkModulePkg,but BaseUefiTianoCustomDecompressLib in
it
may still need to be used. So move BaseUefiTianoCustomDecompressLib from
IntelFrameworkModulePkg to MdeModulePkg firstly.
Patch 1-3 are to clean up platform unnecessary dependency on
BaseUefiTianoCustomDecompressLib
in IntelFrameworkModulePkg before the move.
Patch 4 is to move the BaseUefiTianoCustomDecompressLib from
IntelFrameworkModulePkg to MdeModulePkg.
Patch 5-7 are to update the consumer to use the
BaseUefiTianoCustomDecompressLib in MdeModulePkg after the move.
Cc: Laszlo Ersek
Cc: Julien Grall
Cc: Leif Lindholm
Cc: Ard Biesheuvel
Cc: Jordan Justen
Cc: Andrew Fish
Cc: Liming Gao
Cc: Ray Ni
Cc: Jian J Wang
Cc: Hao Wu
Cc: Michael D Kinney
Cc: Kelly Steele
Cc: Zailiang Sun
Cc: Yi Qian
Dandan Bi (7):
ArmVirtPkg: Update UefiDecompressLib instance
BeagleBoardPkg: Update UefiDecompressLib instance
EmulatorPkg: Update UefiDecompressLib instance
MdeModulePkg: Move BaseUefiTianoCustomDecompressLib to
Nt32Pkg: Update to use UefiDecompressLib in MdeModulePkg
Quark: Update to use UefiDecompressLib in MdeModulePkg
Vlv2TbltDevicePkg: Update to use UefiDecompressLib in MdeModulePkg
ArmVirtPkg/ArmVirt.dsc.inc | 5 -
ArmVirtPkg/ArmVirtRules.fdf.inc | 9 -
BeagleBoardPkg/BeagleBoardPkg.dsc| 6 ++
BeagleBoardPkg/BeagleBoardPkg.fdf| 9 -
EmulatorPkg/EmulatorPkg.dsc | 2 +-
IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec | 4
IntelFrameworkModulePkg/IntelFrameworkModulePkg.dsc | 1 -
.../Include/Guid/TianoDecompress.h | 0
.../BaseUefiTianoCustomDecompressLib.c | 0
.../BaseUefiTianoCustomDecompressLib.inf | 2 +-
.../BaseUefiTianoCustomDecompressLibInternals.h | 0
.../BaseUefiTianoDecompressLib.uni | 0
MdeModulePkg/MdeModulePkg.dec| 4
MdeModulePkg/MdeModulePkg.dsc| 1 +
Nt32Pkg/Nt32Pkg.dsc | 2 +-
QuarkPlatformPkg/Quark.dsc | 2 +-
QuarkPlatformPkg/QuarkMin.dsc| 2 +-
Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc | 2 +-
Vlv2TbltDevicePkg/PlatformPkgIA32.dsc| 2 +-
Vlv2TbltDevicePkg/PlatformPkgX64.dsc | 2 +-
20 files changed, 15 insertions(+), 40 deletions(-)
rename {IntelFrameworkModulePkg =>
MdeModulePkg}/Include/Guid/TianoDecompress.h (100%)
rename {IntelFrameworkModulePkg =>
MdeModulePkg}/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTianoCustomDecompressLib.c
(100%)
rename {IntelFrameworkModulePkg =>
MdeModulePkg}/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTianoCustomDecompressLib.inf
(94%)
rename {IntelFrameworkModulePkg =>
MdeModulePkg}/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTianoCustomDecompressLibInternals.h
(100%)
rename {IntelFrameworkModulePkg =>
MdeModulePkg}/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTianoDecompressLib.uni
(100%)
--
2.18.0.windows.1
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#38619): https://edk2.groups.io/g/devel/message/38619
Mute This Topic: https://groups.io/mt/30959946/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[edk2-devel] [patch V2 1/7] ArmVirtPkg: Update UefiDecompressLib instance
REF: https://bugzilla.tianocore.org/show_bug.cgi?id=1683 V2: Use the common UefiDecompressLib resolution in [LibraryClasses.common] section and drop all the others. BaseUefiDecompressLib in MdePkg is the base UEFI decompress Library. BaseUefiTianoCustomDecompressLib in IntelFrameworkModulePkg implements the base UEFI decompress functionality and Tiano decompress functionality. 1. TIANOCOMPRESSED rule in ArmVirtRules.fdf.inc is not used, so remove it. 2. Platform doesn't use the TianoCompress, so do not have to use BaseUefiTianoCustomDecompressLib, can use the BaseUefiDecompressLib in MdePkg directly. 3. UefiDecompressLib common resolution now can apply to all module types. So keep the UefiDecompressLib resolution in [LibraryClasses.common] section and remove all others. Cc: Laszlo Ersek Cc: Ard Biesheuvel Cc: Julien Grall Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Dandan Bi --- ArmVirtPkg/ArmVirt.dsc.inc | 5 - ArmVirtPkg/ArmVirtRules.fdf.inc | 9 - 2 files changed, 14 deletions(-) diff --git a/ArmVirtPkg/ArmVirt.dsc.inc b/ArmVirtPkg/ArmVirt.dsc.inc index d172a082c9..e595e249b7 100644 --- a/ArmVirtPkg/ArmVirt.dsc.inc +++ b/ArmVirtPkg/ArmVirt.dsc.inc @@ -187,11 +187,10 @@ MemoryAllocationLib|MdePkg/Library/PeiMemoryAllocationLib/PeiMemoryAllocationLib.inf PeiCoreEntryPoint|MdePkg/Library/PeiCoreEntryPoint/PeiCoreEntryPoint.inf PerformanceLib|MdeModulePkg/Library/PeiPerformanceLib/PeiPerformanceLib.inf OemHookStatusCodeLib|MdeModulePkg/Library/OemHookStatusCodeLibNull/OemHookStatusCodeLibNull.inf PeCoffGetEntryPointLib|MdePkg/Library/BasePeCoffGetEntryPointLib/BasePeCoffGetEntryPointLib.inf - UefiDecompressLib|MdePkg/Library/BaseUefiDecompressLib/BaseUefiDecompressLib.inf ExtractGuidedSectionLib|MdePkg/Library/PeiExtractGuidedSectionLib/PeiExtractGuidedSectionLib.inf PeiServicesTablePointerLib|ArmPkg/Library/PeiServicesTablePointerLib/PeiServicesTablePointerLib.inf SerialPortLib|ArmVirtPkg/Library/FdtPL011SerialPortLib/EarlyFdtPL011SerialPortLib.inf @@ -203,37 +202,33 @@ MemoryAllocationLib|MdePkg/Library/PeiMemoryAllocationLib/PeiMemoryAllocationLib.inf PeimEntryPoint|MdePkg/Library/PeimEntryPoint/PeimEntryPoint.inf PerformanceLib|MdeModulePkg/Library/PeiPerformanceLib/PeiPerformanceLib.inf OemHookStatusCodeLib|MdeModulePkg/Library/OemHookStatusCodeLibNull/OemHookStatusCodeLibNull.inf PeCoffGetEntryPointLib|MdePkg/Library/BasePeCoffGetEntryPointLib/BasePeCoffGetEntryPointLib.inf - UefiDecompressLib|MdePkg/Library/BaseUefiDecompressLib/BaseUefiDecompressLib.inf ExtractGuidedSectionLib|MdePkg/Library/PeiExtractGuidedSectionLib/PeiExtractGuidedSectionLib.inf PeiServicesTablePointerLib|ArmPkg/Library/PeiServicesTablePointerLib/PeiServicesTablePointerLib.inf SerialPortLib|ArmVirtPkg/Library/FdtPL011SerialPortLib/EarlyFdtPL011SerialPortLib.inf [LibraryClasses.common.DXE_CORE] HobLib|MdePkg/Library/DxeCoreHobLib/DxeCoreHobLib.inf MemoryAllocationLib|MdeModulePkg/Library/DxeCoreMemoryAllocationLib/DxeCoreMemoryAllocationLib.inf DxeCoreEntryPoint|MdePkg/Library/DxeCoreEntryPoint/DxeCoreEntryPoint.inf ExtractGuidedSectionLib|MdePkg/Library/DxeExtractGuidedSectionLib/DxeExtractGuidedSectionLib.inf - UefiDecompressLib|MdePkg/Library/BaseUefiDecompressLib/BaseUefiDecompressLib.inf PerformanceLib|MdeModulePkg/Library/DxeCorePerformanceLib/DxeCorePerformanceLib.inf [LibraryClasses.common.DXE_DRIVER] SecurityManagementLib|MdeModulePkg/Library/DxeSecurityManagementLib/DxeSecurityManagementLib.inf PerformanceLib|MdeModulePkg/Library/DxePerformanceLib/DxePerformanceLib.inf MemoryAllocationLib|MdePkg/Library/UefiMemoryAllocationLib/UefiMemoryAllocationLib.inf [LibraryClasses.common.UEFI_APPLICATION] - UefiDecompressLib|IntelFrameworkModulePkg/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTianoCustomDecompressLib.inf PerformanceLib|MdeModulePkg/Library/DxePerformanceLib/DxePerformanceLib.inf MemoryAllocationLib|MdePkg/Library/UefiMemoryAllocationLib/UefiMemoryAllocationLib.inf HiiLib|MdeModulePkg/Library/UefiHiiLib/UefiHiiLib.inf [LibraryClasses.common.UEFI_DRIVER] - UefiDecompressLib|IntelFrameworkModulePkg/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTianoCustomDecompressLib.inf ExtractGuidedSectionLib|MdePkg/Library/DxeExtractGuidedSectionLib/DxeExtractGuidedSectionLib.inf PerformanceLib|MdeModulePkg/Library/DxePerformanceLib/DxePerformanceLib.inf MemoryAllocationLib|MdePkg/Library/UefiMemoryAllocationLib/UefiMemoryAllocationLib.inf [LibraryClasses.common.DXE_RUNTIME_DRIVER] diff --git a/ArmVirtPkg/ArmVirtRules.fdf.inc b/ArmVirtPkg/ArmVirtRules.fdf.inc index 5ff3004786..bed06364e1 100644 --- a/ArmVirtPkg/ArmVirtRules.fdf.inc +++ b/ArmVirtPkg/ArmVirtRules.fdf.inc @@ -56,19 +56,10 @@ PEI_DEPEX PEI_DEPEX Optional $(INF_OUTPUT)/$(MODULE_NAME).depex TE TE Align = Auto $(INF_OUTPUT)/$(MODULE
[edk2-devel] [patch V2 6/7] Quark: Update to use UefiDecompressLib in MdeModulePkg
REF: https://bugzilla.tianocore.org/show_bug.cgi?id=1683 We have moved the BaseUefiTianoCustomDecompressLib from IntelFrameworkModulePkg to MdeModulePkg, so update the consumer accordingly. Cc: Michael D Kinney Cc: Kelly Steele Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Dandan Bi --- QuarkPlatformPkg/Quark.dsc| 2 +- QuarkPlatformPkg/QuarkMin.dsc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/QuarkPlatformPkg/Quark.dsc b/QuarkPlatformPkg/Quark.dsc index 0e69b3c51f..226825bc05 100644 --- a/QuarkPlatformPkg/Quark.dsc +++ b/QuarkPlatformPkg/Quark.dsc @@ -117,11 +117,11 @@ UefiRuntimeLib|MdePkg/Library/UefiRuntimeLib/UefiRuntimeLib.inf UefiLib|MdePkg/Library/UefiLib/UefiLib.inf HiiLib|MdeModulePkg/Library/UefiHiiLib/UefiHiiLib.inf UefiHiiServicesLib|MdeModulePkg/Library/UefiHiiServicesLib/UefiHiiServicesLib.inf DevicePathLib|MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.inf - UefiDecompressLib|IntelFrameworkModulePkg/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTianoCustomDecompressLib.inf + UefiDecompressLib|MdeModulePkg/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTianoCustomDecompressLib.inf PeiServicesTablePointerLib|MdePkg/Library/PeiServicesTablePointerLibIdt/PeiServicesTablePointerLibIdt.inf PeiServicesLib|MdePkg/Library/PeiServicesLib/PeiServicesLib.inf DxeServicesLib|MdePkg/Library/DxeServicesLib/DxeServicesLib.inf DxeServicesTableLib|MdePkg/Library/DxeServicesTableLib/DxeServicesTableLib.inf UefiCpuLib|UefiCpuPkg/Library/BaseUefiCpuLib/BaseUefiCpuLib.inf diff --git a/QuarkPlatformPkg/QuarkMin.dsc b/QuarkPlatformPkg/QuarkMin.dsc index 04ecd096ce..afd09e3fde 100644 --- a/QuarkPlatformPkg/QuarkMin.dsc +++ b/QuarkPlatformPkg/QuarkMin.dsc @@ -105,11 +105,11 @@ UefiRuntimeLib|MdePkg/Library/UefiRuntimeLib/UefiRuntimeLib.inf UefiLib|MdePkg/Library/UefiLib/UefiLib.inf HiiLib|MdeModulePkg/Library/UefiHiiLib/UefiHiiLib.inf UefiHiiServicesLib|MdeModulePkg/Library/UefiHiiServicesLib/UefiHiiServicesLib.inf DevicePathLib|MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.inf - UefiDecompressLib|IntelFrameworkModulePkg/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTianoCustomDecompressLib.inf + UefiDecompressLib|MdeModulePkg/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTianoCustomDecompressLib.inf PeiServicesTablePointerLib|MdePkg/Library/PeiServicesTablePointerLibIdt/PeiServicesTablePointerLibIdt.inf PeiServicesLib|MdePkg/Library/PeiServicesLib/PeiServicesLib.inf DxeServicesLib|MdePkg/Library/DxeServicesLib/DxeServicesLib.inf DxeServicesTableLib|MdePkg/Library/DxeServicesTableLib/DxeServicesTableLib.inf UefiCpuLib|UefiCpuPkg/Library/BaseUefiCpuLib/BaseUefiCpuLib.inf -- 2.18.0.windows.1 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#38625): https://edk2.groups.io/g/devel/message/38625 Mute This Topic: https://groups.io/mt/30959953/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[edk2-devel] [patch V2 4/7] MdeModulePkg: Move BaseUefiTianoCustomDecompressLib to
REF: https://bugzilla.tianocore.org/show_bug.cgi?id=1683
We will remove IntelFrameworkModulePkg,
but BaseUefiTianoCustomDecompressLib may still need
to be used. So move BaseUefiTianoCustomDecompressLib
from IntelFrameworkModulePkg to MdeModulePkg.
Cc: Liming Gao
Cc: Jian J Wang
Cc: Hao Wu
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Dandan Bi
---
IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec | 4
IntelFrameworkModulePkg/IntelFrameworkModulePkg.dsc | 1 -
.../Include/Guid/TianoDecompress.h| 0
.../BaseUefiTianoCustomDecompressLib.c| 0
.../BaseUefiTianoCustomDecompressLib.inf | 2 +-
.../BaseUefiTianoCustomDecompressLibInternals.h | 0
.../BaseUefiTianoDecompressLib.uni| 0
MdeModulePkg/MdeModulePkg.dec | 4
MdeModulePkg/MdeModulePkg.dsc | 1 +
9 files changed, 6 insertions(+), 6 deletions(-)
rename {IntelFrameworkModulePkg =>
MdeModulePkg}/Include/Guid/TianoDecompress.h (100%)
rename {IntelFrameworkModulePkg =>
MdeModulePkg}/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTianoCustomDecompressLib.c
(100%)
rename {IntelFrameworkModulePkg =>
MdeModulePkg}/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTianoCustomDecompressLib.inf
(94%)
rename {IntelFrameworkModulePkg =>
MdeModulePkg}/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTianoCustomDecompressLibInternals.h
(100%)
rename {IntelFrameworkModulePkg =>
MdeModulePkg}/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTianoDecompressLib.uni
(100%)
diff --git a/IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec
b/IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec
index 5557b5a1cd..0a451dd9ee 100644
--- a/IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec
+++ b/IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec
@@ -40,14 +40,10 @@
## GUID identifies Data Hub records logged by Status Code Runtime Protocol.
# Include/Guid/DataHubStatusCodeRecord.h
gEfiDataHubStatusCodeRecordGuid = { 0xD083E94C, 0x6560, 0x42E4, { 0xB6,
0xD4, 0x2D, 0xF7, 0x5A, 0xDF, 0x6A, 0x2A }}
- ## GUID indicates the tiano custom compress/decompress algorithm.
- # Include/Guid/TianoDecompress.h
- gTianoCustomDecompressGuid = { 0xA31280AD, 0x481E, 0x41B6, { 0x95, 0xE8,
0x12, 0x7F, 0x4C, 0x98, 0x47, 0x79 }}
-
## Include/Guid/AcpiVariable.h
gEfiAcpiVariableCompatiblityGuid = { 0xc020489e, 0x6db2, 0x4ef2, { 0x9a,
0xa5, 0xca, 0x6, 0xfc, 0x11, 0xd3, 0x6a }}
## Include/Guid/LegacyBios.h
gEfiLegacyBiosGuid = { 0x2E3044AC, 0x879F, 0x490F, { 0x97,
0x60, 0xBB, 0xDF, 0xAF, 0x69, 0x5F, 0x50 }}
diff --git a/IntelFrameworkModulePkg/IntelFrameworkModulePkg.dsc
b/IntelFrameworkModulePkg/IntelFrameworkModulePkg.dsc
index 949a181a7b..2afda5df79 100644
--- a/IntelFrameworkModulePkg/IntelFrameworkModulePkg.dsc
+++ b/IntelFrameworkModulePkg/IntelFrameworkModulePkg.dsc
@@ -117,11 +117,10 @@
gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x0f
gEfiMdePkgTokenSpaceGuid.PcdReportStatusCodePropertyMask|0x06
gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseAddress|0xE000
[Components]
-
IntelFrameworkModulePkg/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTianoCustomDecompressLib.inf
IntelFrameworkModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf
IntelFrameworkModulePkg/Library/PeiS3Lib/PeiS3Lib.inf
IntelFrameworkModulePkg/Library/PeiRecoveryLib/PeiRecoveryLib.inf
IntelFrameworkModulePkg/Library/DxeReportStatusCodeLibFramework/DxeReportStatusCodeLib.inf
IntelFrameworkModulePkg/Library/SmmRuntimeDxeReportStatusCodeLibFramework/SmmRuntimeDxeReportStatusCodeLibFramework.inf
diff --git a/IntelFrameworkModulePkg/Include/Guid/TianoDecompress.h
b/MdeModulePkg/Include/Guid/TianoDecompress.h
similarity index 100%
rename from IntelFrameworkModulePkg/Include/Guid/TianoDecompress.h
rename to MdeModulePkg/Include/Guid/TianoDecompress.h
diff --git
a/IntelFrameworkModulePkg/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTianoCustomDecompressLib.c
b/MdeModulePkg/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTianoCustomDecompressLib.c
similarity index 100%
rename from
IntelFrameworkModulePkg/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTianoCustomDecompressLib.c
rename to
MdeModulePkg/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTianoCustomDecompressLib.c
diff --git
a/IntelFrameworkModulePkg/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTianoCustomDecompressLib.inf
b/MdeModulePkg/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTianoCustomDecompressLib.inf
similarity index 94%
rename from
IntelFrameworkModulePkg/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTianoCustomDecompressLib.inf
rename to
MdeModulePkg/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTianoCustomDecompressLib.inf
index ee64fa0d0e..41cc48cd2
[edk2-devel] [patch V2 2/7] BeagleBoardPkg: Update UefiDecompressLib instance
REF: https://bugzilla.tianocore.org/show_bug.cgi?id=1683
V2: Add a single UefiDecompressLib resolution to the
common section and drop all the others.
BaseUefiDecompressLib in MdePkg is the
base UEFI decompress Library.
BaseUefiTianoCustomDecompressLib in IntelFrameworkModulePkg
implements the base UEFI decompress functionality and
Tiano decompress functionality.
1. TIANOCOMPRESSED rule in BeagleBoardPkg.fdf
is not used, so remove it.
2. Platform doesn't use the TianoCompress, so do
not have to use BaseUefiTianoCustomDecompressLib,
can use the BaseUefiDecompressLib in MdePkg directly.
3. A single UefiDecompressLib common resolution can
apply to all module types now. So add the single
UefiDecompressLib in MdePkg in [LibraryClasses.common]
section and remove all others.
Cc: Leif Lindholm
Cc: Ard Biesheuvel
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Dandan Bi
Reviewed-by: Ard Biesheuvel
---
BeagleBoardPkg/BeagleBoardPkg.dsc | 6 ++
BeagleBoardPkg/BeagleBoardPkg.fdf | 9 -
2 files changed, 2 insertions(+), 13 deletions(-)
diff --git a/BeagleBoardPkg/BeagleBoardPkg.dsc
b/BeagleBoardPkg/BeagleBoardPkg.dsc
index e0fee3692f..6ae734ebfb 100644
--- a/BeagleBoardPkg/BeagleBoardPkg.dsc
+++ b/BeagleBoardPkg/BeagleBoardPkg.dsc
@@ -140,14 +140,15 @@
SynchronizationLib|MdePkg/Library/BaseSynchronizationLib/BaseSynchronizationLib.inf
AuthVariableLib|MdeModulePkg/Library/AuthVariableLibNull/AuthVariableLibNull.inf
TpmMeasurementLib|MdeModulePkg/Library/TpmMeasurementLibNull/TpmMeasurementLibNull.inf
VarCheckLib|MdeModulePkg/Library/VarCheckLib/VarCheckLib.inf
+
UefiDecompressLib|MdePkg/Library/BaseUefiDecompressLib/BaseUefiDecompressLib.inf
+
[LibraryClasses.common.SEC]
PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf
ReportStatusCodeLib|MdeModulePkg/Library/PeiDxeDebugLibReportStatusCode/PeiDxeDebugLibReportStatusCode.inf
-
UefiDecompressLib|MdePkg/Library/BaseUefiDecompressLib/BaseUefiDecompressLib.inf
ExtractGuidedSectionLib|EmbeddedPkg/Library/PrePiExtractGuidedSectionLib/PrePiExtractGuidedSectionLib.inf
PeCoffLib|MdePkg/Library/BasePeCoffLib/BasePeCoffLib.inf
HobLib|EmbeddedPkg/Library/PrePiHobLib/PrePiHobLib.inf
@@ -168,11 +169,10 @@
HobLib|MdePkg/Library/DxeCoreHobLib/DxeCoreHobLib.inf
MemoryAllocationLib|MdeModulePkg/Library/DxeCoreMemoryAllocationLib/DxeCoreMemoryAllocationLib.inf
DxeCoreEntryPoint|MdePkg/Library/DxeCoreEntryPoint/DxeCoreEntryPoint.inf
ReportStatusCodeLib|IntelFrameworkModulePkg/Library/DxeReportStatusCodeLibFramework/DxeReportStatusCodeLib.inf
ExtractGuidedSectionLib|MdePkg/Library/DxeExtractGuidedSectionLib/DxeExtractGuidedSectionLib.inf
-
UefiDecompressLib|MdePkg/Library/BaseUefiDecompressLib/BaseUefiDecompressLib.inf
DxeServicesLib|MdePkg/Library/DxeServicesLib/DxeServicesLib.inf
# PeCoffLib|MdePkg/Library/BasePeCoffLib/BasePeCoffLib.inf
PeCoffLib|BeagleBoardPkg/Library/DxeHobPeCoffLib/DxeHobPeCoffLib.inf
PerformanceLib|MdeModulePkg/Library/DxeCorePerformanceLib/DxeCorePerformanceLib.inf
@@ -185,17 +185,15 @@
PerformanceLib|MdeModulePkg/Library/DxePerformanceLib/DxePerformanceLib.inf
NonDiscoverableDeviceRegistrationLib|MdeModulePkg/Library/NonDiscoverableDeviceRegistrationLib/NonDiscoverableDeviceRegistrationLib.inf
[LibraryClasses.common.UEFI_APPLICATION]
ReportStatusCodeLib|IntelFrameworkModulePkg/Library/DxeReportStatusCodeLibFramework/DxeReportStatusCodeLib.inf
-
UefiDecompressLib|IntelFrameworkModulePkg/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTianoCustomDecompressLib.inf
PerformanceLib|MdeModulePkg/Library/DxePerformanceLib/DxePerformanceLib.inf
HiiLib|MdeModulePkg/Library/UefiHiiLib/UefiHiiLib.inf
[LibraryClasses.common.UEFI_DRIVER]
ReportStatusCodeLib|IntelFrameworkModulePkg/Library/DxeReportStatusCodeLibFramework/DxeReportStatusCodeLib.inf
-
UefiDecompressLib|IntelFrameworkModulePkg/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTianoCustomDecompressLib.inf
ExtractGuidedSectionLib|MdePkg/Library/DxeExtractGuidedSectionLib/DxeExtractGuidedSectionLib.inf
PerformanceLib|MdeModulePkg/Library/DxePerformanceLib/DxePerformanceLib.inf
DxeServicesLib|MdePkg/Library/DxeServicesLib/DxeServicesLib.inf
[LibraryClasses.common.DXE_RUNTIME_DRIVER]
diff --git a/BeagleBoardPkg/BeagleBoardPkg.fdf
b/BeagleBoardPkg/BeagleBoardPkg.fdf
index 42d6bad0c7..9c9cecf894 100644
--- a/BeagleBoardPkg/BeagleBoardPkg.fdf
+++ b/BeagleBoardPkg/BeagleBoardPkg.fdf
@@ -262,19 +262,10 @@ READ_LOCK_STATUS = TRUE
PEI_DEPEX PEI_DEPEX Optional $(INF_OUTPUT)/$(MODULE_NAME).depex
PE32 PE32 $(INF_OUTPUT)/$(MODULE_NAME).efi
UI STRING="$(MODULE_NAME)" Optional
}
-[Rule.Common.PEIM.TIANOCOMPRESSED]
- FILE PEIM = $(NAMED_GUID) DEBUG_MYTOOLS_IA32 {
-PEI_DEPEX PEI_DEPEX Optional$(INF_OUTPUT)/$(MODULE_NAME).depex
-GUIDED A31280AD-481E-41B6-95
[edk2-devel] [patch V2 5/7] Nt32Pkg: Update to use UefiDecompressLib in MdeModulePkg
REF: https://bugzilla.tianocore.org/show_bug.cgi?id=1683 We have moved the BaseUefiTianoCustomDecompressLib from IntelFrameworkModulePkg to MdeModulePkg, so update the consumer accordingly. Cc: Ray Ni Cc: Hao Wu Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Dandan Bi --- Nt32Pkg/Nt32Pkg.dsc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Nt32Pkg/Nt32Pkg.dsc b/Nt32Pkg/Nt32Pkg.dsc index d7b78007d2..2a7218766d 100644 --- a/Nt32Pkg/Nt32Pkg.dsc +++ b/Nt32Pkg/Nt32Pkg.dsc @@ -124,11 +124,11 @@ UefiRuntimeLib|MdePkg/Library/UefiRuntimeLib/UefiRuntimeLib.inf UefiLib|MdePkg/Library/UefiLib/UefiLib.inf UefiHiiServicesLib|MdeModulePkg/Library/UefiHiiServicesLib/UefiHiiServicesLib.inf HiiLib|MdeModulePkg/Library/UefiHiiLib/UefiHiiLib.inf DevicePathLib|MdePkg/Library/UefiDevicePathLibDevicePathProtocol/UefiDevicePathLibDevicePathProtocol.inf - UefiDecompressLib|IntelFrameworkModulePkg/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTianoCustomDecompressLib.inf + UefiDecompressLib|MdeModulePkg/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTianoCustomDecompressLib.inf PeiServicesTablePointerLib|MdePkg/Library/PeiServicesTablePointerLib/PeiServicesTablePointerLib.inf PeiServicesLib|MdePkg/Library/PeiServicesLib/PeiServicesLib.inf DxeServicesLib|MdePkg/Library/DxeServicesLib/DxeServicesLib.inf DxeServicesTableLib|MdePkg/Library/DxeServicesTableLib/DxeServicesTableLib.inf UefiBootManagerLib|MdeModulePkg/Library/UefiBootManagerLib/UefiBootManagerLib.inf -- 2.18.0.windows.1 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#38624): https://edk2.groups.io/g/devel/message/38624 Mute This Topic: https://groups.io/mt/30959952/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[edk2-devel] [patch V2 3/7] EmulatorPkg: Update UefiDecompressLib instance
REF: https://bugzilla.tianocore.org/show_bug.cgi?id=1683 BaseUefiDecompressLib in MdePkg is the base UEFI decompress Library. BaseUefiTianoCustomDecompressLib in IntelFrameworkModulePkg implements the base UEFI decompress functionality and Tiano decompress functionality. BaseUefiDecompressLib in MdePkg is the base UEFI decompress Library. BaseUefiTianoCustomDecompressLib in IntelFrameworkModulePkg implements the base UEFI decompress functionality and Tiano decompress functionality. Platform doesn't use the TianoCompress, so do not have to use BaseUefiTianoCustomDecompressLib, can use the BaseUefiDecompressLib in MdePkg directly. Cc: Jordan Justen Cc: Andrew Fish Cc: Ray Ni Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Dandan Bi --- EmulatorPkg/EmulatorPkg.dsc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/EmulatorPkg/EmulatorPkg.dsc b/EmulatorPkg/EmulatorPkg.dsc index 4097e1192e..84223b83ba 100644 --- a/EmulatorPkg/EmulatorPkg.dsc +++ b/EmulatorPkg/EmulatorPkg.dsc @@ -61,11 +61,11 @@ UefiRuntimeLib|MdePkg/Library/UefiRuntimeLib/UefiRuntimeLib.inf UefiLib|MdePkg/Library/UefiLib/UefiLib.inf UefiHiiServicesLib|MdeModulePkg/Library/UefiHiiServicesLib/UefiHiiServicesLib.inf HiiLib|MdeModulePkg/Library/UefiHiiLib/UefiHiiLib.inf DevicePathLib|MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.inf - UefiDecompressLib|IntelFrameworkModulePkg/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTianoCustomDecompressLib.inf + UefiDecompressLib|MdePkg/Library/BaseUefiDecompressLib/BaseUefiDecompressLib.inf PeiServicesLib|MdePkg/Library/PeiServicesLib/PeiServicesLib.inf DxeServicesLib|MdePkg/Library/DxeServicesLib/DxeServicesLib.inf DxeServicesTableLib|MdePkg/Library/DxeServicesTableLib/DxeServicesTableLib.inf SmbiosLib|EmulatorPkg/Library/SmbiosLib/SmbiosLib.inf -- 2.18.0.windows.1 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#38622): https://edk2.groups.io/g/devel/message/38622 Mute This Topic: https://groups.io/mt/30959950/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[edk2-devel] [patch V2 7/7] Vlv2TbltDevicePkg: Update to use UefiDecompressLib in MdeModulePkg
REF: https://bugzilla.tianocore.org/show_bug.cgi?id=1683 We have moved the BaseUefiTianoCustomDecompressLib from IntelFrameworkModulePkg to MdeModulePkg, so update the consumer accordingly. Cc: Zailiang Sun Cc: Yi Qian Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Dandan Bi --- Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc | 2 +- Vlv2TbltDevicePkg/PlatformPkgIA32.dsc | 2 +- Vlv2TbltDevicePkg/PlatformPkgX64.dsc| 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc b/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc index ac401c4826..3b4c7ec579 100644 --- a/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc +++ b/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc @@ -136,11 +136,11 @@ UefiRuntimeLib|MdePkg/Library/UefiRuntimeLib/UefiRuntimeLib.inf UefiLib|MdePkg/Library/UefiLib/UefiLib.inf HiiLib|MdeModulePkg/Library/UefiHiiLib/UefiHiiLib.inf UefiHiiServicesLib|MdeModulePkg/Library/UefiHiiServicesLib/UefiHiiServicesLib.inf DevicePathLib|MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.inf - UefiDecompressLib|IntelFrameworkModulePkg/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTianoCustomDecompressLib.inf + UefiDecompressLib|MdeModulePkg/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTianoCustomDecompressLib.inf PeiServicesTablePointerLib|MdePkg/Library/PeiServicesTablePointerLibIdt/PeiServicesTablePointerLibIdt.inf PeiServicesLib|MdePkg/Library/PeiServicesLib/PeiServicesLib.inf DxeServicesLib|MdePkg/Library/DxeServicesLib/DxeServicesLib.inf DxeServicesTableLib|MdePkg/Library/DxeServicesTableLib/DxeServicesTableLib.inf UefiCpuLib|UefiCpuPkg/Library/BaseUefiCpuLib/BaseUefiCpuLib.inf diff --git a/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc b/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc index 0b5b976d61..ba5ad53293 100644 --- a/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc +++ b/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc @@ -136,11 +136,11 @@ UefiRuntimeLib|MdePkg/Library/UefiRuntimeLib/UefiRuntimeLib.inf UefiLib|MdePkg/Library/UefiLib/UefiLib.inf HiiLib|MdeModulePkg/Library/UefiHiiLib/UefiHiiLib.inf UefiHiiServicesLib|MdeModulePkg/Library/UefiHiiServicesLib/UefiHiiServicesLib.inf DevicePathLib|MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.inf - UefiDecompressLib|IntelFrameworkModulePkg/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTianoCustomDecompressLib.inf + UefiDecompressLib|MdeModulePkg/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTianoCustomDecompressLib.inf PeiServicesTablePointerLib|MdePkg/Library/PeiServicesTablePointerLibIdt/PeiServicesTablePointerLibIdt.inf PeiServicesLib|MdePkg/Library/PeiServicesLib/PeiServicesLib.inf DxeServicesLib|MdePkg/Library/DxeServicesLib/DxeServicesLib.inf DxeServicesTableLib|MdePkg/Library/DxeServicesTableLib/DxeServicesTableLib.inf UefiCpuLib|UefiCpuPkg/Library/BaseUefiCpuLib/BaseUefiCpuLib.inf diff --git a/Vlv2TbltDevicePkg/PlatformPkgX64.dsc b/Vlv2TbltDevicePkg/PlatformPkgX64.dsc index 1940aead03..c9c9ee8af6 100644 --- a/Vlv2TbltDevicePkg/PlatformPkgX64.dsc +++ b/Vlv2TbltDevicePkg/PlatformPkgX64.dsc @@ -136,11 +136,11 @@ UefiRuntimeLib|MdePkg/Library/UefiRuntimeLib/UefiRuntimeLib.inf UefiLib|MdePkg/Library/UefiLib/UefiLib.inf HiiLib|MdeModulePkg/Library/UefiHiiLib/UefiHiiLib.inf UefiHiiServicesLib|MdeModulePkg/Library/UefiHiiServicesLib/UefiHiiServicesLib.inf DevicePathLib|MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.inf - UefiDecompressLib|IntelFrameworkModulePkg/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTianoCustomDecompressLib.inf + UefiDecompressLib|MdeModulePkg/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTianoCustomDecompressLib.inf PeiServicesTablePointerLib|MdePkg/Library/PeiServicesTablePointerLibIdt/PeiServicesTablePointerLibIdt.inf PeiServicesLib|MdePkg/Library/PeiServicesLib/PeiServicesLib.inf DxeServicesLib|MdePkg/Library/DxeServicesLib/DxeServicesLib.inf DxeServicesTableLib|MdePkg/Library/DxeServicesTableLib/DxeServicesTableLib.inf UefiCpuLib|UefiCpuPkg/Library/BaseUefiCpuLib/BaseUefiCpuLib.inf -- 2.18.0.windows.1 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#38626): https://edk2.groups.io/g/devel/message/38626 Mute This Topic: https://groups.io/mt/30959954/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [edk2-devel] [edk2] [RFC] Plan to delete ShellBinPkg from edk2/master
Thanks Andrew for the summary. For now there is no objection for platform to use shell source build, so I think I can remove the dependency of ShellBinPkg in all open platforms firstly. And I will delete ShellBinPkg if there is no need to publish shell binaries or after shell binaries have been uploaded with stable tag. If all think publish stable shell binaries is useful and need to upload them with stable tag. Liming, could you help work out the process for shell binaries publish with each edk2 stable tag? Then we can follow the process to upload the binaries and remove ShellBinPkg finally. Thanks, Dandan From: af...@apple.com [mailto:af...@apple.com] Sent: Friday, April 5, 2019 12:36 AM To: devel@edk2.groups.io; Laszlo Ersek Cc: Ni, Ray ; Kinney, Michael D ; Bi, Dandan ; Cetola, Stephano ; Gao, Liming ; Carsey, Jaben Subject: Re: [edk2-devel] [edk2] [RFC] Plan to delete ShellBinPkg from edk2/master On Apr 4, 2019, at 9:06 AM, Laszlo Ersek mailto:ler...@redhat.com>> wrote: On 04/04/19 17:10, Andrew Fish wrote: On Apr 4, 2019, at 3:45 AM, Laszlo Ersek mailto:ler...@redhat.com>> wrote: On 04/04/19 06:09, Andrew Fish wrote: On Apr 3, 2019, at 8:42 PM, Ni, Ray mailto:ray...@intel.com>> wrote: Mike, Laszlo, It's a good idea to store the shell binaries into the assets of each stable tag. If we go in this way, it means "build" requires network connection to download the shell binary from the assets of a certain release. Do you think it's acceptable? Ray, The other option would be to have a configuration step, like installing Python or the C compilers, that copies the binary. You need a network connection to clone the git repo and to stay in sync with it. I guess you could model that as a git submodule, or actually have a script that grabs the binary you want from a remote system, and fall back to the local copy if you don't have a network connection. Or we can separate the binary download and build into two phases so build phase can be independent on network connection. Is there any known practice/solution for such requirement (stable sub-component binaries needed by a production image generation)? I think to some extent this kind of thing is driven by the customers build rules. Basically what the customer think of as their manifest of parts for software version X. I suggested PREBUILD because I took it as a given, from Mike's problem statement, that "build" had to ensure, internally, the local availability of the shell binary. If that's a not requirement, then IMO it's much better to leave it to organizations to fetch the prerequisites of their platform builds. I'd say that's out of scope for upstream edk2 -- if they need the shell binary to be available off-line, at their build time, they can download it earlier and cache it locally. Laszlo, I guess for edk2 projects the maintainers own the manifest. So the edk2 projects that need the Shell should define how that works. I don't think we need to define a generic solution for 3rd parties as I'd guess Red Hat and Microsoft probably already have tools and strategies to deal with cobbling together software from different packages. So I guess we should ask the maintainers of the ekd2 packages does the version of the Shell matter? If no then just pre-install a shell binary as part of the setup. If the version matters then we should look into doing something a little more fancy, and use the pre-installed shell binary as the fallback. Is there anyway to tell the Shell version from the Shell PE/COFF? One option could be a build warning if the shell is old and just have the user manually update the shell if needed. As a co-maintainer under OvmfPkg and ArmVirtPkg, I prefer to build the shell from source at all times, namely from the source code that is part of the entire edk2 tree at a given commit / checkout. I don't see any possibility or desire for the virtual firmware packages (RPMs) that I have a say in to consume/ship a pre-built UEFI shell binary. --*-- The reason I recommend for us (the TianoCore community) to offer the shell as a prebuilt binary too, somewhere on the web, is because it would help UEFI users (in the most general sense). Laszlo, Sorry I might have taken the discussion off the rails. 1) It seems like that for edk2 folks are happy with build form source. 2)I agree it would useful to have a known good binary that people can download from the web, and the hash that proves it is the version you think it is. Some instructions on how build a bootable USB key would be useful too. 3) We don't really need to solve the problem of a build system and binaries if non of the edk2 packages require that feature. Thanks, Andrew Fish Thanks, Laszlo -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#38632): https://edk2.groups.io/g/devel/message/38632 Mute This Topic: https://groups.io/mt/30886118/21656 Group Owner: devel+ow...@e
[edk2-devel] [edk2-platforms/devel-MinPlatform] [patch 2/3] KabylakeOpenBoardPkg/KBLRvp3: Use shell source directly
REF: https://bugzilla.tianocore.org/show_bug.cgi?id=1675
In long term we will remove ShellBinPkg, so now update
platform to use ShellPkg directly.
Cc: Chasel Chiu
Cc: Michael Kubacki
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Dandan Bi
---
.../KabylakeRvp3/OpenBoardPkg.dsc | 22 ++-
.../KabylakeRvp3/OpenBoardPkg.fdf | 2 +-
2 files changed, 22 insertions(+), 2 deletions(-)
diff --git a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/OpenBoardPkg.dsc
b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/OpenBoardPkg.dsc
index d1fb795f15..8602052666 100644
--- a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/OpenBoardPkg.dsc
+++ b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/OpenBoardPkg.dsc
@@ -261,11 +261,31 @@
MdeModulePkg/Bus/Pci/SataControllerDxe/SataControllerDxe.inf
MdeModulePkg/Bus/Ata/AtaBusDxe/AtaBusDxe.inf
MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThru.inf
MdeModulePkg/Universal/Console/GraphicsOutputDxe/GraphicsOutputDxe.inf
- ShellBinPkg/UefiShell/UefiShell.inf
+ #
+ # Shell
+ #
+ ShellPkg/Application/Shell/Shell.inf {
+
+ gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE
+
+
NULL|ShellPkg/Library/UefiShellLevel2CommandsLib/UefiShellLevel2CommandsLib.inf
+
NULL|ShellPkg/Library/UefiShellLevel1CommandsLib/UefiShellLevel1CommandsLib.inf
+
NULL|ShellPkg/Library/UefiShellLevel3CommandsLib/UefiShellLevel3CommandsLib.inf
+
NULL|ShellPkg/Library/UefiShellDriver1CommandsLib/UefiShellDriver1CommandsLib.inf
+
NULL|ShellPkg/Library/UefiShellInstall1CommandsLib/UefiShellInstall1CommandsLib.inf
+
NULL|ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLib.inf
+
NULL|ShellPkg/Library/UefiShellNetwork1CommandsLib/UefiShellNetwork1CommandsLib.inf
+
NULL|ShellPkg/Library/UefiShellNetwork2CommandsLib/UefiShellNetwork2CommandsLib.inf
+
ShellCommandLib|ShellPkg/Library/UefiShellCommandLib/UefiShellCommandLib.inf
+
HandleParsingLib|ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.inf
+
BcfgCommandLib|ShellPkg/Library/UefiShellBcfgCommandLib/UefiShellBcfgCommandLib.inf
+ ShellCEntryLib|ShellPkg/Library/UefiShellCEntryLib/UefiShellCEntryLib.inf
+ ShellLib|ShellPkg/Library/UefiShellLib/UefiShellLib.inf
+ }
#
# Silicon
#
!include $(PLATFORM_SI_PACKAGE)/SiPkgDxe.dsc
diff --git a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/OpenBoardPkg.fdf
b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/OpenBoardPkg.fdf
index dc2a5d7e12..8e8abab0dc 100644
--- a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/OpenBoardPkg.fdf
+++ b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/OpenBoardPkg.fdf
@@ -333,11 +333,11 @@ INF
MdeModulePkg/Bus/Pci/PciHostBridgeDxe/PciHostBridgeDxe.inf
INF MdeModulePkg/Bus/Pci/SataControllerDxe/SataControllerDxe.inf
INF MdeModulePkg/Bus/Ata/AtaBusDxe/AtaBusDxe.inf
INF MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThru.inf
INF MdeModulePkg/Universal/Console/GraphicsOutputDxe/GraphicsOutputDxe.inf
-INF ShellBinPkg/UefiShell/UefiShell.inf
+INF ShellPkg/Application/Shell/Shell.inf
INF $(PLATFORM_PACKAGE)/PlatformInit/PlatformInitDxe/PlatformInitDxe.inf
INF IntelFsp2WrapperPkg/FspWrapperNotifyDxe/FspWrapperNotifyDxe.inf
INF $(PLATFORM_PACKAGE)/Test/TestPointStubDxe/TestPointStubDxe.inf
--
2.18.0.windows.1
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#38775): https://edk2.groups.io/g/devel/message/38775
Mute This Topic: https://groups.io/mt/31016080/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[edk2-devel] [edk2-platforms/devel-MinPlatform] [patch 0/3] Update to use shell source directly
The series will update ClevoOpenBoardPkg KabylakeOpenBoardPkg and PurleyOpenBoardPkg to use ShellPkg directly. Test done for the series: Build pass for ClevoOpenBoardPkg KabylakeOpenBoardPkg and PurleyOpenBoardPkg. Boot to shell with KBLRvp3. Cc: Michael Kubacki Cc: Ankit Sinha Cc: Nate DeSimone Cc: Chasel Chiu Cc: Shifei A Lu Cc: Xiaohu Zhou Cc: Isaac W Oram Dandan Bi (3): ClevoOpenBoardPkg/N1xxWU: Use shell source directly KabylakeOpenBoardPkg/KBLRvp3: Use shell source directly PurleyOpenBoardPkg/BoardMtOlympus: Use shell source directly .../ClevoOpenBoardPkg/N1xxWU/OpenBoardPkg.dsc | 22 ++- .../ClevoOpenBoardPkg/N1xxWU/OpenBoardPkg.fdf | 2 +- .../KabylakeRvp3/OpenBoardPkg.dsc | 22 ++- .../KabylakeRvp3/OpenBoardPkg.fdf | 2 +- .../BoardMtOlympus/PlatformPkg.dsc| 22 ++- .../BoardMtOlympus/PlatformPkg.fdf| 2 +- 6 files changed, 66 insertions(+), 6 deletions(-) -- 2.18.0.windows.1 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#38773): https://edk2.groups.io/g/devel/message/38773 Mute This Topic: https://groups.io/mt/31016077/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[edk2-devel] [edk2-platforms/devel-MinPlatform] [patch 3/3] PurleyOpenBoardPkg/BoardMtOlympus: Use shell source directly
REF: https://bugzilla.tianocore.org/show_bug.cgi?id=1675
In long term we will remove ShellBinPkg, so now update
platform to use ShellPkg directly.
Cc: Shifei A Lu
Cc: Xiaohu Zhou
Cc: Isaac W Oram
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Dandan Bi
---
.../BoardMtOlympus/PlatformPkg.dsc| 22 ++-
.../BoardMtOlympus/PlatformPkg.fdf| 2 +-
2 files changed, 22 insertions(+), 2 deletions(-)
diff --git a/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/PlatformPkg.dsc
b/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/PlatformPkg.dsc
index 384e70a832..aa8bde5460 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/PlatformPkg.dsc
+++ b/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/PlatformPkg.dsc
@@ -225,11 +225,31 @@
AdvancedFeaturePkg/Smbios/SmbiosBasicDxe/SmbiosBasicDxe.inf
!endif
PurleyOpenBoardPkg/Policy/S3NvramSave/S3NvramSave.inf
- ShellBinPkg/UefiShell/UefiShell.inf
+ #
+ # Shell
+ #
+ ShellPkg/Application/Shell/Shell.inf {
+
+ gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE
+
+
NULL|ShellPkg/Library/UefiShellLevel2CommandsLib/UefiShellLevel2CommandsLib.inf
+
NULL|ShellPkg/Library/UefiShellLevel1CommandsLib/UefiShellLevel1CommandsLib.inf
+
NULL|ShellPkg/Library/UefiShellLevel3CommandsLib/UefiShellLevel3CommandsLib.inf
+
NULL|ShellPkg/Library/UefiShellDriver1CommandsLib/UefiShellDriver1CommandsLib.inf
+
NULL|ShellPkg/Library/UefiShellInstall1CommandsLib/UefiShellInstall1CommandsLib.inf
+
NULL|ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLib.inf
+
NULL|ShellPkg/Library/UefiShellNetwork1CommandsLib/UefiShellNetwork1CommandsLib.inf
+
NULL|ShellPkg/Library/UefiShellNetwork2CommandsLib/UefiShellNetwork2CommandsLib.inf
+
ShellCommandLib|ShellPkg/Library/UefiShellCommandLib/UefiShellCommandLib.inf
+
HandleParsingLib|ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.inf
+
BcfgCommandLib|ShellPkg/Library/UefiShellBcfgCommandLib/UefiShellBcfgCommandLib.inf
+ ShellCEntryLib|ShellPkg/Library/UefiShellCEntryLib/UefiShellCEntryLib.inf
+ ShellLib|ShellPkg/Library/UefiShellLib/UefiShellLib.inf
+ }
MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressDxe.inf
PcAtChipsetPkg/8259InterruptControllerDxe/8259.inf
diff --git a/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/PlatformPkg.fdf
b/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/PlatformPkg.fdf
index 610aa18d49..0100f88aa3 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/PlatformPkg.fdf
+++ b/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/PlatformPkg.fdf
@@ -297,11 +297,11 @@ INF $(BOARD_PKG)/Policy/IioUdsDataDxe/IioUdsDataDxe.inf
INF $(BOARD_PKG)/Policy/PlatformCpuPolicy/PlatformCpuPolicy.inf
INF $(BOARD_PKG)/Pci/PciPlatform/PciPlatform.inf
INF MinPlatformPkg/PlatformInit/PlatformInitDxe/PlatformInitDxe.inf
-INF ShellBinPkg/UefiShell/UefiShell.inf
+INF ShellPkg/Application/Shell/Shell.inf
INF PcAtChipsetPkg/8259InterruptControllerDxe/8259.inf
INF MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressDxe.inf
--
2.18.0.windows.1
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#38776): https://edk2.groups.io/g/devel/message/38776
Mute This Topic: https://groups.io/mt/31016081/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[edk2-devel] [edk2-platforms/devel-MinPlatform] [patch 1/3] ClevoOpenBoardPkg/N1xxWU: Use shell source directly
REF: https://bugzilla.tianocore.org/show_bug.cgi?id=1675
In long term we will remove ShellBinPkg, so now update
platform to use ShellPkg directly.
Cc: Michael Kubacki
Cc: Ankit Sinha
Cc: Nate DeSimone
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Dandan Bi
---
.../ClevoOpenBoardPkg/N1xxWU/OpenBoardPkg.dsc | 22 ++-
.../ClevoOpenBoardPkg/N1xxWU/OpenBoardPkg.fdf | 2 +-
2 files changed, 22 insertions(+), 2 deletions(-)
diff --git a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/OpenBoardPkg.dsc
b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/OpenBoardPkg.dsc
index c43a30de34..4fc4c9c141 100644
--- a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/OpenBoardPkg.dsc
+++ b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/OpenBoardPkg.dsc
@@ -272,11 +272,31 @@
MdeModulePkg/Bus/Pci/SataControllerDxe/SataControllerDxe.inf
MdeModulePkg/Bus/Ata/AtaBusDxe/AtaBusDxe.inf
MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThru.inf
MdeModulePkg/Universal/Console/GraphicsOutputDxe/GraphicsOutputDxe.inf
- ShellBinPkg/UefiShell/UefiShell.inf
+ #
+ # Shell
+ #
+ ShellPkg/Application/Shell/Shell.inf {
+
+ gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE
+
+
NULL|ShellPkg/Library/UefiShellLevel2CommandsLib/UefiShellLevel2CommandsLib.inf
+
NULL|ShellPkg/Library/UefiShellLevel1CommandsLib/UefiShellLevel1CommandsLib.inf
+
NULL|ShellPkg/Library/UefiShellLevel3CommandsLib/UefiShellLevel3CommandsLib.inf
+
NULL|ShellPkg/Library/UefiShellDriver1CommandsLib/UefiShellDriver1CommandsLib.inf
+
NULL|ShellPkg/Library/UefiShellInstall1CommandsLib/UefiShellInstall1CommandsLib.inf
+
NULL|ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLib.inf
+
NULL|ShellPkg/Library/UefiShellNetwork1CommandsLib/UefiShellNetwork1CommandsLib.inf
+
NULL|ShellPkg/Library/UefiShellNetwork2CommandsLib/UefiShellNetwork2CommandsLib.inf
+
ShellCommandLib|ShellPkg/Library/UefiShellCommandLib/UefiShellCommandLib.inf
+
HandleParsingLib|ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.inf
+
BcfgCommandLib|ShellPkg/Library/UefiShellBcfgCommandLib/UefiShellBcfgCommandLib.inf
+ ShellCEntryLib|ShellPkg/Library/UefiShellCEntryLib/UefiShellCEntryLib.inf
+ ShellLib|ShellPkg/Library/UefiShellLib/UefiShellLib.inf
+ }
#
# Silicon
#
!include $(PLATFORM_SI_PACKAGE)/SiPkgDxe.dsc
diff --git a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/OpenBoardPkg.fdf
b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/OpenBoardPkg.fdf
index 7f3e965c75..6b8cb4a0b5 100644
--- a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/OpenBoardPkg.fdf
+++ b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/OpenBoardPkg.fdf
@@ -337,11 +337,11 @@ INF
MdeModulePkg/Bus/Pci/PciHostBridgeDxe/PciHostBridgeDxe.inf
INF MdeModulePkg/Bus/Pci/SataControllerDxe/SataControllerDxe.inf
INF MdeModulePkg/Bus/Ata/AtaBusDxe/AtaBusDxe.inf
INF MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThru.inf
INF MdeModulePkg/Universal/Console/GraphicsOutputDxe/GraphicsOutputDxe.inf
-INF ShellBinPkg/UefiShell/UefiShell.inf
+INF ShellPkg/Application/Shell/Shell.inf
INF $(PLATFORM_PACKAGE)/PlatformInit/PlatformInitDxe/PlatformInitDxe.inf
INF IntelFsp2WrapperPkg/FspWrapperNotifyDxe/FspWrapperNotifyDxe.inf
INF $(PLATFORM_PACKAGE)/Test/TestPointStubDxe/TestPointStubDxe.inf
--
2.18.0.windows.1
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#38774): https://edk2.groups.io/g/devel/message/38774
Mute This Topic: https://groups.io/mt/31016079/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[edk2-devel] [patch] CorebootPayloadPkg: Remove the dependency of ShellBinPkg
REF: https://bugzilla.tianocore.org/show_bug.cgi?id=1675
In long term we will remove ShellBinPkg, so now we update
platform to use ShellPkg only.
Cc: Maurice Ma
Cc: Prince Agyeman
Cc: Benjamin You
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Dandan Bi
---
CorebootPayloadPkg/CorebootPayloadPkg.fdf | 18 --
CorebootPayloadPkg/CorebootPayloadPkgIa32.dsc | 9 -
.../CorebootPayloadPkgIa32X64.dsc | 9 -
3 files changed, 36 deletions(-)
diff --git a/CorebootPayloadPkg/CorebootPayloadPkg.fdf
b/CorebootPayloadPkg/CorebootPayloadPkg.fdf
index 0c24f96a15..d399ad8eb8 100644
--- a/CorebootPayloadPkg/CorebootPayloadPkg.fdf
+++ b/CorebootPayloadPkg/CorebootPayloadPkg.fdf
@@ -177,31 +177,13 @@ INF
MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorageDxe.inf
INF QuarkSocPkg/QuarkSouthCluster/Usb/Ohci/Dxe/OhciDxe.inf
#
# Shell
#
-!if $(SHELL_TYPE) == BUILD_SHELL
INF ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf
INF ShellPkg/DynamicCommand/DpDynamicCommand/DpDynamicCommand.inf
INF ShellPkg/Application/Shell/Shell.inf
-!endif
-
-!if $(SHELL_TYPE) == MIN_BIN
-!if $(ARCH) == IA32
-INF RuleOverride = BINARY USE = IA32 ShellBinPkg/MinUefiShell/MinUefiShell.inf
-!else
-INF RuleOverride = BINARY USE = X64 ShellBinPkg/MinUefiShell/MinUefiShell.inf
-!endif
-!endif
-
-!if $(SHELL_TYPE) == UEFI_BIN
-!if $(ARCH) == IA32
-INF RuleOverride = BINARY USE = IA32 ShellBinPkg/UefiShell/UefiShell.inf
-!else
-INF RuleOverride = BINARY USE = X64 ShellBinPkg/UefiShell/UefiShell.inf
-!endif
-!endif
FILE FREEFORM= PCD(gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdLogoFile) {
SECTION RAW = MdeModulePkg/Logo/Logo.bmp
}
diff --git a/CorebootPayloadPkg/CorebootPayloadPkgIa32.dsc
b/CorebootPayloadPkg/CorebootPayloadPkgIa32.dsc
index 98d6073866..c53b53b2f7 100644
--- a/CorebootPayloadPkg/CorebootPayloadPkgIa32.dsc
+++ b/CorebootPayloadPkg/CorebootPayloadPkgIa32.dsc
@@ -80,15 +80,10 @@
#
# Chipset options
#
DEFINE USE_HPET_TIMER = FALSE
- #
- # Shell options: [BUILD_SHELL, MIN_BIN, NONE, UEFI]
- #
- DEFINE SHELL_TYPE = UEFI_BIN
-
[BuildOptions]
*_*_*_CC_FLAGS = -D DISABLE_NEW_DEPRECATED_INTERFACES
GCC:*_UNIXGCC_*_CC_FLAGS = -DMDEPKG_NDEBUG
GCC:RELEASE_*_*_CC_FLAGS = -DMDEPKG_NDEBUG
INTEL:RELEASE_*_*_CC_FLAGS = /D MDEPKG_NDEBUG
@@ -520,12 +515,10 @@
#--
# Build the shell
#--
-!if $(SHELL_TYPE) == BUILD_SHELL
-
#
# Shell Lib
#
[LibraryClasses]
BcfgCommandLib|ShellPkg/Library/UefiShellBcfgCommandLib/UefiShellBcfgCommandLib.inf
@@ -583,7 +576,5 @@
PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf
ShellCEntryLib|ShellPkg/Library/UefiShellCEntryLib/UefiShellCEntryLib.inf
ShellCommandLib|ShellPkg/Library/UefiShellCommandLib/UefiShellCommandLib.inf
SortLib|MdeModulePkg/Library/UefiSortLib/UefiSortLib.inf
}
-
-!endif
diff --git a/CorebootPayloadPkg/CorebootPayloadPkgIa32X64.dsc
b/CorebootPayloadPkg/CorebootPayloadPkgIa32X64.dsc
index 608a288c42..3ecc0d0039 100644
--- a/CorebootPayloadPkg/CorebootPayloadPkgIa32X64.dsc
+++ b/CorebootPayloadPkg/CorebootPayloadPkgIa32X64.dsc
@@ -80,15 +80,10 @@
#
# Chipset options
#
DEFINE USE_HPET_TIMER = FALSE
- #
- # Shell options: [BUILD_SHELL, MIN_BIN, NONE, UEFI]
- #
- DEFINE SHELL_TYPE = UEFI_BIN
-
[BuildOptions]
*_*_*_CC_FLAGS = -D DISABLE_NEW_DEPRECATED_INTERFACES
GCC:*_UNIXGCC_*_CC_FLAGS = -DMDEPKG_NDEBUG
GCC:RELEASE_*_*_CC_FLAGS = -DMDEPKG_NDEBUG
INTEL:RELEASE_*_*_CC_FLAGS = /D MDEPKG_NDEBUG
@@ -521,12 +516,10 @@
#--
# Build the shell
#--
-!if $(SHELL_TYPE) == BUILD_SHELL
-
#
# Shell Lib
#
[LibraryClasses]
BcfgCommandLib|ShellPkg/Library/UefiShellBcfgCommandLib/UefiShellBcfgCommandLib.inf
@@ -584,7 +577,5 @@
PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf
ShellCEntryLib|ShellPkg/Library/UefiShellCEntryLib/UefiShellCEntryLib.inf
ShellCommandLib|ShellPkg/Library/UefiShellCommandLib/UefiShellCommandLib.inf
SortLib|MdeModulePkg/Library/UefiSortLib/UefiSortLib.inf
}
-
-!endif
--
2.18.0.windows.1
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#38777): https://edk2.groups.io/g/devel/message/38777
Mute This Topic: https://groups.io/mt/31016083/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [edk2-devel] [patch] ShellBinPkg: Remove ShellBinPkg
Thank you all. I will update the patch according to Laszlo's comments before commit the patch. Thanks, Dandan > -Original Message- > From: Laszlo Ersek [mailto:ler...@redhat.com] > Sent: Wednesday, April 17, 2019 6:53 PM > To: Ard Biesheuvel ; Bi, Dandan > > Cc: edk2-devel-groups-io ; Carsey, Jaben > ; Ni, Ray ; Leif Lindholm > ; Gao, Liming > Subject: Re: [patch] ShellBinPkg: Remove ShellBinPkg > > On 04/17/19 09:16, Ard Biesheuvel wrote: > > On Tue, 16 Apr 2019 at 23:40, Dandan Bi wrote: > >> > >> REF: https://bugzilla.tianocore.org/show_bug.cgi?id=1675 > >> > >> Remove ShellBinPkg from edk2. > >> If developers work on current edk2 master and still want to use Shell > >> binary after this removal, they can get it from source code in the > >> Assets part of edk2-stable201903 tag release page. > >> And from next release (edk2-stable201905 tag), we will publish all > >> Shell binaries to the according Assets part directly. > >> edk2 release link: https://github.com/tianocore/edk2/releases > >> > >> Cc: Jaben Carsey > >> Cc: Ray Ni > >> Cc: Leif Lindholm > >> Cc: Ard Biesheuvel > >> Cc: Liming Gao > >> Cc: Laszlo Ersek > >> Signed-off-by: Dandan Bi > > > > Acked-by: Ard Biesheuvel > > > > BTW you can use the --no-binary option to git to omit the binary diffs > > in the patch. Especially when deleting binaries, that saves a lot of > > hassle dealing with a multimegabyte patch email. > > +1 > > For the patch, I have a request towards Dandan: regarding the line > > +Maintainers for stable Shell binaries generation when need to publish Shell > binaries with edk2 release: > > please: > > (1) wrap it with an 80-char margin, > (2) please insert a blank line just above it. > > With those: > > Acked-by: Laszlo Ersek > > Thanks > Laszlo -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#39281): https://edk2.groups.io/g/devel/message/39281 Mute This Topic: https://groups.io/mt/31209298/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[edk2-devel] [patch] MdeModulePkg/HiiDatabaseDxe: Release lock on all error return path
REF: https://bugzilla.tianocore.org/show_bug.cgi?id=1652
Commit ffe5f7a6b4e9
"MdeModulePkg/HiiDatabase: Fix potential integer overflow "
added some new error paths, but it missed releasing the
mHiiDatabaseLock lock on those paths.
This patch releases mHiiDatabaseLock on those paths.
Cc: Hao Wu
Cc: Ray Ni
Cc: Liming Gao
Signed-off-by: Dandan Bi
---
MdeModulePkg/Universal/HiiDatabaseDxe/Image.c | 7 ++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/MdeModulePkg/Universal/HiiDatabaseDxe/Image.c
b/MdeModulePkg/Universal/HiiDatabaseDxe/Image.c
index bd623cae15..a108fc6157 100644
--- a/MdeModulePkg/Universal/HiiDatabaseDxe/Image.c
+++ b/MdeModulePkg/Universal/HiiDatabaseDxe/Image.c
@@ -1,10 +1,10 @@
/** @file
Implementation for EFI_HII_IMAGE_PROTOCOL.
-Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.
+Copyright (c) 2007 - 2019, Intel Corporation. All rights reserved.
SPDX-License-Identifier: BSD-2-Clause-Patent
**/
@@ -651,10 +651,11 @@ HiiNewImage (
// Make sure the size doesn't overflow UINT32.
// Note: 24Bit BMP occpuies 3 bytes per pixel.
//
NewBlockSize = (UINT32)Image->Width * Image->Height;
if (NewBlockSize > (MAX_UINT32 - (sizeof (EFI_HII_IIBT_IMAGE_24BIT_BLOCK) -
sizeof (EFI_HII_RGB_PIXEL))) / 3) {
+EfiReleaseLock (&mHiiDatabaseLock);
return EFI_OUT_OF_RESOURCES;
}
NewBlockSize = NewBlockSize * 3 + (sizeof (EFI_HII_IIBT_IMAGE_24BIT_BLOCK) -
sizeof (EFI_HII_RGB_PIXEL));
//
@@ -678,10 +679,11 @@ HiiNewImage (
//
// Make sure the final package length doesn't overflow.
// Length of the package header is represented using 24 bits. So MAX
length is MAX_UINT24.
//
if (NewBlockSize > MAX_UINT24 - ImagePackage->ImagePkgHdr.Header.Length) {
+ EfiReleaseLock (&mHiiDatabaseLock);
return EFI_OUT_OF_RESOURCES;
}
//
// Because ImagePackage->ImageBlockSize <
ImagePackage->ImagePkgHdr.Header.Length,
// So (ImagePackage->ImageBlockSize + NewBlockSize) <= MAX_UINT24
@@ -719,10 +721,11 @@ HiiNewImage (
//
// Make sure the final package length doesn't overflow.
// Length of the package header is represented using 24 bits. So MAX
length is MAX_UINT24.
//
if (NewBlockSize > MAX_UINT24 - (sizeof (EFI_HII_IMAGE_PACKAGE_HDR) +
sizeof (EFI_HII_IIBT_END_BLOCK))) {
+ EfiReleaseLock (&mHiiDatabaseLock);
return EFI_OUT_OF_RESOURCES;
}
//
// The specified package list does not contain image package.
// Create one to add this image block.
@@ -1159,16 +1162,18 @@ HiiSetImage (
// Length of the package header is represented using 24 bits. So MAX length
is MAX_UINT24.
// 24Bit BMP occpuies 3 bytes per pixel.
//
NewBlockSize = (UINT32)Image->Width * Image->Height;
if (NewBlockSize > (MAX_UINT32 - (sizeof (EFI_HII_IIBT_IMAGE_24BIT_BLOCK) -
sizeof (EFI_HII_RGB_PIXEL))) / 3) {
+EfiReleaseLock (&mHiiDatabaseLock);
return EFI_OUT_OF_RESOURCES;
}
NewBlockSize = NewBlockSize * 3 + (sizeof (EFI_HII_IIBT_IMAGE_24BIT_BLOCK) -
sizeof (EFI_HII_RGB_PIXEL));
if ((NewBlockSize > OldBlockSize) &&
(NewBlockSize - OldBlockSize > MAX_UINT24 -
ImagePackage->ImagePkgHdr.Header.Length)
) {
+EfiReleaseLock (&mHiiDatabaseLock);
return EFI_OUT_OF_RESOURCES;
}
//
// Adjust the image package to remove the original block firstly then add
the new block.
--
2.18.0.windows.1
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#39353): https://edk2.groups.io/g/devel/message/39353
Mute This Topic: https://groups.io/mt/31269775/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[edk2-devel] [patch 1/2] MdeModulePkg/BMMUiLib: Set Handle to NULL after uninstall protocol
REF: https://bugzilla.tianocore.org/show_bug.cgi?id=1728 Currently Emulator meets ASSERT when enter setup->Continue->enter setup. When re-enter setup, the BmmDriverHandle in BMMUiLib Constructor is not NULL which cause InstallMultipleProtocolInterfaces failure, then ASSERT. So here set BmmDriverHandle to NULL after uninstalling protocols on it in Destructor function to avoid this issue. Cc: Liming Gao Cc: Eric Dong Cc: Hao Wu Cc: Ruiyu Ni Signed-off-by: Dandan Bi --- .../Library/BootMaintenanceManagerUiLib/BootMaintenance.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/MdeModulePkg/Library/BootMaintenanceManagerUiLib/BootMaintenance.c b/MdeModulePkg/Library/BootMaintenanceManagerUiLib/BootMaintenance.c index 2167d3a5e8..28592f9f47 100644 --- a/MdeModulePkg/Library/BootMaintenanceManagerUiLib/BootMaintenance.c +++ b/MdeModulePkg/Library/BootMaintenanceManagerUiLib/BootMaintenance.c @@ -1,9 +1,9 @@ /** @file The functions for Boot Maintainence Main menu. -Copyright (c) 2004 - 2018, Intel Corporation. All rights reserved. +Copyright (c) 2004 - 2019, Intel Corporation. All rights reserved. SPDX-License-Identifier: BSD-2-Clause-Patent **/ #include "BootMaintenanceManager.h" @@ -1761,9 +1761,10 @@ BootMaintenanceManagerUiLibDestructor ( &mBmmCallbackInfo->BmmConfigAccess, NULL ); FreePool (mBmmCallbackInfo->LoadContext); + mBmmCallbackInfo->BmmDriverHandle = NULL; return EFI_SUCCESS; } -- 2.18.0.windows.1 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#39396): https://edk2.groups.io/g/devel/message/39396 Mute This Topic: https://groups.io/mt/31306510/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[edk2-devel] [patch 0/2] Fix Emulator ASSERT issue when re-enter setup
REF: https://bugzilla.tianocore.org/show_bug.cgi?id=1728 Currently Emulator meets ASSERT when enter setup->Continue->enter setup. When re-enter setup, in the Constructor functions of some Libs linked by UiApp, the handle is not NULL which cause InstallMultipleProtocolInterfaces failure then ASSERT. So here set handle to NULL after uninstalling protocols on it in Libs Destructor function to avoid this issue. Cc: Liming Gao Cc: Eric Dong Cc: Hao Wu Cc: Ruiyu Ni Dandan Bi (2): MdeModulePkg/BMMUiLib: Set Handle to NULL after uninstall protocol MdeModulePkg/FileExplorer: Set Handle to NULL after uninstall protocol .../Library/BootMaintenanceManagerUiLib/BootMaintenance.c | 3 ++- MdeModulePkg/Library/FileExplorerLib/FileExplorer.c| 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) -- 2.18.0.windows.1 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#39395): https://edk2.groups.io/g/devel/message/39395 Mute This Topic: https://groups.io/mt/31306509/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[edk2-devel] [patch 2/2] MdeModulePkg/FileExplorer: Set Handle to NULL after uninstall protocol
REF: https://bugzilla.tianocore.org/show_bug.cgi?id=1728 Currently Emulator meets ASSERT when enter setup->Continue->enter setup. When re-enter setup, the FeDriverHandle in FileExplorerLib Constructor is not NULL which cause InstallMultipleProtocolInterfaces failure, then ASSERT. So here set FeDriverHandle to NULL after uninstalling protocols on it in the Destructor function to avoid this issue. Cc: Liming Gao Cc: Eric Dong Cc: Hao Wu Cc: Ruiyu Ni Signed-off-by: Dandan Bi --- MdeModulePkg/Library/FileExplorerLib/FileExplorer.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/MdeModulePkg/Library/FileExplorerLib/FileExplorer.c b/MdeModulePkg/Library/FileExplorerLib/FileExplorer.c index 27f12fcbf9..58e4910259 100644 --- a/MdeModulePkg/Library/FileExplorerLib/FileExplorer.c +++ b/MdeModulePkg/Library/FileExplorerLib/FileExplorer.c @@ -1,9 +1,9 @@ /** @file File explorer related functions. -Copyright (c) 2004 - 2018, Intel Corporation. All rights reserved. +Copyright (c) 2004 - 2019, Intel Corporation. All rights reserved. SPDX-License-Identifier: BSD-2-Clause-Patent **/ @@ -1641,10 +1641,11 @@ FileExplorerLibDestructor ( NULL ); ASSERT_EFI_ERROR (Status); HiiRemovePackages (gFileExplorerPrivate.FeHiiHandle); +gFileExplorerPrivate.FeDriverHandle = NULL; } FreePool (gHiiVendorDevicePath); return EFI_SUCCESS; -- 2.18.0.windows.1 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#39397): https://edk2.groups.io/g/devel/message/39397 Mute This Topic: https://groups.io/mt/31306517/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [edk2-devel] [patch 0/7] Move BaseUefiTianoCustomDecompressLib from IntelFrameworkModulePkg to MdeModulePkg
> -Original Message- > From: devel@edk2.groups.io [mailto:devel@edk2.groups.io] On Behalf Of > Ard Biesheuvel > Sent: Wednesday, April 24, 2019 12:26 AM > To: Bi, Dandan > Cc: edk2-devel-groups-io ; Laszlo Ersek > ; Julien Grall ; Leif Lindholm > ; Justen, Jordan L ; > Andrew Fish ; Gao, Liming ; Ni, > Ray ; Wang, Jian J ; Wu, Hao A > ; Kinney, Michael D ; > Steele, Kelly ; Sun, Zailiang > ; Qian, Yi > Subject: Re: [edk2-devel] [patch 0/7] Move > BaseUefiTianoCustomDecompressLib from IntelFrameworkModulePkg to > MdeModulePkg > > On Thu, 4 Apr 2019 at 15:52, Dandan Bi wrote: > > > > We will remove IntelFrameworkModulePkg,but > > BaseUefiTianoCustomDecompressLib in it may still need to be used. So > > move BaseUefiTianoCustomDecompressLib from > IntelFrameworkModulePkg to MdeModulePkg firstly. > > > > The following platforms are now broken in edk2-platforms/master since they > still refer to BaseUefiTianoCustomDecompressLib in the old > location: > > AMD Overdrive > Lemaker Cello > Raspberry Pi3 > SoftIron 1000 > D03/D05/D06 > Hikey/Hikey960 > > Could we please try not to leave edk2-platforms behind when making > changes to the core repository? Thanks. Sorry for missing checking the edk2-platforms/master when making the changes. I will submit patch to fix the issue. Thanks, Dandan > > -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#39431): https://edk2.groups.io/g/devel/message/39431 Mute This Topic: https://groups.io/mt/30896388/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[edk2-devel] [edk2-platforms/master] [patch 4/5] Platform/SoftIron: Update to use UefiDecompressLib in MdeModulePkg
REF: https://bugzilla.tianocore.org/show_bug.cgi?id=1683 We have moved the BaseUefiTianoCustomDecompressLib from IntelFrameworkModulePkg to MdeModulePkg, so update the consumer accordingly. Cc: Ard Biesheuvel Cc: Leif Lindholm Cc: Michael D Kinney Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Dandan Bi --- Platform/SoftIron/Overdrive1000Board/Overdrive1000Board.dsc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Platform/SoftIron/Overdrive1000Board/Overdrive1000Board.dsc b/Platform/SoftIron/Overdrive1000Board/Overdrive1000Board.dsc index 7e9728d043..6ae0f2620c 100644 --- a/Platform/SoftIron/Overdrive1000Board/Overdrive1000Board.dsc +++ b/Platform/SoftIron/Overdrive1000Board/Overdrive1000Board.dsc @@ -216,19 +216,19 @@ DEFINE DO_FLASHER = FALSE !if $(TARGET) != RELEASE DebugLib|MdePkg/Library/DxeRuntimeDebugLibSerialPort/DxeRuntimeDebugLibSerialPort.inf !endif [LibraryClasses.common.UEFI_APPLICATION] - UefiDecompressLib|IntelFrameworkModulePkg/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTianoCustomDecompressLib.inf + UefiDecompressLib|MdeModulePkg/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTianoCustomDecompressLib.inf PerformanceLib|MdeModulePkg/Library/DxePerformanceLib/DxePerformanceLib.inf MemoryAllocationLib|MdePkg/Library/UefiMemoryAllocationLib/UefiMemoryAllocationLib.inf HiiLib|MdeModulePkg/Library/UefiHiiLib/UefiHiiLib.inf ReportStatusCodeLib|MdeModulePkg/Library/DxeReportStatusCodeLib/DxeReportStatusCodeLib.inf [LibraryClasses.common.UEFI_DRIVER] ReportStatusCodeLib|IntelFrameworkModulePkg/Library/DxeReportStatusCodeLibFramework/DxeReportStatusCodeLib.inf - UefiDecompressLib|IntelFrameworkModulePkg/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTianoCustomDecompressLib.inf + UefiDecompressLib|MdeModulePkg/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTianoCustomDecompressLib.inf ExtractGuidedSectionLib|MdePkg/Library/DxeExtractGuidedSectionLib/DxeExtractGuidedSectionLib.inf PerformanceLib|MdeModulePkg/Library/DxePerformanceLib/DxePerformanceLib.inf MemoryAllocationLib|MdePkg/Library/UefiMemoryAllocationLib/UefiMemoryAllocationLib.inf [LibraryClasses.ARM] -- 2.18.0.windows.1 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#39436): https://edk2.groups.io/g/devel/message/39436 Mute This Topic: https://groups.io/mt/31317039/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[edk2-devel] [edk2-platforms/master] [patch 2/5] Platform/LeMaker: Update to use UefiDecompressLib in MdeModulePkg
REF: https://bugzilla.tianocore.org/show_bug.cgi?id=1683 We have moved the BaseUefiTianoCustomDecompressLib from IntelFrameworkModulePkg to MdeModulePkg, so update the consumer accordingly. Cc: Ard Biesheuvel Cc: Leif Lindholm Cc: Michael D Kinney Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Dandan Bi --- Platform/LeMaker/CelloBoard/CelloBoard.dsc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Platform/LeMaker/CelloBoard/CelloBoard.dsc b/Platform/LeMaker/CelloBoard/CelloBoard.dsc index dad9cae97e..56a31a97a4 100644 --- a/Platform/LeMaker/CelloBoard/CelloBoard.dsc +++ b/Platform/LeMaker/CelloBoard/CelloBoard.dsc @@ -217,19 +217,19 @@ DEFINE DO_FLASHER = FALSE !if $(TARGET) != RELEASE DebugLib|MdePkg/Library/DxeRuntimeDebugLibSerialPort/DxeRuntimeDebugLibSerialPort.inf !endif [LibraryClasses.common.UEFI_APPLICATION] - UefiDecompressLib|IntelFrameworkModulePkg/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTianoCustomDecompressLib.inf + UefiDecompressLib|MdeModulePkg/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTianoCustomDecompressLib.inf PerformanceLib|MdeModulePkg/Library/DxePerformanceLib/DxePerformanceLib.inf MemoryAllocationLib|MdePkg/Library/UefiMemoryAllocationLib/UefiMemoryAllocationLib.inf HiiLib|MdeModulePkg/Library/UefiHiiLib/UefiHiiLib.inf ReportStatusCodeLib|MdeModulePkg/Library/DxeReportStatusCodeLib/DxeReportStatusCodeLib.inf [LibraryClasses.common.UEFI_DRIVER] ReportStatusCodeLib|IntelFrameworkModulePkg/Library/DxeReportStatusCodeLibFramework/DxeReportStatusCodeLib.inf - UefiDecompressLib|IntelFrameworkModulePkg/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTianoCustomDecompressLib.inf + UefiDecompressLib|MdeModulePkg/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTianoCustomDecompressLib.inf ExtractGuidedSectionLib|MdePkg/Library/DxeExtractGuidedSectionLib/DxeExtractGuidedSectionLib.inf PerformanceLib|MdeModulePkg/Library/DxePerformanceLib/DxePerformanceLib.inf MemoryAllocationLib|MdePkg/Library/UefiMemoryAllocationLib/UefiMemoryAllocationLib.inf [LibraryClasses.ARM] -- 2.18.0.windows.1 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#39434): https://edk2.groups.io/g/devel/message/39434 Mute This Topic: https://groups.io/mt/31317035/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[edk2-devel] [edk2-platforms/master] [patch 0/5] Update platforms to use UefiDecompressLib in MdeModulePkg
REF: https://bugzilla.tianocore.org/show_bug.cgi?id=1683 We have moved the BaseUefiTianoCustomDecompressLib from IntelFrameworkModulePkg to MdeModulePkg, so update consumers accordingly. Cc: Ard Biesheuvel Cc: Leif Lindholm Cc: Michael D Kinney Dandan Bi (5): Platform/AMD: Update to use UefiDecompressLib in MdeModulePkg Platform/LeMaker: Update to use UefiDecompressLib in MdeModulePkg Platform/RaspberryPi: Update to use UefiDecompressLib in MdeModulePkg Platform/SoftIron: Update to use UefiDecompressLib in MdeModulePkg Silicon/Hisilicon: Update to use UefiDecompressLib in MdeModulePkg Platform/AMD/OverdriveBoard/OverdriveBoard.dsc | 4 ++-- Platform/LeMaker/CelloBoard/CelloBoard.dsc | 4 ++-- Platform/RaspberryPi/RPi3/RPi3.dsc | 4 ++-- Platform/SoftIron/Overdrive1000Board/Overdrive1000Board.dsc | 4 ++-- Silicon/Hisilicon/Hisilicon.dsc.inc | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) -- 2.18.0.windows.1 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#39432): https://edk2.groups.io/g/devel/message/39432 Mute This Topic: https://groups.io/mt/31317032/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[edk2-devel] [edk2-platforms/master] [patch 1/5] Platform/AMD: Update to use UefiDecompressLib in MdeModulePkg
REF: https://bugzilla.tianocore.org/show_bug.cgi?id=1683 We have moved the BaseUefiTianoCustomDecompressLib from IntelFrameworkModulePkg to MdeModulePkg, so update the consumer accordingly. Cc: Ard Biesheuvel Cc: Leif Lindholm Cc: Michael D Kinney Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Dandan Bi --- Platform/AMD/OverdriveBoard/OverdriveBoard.dsc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Platform/AMD/OverdriveBoard/OverdriveBoard.dsc b/Platform/AMD/OverdriveBoard/OverdriveBoard.dsc index 93d351de5a..b6a1507b4a 100644 --- a/Platform/AMD/OverdriveBoard/OverdriveBoard.dsc +++ b/Platform/AMD/OverdriveBoard/OverdriveBoard.dsc @@ -227,17 +227,17 @@ DEFINE DO_FLASHER = FALSE !if $(TARGET) != RELEASE DebugLib|MdePkg/Library/DxeRuntimeDebugLibSerialPort/DxeRuntimeDebugLibSerialPort.inf !endif [LibraryClasses.common.UEFI_APPLICATION] - UefiDecompressLib|IntelFrameworkModulePkg/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTianoCustomDecompressLib.inf + UefiDecompressLib|MdeModulePkg/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTianoCustomDecompressLib.inf PerformanceLib|MdeModulePkg/Library/DxePerformanceLib/DxePerformanceLib.inf MemoryAllocationLib|MdePkg/Library/UefiMemoryAllocationLib/UefiMemoryAllocationLib.inf HiiLib|MdeModulePkg/Library/UefiHiiLib/UefiHiiLib.inf [LibraryClasses.common.UEFI_DRIVER] - UefiDecompressLib|IntelFrameworkModulePkg/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTianoCustomDecompressLib.inf + UefiDecompressLib|MdeModulePkg/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTianoCustomDecompressLib.inf ExtractGuidedSectionLib|MdePkg/Library/DxeExtractGuidedSectionLib/DxeExtractGuidedSectionLib.inf PerformanceLib|MdeModulePkg/Library/DxePerformanceLib/DxePerformanceLib.inf MemoryAllocationLib|MdePkg/Library/UefiMemoryAllocationLib/UefiMemoryAllocationLib.inf [LibraryClasses.ARM] -- 2.18.0.windows.1 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#39433): https://edk2.groups.io/g/devel/message/39433 Mute This Topic: https://groups.io/mt/31317033/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[edk2-devel] [edk2-platforms/master] [patch 5/5] Silicon/Hisilicon: Update to use UefiDecompressLib in MdeModulePkg
REF: https://bugzilla.tianocore.org/show_bug.cgi?id=1683 We have moved the BaseUefiTianoCustomDecompressLib from IntelFrameworkModulePkg to MdeModulePkg, so update the consumer accordingly. Cc: Ard Biesheuvel Cc: Leif Lindholm Cc: Michael D Kinney Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Dandan Bi --- Silicon/Hisilicon/Hisilicon.dsc.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Silicon/Hisilicon/Hisilicon.dsc.inc b/Silicon/Hisilicon/Hisilicon.dsc.inc index 1282a97801..a2ade57451 100644 --- a/Silicon/Hisilicon/Hisilicon.dsc.inc +++ b/Silicon/Hisilicon/Hisilicon.dsc.inc @@ -184,11 +184,11 @@ SecurityManagementLib|MdeModulePkg/Library/DxeSecurityManagementLib/DxeSecurityManagementLib.inf PerformanceLib|MdeModulePkg/Library/DxePerformanceLib/DxePerformanceLib.inf MemoryAllocationLib|MdePkg/Library/UefiMemoryAllocationLib/UefiMemoryAllocationLib.inf [LibraryClasses.common.UEFI_APPLICATION] - UefiDecompressLib|IntelFrameworkModulePkg/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTianoCustomDecompressLib.inf + UefiDecompressLib|MdeModulePkg/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTianoCustomDecompressLib.inf PerformanceLib|MdeModulePkg/Library/DxePerformanceLib/DxePerformanceLib.inf MemoryAllocationLib|MdePkg/Library/UefiMemoryAllocationLib/UefiMemoryAllocationLib.inf HiiLib|MdeModulePkg/Library/UefiHiiLib/UefiHiiLib.inf [LibraryClasses.common.UEFI_DRIVER,LibraryClasses.common.UEFI_APPLICATION] @@ -196,11 +196,11 @@ ReportStatusCodeLib|MdeModulePkg/Library/DxeReportStatusCodeLib/DxeReportStatusCodeLib.inf UefiBootManagerLib|MdeModulePkg/Library/UefiBootManagerLib/UefiBootManagerLib.inf [LibraryClasses.common.UEFI_DRIVER] ReportStatusCodeLib|IntelFrameworkModulePkg/Library/DxeReportStatusCodeLibFramework/DxeReportStatusCodeLib.inf - UefiDecompressLib|IntelFrameworkModulePkg/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTianoCustomDecompressLib.inf + UefiDecompressLib|MdeModulePkg/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTianoCustomDecompressLib.inf ExtractGuidedSectionLib|MdePkg/Library/DxeExtractGuidedSectionLib/DxeExtractGuidedSectionLib.inf PerformanceLib|MdeModulePkg/Library/DxePerformanceLib/DxePerformanceLib.inf DxeServicesLib|MdePkg/Library/DxeServicesLib/DxeServicesLib.inf MemoryAllocationLib|MdePkg/Library/UefiMemoryAllocationLib/UefiMemoryAllocationLib.inf -- 2.18.0.windows.1 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#39437): https://edk2.groups.io/g/devel/message/39437 Mute This Topic: https://groups.io/mt/31317046/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[edk2-devel] [edk2-platforms/master] [patch 3/5] Platform/RaspberryPi: Update to use UefiDecompressLib in MdeModulePkg
REF: https://bugzilla.tianocore.org/show_bug.cgi?id=1683 We have moved the BaseUefiTianoCustomDecompressLib from IntelFrameworkModulePkg to MdeModulePkg, so update the consumer accordingly. Cc: Ard Biesheuvel Cc: Leif Lindholm Cc: Michael D Kinney Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Dandan Bi --- Platform/RaspberryPi/RPi3/RPi3.dsc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Platform/RaspberryPi/RPi3/RPi3.dsc b/Platform/RaspberryPi/RPi3/RPi3.dsc index 26c8a0d040..f1143b1471 100644 --- a/Platform/RaspberryPi/RPi3/RPi3.dsc +++ b/Platform/RaspberryPi/RPi3/RPi3.dsc @@ -188,21 +188,21 @@ SecurityManagementLib|MdeModulePkg/Library/DxeSecurityManagementLib/DxeSecurityManagementLib.inf PerformanceLib|MdeModulePkg/Library/DxePerformanceLib/DxePerformanceLib.inf MemoryAllocationLib|MdePkg/Library/UefiMemoryAllocationLib/UefiMemoryAllocationLib.inf [LibraryClasses.common.UEFI_APPLICATION] - UefiDecompressLib|IntelFrameworkModulePkg/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTianoCustomDecompressLib.inf + UefiDecompressLib|MdeModulePkg/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTianoCustomDecompressLib.inf PerformanceLib|MdeModulePkg/Library/DxePerformanceLib/DxePerformanceLib.inf MemoryAllocationLib|MdePkg/Library/UefiMemoryAllocationLib/UefiMemoryAllocationLib.inf HiiLib|MdeModulePkg/Library/UefiHiiLib/UefiHiiLib.inf ShellLib|ShellPkg/Library/UefiShellLib/UefiShellLib.inf FileHandleLib|MdePkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf ReportStatusCodeLib|MdeModulePkg/Library/DxeReportStatusCodeLib/DxeReportStatusCodeLib.inf [LibraryClasses.common.UEFI_DRIVER] ReportStatusCodeLib|IntelFrameworkModulePkg/Library/DxeReportStatusCodeLibFramework/DxeReportStatusCodeLib.inf - UefiDecompressLib|IntelFrameworkModulePkg/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTianoCustomDecompressLib.inf + UefiDecompressLib|MdeModulePkg/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTianoCustomDecompressLib.inf ExtractGuidedSectionLib|MdePkg/Library/DxeExtractGuidedSectionLib/DxeExtractGuidedSectionLib.inf PerformanceLib|MdeModulePkg/Library/DxePerformanceLib/DxePerformanceLib.inf MemoryAllocationLib|MdePkg/Library/UefiMemoryAllocationLib/UefiMemoryAllocationLib.inf [LibraryClasses.common.DXE_RUNTIME_DRIVER] -- 2.18.0.windows.1 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#39435): https://edk2.groups.io/g/devel/message/39435 Mute This Topic: https://groups.io/mt/31317036/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[edk2-devel] [patch] MdeModulePkg/HiiDB: Minimize memory allocation times after ReadyToBoot
REF: https://bugzilla.tianocore.org/show_bug.cgi?id=1597
Currently RTData are allocated at/after ReadyToBoot to store the
contents in HiiDatabase and the HII configurations for OS runtime
utilization.
Some platforms may meet S4 resume issue since the allocation after
ReadyToBoot cause memory map change.
Now this patch to do some overallocation to minimize the number
of memory allocations after ReadyToBoot and also add warning
message when do allocation after ReadyToBoot.
Cc: Michael D Kinney
Cc: Liming Gao
Cc: Eric Dong
Signed-off-by: Dandan Bi
---
.../Universal/HiiDatabaseDxe/Database.c | 24 +--
1 file changed, 17 insertions(+), 7 deletions(-)
diff --git a/MdeModulePkg/Universal/HiiDatabaseDxe/Database.c
b/MdeModulePkg/Universal/HiiDatabaseDxe/Database.c
index 6da0e30c98..d3791ca68b 100644
--- a/MdeModulePkg/Universal/HiiDatabaseDxe/Database.c
+++ b/MdeModulePkg/Universal/HiiDatabaseDxe/Database.c
@@ -1,9 +1,9 @@
/** @file
Implementation for EFI_HII_DATABASE_PROTOCOL.
-Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.
+Copyright (c) 2007 - 2019, Intel Corporation. All rights reserved.
SPDX-License-Identifier: BSD-2-Clause-Patent
**/
@@ -3361,18 +3361,23 @@ HiiGetConfigRespInfo(
Status =
HiiConfigRoutingExportConfig(&Private->ConfigRouting,&ConfigAltResp);
if (!EFI_ERROR (Status)){
ConfigSize = StrSize(ConfigAltResp);
if (ConfigSize > gConfigRespSize){
- gConfigRespSize = ConfigSize;
+ //
+ // Do 25% overallocation to minimize the number of memory allocations
after ReadyToBoot.
+ // Since lots of allocation after ReadyToBoot may change memory map and
cause S4 resume issue.
+ //
+ gConfigRespSize = ConfigSize + (ConfigSize >> 2);
if (gRTConfigRespBuffer != NULL){
FreePool(gRTConfigRespBuffer);
+DEBUG ((DEBUG_WARN, "[HiiDatabase]: Memory allocation is required
after ReadyToBoot, which may change memory map and cause S4 resume issue.\n"));
}
- gRTConfigRespBuffer = (EFI_STRING)AllocateRuntimeZeroPool(ConfigSize);
+ gRTConfigRespBuffer = (EFI_STRING) AllocateRuntimeZeroPool
(gConfigRespSize);
if (gRTConfigRespBuffer == NULL){
FreePool(ConfigAltResp);
-DEBUG ((DEBUG_ERROR, "Not enough memory resource to get the ConfigResp
string.\n"));
+DEBUG ((DEBUG_ERROR, "[HiiDatabase]: No enough memory resource to
store the ConfigResp string.\n"));
return EFI_OUT_OF_RESOURCES;
}
} else {
ZeroMem(gRTConfigRespBuffer,gConfigRespSize);
}
@@ -3412,17 +3417,22 @@ HiiGetDatabaseInfo(
Status = HiiExportPackageLists(This, NULL, &DatabaseInfoSize, DatabaseInfo);
ASSERT(Status == EFI_BUFFER_TOO_SMALL);
if(DatabaseInfoSize > gDatabaseInfoSize ) {
-gDatabaseInfoSize = DatabaseInfoSize;
+//
+// Do 25% overallocation to minimize the number of memory allocations
after ReadyToBoot.
+// Since lots of allocation after ReadyToBoot may change memory map and
cause S4 resume issue.
+//
+gDatabaseInfoSize = DatabaseInfoSize + (DatabaseInfoSize >> 2);
if (gRTDatabaseInfoBuffer != NULL){
FreePool(gRTDatabaseInfoBuffer);
+ DEBUG ((DEBUG_WARN, "[HiiDatabase]: Memory allocation is required after
ReadyToBoot, which may change memory map and cause S4 resume issue.\n"));
}
-gRTDatabaseInfoBuffer = AllocateRuntimeZeroPool(DatabaseInfoSize);
+gRTDatabaseInfoBuffer = AllocateRuntimeZeroPool (gDatabaseInfoSize);
if (gRTDatabaseInfoBuffer == NULL){
- DEBUG ((DEBUG_ERROR, "Not enough memory resource to get the HiiDatabase
info.\n"));
+ DEBUG ((DEBUG_ERROR, "[HiiDatabase]: No enough memory resource to store
the HiiDatabase info.\n"));
return EFI_OUT_OF_RESOURCES;
}
} else {
ZeroMem(gRTDatabaseInfoBuffer,gDatabaseInfoSize);
}
--
2.18.0.windows.1
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#39535): https://edk2.groups.io/g/devel/message/39535
Mute This Topic: https://groups.io/mt/31338933/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[edk2-devel] [edk2-platforms/devel-MinPlatform] [patch 2/2] ClevoOpenBoardPkg/N1xxWU: Remove PcdFrameworkCompatibilitySupport usage
REF: https://bugzilla.tianocore.org/show_bug.cgi?id=1464 Framework compatibility support is no needed and PcdFrameworkCompatibilitySupport will be removed from edk2. So remove the usage of this PCD in platforms firstly. Cc: Michael Kubacki Cc: Ankit Sinha Cc: Nate DeSimone Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Dandan Bi --- Platform/Intel/ClevoOpenBoardPkg/N1xxWU/OpenBoardPkgPcd.dsc | 1 - 1 file changed, 1 deletion(-) diff --git a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/OpenBoardPkgPcd.dsc b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/OpenBoardPkgPcd.dsc index 1372dd81fc..9b6f5005eb 100644 --- a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/OpenBoardPkgPcd.dsc +++ b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/OpenBoardPkgPcd.dsc @@ -17,11 +17,10 @@ # # Pcd Section - list of all EDK II PCD Entries defined by this Platform # [PcdsFeatureFlag.common] - gEfiMdeModulePkgTokenSpaceGuid.PcdFrameworkCompatibilitySupport|TRUE gUefiCpuPkgTokenSpaceGuid.PcdCpuSmmEnableBspElection|FALSE gEfiMdeModulePkgTokenSpaceGuid.PcdPeiCoreImageLoaderSearchTeSectionFirst|FALSE !if $(TARGET) == RELEASE gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeUseSerial|FALSE !else -- 2.18.0.windows.1 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#39619): https://edk2.groups.io/g/devel/message/39619 Mute This Topic: https://groups.io/mt/31349694/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[edk2-devel] [edk2-platforms/devel-MinPlatform] [patch 0/2] Remove PcdFrameworkCompatibilitySupport usage
REF: https://bugzilla.tianocore.org/show_bug.cgi?id=1464 Framework compatibility support is no needed and PcdFrameworkCompatibilitySupport will be removed from edk2. So remove this PCD in platforms firstly. Test done for the series: Build pass for ClevoOpenBoardPkg KabylakeOpenBoardPkg. Boot to shell with KBLRvp3. Cc: Michael Kubacki Cc: Ankit Sinha Cc: Nate DeSimone Cc: Chasel Chiu Dandan Bi (2): KabylakeOpenBoardPkg/KBLRvp3: Remove PcdFrameworkCompatibilitySupport usage ClevoOpenBoardPkg/N1xxWU: Remove PcdFrameworkCompatibilitySupport usage Platform/Intel/ClevoOpenBoardPkg/N1xxWU/OpenBoardPkgPcd.dsc | 1 - .../Intel/KabylakeOpenBoardPkg/KabylakeRvp3/OpenBoardPkgPcd.dsc | 1 - 2 files changed, 2 deletions(-) -- 2.18.0.windows.1 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#39617): https://edk2.groups.io/g/devel/message/39617 Mute This Topic: https://groups.io/mt/31349692/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[edk2-devel] [edk2-platforms/devel-MinPlatform] [patch 1/2] KabylakeOpenBoardPkg/KBLRvp3: Remove PcdFrameworkCompatibilitySupport usage
REF: https://bugzilla.tianocore.org/show_bug.cgi?id=1464 Framework compatibility support is no needed and PcdFrameworkCompatibilitySupport will be removed from edk2. So remove the usage of this PCD in platforms firstly. Cc: Chasel Chiu Cc: Michael Kubacki Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Dandan Bi --- .../Intel/KabylakeOpenBoardPkg/KabylakeRvp3/OpenBoardPkgPcd.dsc | 1 - 1 file changed, 1 deletion(-) diff --git a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/OpenBoardPkgPcd.dsc b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/OpenBoardPkgPcd.dsc index 51d4e2ea46..c0d566db21 100644 --- a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/OpenBoardPkgPcd.dsc +++ b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/OpenBoardPkgPcd.dsc @@ -17,11 +17,10 @@ # # Pcd Section - list of all EDK II PCD Entries defined by this Platform # [PcdsFeatureFlag.common] - gEfiMdeModulePkgTokenSpaceGuid.PcdFrameworkCompatibilitySupport|TRUE gUefiCpuPkgTokenSpaceGuid.PcdCpuSmmEnableBspElection|FALSE gEfiMdeModulePkgTokenSpaceGuid.PcdPeiCoreImageLoaderSearchTeSectionFirst|FALSE !if $(TARGET) == RELEASE gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeUseSerial|FALSE !else -- 2.18.0.windows.1 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#39618): https://edk2.groups.io/g/devel/message/39618 Mute This Topic: https://groups.io/mt/31349693/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[edk2-devel] [patch 05/11] MdeModulePkg/CdExpress: Remove PcdFrameworkCompatibilitySupport usage
REF: https://bugzilla.tianocore.org/show_bug.cgi?id=1464
Currently Framework compatibility is not needed and
PcdFrameworkCompatibilitySupport will be removed from edk2.
So remove the usage of this PCD firstly.
Cc: Hao Wu
Cc: Liming Gao
Signed-off-by: Dandan Bi
---
.../Universal/Disk/CdExpressPei/CdExpressPei.inf | 5 +
.../Universal/Disk/CdExpressPei/PeiCdExpress.c | 10 +-
2 files changed, 2 insertions(+), 13 deletions(-)
diff --git a/MdeModulePkg/Universal/Disk/CdExpressPei/CdExpressPei.inf
b/MdeModulePkg/Universal/Disk/CdExpressPei/CdExpressPei.inf
index 11ab49b33b..184036bfb9 100644
--- a/MdeModulePkg/Universal/Disk/CdExpressPei/CdExpressPei.inf
+++ b/MdeModulePkg/Universal/Disk/CdExpressPei/CdExpressPei.inf
@@ -3,11 +3,11 @@
#
# This module reads data from CDROM device by all installed block IO ppi and
# finds whether there is Recovery data in the device. If it finds recovery
# data, it will install Device Recovery Module PPI.
#
-# Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.
+# Copyright (c) 2006 - 2019, Intel Corporation. All rights reserved.
#
# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
@@ -56,13 +56,10 @@
## NOTIFY
## CONSUMES
gEfiPeiVirtualBlockIo2PpiGuid
gEfiPeiDeviceRecoveryModulePpiGuid## PRODUCES
-[FeaturePcd]
- gEfiMdeModulePkgTokenSpaceGuid.PcdFrameworkCompatibilitySupport ## CONSUMES
-
[Pcd]
gEfiMdeModulePkgTokenSpaceGuid.PcdRecoveryFileName ## CONSUMES
[Depex]
gEfiPeiMemoryDiscoveredPpiGuid AND gEfiPeiBootInRecoveryModePpiGuid
diff --git a/MdeModulePkg/Universal/Disk/CdExpressPei/PeiCdExpress.c
b/MdeModulePkg/Universal/Disk/CdExpressPei/PeiCdExpress.c
index b029c54729..fd34f07eec 100644
--- a/MdeModulePkg/Universal/Disk/CdExpressPei/PeiCdExpress.c
+++ b/MdeModulePkg/Universal/Disk/CdExpressPei/PeiCdExpress.c
@@ -1,9 +1,9 @@
/** @file
Source file for CD recovery PEIM
-Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.
+Copyright (c) 2006 - 2019, Intel Corporation. All rights reserved.
SPDX-License-Identifier: BSD-2-Clause-Patent
**/
@@ -585,14 +585,10 @@ GetRecoveryCapsuleInfo (
if (EFI_ERROR (Status)) {
return Status;
}
- if (FeaturePcdGet (PcdFrameworkCompatibilitySupport)) {
-CapsuleInstance = CapsuleInstance + 1;
- }
-
if ((CapsuleInstance == 0) || (CapsuleInstance > NumberRecoveryCapsules)) {
return EFI_NOT_FOUND;
}
PrivateData = PEI_CD_EXPRESS_PRIVATE_DATA_FROM_THIS (This);
@@ -645,14 +641,10 @@ LoadRecoveryCapsule (
if (EFI_ERROR (Status)) {
return Status;
}
- if (FeaturePcdGet (PcdFrameworkCompatibilitySupport)) {
-CapsuleInstance = CapsuleInstance + 1;
- }
-
if ((CapsuleInstance == 0) || (CapsuleInstance > NumberRecoveryCapsules)) {
return EFI_NOT_FOUND;
}
PrivateData = PEI_CD_EXPRESS_PRIVATE_DATA_FROM_THIS (This);
--
2.18.0.windows.1
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#39724): https://edk2.groups.io/g/devel/message/39724
Mute This Topic: https://groups.io/mt/31378999/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[edk2-devel] [patch 01/11] BaseTools/VfrCompile: Remove framework VFR support
REF: https://bugzilla.tianocore.org/show_bug.cgi?id=1464
Currently there is no usage of framework VFR,
remove the support from VfrCompile.
Cc: Bob Feng
Cc: Liming Gao
Signed-off-by: Dandan Bi
---
BaseTools/Source/C/VfrCompile/VfrCompiler.cpp | 35 +-
BaseTools/Source/C/VfrCompile/VfrCompiler.h | 3 +-
BaseTools/Source/C/VfrCompile/VfrFormPkg.cpp | 23 +---
BaseTools/Source/C/VfrCompile/VfrFormPkg.h| 3 +-
BaseTools/Source/C/VfrCompile/VfrSyntax.g | 103 +-
.../Source/C/VfrCompile/VfrUtilityLib.cpp | 52 +
BaseTools/Source/C/VfrCompile/VfrUtilityLib.h | 7 +-
.../VfrCompiler_Utility_Man_Page.rtf | 4 -
8 files changed, 15 insertions(+), 215 deletions(-)
diff --git a/BaseTools/Source/C/VfrCompile/VfrCompiler.cpp
b/BaseTools/Source/C/VfrCompile/VfrCompiler.cpp
index c4d4d261ad..5f4d262d85 100644
--- a/BaseTools/Source/C/VfrCompile/VfrCompiler.cpp
+++ b/BaseTools/Source/C/VfrCompile/VfrCompiler.cpp
@@ -1,10 +1,10 @@
/** @file
VfrCompiler main class and main function.
-Copyright (c) 2004 - 2018, Intel Corporation. All rights reserved.
+Copyright (c) 2004 - 2019, Intel Corporation. All rights reserved.
SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#include "stdio.h"
@@ -72,11 +72,10 @@ CVfrCompiler::OptionInitialization (
mOptions.PreprocessorOutputFileName= NULL;
mOptions.VfrBaseFileName = NULL;
mOptions.IncludePaths = NULL;
mOptions.SkipCPreprocessor = TRUE;
mOptions.CPreprocessorOptions = NULL;
- mOptions.CompatibleMode= FALSE;
mOptions.HasOverrideClassGuid = FALSE;
mOptions.WarningAsError= FALSE;
mOptions.AutoDefault = FALSE;
mOptions.CheckDefault = FALSE;
memset (&mOptions.OverrideClassGuid, 0, sizeof (EFI_GUID));
@@ -140,12 +139,10 @@ CVfrCompiler::OptionInitialization (
DebugError (NULL, 0, 1001, "Missing option", "-od - missing
C-preprocessor argument");
goto Fail;
}
AppendCPreprocessorOptions (Argv[Index]);
-} else if (stricmp(Argv[Index], "-c") == 0 || stricmp(Argv[Index],
"--compatible-framework") == 0) {
- mOptions.CompatibleMode = TRUE;
} else if (stricmp(Argv[Index], "-s") == 0|| stricmp(Argv[Index],
"--string-db") == 0) {
Index++;
if ((Index >= Argc) || (Argv[Index][0] == '-')) {
DebugError (NULL, 0, 1001, "Missing option", "-s missing input string
file name");
goto Fail;
@@ -559,12 +556,10 @@ CVfrCompiler::Usage (
" default is current directory",
" -b, --create-ifr-package",
" create an IFR HII pack file",
" -n, --no-pre-processing",
" do not preprocessing input file",
-" -c, --compatible-framework",
-" compatible framework vfr file",
" -s, --string-db",
" input uni string package file",
" -g, --guid",
" override class guid input",
" format is ----",
@@ -683,11 +678,10 @@ CVfrCompiler::Compile (
if ((pInFile = fopen (LongFilePath (InFileName), "r")) == NULL) {
DebugError (NULL, 0, 0001, "Error opening the input file", "%s",
InFileName);
goto Fail;
}
- InputInfo.CompatibleMode = mOptions.CompatibleMode;
if (mOptions.HasOverrideClassGuid) {
InputInfo.OverrideClassGuid = &mOptions.OverrideClassGuid;
} else {
InputInfo.OverrideClassGuid = NULL;
}
@@ -773,31 +767,10 @@ CVfrCompiler::AdjustBin (
//ok
} else {
DebugError (NULL, 0, 0001, "Error parsing vfr file", " %s.Buffer not
allocated.", mOptions.VfrFileName);
}
- //
- // For UEFI mode, not do OpCode Adjust
- //
- if (mOptions.CompatibleMode) {
-//
-// Adjust Opcode to be compatible with framework vfr
-//
-Status = gCIfrRecordInfoDB.IfrRecordAdjust ();
-if (Status != VFR_RETURN_SUCCESS) {
- //
- // Record List Adjust Failed
- //
- SET_RUN_STATUS (STATUS_FAILED);
- return;
-}
-//
-// Re get the IfrRecord Buffer.
-//
-gCIfrRecordInfoDB.IfrRecordOutput (gRBuffer);
- }
-
return;
}
VOID
CVfrCompiler::GenBinary (
@@ -851,24 +824,20 @@ CVfrCompiler::GenCFile (
if (!IS_RUN_STATUS(STATUS_GENBINARY)) {
goto Fail;
}
- if (!mOptions.CreateIfrPkgFile || mOptions.CompatibleMode) {
+ if (!mOptions.CreateIfrPkgFile) {
if ((pFile = fopen (LongFilePath (mOptions.COutputFileName), "w")) ==
NULL) {
DebugError (NULL, 0, 0001, "Error opening output C file", "%s",
[edk2-devel] [patch 06/11] MdeModulePkg/Setup: Remove PcdFrameworkCompatibilitySupport usage
REF: https://bugzilla.tianocore.org/show_bug.cgi?id=1464
Currently Framework compatibility support is not needed and
PcdFrameworkCompatibilitySupport will be removed from edk2.
So remove the usage of this PCD firstly.
Cc: Liming Gao
Cc: Eric Dong
Signed-off-by: Dandan Bi
---
.../Universal/SetupBrowserDxe/IfrParse.c | 86 +--
.../SetupBrowserDxe/SetupBrowserDxe.inf | 6 +-
2 files changed, 2 insertions(+), 90 deletions(-)
diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/IfrParse.c
b/MdeModulePkg/Universal/SetupBrowserDxe/IfrParse.c
index 034edb51a7..891b95cf9f 100644
--- a/MdeModulePkg/Universal/SetupBrowserDxe/IfrParse.c
+++ b/MdeModulePkg/Universal/SetupBrowserDxe/IfrParse.c
@@ -1,9 +1,9 @@
/** @file
Parser for IFR binary encoding.
-Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.
+Copyright (c) 2007 - 2019, Intel Corporation. All rights reserved.
SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#include "Setup.h"
@@ -82,80 +82,10 @@ CreateStatement (
InsertTailList (&Form->StatementListHead, &Statement->Link);
}
return Statement;
}
-/**
- Convert a numeric value to a Unicode String and insert it to String Package.
- This string is used as the Unicode Name for the EFI Variable. This is to
support
- the deprecated vareqval opcode.
-
- @param FormSetThe FormSet.
- @param Statement The numeric question whose VarStoreInfo.VarName is the
-numeric value which is used to produce the Unicode Name
-for the EFI Variable.
-
- If the Statement is NULL, the ASSERT.
- If the opcode is not Numeric, then ASSERT.
-
- @retval EFI_SUCCESS The funtion always succeeds.
-**/
-EFI_STATUS
-UpdateCheckBoxStringToken (
- IN CONST FORM_BROWSER_FORMSET *FormSet,
- IN FORM_BROWSER_STATEMENT *Statement
- )
-{
- CHAR16 Str[MAXIMUM_VALUE_CHARACTERS];
- EFI_STRING_ID Id;
-
- ASSERT (Statement != NULL);
- ASSERT (Statement->Operand == EFI_IFR_NUMERIC_OP);
-
- UnicodeValueToStringS (Str, sizeof (Str), 0,
Statement->VarStoreInfo.VarName, MAXIMUM_VALUE_CHARACTERS - 1);
-
- Id = HiiSetString (FormSet->HiiHandle, 0, Str, NULL);
- if (Id == 0) {
-return EFI_OUT_OF_RESOURCES;
- }
-
- Statement->VarStoreInfo.VarName = Id;
-
- return EFI_SUCCESS;
-}
-
-/**
- Check if the next opcode is the EFI_IFR_EXTEND_OP_VAREQNAME.
-
- @param OpCodeData The current opcode.
-
- @retval TRUE Yes.
- @retval FALSE No.
-**/
-BOOLEAN
-IsNextOpCodeGuidedVarEqName (
- IN UINT8 *OpCodeData
- )
-{
- //
- // Get next opcode
- //
- OpCodeData += ((EFI_IFR_OP_HEADER *) OpCodeData)->Length;
- if (*OpCodeData == EFI_IFR_GUID_OP) {
-if (CompareGuid (&gEfiIfrFrameworkGuid, (EFI_GUID *)(OpCodeData + sizeof
(EFI_IFR_OP_HEADER {
- //
- // Specific GUIDed opcodes to support IFR generated from Framework HII
VFR
- //
- if EFI_IFR_GUID_VAREQNAME *) OpCodeData)->ExtendOpCode) ==
EFI_IFR_EXTEND_OP_VAREQNAME) {
-return TRUE;
- }
-}
- }
-
- return FALSE;
-}
-
/**
Initialize Question's members.
@param OpCodeData Pointer of the raw OpCode data.
@param FormSetPointer of the current FormSet.
@@ -174,11 +104,10 @@ CreateQuestion (
FORM_BROWSER_STATEMENT *Statement;
EFI_IFR_QUESTION_HEADER *QuestionHdr;
LIST_ENTRY *Link;
FORMSET_STORAGE *Storage;
NAME_VALUE_NODE *NameValueNode;
- EFI_STATUS Status;
BOOLEAN Find;
Statement = CreateStatement (OpCodeData, FormSet, Form);
if (Statement == NULL) {
return NULL;
@@ -196,23 +125,10 @@ CreateQuestion (
// VarStoreId of zero indicates no variable storage
//
return Statement;
}
- //
- // Take a look at next OpCode to see whether it is a GUIDed opcode to support
- // Framework Compatibility
- //
- if (FeaturePcdGet (PcdFrameworkCompatibilitySupport)) {
-if ((*OpCodeData == EFI_IFR_NUMERIC_OP) && IsNextOpCodeGuidedVarEqName
(OpCodeData)) {
- Status = UpdateCheckBoxStringToken (FormSet, Statement);
- if (EFI_ERROR (Status)) {
-return NULL;
- }
-}
- }
-
//
// Find Storage for this Question
//
Link = GetFirstNode (&FormSet->StorageListHead);
while (!IsNull (&FormSet->StorageListHead, Link)) {
diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf
b/MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf
index a6b9402daa..82db7c1ef1 100644
--- a/MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf
+++ b/MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf
@@ -1,11 +1,11 @@
## @file
# The DXE driver produces FORM BROWSER2 protocol defined in UEFI specification.
#
# It also produces FormBrowserEx(2) protocol to let user register the
different Hot key service.
#
-# Copyright
[edk2-devel] [patch 03/11] IntelFrameworkModulePkg: Remove PcdFrameworkCompatibilitySupport usage
REF: https://bugzilla.tianocore.org/show_bug.cgi?id=1464
Currently Framework compatibility is not needed and
PcdFrameworkCompatibilitySupport will be removed from edk2.
So remove the usage of this PCD firstly.
Cc: Liming Gao
Signed-off-by: Dandan Bi
---
.../Universal/Acpi/AcpiS3SaveDxe/AcpiS3Save.c | 10 +-
.../Universal/Acpi/AcpiS3SaveDxe/AcpiS3SaveDxe.inf | 3 +--
2 files changed, 2 insertions(+), 11 deletions(-)
diff --git a/IntelFrameworkModulePkg/Universal/Acpi/AcpiS3SaveDxe/AcpiS3Save.c
b/IntelFrameworkModulePkg/Universal/Acpi/AcpiS3SaveDxe/AcpiS3Save.c
index b5f8131f98..366ada935d 100644
--- a/IntelFrameworkModulePkg/Universal/Acpi/AcpiS3SaveDxe/AcpiS3Save.c
+++ b/IntelFrameworkModulePkg/Universal/Acpi/AcpiS3SaveDxe/AcpiS3Save.c
@@ -1,10 +1,10 @@
/** @file
This is an implementation of the ACPI S3 Save protocol. This is defined in
S3 boot path specification 0.9.
-Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.
+Copyright (c) 2006 - 2019, Intel Corporation. All rights reserved.
SPDX-License-Identifier: BSD-2-Clause-Patent
**/
@@ -138,14 +138,10 @@ S3Ready (
if (AlreadyEntered) {
return EFI_SUCCESS;
}
AlreadyEntered = TRUE;
- if (FeaturePcdGet(PcdFrameworkCompatibilitySupport)) {
-S3ReadyThunkPlatform ();
- }
-
return EFI_SUCCESS;
}
/**
The Driver Entry Point.
@@ -180,14 +176,10 @@ InstallAcpiS3Save (
mLegacyRegionSize = 0x250;
} else {
mLegacyRegionSize = 0x100;
}
- if (FeaturePcdGet(PcdFrameworkCompatibilitySupport)) {
-InstallAcpiS3SaveThunk ();
- }
-
Status = gBS->InstallProtocolInterface (
&ImageHandle,
&gEfiAcpiS3SaveProtocolGuid,
EFI_NATIVE_INTERFACE,
&mS3Save
diff --git
a/IntelFrameworkModulePkg/Universal/Acpi/AcpiS3SaveDxe/AcpiS3SaveDxe.inf
b/IntelFrameworkModulePkg/Universal/Acpi/AcpiS3SaveDxe/AcpiS3SaveDxe.inf
index 2e4f0868d2..0cfcb8ce53 100644
--- a/IntelFrameworkModulePkg/Universal/Acpi/AcpiS3SaveDxe/AcpiS3SaveDxe.inf
+++ b/IntelFrameworkModulePkg/Universal/Acpi/AcpiS3SaveDxe/AcpiS3SaveDxe.inf
@@ -1,9 +1,9 @@
## @file
# AcpiS3Save module installs ACPI S3 Save protocol to prepare S3 boot data.
#
-# Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.
+# Copyright (c) 2006 - 2019, Intel Corporation. All rights reserved.
#
# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
@@ -56,11 +56,10 @@
## SOMETIMES_CONSUMES
gEdkiiVariableLockProtocolGuid
[FeaturePcd]
gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdPlatformCsmSupport ##
CONSUMES
- gEfiMdeModulePkgTokenSpaceGuid.PcdFrameworkCompatibilitySupport ##
CONSUMES
[Pcd]
gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdS3AcpiReservedMemorySize##
SOMETIMES_CONSUMES
gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiS3Enable ##
CONSUMES
--
2.18.0.windows.1
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#39722): https://edk2.groups.io/g/devel/message/39722
Mute This Topic: https://groups.io/mt/31378997/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[edk2-devel] [patch 09/11] UefiCpuPkg: Remove PcdFrameworkCompatibilitySupport usage
REF: https://bugzilla.tianocore.org/show_bug.cgi?id=1464
Currently Framework compatibility support is not needed and
PcdFrameworkCompatibilitySupport will be removed from edk2.
So remove the usage of this PCD firstly.
Cc: Eric Dong
Cc: Ray Ni
Cc: Laszlo Ersek
Signed-off-by: Dandan Bi
---
.../Universal/Acpi/S3Resume2Pei/S3Resume.c| 30 ---
.../Acpi/S3Resume2Pei/S3Resume2Pei.inf| 3 +-
2 files changed, 1 insertion(+), 32 deletions(-)
diff --git a/UefiCpuPkg/Universal/Acpi/S3Resume2Pei/S3Resume.c
b/UefiCpuPkg/Universal/Acpi/S3Resume2Pei/S3Resume.c
index 77c3fb6bdc..83ce1c4037 100644
--- a/UefiCpuPkg/Universal/Acpi/S3Resume2Pei/S3Resume.c
+++ b/UefiCpuPkg/Universal/Acpi/S3Resume2Pei/S3Resume.c
@@ -741,12 +741,10 @@ S3ResumeExecuteBootScript (
{
EFI_STATUS Status;
PEI_SMM_ACCESS_PPI *SmmAccess;
UINTN Index;
VOID *GuidHob;
- IA32_DESCRIPTOR*IdtDescriptor;
- VOID *IdtBuffer;
PEI_S3_RESUME_STATE*PeiS3ResumeState;
BOOLEANInterruptStatus;
DEBUG ((DEBUG_INFO, "S3ResumeExecuteBootScript()\n"));
@@ -802,38 +800,10 @@ S3ResumeExecuteBootScript (
if (FeaturePcdGet (PcdDxeIplSwitchToLongMode)) {
AsmWriteCr3 ((UINTN)AcpiS3Context->S3NvsPageTableAddress);
}
- if (FeaturePcdGet (PcdFrameworkCompatibilitySupport)) {
-//
-// On some platform, such as ECP, a dispatch node in boot script table may
execute a 32-bit PEIM which may need PeiServices
-// pointer. So PeiServices need preserve in (IDTBase- sizeof (UINTN)).
-//
-IdtDescriptor = (IA32_DESCRIPTOR *) (UINTN) (AcpiS3Context->IdtrProfile);
-//
-// Make sure the newly allocated IDT align with 16-bytes
-//
-IdtBuffer = AllocatePages (EFI_SIZE_TO_PAGES((IdtDescriptor->Limit + 1) +
16));
-if (IdtBuffer == NULL) {
- REPORT_STATUS_CODE (
-EFI_ERROR_CODE | EFI_ERROR_MAJOR,
-(EFI_SOFTWARE_PEI_MODULE | EFI_SW_PEI_EC_S3_RESUME_FAILED)
-);
- ASSERT (FALSE);
-}
-//
-// Additional 16 bytes allocated to save IA32 IDT descriptor and Pei
Service Table Pointer
-// IA32 IDT descriptor will be used to setup IA32 IDT table for 32-bit
Framework Boot Script code
-//
-ZeroMem (IdtBuffer, 16);
-AsmReadIdtr ((IA32_DESCRIPTOR *)IdtBuffer);
-CopyMem ((VOID*)((UINT8*)IdtBuffer + 16),(VOID*)(IdtDescriptor->Base),
(IdtDescriptor->Limit + 1));
-IdtDescriptor->Base = (UINTN)((UINT8*)IdtBuffer + 16);
-*(UINTN*)(IdtDescriptor->Base - sizeof(UINTN)) =
(UINTN)GetPeiServicesTablePointer ();
- }
-
InterruptStatus = SaveAndDisableInterrupts ();
//
// Need to make sure the GDT is loaded with values that support long mode
and real mode.
//
AsmWriteGdtr (&mGdt);
diff --git a/UefiCpuPkg/Universal/Acpi/S3Resume2Pei/S3Resume2Pei.inf
b/UefiCpuPkg/Universal/Acpi/S3Resume2Pei/S3Resume2Pei.inf
index d694a98691..aae984d138 100644
--- a/UefiCpuPkg/Universal/Acpi/S3Resume2Pei/S3Resume2Pei.inf
+++ b/UefiCpuPkg/Universal/Acpi/S3Resume2Pei/S3Resume2Pei.inf
@@ -3,11 +3,11 @@
#
# This module works with StandAloneBootScriptExecutor to S3 resume to OS.
# This module will excute the boot script saved during last boot and after
that,
# control is passed to OS waking up handler.
#
-# Copyright (c) 2010 - 2018, Intel Corporation. All rights reserved.
+# Copyright (c) 2010 - 2019, Intel Corporation. All rights reserved.
# Copyright (c) 2017, AMD Incorporated. All rights reserved.
#
# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
@@ -87,11 +87,10 @@
gEfiEndOfPeiSignalPpiGuid ## SOMETIMES_PRODUCES
gEfiPeiSmmCommunicationPpiGuid## SOMETIMES_CONSUMES
[FeaturePcd]
gEfiMdeModulePkgTokenSpaceGuid.PcdDxeIplSwitchToLongMode ## CONSUMES
- gEfiMdeModulePkgTokenSpaceGuid.PcdFrameworkCompatibilitySupport ## CONSUMES
[Pcd]
gEfiMdeModulePkgTokenSpaceGuid.PcdUse1GPageTable ## SOMETIMES_CONSUMES
gEfiMdeModulePkgTokenSpaceGuid.PcdPteMemoryEncryptionAddressOrMask##
CONSUMES
--
2.18.0.windows.1
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#39728): https://edk2.groups.io/g/devel/message/39728
Mute This Topic: https://groups.io/mt/31379004/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[edk2-devel] [patch 11/11] MdeModulePkg: Remove PcdFrameworkCompatibilitySupport
REF: https://bugzilla.tianocore.org/show_bug.cgi?id=1464 Currently Framework compatibility support is not needed and PcdFrameworkCompatibilitySupport will be removed from edk2. So remove the usage of this PCD firstly. Cc: Liming Gao Cc: Hao Wu Cc: Jian J Wang Signed-off-by: Dandan Bi --- MdeModulePkg/MdeModulePkg.dec | 8 MdeModulePkg/MdeModulePkg.uni | 6 -- 2 files changed, 14 deletions(-) diff --git a/MdeModulePkg/MdeModulePkg.dec b/MdeModulePkg/MdeModulePkg.dec index be84916cc0..095863dc07 100644 --- a/MdeModulePkg/MdeModulePkg.dec +++ b/MdeModulePkg/MdeModulePkg.dec @@ -735,18 +735,10 @@ # TRUE - USB KeyBoard Driver will disable the default keyboard layout. # FALSE - USB KeyBoard Driver will not disable the default keyboard layout. # @Prompt Disable default keyboard layout in USB KeyBoard Driver. gEfiMdeModulePkgTokenSpaceGuid.PcdDisableDefaultKeyboardLayoutInUsbKbDriver|FALSE|BOOLEAN|0x00010200 - ## Indicates if backward compatibility to Framework HII and Framework FvHob is supported. - # TRUE - Setup Browser supports GUID opcodes generated from Framework HII VFR file by VFR compiler. - # the PeiCore will handle the framework FvHob and install FvInfo PPI for it. - # FALSE - Setup Browser doesn't support GUID opcodes generated from Framework HII VFR file by VFR compiler. - # the PeiCore will not handle the framework FvHob and install FvInfo PPI for it. - # @Prompt Enable framework backward compatibility support. - gEfiMdeModulePkgTokenSpaceGuid.PcdFrameworkCompatibilitySupport|FALSE|BOOLEAN|0x00012009 - ## Indicates if HelloWorld Application will print the verbose information. # This PCD is a sample to explain FeatureFlag PCD usage. # TRUE - HelloWorld Application will print the verbose information. # FALSE - HelloWorld Application will not print the verbose information. # @Prompt Enable HelloWorld print. diff --git a/MdeModulePkg/MdeModulePkg.uni b/MdeModulePkg/MdeModulePkg.uni index cf2aefa7ad..b71e68617c 100644 --- a/MdeModulePkg/MdeModulePkg.uni +++ b/MdeModulePkg/MdeModulePkg.uni @@ -709,16 +709,10 @@ #string STR_gEfiMdeModulePkgTokenSpaceGuid_PcdDisableDefaultKeyboardLayoutInUsbKbDriver_HELP #language en-US "Disable default USB keyboard layout? The default keyboard layout serves as the backup when no keyboard layout can be retrieved from HII database.\n" "TRUE - disable\n" "FALSE - enable" -#string STR_gEfiMdeModulePkgTokenSpaceGuid_PcdFrameworkCompatibilitySupport_PROMPT #language en-US "Enable framework backward compatibility support" - -#string STR_gEfiMdeModulePkgTokenSpaceGuid_PcdFrameworkCompatibilitySupport_HELP #language en-US "Indicates if backward compatibility to Framework HII and Framework FvHob is supported.\n" - "TRUE - Setup Browser supports GUID opcodes generated from Framework HII VFR file by VFR compiler. the PeiCore will handle the framework FvHob and install FvInfo PPI for it.\n" - "FALSE - Setup Browser doesn't support GUID opcodes generated from Framework HII VFR file by VFR compiler. the PeiCore will not handle the framework FvHob and install FvInfo PPI for it." - #string STR_gEfiMdeModulePkgTokenSpaceGuid_PcdHelloWorldPrintEnable_PROMPT #language en-US "Enable HelloWorld print" #string STR_gEfiMdeModulePkgTokenSpaceGuid_PcdHelloWorldPrintEnable_HELP #language en-US "Indicates if HelloWorld Application will print the verbose information. This PCD is a sample to explain FeatureFlag PCD usage.\n" "TRUE - HelloWorld Application will print the verbose information.\n" "FALSE - HelloWorld Application will not print the verbose information." -- 2.18.0.windows.1 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#39730): https://edk2.groups.io/g/devel/message/39730 Mute This Topic: https://groups.io/mt/31379007/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[edk2-devel] [patch 00/11] Remove PcdFrameworkCompatibilitySupport
REF: https://bugzilla.tianocore.org/show_bug.cgi?id=1464 Patch 1-10 remove usage of PcdFrameworkCompatibilitySupport. patch 11 remove PcdFrameworkCompatibilitySupport Cc: Bob Feng Cc: Liming Gao Cc: Ray Ni Cc: Hao Wu Cc: Eric Dong Cc: Michael D Kinney Cc: Kelly Steele Cc: Zailiang Sun Cc: Yi Qian Cc: Laszlo Ersek Cc: Jiewen Yao Cc: Chao Zhang Dandan Bi (11): BaseTools/VfrCompile: Remove framework VFR support FatPkg/FatPei: Remove PcdFrameworkCompatibilitySupport usage IntelFrameworkModulePkg: Remove PcdFrameworkCompatibilitySupport usage MdeModulePkg/Core: Remove PcdFrameworkCompatibilitySupport usage MdeModulePkg/CdExpress: Remove PcdFrameworkCompatibilitySupport usage MdeModulePkg/Setup: Remove PcdFrameworkCompatibilitySupport usage QuarkPlatformPkg: Remove PcdFrameworkCompatibilitySupport usage SignedCapsulePkg: Remove PcdFrameworkCompatibilitySupport usage UefiCpuPkg: Remove PcdFrameworkCompatibilitySupport usage Vlv2TbltDevicePkg: Remove PcdFrameworkCompatibilitySupport usage MdeModulePkg: Remove PcdFrameworkCompatibilitySupport BaseTools/Source/C/VfrCompile/VfrCompiler.cpp | 35 + BaseTools/Source/C/VfrCompile/VfrCompiler.h | 3 +- BaseTools/Source/C/VfrCompile/VfrFormPkg.cpp | 23 +-- BaseTools/Source/C/VfrCompile/VfrFormPkg.h| 3 +- BaseTools/Source/C/VfrCompile/VfrSyntax.g | 103 +- .../Source/C/VfrCompile/VfrUtilityLib.cpp | 52 +-- BaseTools/Source/C/VfrCompile/VfrUtilityLib.h | 7 +- .../VfrCompiler_Utility_Man_Page.rtf | 4 - FatPkg/FatPei/FatLiteApi.c| 10 +- FatPkg/FatPei/FatPei.inf | 4 - .../Universal/Acpi/AcpiS3SaveDxe/AcpiS3Save.c | 10 +- .../Acpi/AcpiS3SaveDxe/AcpiS3SaveDxe.inf | 3 +- MdeModulePkg/Core/Dxe/DxeMain.inf | 6 +- MdeModulePkg/Core/Dxe/Image/Image.c | 132 +- MdeModulePkg/Core/Dxe/Image/Image.h | 85 +-- MdeModulePkg/Core/Pei/FwVol/FwVol.c | 65 - MdeModulePkg/Core/Pei/PeiMain.inf | 1 - MdeModulePkg/MdeModulePkg.dec | 8 -- MdeModulePkg/MdeModulePkg.uni | 6 - .../Disk/CdExpressPei/CdExpressPei.inf| 5 +- .../Disk/CdExpressPei/PeiCdExpress.c | 10 +- .../Universal/SetupBrowserDxe/IfrParse.c | 86 +--- .../SetupBrowserDxe/SetupBrowserDxe.inf | 6 +- .../Pei/PlatformInit/Generic/Recovery.c | 50 ++- .../Pei/PlatformInit/PlatformEarlyInit.inf| 3 +- .../RecoveryModuleLoadPei.c | 6 +- .../RecoveryModuleLoadPei.inf | 5 +- .../Universal/Acpi/S3Resume2Pei/S3Resume.c| 30 .../Acpi/S3Resume2Pei/S3Resume2Pei.inf| 3 +- Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc | 3 +- Vlv2TbltDevicePkg/PlatformPkgIA32.dsc | 3 +- Vlv2TbltDevicePkg/PlatformPkgX64.dsc | 3 +- 32 files changed, 48 insertions(+), 725 deletions(-) -- 2.18.0.windows.1 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#39719): https://edk2.groups.io/g/devel/message/39719 Mute This Topic: https://groups.io/mt/31378992/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[edk2-devel] [patch 02/11] FatPkg/FatPei: Remove PcdFrameworkCompatibilitySupport usage
REF: https://bugzilla.tianocore.org/show_bug.cgi?id=1464
Currently Framework compatibility is not needed and
PcdFrameworkCompatibilitySupport will be removed from edk2.
So remove the usage of this PCD firstly.
Cc: Ray Ni
Signed-off-by: Dandan Bi
---
FatPkg/FatPei/FatLiteApi.c | 10 +-
FatPkg/FatPei/FatPei.inf | 4
2 files changed, 1 insertion(+), 13 deletions(-)
diff --git a/FatPkg/FatPei/FatLiteApi.c b/FatPkg/FatPei/FatLiteApi.c
index 0bf6ddae6a..b9f883b9e0 100644
--- a/FatPkg/FatPei/FatLiteApi.c
+++ b/FatPkg/FatPei/FatLiteApi.c
@@ -1,9 +1,9 @@
/** @file
FAT recovery PEIM entry point, Ppi Functions and FAT Api functions.
-Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.
+Copyright (c) 2006 - 2019, Intel Corporation. All rights reserved.
SPDX-License-Identifier: BSD-2-Clause-Patent
**/
@@ -429,14 +429,10 @@ GetRecoveryCapsuleInfo (
if (EFI_ERROR (Status)) {
return Status;
}
- if (FeaturePcdGet (PcdFrameworkCompatibilitySupport)) {
-CapsuleInstance = CapsuleInstance + 1;
- }
-
if ((CapsuleInstance == 0) || (CapsuleInstance > NumberRecoveryCapsules)) {
return EFI_NOT_FOUND;
}
PrivateData = PEI_FAT_PRIVATE_DATA_FROM_THIS (This);
@@ -557,14 +553,10 @@ LoadRecoveryCapsule (
if (EFI_ERROR (Status)) {
return Status;
}
- if (FeaturePcdGet (PcdFrameworkCompatibilitySupport)) {
-CapsuleInstance = CapsuleInstance + 1;
- }
-
if ((CapsuleInstance == 0) || (CapsuleInstance > NumberRecoveryCapsules)) {
return EFI_NOT_FOUND;
}
PrivateData = PEI_FAT_PRIVATE_DATA_FROM_THIS (This);
diff --git a/FatPkg/FatPei/FatPei.inf b/FatPkg/FatPei/FatPei.inf
index b554aae040..d3466db9bf 100644
--- a/FatPkg/FatPei/FatPei.inf
+++ b/FatPkg/FatPei/FatPei.inf
@@ -63,14 +63,10 @@
[Ppis]
gEfiPeiVirtualBlockIoPpiGuid ## SOMETIMES_CONSUMES
PPI_NOTIFY
gEfiPeiVirtualBlockIo2PpiGuid ## SOMETIMES_CONSUMES
PPI_NOTIFY
gEfiPeiDeviceRecoveryModulePpiGuid## SOMETIMES_PRODUCES
-
-[FeaturePcd]
- gEfiMdeModulePkgTokenSpaceGuid.PcdFrameworkCompatibilitySupport ##
CONSUMES
-
[Pcd]
gEfiMdeModulePkgTokenSpaceGuid.PcdRecoveryFileName ## CONSUMES
[Depex]
gEfiPeiMemoryDiscoveredPpiGuid AND gEfiPeiBootInRecoveryModePpiGuid
--
2.18.0.windows.1
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#39721): https://edk2.groups.io/g/devel/message/39721
Mute This Topic: https://groups.io/mt/31378995/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[edk2-devel] [patch 08/11] SignedCapsulePkg: Remove PcdFrameworkCompatibilitySupport usage
REF: https://bugzilla.tianocore.org/show_bug.cgi?id=1464
Currently Framework compatibility support is not needed and
PcdFrameworkCompatibilitySupport will be removed from edk2.
So remove the usage of this PCD firstly.
Cc: Jiewen Yao
Cc: Chao Zhang
---
.../Universal/RecoveryModuleLoadPei/RecoveryModuleLoadPei.c | 6 +++---
.../RecoveryModuleLoadPei/RecoveryModuleLoadPei.inf | 5 +
2 files changed, 4 insertions(+), 7 deletions(-)
diff --git
a/SignedCapsulePkg/Universal/RecoveryModuleLoadPei/RecoveryModuleLoadPei.c
b/SignedCapsulePkg/Universal/RecoveryModuleLoadPei/RecoveryModuleLoadPei.c
index 29a2cc520c..eda3cc5420 100644
--- a/SignedCapsulePkg/Universal/RecoveryModuleLoadPei/RecoveryModuleLoadPei.c
+++ b/SignedCapsulePkg/Universal/RecoveryModuleLoadPei/RecoveryModuleLoadPei.c
@@ -7,11 +7,11 @@
buffer overflow, integer overflow.
ProcessRecoveryCapsule(), ProcessFmpCapsuleImage(), ProcessRecoveryImage(),
ValidateFmpCapsule() will receive untrusted input and do basic validation.
-Copyright (c) 2016 - 2018, Intel Corporation. All rights reserved.
+Copyright (c) 2016 - 2019, Intel Corporation. All rights reserved.
SPDX-License-Identifier: BSD-2-Clause-Patent
**/
//
@@ -764,11 +764,11 @@ LoadRecoveryCapsule (
for (CapsuleInstance = 1; CapsuleInstance <= NumberRecoveryCapsules;
CapsuleInstance++) {
CapsuleSize = 0;
Status = DeviceRecoveryPpi->GetRecoveryCapsuleInfo (
(EFI_PEI_SERVICES **)PeiServices,
DeviceRecoveryPpi,
-
FeaturePcdGet(PcdFrameworkCompatibilitySupport) ? CapsuleInstance - 1 :
CapsuleInstance,
+CapsuleInstance,
&CapsuleSize,
&CapsuleType
);
DEBUG ((DEBUG_ERROR, "LoadRecoveryCapsule - GetRecoveryCapsuleInfo (%d -
%x) - %r\n", CapsuleInstance, CapsuleSize, Status));
if (EFI_ERROR (Status)) {
@@ -781,11 +781,11 @@ LoadRecoveryCapsule (
continue;
}
Status = DeviceRecoveryPpi->LoadRecoveryCapsule (
(EFI_PEI_SERVICES **)PeiServices,
DeviceRecoveryPpi,
-
FeaturePcdGet(PcdFrameworkCompatibilitySupport) ? CapsuleInstance - 1 :
CapsuleInstance,
+CapsuleInstance,
CapsuleBuffer
);
DEBUG ((DEBUG_ERROR, "LoadRecoveryCapsule - LoadRecoveryCapsule (%d) -
%r\n", CapsuleInstance, Status));
if (EFI_ERROR (Status)) {
FreePages (CapsuleBuffer, EFI_SIZE_TO_PAGES(CapsuleSize));
diff --git
a/SignedCapsulePkg/Universal/RecoveryModuleLoadPei/RecoveryModuleLoadPei.inf
b/SignedCapsulePkg/Universal/RecoveryModuleLoadPei/RecoveryModuleLoadPei.inf
index f0f5d21a7a..431b0e1802 100644
--- a/SignedCapsulePkg/Universal/RecoveryModuleLoadPei/RecoveryModuleLoadPei.inf
+++ b/SignedCapsulePkg/Universal/RecoveryModuleLoadPei/RecoveryModuleLoadPei.inf
@@ -1,11 +1,11 @@
## @file
# Recovery module.
#
# Load Recovery capsule and install FV.
#
-# Copyright (c) 2016 - 2018, Intel Corporation. All rights reserved.
+# Copyright (c) 2016 - 2019, Intel Corporation. All rights reserved.
#
# SPDX-License-Identifier: BSD-2-Clause-Patent
#
#
##
@@ -54,13 +54,10 @@
[Pcd]
gEfiMdeModulePkgTokenSpaceGuid.PcdSystemFmpCapsuleImageTypeIdGuid ##
CONSUMES
gEfiSignedCapsulePkgTokenSpaceGuid.PcdEdkiiSystemFirmwareFileGuid ##
CONSUMES
-[FeaturePcd]
- gEfiMdeModulePkgTokenSpaceGuid.PcdFrameworkCompatibilitySupport ##
CONSUMES
-
[depex]
gEfiPeiBootInRecoveryModePpiGuid
[UserExtensions.TianoCore."ExtraFiles"]
RecoveryModuleLoadPeiExtra.uni
--
2.18.0.windows.1
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#39727): https://edk2.groups.io/g/devel/message/39727
Mute This Topic: https://groups.io/mt/31379002/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[edk2-devel] [patch 10/11] Vlv2TbltDevicePkg: Remove PcdFrameworkCompatibilitySupport usage
REF: https://bugzilla.tianocore.org/show_bug.cgi?id=1464 Currently Framework compatibility support is not needed and PcdFrameworkCompatibilitySupport will be removed from edk2. So remove the usage of this PCD firstly. Cc: Zailiang Sun Cc: Yi Qian Signed-off-by: Dandan Bi --- Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc | 3 +-- Vlv2TbltDevicePkg/PlatformPkgIA32.dsc | 3 +-- Vlv2TbltDevicePkg/PlatformPkgX64.dsc| 3 +-- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc b/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc index b3642c5c7a..96e77d54e8 100644 --- a/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc +++ b/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc @@ -1,9 +1,9 @@ #/** @file # Platform description. # -# Copyright (c) 2012 - 2018, Intel Corporation. All rights reserved. +# Copyright (c) 2012 - 2019, Intel Corporation. All rights reserved. # # SPDX-License-Identifier: BSD-2-Clause-Patent # # #**/ @@ -489,11 +489,10 @@ !if $(CAPSULE_RESET_ENABLE) == TRUE gEfiMdeModulePkgTokenSpaceGuid.PcdSupportUpdateCapsuleReset|TRUE !else gEfiMdeModulePkgTokenSpaceGuid.PcdSupportUpdateCapsuleReset|FALSE !endif - gEfiMdeModulePkgTokenSpaceGuid.PcdFrameworkCompatibilitySupport|TRUE gEfiCpuTokenSpaceGuid.PcdCpuSmmEnableBspElection|FALSE !if $(DATAHUB_STATUS_CODE_ENABLE) == TRUE gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeUseDataHub|TRUE !else gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeUseDataHub|FALSE diff --git a/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc b/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc index 28e6f5a181..114353082b 100644 --- a/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc +++ b/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc @@ -1,9 +1,9 @@ #/** @file # Platform description. # -# Copyright (c) 2012 - 2018, Intel Corporation. All rights reserved. +# Copyright (c) 2012 - 2019, Intel Corporation. All rights reserved. # # SPDX-License-Identifier: BSD-2-Clause-Patent # # #**/ @@ -491,11 +491,10 @@ !if $(CAPSULE_RESET_ENABLE) == TRUE gEfiMdeModulePkgTokenSpaceGuid.PcdSupportUpdateCapsuleReset|TRUE !else gEfiMdeModulePkgTokenSpaceGuid.PcdSupportUpdateCapsuleReset|FALSE !endif - gEfiMdeModulePkgTokenSpaceGuid.PcdFrameworkCompatibilitySupport|TRUE gEfiCpuTokenSpaceGuid.PcdCpuSmmEnableBspElection|FALSE !if $(DATAHUB_STATUS_CODE_ENABLE) == TRUE gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeUseDataHub|TRUE !else gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeUseDataHub|FALSE diff --git a/Vlv2TbltDevicePkg/PlatformPkgX64.dsc b/Vlv2TbltDevicePkg/PlatformPkgX64.dsc index f9ba56ef4b..20fdc691cb 100644 --- a/Vlv2TbltDevicePkg/PlatformPkgX64.dsc +++ b/Vlv2TbltDevicePkg/PlatformPkgX64.dsc @@ -1,9 +1,9 @@ #/** @file # Platform description. # -# Copyright (c) 2012 - 2018, Intel Corporation. All rights reserved. +# Copyright (c) 2012 - 2019, Intel Corporation. All rights reserved. # # SPDX-License-Identifier: BSD-2-Clause-Patent # # #**/ @@ -491,11 +491,10 @@ !if $(CAPSULE_RESET_ENABLE) == TRUE gEfiMdeModulePkgTokenSpaceGuid.PcdSupportUpdateCapsuleReset|TRUE !else gEfiMdeModulePkgTokenSpaceGuid.PcdSupportUpdateCapsuleReset|FALSE !endif - gEfiMdeModulePkgTokenSpaceGuid.PcdFrameworkCompatibilitySupport|TRUE gEfiCpuTokenSpaceGuid.PcdCpuSmmEnableBspElection|FALSE !if $(DATAHUB_STATUS_CODE_ENABLE) == TRUE gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeUseDataHub|TRUE !else gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeUseDataHub|FALSE -- 2.18.0.windows.1 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#39729): https://edk2.groups.io/g/devel/message/39729 Mute This Topic: https://groups.io/mt/31379005/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[edk2-devel] [patch 04/11] MdeModulePkg/Core: Remove PcdFrameworkCompatibilitySupport usage
REF: https://bugzilla.tianocore.org/show_bug.cgi?id=1464
Currently Framework compatibility is not needed and
PcdFrameworkCompatibilitySupport will be removed from edk2.
So remove the usage of this PCD firstly.
Cc: Liming Gao
Signed-off-by: Dandan Bi
---
MdeModulePkg/Core/Dxe/DxeMain.inf | 6 +-
MdeModulePkg/Core/Dxe/Image/Image.c | 132 +---
MdeModulePkg/Core/Dxe/Image/Image.h | 85 +-
MdeModulePkg/Core/Pei/FwVol/FwVol.c | 65 --
MdeModulePkg/Core/Pei/PeiMain.inf | 1 -
5 files changed, 3 insertions(+), 286 deletions(-)
diff --git a/MdeModulePkg/Core/Dxe/DxeMain.inf
b/MdeModulePkg/Core/Dxe/DxeMain.inf
index 8dee5bee0a..61161bee28 100644
--- a/MdeModulePkg/Core/Dxe/DxeMain.inf
+++ b/MdeModulePkg/Core/Dxe/DxeMain.inf
@@ -1,11 +1,11 @@
## @file
# This is core module in DXE phase.
#
# It provides an implementation of DXE Core that is compliant with DXE CIS.
#
-# Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.
+# Copyright (c) 2006 - 2019, Intel Corporation. All rights reserved.
# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
[Defines]
@@ -130,11 +130,10 @@
[Protocols]
## PRODUCES
## SOMETIMES_CONSUMES
gEfiDecompressProtocolGuid
- gEfiLoadPeImageProtocolGuid ## SOMETIMES_PRODUCES #
Produces when PcdFrameworkCompatibilitySupport is set
gEfiSimpleFileSystemProtocolGuid ## SOMETIMES_CONSUMES
gEfiLoadFileProtocolGuid ## SOMETIMES_CONSUMES
gEfiLoadFile2ProtocolGuid ## SOMETIMES_CONSUMES
gEfiBusSpecificDriverOverrideProtocolGuid ## SOMETIMES_CONSUMES
gEfiDriverFamilyOverrideProtocolGuid ## SOMETIMES_CONSUMES
@@ -171,13 +170,10 @@
gEfiVariableWriteArchProtocolGuid ## CONSUMES
gEfiVariableArchProtocolGuid ## CONSUMES
gEfiCapsuleArchProtocolGuid ## CONSUMES
gEfiWatchdogTimerArchProtocolGuid ## CONSUMES
-[FeaturePcd]
- gEfiMdeModulePkgTokenSpaceGuid.PcdFrameworkCompatibilitySupport ##
CONSUMES
-
[Pcd]
gEfiMdeModulePkgTokenSpaceGuid.PcdLoadFixAddressBootTimeCodePageNumber##
SOMETIMES_CONSUMES
gEfiMdeModulePkgTokenSpaceGuid.PcdLoadFixAddressRuntimeCodePageNumber ##
SOMETIMES_CONSUMES
gEfiMdeModulePkgTokenSpaceGuid.PcdLoadModuleAtFixAddressEnable##
CONSUMES
gEfiMdeModulePkgTokenSpaceGuid.PcdMaxEfiSystemTablePointerAddress ##
CONSUMES
diff --git a/MdeModulePkg/Core/Dxe/Image/Image.c
b/MdeModulePkg/Core/Dxe/Image/Image.c
index de5b8bed27..22a87ecf6d 100644
--- a/MdeModulePkg/Core/Dxe/Image/Image.c
+++ b/MdeModulePkg/Core/Dxe/Image/Image.c
@@ -1,9 +1,9 @@
/** @file
Core image handling services to load and unload PeImage.
-Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.
+Copyright (c) 2006 - 2019, Intel Corporation. All rights reserved.
SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#include "DxeMain.h"
@@ -12,19 +12,10 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
//
// Module Globals
//
LOADED_IMAGE_PRIVATE_DATA *mCurrentImage = NULL;
-LOAD_PE32_IMAGE_PRIVATE_DATA mLoadPe32PrivateData = {
- LOAD_PE32_IMAGE_PRIVATE_DATA_SIGNATURE,
- NULL,
- {
-CoreLoadImageEx,
-CoreUnloadImageEx
- }
-};
-
typedef struct {
LIST_ENTRYLink;
EDKII_PECOFF_IMAGE_EMULATOR_PROTOCOL *Emulator;
UINT16MachineType;
} EMULATOR_ENTRY;
@@ -274,22 +265,10 @@ CoreInitializeImageServices (
);
ASSERT_EFI_ERROR(Status);
InitializeListHead (&mAvailableEmulators);
- if (FeaturePcdGet (PcdFrameworkCompatibilitySupport)) {
-//
-// Export DXE Core PE Loader functionality for backward compatibility.
-//
-Status = CoreInstallProtocolInterface (
- &mLoadPe32PrivateData.Handle,
- &gEfiLoadPeImageProtocolGuid,
- EFI_NATIVE_INTERFACE,
- &mLoadPe32PrivateData.Pe32Image
- );
- }
-
ProtectUefiImage (&Image->Info, Image->LoadedImageDevicePath);
return Status;
}
@@ -1564,96 +1543,10 @@ CoreLoadImage (
PERF_LOAD_IMAGE_END (Handle);
return Status;
}
-
-
-/**
- Loads an EFI image into memory and returns a handle to the image with
extended parameters.
-
- @param ThisCalling context
- @param ParentImageHandle The caller's image handle.
- @param FilePathThe specific file path from which the image
is
- loaded.
- @param SourceBufferIf not NULL, a pointer to the memory location
- containing a copy of the image to be loaded.
- @param SourceSize The size in bytes of SourceBuffer.
- @param DstBuffer The buffer to store the image.
- @param NumberOfPages F
[edk2-devel] [patch 07/11] QuarkPlatformPkg: Remove PcdFrameworkCompatibilitySupport usage
REF: https://bugzilla.tianocore.org/show_bug.cgi?id=1464
Currently Framework compatibility support is not needed and
PcdFrameworkCompatibilitySupport will be removed from edk2.
So remove the usage of this PCD firstly.
Cc: Michael D Kinney
Cc: Kelly Steele
Cc: Liming Gao
Signed-off-by: Dandan Bi
---
.../Pei/PlatformInit/Generic/Recovery.c | 50 ++-
.../Pei/PlatformInit/PlatformEarlyInit.inf| 3 +-
2 files changed, 15 insertions(+), 38 deletions(-)
diff --git a/QuarkPlatformPkg/Platform/Pei/PlatformInit/Generic/Recovery.c
b/QuarkPlatformPkg/Platform/Pei/PlatformInit/Generic/Recovery.c
index f6a076f757..67299a68b7 100644
--- a/QuarkPlatformPkg/Platform/Pei/PlatformInit/Generic/Recovery.c
+++ b/QuarkPlatformPkg/Platform/Pei/PlatformInit/Generic/Recovery.c
@@ -1,10 +1,10 @@
/** @file
Install Platform EFI_PEI_RECOVERY_MODULE_PPI and Implementation of
EFI_PEI_LOAD_RECOVERY_CAPSULE service.
-Copyright (c) 2013-2016 Intel Corporation.
+Copyright (c) 2013-2019 Intel Corporation.
SPDX-License-Identifier: BSD-2-Clause-Patent
**/
@@ -195,29 +195,17 @@ Returns:
//
// If there is an image provider, get the capsule ID
//
if (ProviderAvailable) {
RecoveryCapsuleSize = 0;
-if (FeaturePcdGet (PcdFrameworkCompatibilitySupport)) {
- Status = DeviceRecoveryModule->GetRecoveryCapsuleInfo (
- PeiServices,
- DeviceRecoveryModule,
- 0,
- &RecoveryCapsuleSize,
- &DeviceId
- );
-} else {
- Status = DeviceRecoveryModule->GetRecoveryCapsuleInfo (
- PeiServices,
- DeviceRecoveryModule,
- 1,
- &RecoveryCapsuleSize,
- &DeviceId
- );
-
-
- }
+Status = DeviceRecoveryModule->GetRecoveryCapsuleInfo (
+PeiServices,
+DeviceRecoveryModule,
+1,
+&RecoveryCapsuleSize,
+&DeviceId
+);
if (EFI_ERROR (Status)) {
return Status;
}
@@ -237,26 +225,16 @@ Returns:
Buffer = NULL;
Address = (UINTN) AllocatePages ((RecoveryCapsuleSize - 1) / 0x1000 + 1);
ASSERT (Address);
Buffer = (UINT8 *) (UINTN) Address;
-if (FeaturePcdGet (PcdFrameworkCompatibilitySupport)) {
- Status = DeviceRecoveryModule->LoadRecoveryCapsule (
- PeiServices,
- DeviceRecoveryModule,
- 0,
- Buffer
- );
- } else {
- Status = DeviceRecoveryModule->LoadRecoveryCapsule (
-PeiServices,
-DeviceRecoveryModule,
-1,
-Buffer
-);
-
- }
+Status = DeviceRecoveryModule->LoadRecoveryCapsule (
+ PeiServices,
+ DeviceRecoveryModule,
+ 1,
+ Buffer
+ );
DEBUG ((EFI_D_INFO | EFI_D_LOAD, "LoadRecoveryCapsule Returns: %r\n",
Status));
if (Status == EFI_DEVICE_ERROR) {
AssertMediaDeviceError (PeiServices);
diff --git a/QuarkPlatformPkg/Platform/Pei/PlatformInit/PlatformEarlyInit.inf
b/QuarkPlatformPkg/Platform/Pei/PlatformInit/PlatformEarlyInit.inf
index 617d681d77..df8b0dd3bd 100644
--- a/QuarkPlatformPkg/Platform/Pei/PlatformInit/PlatformEarlyInit.inf
+++ b/QuarkPlatformPkg/Platform/Pei/PlatformInit/PlatformEarlyInit.inf
@@ -34,11 +34,11 @@
# Recovery.c - provides the platform recoveyr functionality.
# MrcWrapper.c - Contains the logic to call MRC PPI and do Framework
# memory specific stuff like build memory map, build
# resource description hob for DXE phase,etc.
# Bootmode.c - Detect boot mode.
-# Copyright (c) 2013 - 2016 Intel Corporation.
+# Copyright (c) 2013 - 2019 Intel Corporation.
#
# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
@@ -138,11 +138,10 @@
[FeaturePcd]
gEfiMdeModulePkgTokenSpaceGuid.PcdRecoveryOnFatUsbDisk
gEfiMdeModulePkgTokenSpaceGuid.PcdRecoveryOnDataCD
gEfiMdeModulePkgTokenSpaceGuid.PcdRecoveryOnFatFloppyDisk
gEfiMdeModulePkgTokenSpaceGuid.PcdRecoveryOnIdeDisk
- gEfiMdeModulePkgTokenSpaceGuid.PcdFrameworkCompatibilitySupport
gQuarkPlatformTokenSpaceGuid.WaitIfResetDueToError
[Pcd]
gQuarkPlatformTokenSpaceGuid.PcdEsramStage1Base
gQuarkPlatformTokenSpaceGuid.PcdFlashAreaSize
--
2.18.0.windows.1
-=-=-=-=-=-=-=-=-=-=-=-
Groups.i
[edk2-devel] [RFC] [patch] Merge MdeModulePkg\BaseTianoCustomDecompressLib into MdePkg\BaseUefiDecompressLib
BaseUefiDecompressLib in MdePkg implements the UEFI Decompress algorithm.
BaseUefiTianoCustomDecompressLib in MdeModulePkg implements the UEFI Decompress
algorithm
and Tiano Custom Decompression algorithm.
Tiano custom decompression algorithm shares most of the code with the UEFI
Decompress algorithm.
So BaseUefiDecompressLib and BaseUefiTianoCustomDecompressLib have lots common
code.
We plan to merge the MdeModulePkg\BaseTianoCustomDecompressLib into
MdePkg\BaseUefiDecompressLib,
in order to reduce the duplicated codes and maintain these two Decompress
algorithms easily.
Propose to update:
1. Make the implemtations of these two Decompress algorithms in exstring
MdePkg/Library/BaseUefiDecompressLib.
2. keep existing BaseUefiDecompressLib.inf in
MdePkg/Library/BaseUefiDecompressLib for UEFI Decompress algorithm.
3. Add BaseTianoCustomDecompressLib.inf in MdePkg/Library/BaseUefiDecompressLib
for Tiano Custom Decompression algorithm.
4. Make existing BaseUefiDecompressLib.c in
MdePkg/Library/BaseUefiDecompressLib to support the Tiano Custom Decompression
algorithm
besides existing UEFI Decompress algorithm.
5. Remove the gTianoCustomDecompressGuid header file from
MdeModulePkg/Include/Guid/TianoDecompress.h
Move the gTianoCustomDecompressGuid definition from MdeModulePkg.dec to
MdePkg.dec.
6. Remove the MdeModulePkg/Library/BaseUefiTianoCustomDecompressLib from edk2.
The draf updates are covered by this patch.
Impact analysis:
1. No impact to the usage of BaseUefiDecompressLib.
2. Need to update the consumers of
MdeModulePkg/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTianoCustomDecompressLib.inf
to use
MdePkg/Library/BaseUefiDecompressLib/BaseTianoCustomDecompressLib.inf
3. Current impacted platforms:
edk2 repo:
Nt32Pkg
Quark
vlv2tbltdevicepkg
edk2-platforms repo:
AMD Overdrive
Lemaker Cello
Raspberry Pi3
SoftIron 1000
D03/D05/D06
Hikey/Hikey960
For platforms in edk2 repo, we can add the BaseTianoCustomDecompressLib.inf in
MdePkg/Library/BaseUefiDecompressLib firstly
and then update platform consumers, remove the
MdeModulePkg/Library/BaseUefiTianoCustomDecompressLib at last.
For the platforms in edk2-platforms repo, I find they don't use the Tiano
Custom Decompression algorithm actually.
So we can update them to use the
MdePkg/Library/BaseUefiDecompressLib/BaseUefiDecompressLib.inf firstly to avoid
any
imconpatible changes.
Cc: Michael D Kinney
Cc: Liming Gao
Cc: Jian J Wang
Cc: Hao Wu
Cc: Ray Ni
Cc: Zailiang Sun
Cc: Yi Qian
Cc: Ard Biesheuvel
Cc: Leif Lindholm
Signed-off-by: Dandan Bi
---
MdeModulePkg/Include/Guid/TianoDecompress.h | 22 -
.../BaseUefiTianoCustomDecompressLib.c| 1063 -
...aseUefiTianoCustomDecompressLibInternals.h | 214
.../BaseUefiTianoDecompressLib.uni| 16 -
MdeModulePkg/MdeModulePkg.dec |4 -
MdeModulePkg/MdeModulePkg.dsc |1 -
.../BaseTianoCustomDecompressLib.inf |5 +-
.../BaseUefiDecompressLib.c | 261 +++-
.../BaseUefiDecompressLib.inf |2 +
.../BaseUefiDecompressLib.uni |6 +-
MdePkg/MdePkg.dec |5 +
MdePkg/MdePkg.dsc |1 +
12 files changed, 270 insertions(+), 1330 deletions(-)
delete mode 100644 MdeModulePkg/Include/Guid/TianoDecompress.h
delete mode 100644
MdeModulePkg/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTianoCustomDecompressLib.c
delete mode 100644
MdeModulePkg/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTianoCustomDecompressLibInternals.h
delete mode 100644
MdeModulePkg/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTianoDecompressLib.uni
rename
MdeModulePkg/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTianoCustomDecompressLib.inf
=> MdePkg/Library/BaseUefiDecompressLib/BaseTianoCustomDecompressLib.inf (88%)
diff --git a/MdeModulePkg/Include/Guid/TianoDecompress.h
b/MdeModulePkg/Include/Guid/TianoDecompress.h
deleted file mode 100644
index 40f74f88f3..00
--- a/MdeModulePkg/Include/Guid/TianoDecompress.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/** @file
- Tiano Custom decompress Guid definition.
-
-Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.
-SPDX-License-Identifier: BSD-2-Clause-Patent
-
-**/
-
-#ifndef __TIANO_CUSTOM_DECOMPRESS_GUID_H__
-#define __TIANO_CUSTOM_DECOMPRESS_GUID_H__
-
-///
-/// The Global ID used to identify a section of an FFS file of type
-/// EFI_SECTION_GUID_DEFINED, whose contents have been compressed using
-/// Tiano Custom compression.
-///
-#define TIANO_CUSTOM_DECOMPRESS_GUID \
- { 0xA31280AD, 0x481E, 0x41B6, { 0x95, 0xE8, 0x12, 0x7F, 0x4C, 0x98, 0x47,
0x79 } }
-
-extern GUID gTianoCustomDecompressGuid;
-
-#endif
diff --git
a/MdeModulePkg/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTianoCustomDecompressLib.c
b/MdeModulePkg/Library/BaseUefiTianoCustomDecom
Re: [edk2-devel] [RFC] [patch] Merge MdeModulePkg\BaseTianoCustomDecompressLib into MdePkg\BaseUefiDecompressLib
> -Original Message- > From: devel@edk2.groups.io [mailto:devel@edk2.groups.io] On Behalf Of > Leif Lindholm > Sent: Wednesday, May 01, 2019 5:35 AM > To: Bi, Dandan > Cc: devel@edk2.groups.io; Kinney, Michael D > ; Gao, Liming ; Wang, > Jian J ; Wu, Hao A ; Ni, Ray > ; Sun, Zailiang ; Qian, Yi > ; Ard Biesheuvel > Subject: Re: [edk2-devel] [RFC] [patch] Merge > MdeModulePkg\BaseTianoCustomDecompressLib into > MdePkg\BaseUefiDecompressLib > > On Tue, Apr 30, 2019 at 04:58:41PM +0800, Dandan Bi wrote: > > BaseUefiDecompressLib in MdePkg implements the UEFI Decompress > algorithm. > > BaseUefiTianoCustomDecompressLib in MdeModulePkg implements the > UEFI Decompress algorithm > > and Tiano Custom Decompression algorithm. > > Tiano custom decompression algorithm shares most of the code with the > UEFI Decompress algorithm. > > So BaseUefiDecompressLib and BaseUefiTianoCustomDecompressLib have > lots common code. > > We plan to merge the MdeModulePkg\BaseTianoCustomDecompressLib > into MdePkg\BaseUefiDecompressLib, > > in order to reduce the duplicated codes and maintain these two > Decompress algorithms easily. > > > > Propose to update: > > 1. Make the implemtations of these two Decompress algorithms in > exstring MdePkg/Library/BaseUefiDecompressLib. > > 2. keep existing BaseUefiDecompressLib.inf in > MdePkg/Library/BaseUefiDecompressLib for UEFI Decompress algorithm. > > 3. Add BaseTianoCustomDecompressLib.inf in > MdePkg/Library/BaseUefiDecompressLib for Tiano Custom Decompression > algorithm. > > 4. Make existing BaseUefiDecompressLib.c in > MdePkg/Library/BaseUefiDecompressLib to support the Tiano Custom > Decompression algorithm > >besides existing UEFI Decompress algorithm. > > 5. Remove the gTianoCustomDecompressGuid header file from > MdeModulePkg/Include/Guid/TianoDecompress.h > >Move the gTianoCustomDecompressGuid definition from > MdeModulePkg.dec to MdePkg.dec. > > 6. Remove the > MdeModulePkg/Library/BaseUefiTianoCustomDecompressLib from edk2. > > > > The draf updates are covered by this patch. > > > > Impact analysis: > > 1. No impact to the usage of BaseUefiDecompressLib. > > 2. Need to update the consumers of > > > MdeModulePkg/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTian > oCustomDecompressLib.inf > >to use > > > MdePkg/Library/BaseUefiDecompressLib/BaseTianoCustomDecompressLib.i > nf > > 3. Current impacted platforms: > > edk2 repo: > >Nt32Pkg > >Quark > >vlv2tbltdevicepkg > > edk2-platforms repo: > >AMD Overdrive > >Lemaker Cello > >Raspberry Pi3 > >SoftIron 1000 > >D03/D05/D06 > >Hikey/Hikey960 > > > > For platforms in edk2 repo, we can add the > BaseTianoCustomDecompressLib.inf in > MdePkg/Library/BaseUefiDecompressLib firstly > > and then update platform consumers, remove the > MdeModulePkg/Library/BaseUefiTianoCustomDecompressLib at last. > > > > For the platforms in edk2-platforms repo, I find they don't use the Tiano > Custom Decompression algorithm actually. > > So we can update them to use the > MdePkg/Library/BaseUefiDecompressLib/BaseUefiDecompressLib.inf firstly > to avoid any > > imconpatible changes. > > That sounds good to me. But can you explain how you determined they > don't use the algorithm? The Tiano Custom Decompression algorithm is registered with TianoCustomDecompress Guid. TianoCustomDecompress A31280AD-481E-41B6-95E8-127F4C984779 We can detect whether this Guid is used in fdf file to see whether the Tiano Compression algorithm is used. For the platforms in edk2-platforms repo, A31280AD-481E-41B6-95E8-127F4C984779 is used to define the TIANOCOMPRESSED rule, but this rule is not used. Thanks, Dandan > > Cc: Michael D Kinney > > Cc: Liming Gao > > Cc: Jian J Wang > > Cc: Hao Wu > > Cc: Ray Ni > > Cc: Zailiang Sun > > Cc: Yi Qian > > Cc: Ard Biesheuvel > > Cc: Leif Lindholm > > > > Signed-off-by: Dandan Bi > > --- > > MdeModulePkg/Include/Guid/TianoDecompress.h | 22 - > > .../BaseUefiTianoCustomDecompressLib.c| 1063 - > > ...aseUefiTianoCustomDecompressLibInternals.h | 214 > > .../BaseUefiTianoDecompressLib.uni| 16 - > > MdeModulePkg/MdeModulePkg.dec |4 - > > MdeModulePkg/MdeModulePkg.dsc |1 - > > .../BaseTianoCustomDecompressLib.inf |5 +- > > .../BaseUefiDecompressLib.c | 261 +++- > > .../BaseUefiDecompressLib.inf
[edk2-devel] [edk2-platforms] [patch 0/7] Update UefiDecompressLib instance
REF: https://bugzilla.tianocore.org/show_bug.cgi?id=1722 BaseUefiDecompressLib in MdePkg is the base UEFI decompress Library. BaseUefiTianoCustomDecompressLib in MdeModulePkg implements the base UEFI decompress functionality and Tiano decompress functionality. 1. TIANOCOMPRESSED rule in OverdriveBoard.fdf is not used, so remove it. 2. Platform doesn't use the TianoCompress, so do not have to use BaseUefiTianoCustomDecompressLib, can use the BaseUefiDecompressLib in MdePkg directly. 3. A common UefiDecompressLib resolution can apply to all module types now. So keep the common one in [LibraryClasses.common] section and remove all others. Cc: Ard Biesheuvel Cc: Leif Lindholm Cc: Michael D Kinney Dandan Bi (7): Platform/AMD: Update UefiDecompressLib instance Platform/LeMaker: Update UefiDecompressLib instance Platform/RPi3: Update UefiDecompressLib instance Platform/SoftIron: Update UefiDecompressLib instance Silicon/Hisilicon: Update UefiDecompressLib instance Platform: Remove useless code Silicon/Armada7k8k: Remove useless code Platform/AMD/OverdriveBoard/OverdriveBoard.dsc | 5 - Platform/AMD/OverdriveBoard/OverdriveBoard.fdf | 9 - Platform/ARM/SgiPkg/SgiPlatform.fdf | 9 - Platform/LeMaker/CelloBoard/CelloBoard.dsc | 5 - Platform/LeMaker/CelloBoard/CelloBoard.fdf | 9 - Platform/RaspberryPi/RPi3/RPi3.dsc | 3 --- Platform/RaspberryPi/RPi3/RPi3.fdf | 9 - Platform/Socionext/DeveloperBox/DeveloperBox.fdf | 9 - .../Socionext/SynQuacerEvalBoard/SynQuacerEvalBoard.fdf | 9 - .../SoftIron/Overdrive1000Board/Overdrive1000Board.dsc | 5 - .../SoftIron/Overdrive1000Board/Overdrive1000Board.fdf | 9 - Silicon/Hisilicon/Hisilicon.dsc.inc | 5 - Silicon/Hisilicon/Hisilicon.fdf.inc | 9 - Silicon/Marvell/Armada7k8k/Armada7k8k.fdf| 9 - 14 files changed, 104 deletions(-) -- 2.18.0.windows.1 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#3): https://edk2.groups.io/g/devel/message/3 Mute This Topic: https://groups.io/mt/31507426/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[edk2-devel] [edk2-platforms] [patch 1/7] Platform/AMD: Update UefiDecompressLib instance
REF: https://bugzilla.tianocore.org/show_bug.cgi?id=1722 BaseUefiDecompressLib in MdePkg is the base UEFI decompress Library. BaseUefiTianoCustomDecompressLib in MdeModulePkg implements the base UEFI decompress functionality and Tiano decompress functionality. 1. TIANOCOMPRESSED rule in OverdriveBoard.fdf is not used, so remove it. 2. Platform doesn't use the TianoCompress, so do not have to use BaseUefiTianoCustomDecompressLib, can use the BaseUefiDecompressLib in MdePkg directly. 3. A common UefiDecompressLib resolution can apply to all module types now. So keep the common one in [LibraryClasses.common] section and remove all others. Cc: Ard Biesheuvel Cc: Leif Lindholm Cc: Michael D Kinney Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Dandan Bi --- Platform/AMD/OverdriveBoard/OverdriveBoard.dsc | 5 - Platform/AMD/OverdriveBoard/OverdriveBoard.fdf | 9 - 2 files changed, 14 deletions(-) diff --git a/Platform/AMD/OverdriveBoard/OverdriveBoard.dsc b/Platform/AMD/OverdriveBoard/OverdriveBoard.dsc index 616553172b..39b5dad154 100644 --- a/Platform/AMD/OverdriveBoard/OverdriveBoard.dsc +++ b/Platform/AMD/OverdriveBoard/OverdriveBoard.dsc @@ -186,11 +186,10 @@ DEFINE X64EMU_ENABLE = FALSE HobLib|MdePkg/Library/PeiHobLib/PeiHobLib.inf MemoryAllocationLib|MdePkg/Library/PeiMemoryAllocationLib/PeiMemoryAllocationLib.inf PeiCoreEntryPoint|MdePkg/Library/PeiCoreEntryPoint/PeiCoreEntryPoint.inf PerformanceLib|MdeModulePkg/Library/PeiPerformanceLib/PeiPerformanceLib.inf PeCoffGetEntryPointLib|MdePkg/Library/BasePeCoffGetEntryPointLib/BasePeCoffGetEntryPointLib.inf - UefiDecompressLib|MdePkg/Library/BaseUefiDecompressLib/BaseUefiDecompressLib.inf ExtractGuidedSectionLib|MdePkg/Library/PeiExtractGuidedSectionLib/PeiExtractGuidedSectionLib.inf PeiServicesTablePointerLib|ArmPkg/Library/PeiServicesTablePointerLib/PeiServicesTablePointerLib.inf [LibraryClasses.common.PEIM] @@ -199,21 +198,19 @@ DEFINE X64EMU_ENABLE = FALSE MemoryAllocationLib|MdePkg/Library/PeiMemoryAllocationLib/PeiMemoryAllocationLib.inf PeimEntryPoint|MdePkg/Library/PeimEntryPoint/PeimEntryPoint.inf PerformanceLib|MdeModulePkg/Library/PeiPerformanceLib/PeiPerformanceLib.inf PeCoffGetEntryPointLib|MdePkg/Library/BasePeCoffGetEntryPointLib/BasePeCoffGetEntryPointLib.inf PeiResourcePublicationLib|MdePkg/Library/PeiResourcePublicationLib/PeiResourcePublicationLib.inf - UefiDecompressLib|MdePkg/Library/BaseUefiDecompressLib/BaseUefiDecompressLib.inf ExtractGuidedSectionLib|MdePkg/Library/PeiExtractGuidedSectionLib/PeiExtractGuidedSectionLib.inf PeiServicesTablePointerLib|ArmPkg/Library/PeiServicesTablePointerLib/PeiServicesTablePointerLib.inf [LibraryClasses.common.DXE_CORE] HobLib|MdePkg/Library/DxeCoreHobLib/DxeCoreHobLib.inf MemoryAllocationLib|MdeModulePkg/Library/DxeCoreMemoryAllocationLib/DxeCoreMemoryAllocationLib.inf DxeCoreEntryPoint|MdePkg/Library/DxeCoreEntryPoint/DxeCoreEntryPoint.inf ExtractGuidedSectionLib|MdePkg/Library/DxeExtractGuidedSectionLib/DxeExtractGuidedSectionLib.inf - UefiDecompressLib|MdePkg/Library/BaseUefiDecompressLib/BaseUefiDecompressLib.inf PerformanceLib|MdeModulePkg/Library/DxeCorePerformanceLib/DxeCorePerformanceLib.inf [LibraryClasses.common.DXE_DRIVER] SecurityManagementLib|MdeModulePkg/Library/DxeSecurityManagementLib/DxeSecurityManagementLib.inf PerformanceLib|MdeModulePkg/Library/DxePerformanceLib/DxePerformanceLib.inf @@ -227,17 +224,15 @@ DEFINE X64EMU_ENABLE = FALSE !if $(TARGET) != RELEASE DebugLib|MdePkg/Library/DxeRuntimeDebugLibSerialPort/DxeRuntimeDebugLibSerialPort.inf !endif [LibraryClasses.common.UEFI_APPLICATION] - UefiDecompressLib|MdeModulePkg/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTianoCustomDecompressLib.inf PerformanceLib|MdeModulePkg/Library/DxePerformanceLib/DxePerformanceLib.inf MemoryAllocationLib|MdePkg/Library/UefiMemoryAllocationLib/UefiMemoryAllocationLib.inf HiiLib|MdeModulePkg/Library/UefiHiiLib/UefiHiiLib.inf [LibraryClasses.common.UEFI_DRIVER] - UefiDecompressLib|MdeModulePkg/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTianoCustomDecompressLib.inf ExtractGuidedSectionLib|MdePkg/Library/DxeExtractGuidedSectionLib/DxeExtractGuidedSectionLib.inf PerformanceLib|MdeModulePkg/Library/DxePerformanceLib/DxePerformanceLib.inf MemoryAllocationLib|MdePkg/Library/UefiMemoryAllocationLib/UefiMemoryAllocationLib.inf [LibraryClasses.ARM] diff --git a/Platform/AMD/OverdriveBoard/OverdriveBoard.fdf b/Platform/AMD/OverdriveBoard/OverdriveBoard.fdf index a058665bcc..2aaf83084e 100644 --- a/Platform/AMD/OverdriveBoard/OverdriveBoard.fdf +++ b/Platform/AMD/OverdriveBoard/OverdriveBoard.fdf @@ -416,19 +416,10 @@ CAPSULE_HEADER_INIT_VERSION = 0x1 PEI_DEPEX PEI_DEPEX Optional |.depex TE TE Align = Auto |.efi UI STRING="$(MODULE_NAME)
[edk2-devel] [edk2-platforms] [patch 2/7] Platform/LeMaker: Update UefiDecompressLib instance
REF: https://bugzilla.tianocore.org/show_bug.cgi?id=1722 BaseUefiDecompressLib in MdePkg is the base UEFI decompress Library. BaseUefiTianoCustomDecompressLib in MdeModulePkg implements the base UEFI decompress functionality and Tiano decompress functionality. 1. TIANOCOMPRESSED rule in fdf is not used, so remove it. 2. Platform doesn't use the TianoCompress, so do not have to use BaseUefiTianoCustomDecompressLib, can use the BaseUefiDecompressLib in MdePkg directly. 3. A common UefiDecompressLib resolution can apply to all module types now. So keep the common one in [LibraryClasses.common] section and remove all others. Cc: Ard Biesheuvel Cc: Leif Lindholm Cc: Michael D Kinney Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Dandan Bi --- Platform/LeMaker/CelloBoard/CelloBoard.dsc | 5 - Platform/LeMaker/CelloBoard/CelloBoard.fdf | 9 - 2 files changed, 14 deletions(-) diff --git a/Platform/LeMaker/CelloBoard/CelloBoard.dsc b/Platform/LeMaker/CelloBoard/CelloBoard.dsc index c26d38226c..bc2f3e2076 100644 --- a/Platform/LeMaker/CelloBoard/CelloBoard.dsc +++ b/Platform/LeMaker/CelloBoard/CelloBoard.dsc @@ -170,11 +170,10 @@ DEFINE NUM_CORES= 4 PeiCoreEntryPoint|MdePkg/Library/PeiCoreEntryPoint/PeiCoreEntryPoint.inf PerformanceLib|MdeModulePkg/Library/PeiPerformanceLib/PeiPerformanceLib.inf ReportStatusCodeLib|MdeModulePkg/Library/PeiReportStatusCodeLib/PeiReportStatusCodeLib.inf OemHookStatusCodeLib|MdeModulePkg/Library/OemHookStatusCodeLibNull/OemHookStatusCodeLibNull.inf PeCoffGetEntryPointLib|MdePkg/Library/BasePeCoffGetEntryPointLib/BasePeCoffGetEntryPointLib.inf - UefiDecompressLib|MdePkg/Library/BaseUefiDecompressLib/BaseUefiDecompressLib.inf ExtractGuidedSectionLib|MdePkg/Library/PeiExtractGuidedSectionLib/PeiExtractGuidedSectionLib.inf PeiServicesTablePointerLib|ArmPkg/Library/PeiServicesTablePointerLib/PeiServicesTablePointerLib.inf [LibraryClasses.common.PEIM] @@ -185,22 +184,20 @@ DEFINE NUM_CORES= 4 PerformanceLib|MdeModulePkg/Library/PeiPerformanceLib/PeiPerformanceLib.inf ReportStatusCodeLib|MdeModulePkg/Library/PeiReportStatusCodeLib/PeiReportStatusCodeLib.inf OemHookStatusCodeLib|MdeModulePkg/Library/OemHookStatusCodeLibNull/OemHookStatusCodeLibNull.inf PeCoffGetEntryPointLib|MdePkg/Library/BasePeCoffGetEntryPointLib/BasePeCoffGetEntryPointLib.inf PeiResourcePublicationLib|MdePkg/Library/PeiResourcePublicationLib/PeiResourcePublicationLib.inf - UefiDecompressLib|MdePkg/Library/BaseUefiDecompressLib/BaseUefiDecompressLib.inf ExtractGuidedSectionLib|MdePkg/Library/PeiExtractGuidedSectionLib/PeiExtractGuidedSectionLib.inf PeiServicesTablePointerLib|ArmPkg/Library/PeiServicesTablePointerLib/PeiServicesTablePointerLib.inf [LibraryClasses.common.DXE_CORE] HobLib|MdePkg/Library/DxeCoreHobLib/DxeCoreHobLib.inf MemoryAllocationLib|MdeModulePkg/Library/DxeCoreMemoryAllocationLib/DxeCoreMemoryAllocationLib.inf DxeCoreEntryPoint|MdePkg/Library/DxeCoreEntryPoint/DxeCoreEntryPoint.inf ReportStatusCodeLib|IntelFrameworkModulePkg/Library/DxeReportStatusCodeLibFramework/DxeReportStatusCodeLib.inf ExtractGuidedSectionLib|MdePkg/Library/DxeExtractGuidedSectionLib/DxeExtractGuidedSectionLib.inf - UefiDecompressLib|MdePkg/Library/BaseUefiDecompressLib/BaseUefiDecompressLib.inf PerformanceLib|MdeModulePkg/Library/DxeCorePerformanceLib/DxeCorePerformanceLib.inf [LibraryClasses.common.DXE_DRIVER] ReportStatusCodeLib|IntelFrameworkModulePkg/Library/DxeReportStatusCodeLibFramework/DxeReportStatusCodeLib.inf SecurityManagementLib|MdeModulePkg/Library/DxeSecurityManagementLib/DxeSecurityManagementLib.inf @@ -216,19 +213,17 @@ DEFINE NUM_CORES= 4 !if $(TARGET) != RELEASE DebugLib|MdePkg/Library/DxeRuntimeDebugLibSerialPort/DxeRuntimeDebugLibSerialPort.inf !endif [LibraryClasses.common.UEFI_APPLICATION] - UefiDecompressLib|MdeModulePkg/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTianoCustomDecompressLib.inf PerformanceLib|MdeModulePkg/Library/DxePerformanceLib/DxePerformanceLib.inf MemoryAllocationLib|MdePkg/Library/UefiMemoryAllocationLib/UefiMemoryAllocationLib.inf HiiLib|MdeModulePkg/Library/UefiHiiLib/UefiHiiLib.inf ReportStatusCodeLib|MdeModulePkg/Library/DxeReportStatusCodeLib/DxeReportStatusCodeLib.inf [LibraryClasses.common.UEFI_DRIVER] ReportStatusCodeLib|IntelFrameworkModulePkg/Library/DxeReportStatusCodeLibFramework/DxeReportStatusCodeLib.inf - UefiDecompressLib|MdeModulePkg/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTianoCustomDecompressLib.inf ExtractGuidedSectionLib|MdePkg/Library/DxeExtractGuidedSectionLib/DxeExtractGuidedSectionLib.inf PerformanceLib|MdeModulePkg/Library/DxePerformanceLib/DxePerformanceLib.inf MemoryAllocationLib|MdePkg/Library/UefiMemoryAllocationLib/UefiMemoryAllocationLib.inf [LibraryClasses.ARM] diff --git a/Platform/LeMaker/CelloBoard/CelloBoard.fdf b/Platform/Le
[edk2-devel] [edk2-platforms] [patch 4/7] Platform/SoftIron: Update UefiDecompressLib instance
REF: https://bugzilla.tianocore.org/show_bug.cgi?id=1722 BaseUefiDecompressLib in MdePkg is the base UEFI decompress Library. BaseUefiTianoCustomDecompressLib in MdeModulePkg implements the base UEFI decompress functionality and Tiano decompress functionality. 1. TIANOCOMPRESSED rule in fdf is not used, so remove it. 2. Platform doesn't use the TianoCompress, so do not have to use BaseUefiTianoCustomDecompressLib, can use the BaseUefiDecompressLib in MdePkg directly. 3. A common UefiDecompressLib resolution can apply to all module types now. So keep the common one in [LibraryClasses.common] section and remove all others. Cc: Ard Biesheuvel Cc: Leif Lindholm Cc: Michael D Kinney Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Dandan Bi --- .../SoftIron/Overdrive1000Board/Overdrive1000Board.dsc | 5 - .../SoftIron/Overdrive1000Board/Overdrive1000Board.fdf | 9 - 2 files changed, 14 deletions(-) diff --git a/Platform/SoftIron/Overdrive1000Board/Overdrive1000Board.dsc b/Platform/SoftIron/Overdrive1000Board/Overdrive1000Board.dsc index 4fbc4201cf..cc4f2facd0 100644 --- a/Platform/SoftIron/Overdrive1000Board/Overdrive1000Board.dsc +++ b/Platform/SoftIron/Overdrive1000Board/Overdrive1000Board.dsc @@ -168,11 +168,10 @@ DEFINE NUM_CORES= 4 PeiCoreEntryPoint|MdePkg/Library/PeiCoreEntryPoint/PeiCoreEntryPoint.inf PerformanceLib|MdeModulePkg/Library/PeiPerformanceLib/PeiPerformanceLib.inf ReportStatusCodeLib|MdeModulePkg/Library/PeiReportStatusCodeLib/PeiReportStatusCodeLib.inf OemHookStatusCodeLib|MdeModulePkg/Library/OemHookStatusCodeLibNull/OemHookStatusCodeLibNull.inf PeCoffGetEntryPointLib|MdePkg/Library/BasePeCoffGetEntryPointLib/BasePeCoffGetEntryPointLib.inf - UefiDecompressLib|MdePkg/Library/BaseUefiDecompressLib/BaseUefiDecompressLib.inf ExtractGuidedSectionLib|MdePkg/Library/PeiExtractGuidedSectionLib/PeiExtractGuidedSectionLib.inf PeiServicesTablePointerLib|ArmPkg/Library/PeiServicesTablePointerLib/PeiServicesTablePointerLib.inf BaseMemoryLib|MdePkg/Library/BaseMemoryLib/BaseMemoryLib.inf @@ -184,22 +183,20 @@ DEFINE NUM_CORES= 4 PerformanceLib|MdeModulePkg/Library/PeiPerformanceLib/PeiPerformanceLib.inf ReportStatusCodeLib|MdeModulePkg/Library/PeiReportStatusCodeLib/PeiReportStatusCodeLib.inf OemHookStatusCodeLib|MdeModulePkg/Library/OemHookStatusCodeLibNull/OemHookStatusCodeLibNull.inf PeCoffGetEntryPointLib|MdePkg/Library/BasePeCoffGetEntryPointLib/BasePeCoffGetEntryPointLib.inf PeiResourcePublicationLib|MdePkg/Library/PeiResourcePublicationLib/PeiResourcePublicationLib.inf - UefiDecompressLib|MdePkg/Library/BaseUefiDecompressLib/BaseUefiDecompressLib.inf ExtractGuidedSectionLib|MdePkg/Library/PeiExtractGuidedSectionLib/PeiExtractGuidedSectionLib.inf PeiServicesTablePointerLib|ArmPkg/Library/PeiServicesTablePointerLib/PeiServicesTablePointerLib.inf [LibraryClasses.common.DXE_CORE] HobLib|MdePkg/Library/DxeCoreHobLib/DxeCoreHobLib.inf MemoryAllocationLib|MdeModulePkg/Library/DxeCoreMemoryAllocationLib/DxeCoreMemoryAllocationLib.inf DxeCoreEntryPoint|MdePkg/Library/DxeCoreEntryPoint/DxeCoreEntryPoint.inf ReportStatusCodeLib|IntelFrameworkModulePkg/Library/DxeReportStatusCodeLibFramework/DxeReportStatusCodeLib.inf ExtractGuidedSectionLib|MdePkg/Library/DxeExtractGuidedSectionLib/DxeExtractGuidedSectionLib.inf - UefiDecompressLib|MdePkg/Library/BaseUefiDecompressLib/BaseUefiDecompressLib.inf PerformanceLib|MdeModulePkg/Library/DxeCorePerformanceLib/DxeCorePerformanceLib.inf [LibraryClasses.common.DXE_DRIVER] ReportStatusCodeLib|IntelFrameworkModulePkg/Library/DxeReportStatusCodeLibFramework/DxeReportStatusCodeLib.inf SecurityManagementLib|MdeModulePkg/Library/DxeSecurityManagementLib/DxeSecurityManagementLib.inf @@ -215,19 +212,17 @@ DEFINE NUM_CORES= 4 !if $(TARGET) != RELEASE DebugLib|MdePkg/Library/DxeRuntimeDebugLibSerialPort/DxeRuntimeDebugLibSerialPort.inf !endif [LibraryClasses.common.UEFI_APPLICATION] - UefiDecompressLib|MdeModulePkg/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTianoCustomDecompressLib.inf PerformanceLib|MdeModulePkg/Library/DxePerformanceLib/DxePerformanceLib.inf MemoryAllocationLib|MdePkg/Library/UefiMemoryAllocationLib/UefiMemoryAllocationLib.inf HiiLib|MdeModulePkg/Library/UefiHiiLib/UefiHiiLib.inf ReportStatusCodeLib|MdeModulePkg/Library/DxeReportStatusCodeLib/DxeReportStatusCodeLib.inf [LibraryClasses.common.UEFI_DRIVER] ReportStatusCodeLib|IntelFrameworkModulePkg/Library/DxeReportStatusCodeLibFramework/DxeReportStatusCodeLib.inf - UefiDecompressLib|MdeModulePkg/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTianoCustomDecompressLib.inf ExtractGuidedSectionLib|MdePkg/Library/DxeExtractGuidedSectionLib/DxeExtractGuidedSectionLib.inf PerformanceLib|MdeModulePkg/Library/DxePerformanceLib/DxePerformanceLib.inf MemoryAllocationLib|MdePkg/Library/UefiMemoryAllocati
[edk2-devel] [edk2-platforms] [patch 5/7] Silicon/Hisilicon: Update UefiDecompressLib instance
REF: https://bugzilla.tianocore.org/show_bug.cgi?id=1722 BaseUefiDecompressLib in MdePkg is the base UEFI decompress Library. BaseUefiTianoCustomDecompressLib in MdeModulePkg implements the base UEFI decompress functionality and Tiano decompress functionality. 1. TIANOCOMPRESSED rule in fdf is not used, so remove it. 2. Platform doesn't use the TianoCompress, so do not have to use BaseUefiTianoCustomDecompressLib, can use the BaseUefiDecompressLib in MdePkg directly. 3. A common UefiDecompressLib resolution can apply to all module types now. So keep the common one in [LibraryClasses.common] section and remove all others. Cc: Ard Biesheuvel Cc: Leif Lindholm Cc: Michael D Kinney Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Dandan Bi --- Silicon/Hisilicon/Hisilicon.dsc.inc | 5 - Silicon/Hisilicon/Hisilicon.fdf.inc | 9 - 2 files changed, 14 deletions(-) diff --git a/Silicon/Hisilicon/Hisilicon.dsc.inc b/Silicon/Hisilicon/Hisilicon.dsc.inc index a2ade57451..8a9812b9ed 100644 --- a/Silicon/Hisilicon/Hisilicon.dsc.inc +++ b/Silicon/Hisilicon/Hisilicon.dsc.inc @@ -138,11 +138,10 @@ PeiCoreEntryPoint|MdePkg/Library/PeiCoreEntryPoint/PeiCoreEntryPoint.inf PerformanceLib|MdeModulePkg/Library/PeiPerformanceLib/PeiPerformanceLib.inf ReportStatusCodeLib|MdeModulePkg/Library/PeiReportStatusCodeLib/PeiReportStatusCodeLib.inf OemHookStatusCodeLib|MdeModulePkg/Library/OemHookStatusCodeLibNull/OemHookStatusCodeLibNull.inf PeCoffGetEntryPointLib|MdePkg/Library/BasePeCoffGetEntryPointLib/BasePeCoffGetEntryPointLib.inf - UefiDecompressLib|MdePkg/Library/BaseUefiDecompressLib/BaseUefiDecompressLib.inf ExtractGuidedSectionLib|MdePkg/Library/PeiExtractGuidedSectionLib/PeiExtractGuidedSectionLib.inf PeiServicesTablePointerLib|ArmPkg/Library/PeiServicesTablePointerLib/PeiServicesTablePointerLib.inf PcdLib|MdePkg/Library/PeiPcdLib/PeiPcdLib.inf BaseMemoryLib|MdePkg/Library/BaseMemoryLib/BaseMemoryLib.inf @@ -155,11 +154,10 @@ PerformanceLib|MdeModulePkg/Library/PeiPerformanceLib/PeiPerformanceLib.inf ReportStatusCodeLib|MdeModulePkg/Library/PeiReportStatusCodeLib/PeiReportStatusCodeLib.inf OemHookStatusCodeLib|MdeModulePkg/Library/OemHookStatusCodeLibNull/OemHookStatusCodeLibNull.inf PeCoffGetEntryPointLib|MdePkg/Library/BasePeCoffGetEntryPointLib/BasePeCoffGetEntryPointLib.inf PeiResourcePublicationLib|MdePkg/Library/PeiResourcePublicationLib/PeiResourcePublicationLib.inf - UefiDecompressLib|MdePkg/Library/BaseUefiDecompressLib/BaseUefiDecompressLib.inf ExtractGuidedSectionLib|MdePkg/Library/PeiExtractGuidedSectionLib/PeiExtractGuidedSectionLib.inf PeiServicesTablePointerLib|ArmPkg/Library/PeiServicesTablePointerLib/PeiServicesTablePointerLib.inf ## Fixed compile error after upgrade to 14.10 @@ -172,11 +170,10 @@ HobLib|MdePkg/Library/DxeCoreHobLib/DxeCoreHobLib.inf MemoryAllocationLib|MdeModulePkg/Library/DxeCoreMemoryAllocationLib/DxeCoreMemoryAllocationLib.inf DxeCoreEntryPoint|MdePkg/Library/DxeCoreEntryPoint/DxeCoreEntryPoint.inf ReportStatusCodeLib|IntelFrameworkModulePkg/Library/DxeReportStatusCodeLibFramework/DxeReportStatusCodeLib.inf ExtractGuidedSectionLib|MdePkg/Library/DxeExtractGuidedSectionLib/DxeExtractGuidedSectionLib.inf - UefiDecompressLib|MdePkg/Library/BaseUefiDecompressLib/BaseUefiDecompressLib.inf DxeServicesLib|MdePkg/Library/DxeServicesLib/DxeServicesLib.inf PerformanceLib|MdeModulePkg/Library/DxeCorePerformanceLib/DxeCorePerformanceLib.inf [LibraryClasses.common.DXE_DRIVER] ReportStatusCodeLib|IntelFrameworkModulePkg/Library/DxeReportStatusCodeLibFramework/DxeReportStatusCodeLib.inf @@ -184,11 +181,10 @@ SecurityManagementLib|MdeModulePkg/Library/DxeSecurityManagementLib/DxeSecurityManagementLib.inf PerformanceLib|MdeModulePkg/Library/DxePerformanceLib/DxePerformanceLib.inf MemoryAllocationLib|MdePkg/Library/UefiMemoryAllocationLib/UefiMemoryAllocationLib.inf [LibraryClasses.common.UEFI_APPLICATION] - UefiDecompressLib|MdeModulePkg/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTianoCustomDecompressLib.inf PerformanceLib|MdeModulePkg/Library/DxePerformanceLib/DxePerformanceLib.inf MemoryAllocationLib|MdePkg/Library/UefiMemoryAllocationLib/UefiMemoryAllocationLib.inf HiiLib|MdeModulePkg/Library/UefiHiiLib/UefiHiiLib.inf [LibraryClasses.common.UEFI_DRIVER,LibraryClasses.common.UEFI_APPLICATION] @@ -196,11 +192,10 @@ ReportStatusCodeLib|MdeModulePkg/Library/DxeReportStatusCodeLib/DxeReportStatusCodeLib.inf UefiBootManagerLib|MdeModulePkg/Library/UefiBootManagerLib/UefiBootManagerLib.inf [LibraryClasses.common.UEFI_DRIVER] ReportStatusCodeLib|IntelFrameworkModulePkg/Library/DxeReportStatusCodeLibFramework/DxeReportStatusCodeLib.inf - UefiDecompressLib|MdeModulePkg/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTianoCustomDecompressLib.inf ExtractGuidedSectionLib|MdePkg/Library/DxeExtractGuidedSecti
[edk2-devel] [edk2-platforms] [patch 7/7] Silicon/Armada7k8k: Remove useless code
TIANOCOMPRESSED rule in fdf is not used, so remove it.
Cc: Ard Biesheuvel
Cc: Leif Lindholm
Cc: Michael D Kinney
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Dandan Bi
---
Silicon/Marvell/Armada7k8k/Armada7k8k.fdf | 9 -
1 file changed, 9 deletions(-)
diff --git a/Silicon/Marvell/Armada7k8k/Armada7k8k.fdf
b/Silicon/Marvell/Armada7k8k/Armada7k8k.fdf
index 3a320ba64d..8a050ef987 100644
--- a/Silicon/Marvell/Armada7k8k/Armada7k8k.fdf
+++ b/Silicon/Marvell/Armada7k8k/Armada7k8k.fdf
@@ -352,19 +352,10 @@ READ_LOCK_STATUS = TRUE
PEI_DEPEX PEI_DEPEX Optional $(INF_OUTPUT)/$(MODULE_NAME).depex
TE TE Align = Auto $(INF_OUTPUT)/$(MODULE_NAME).efi
UI STRING="$(MODULE_NAME)" Optional
}
-[Rule.Common.PEIM.TIANOCOMPRESSED]
- FILE PEIM = $(NAMED_GUID) DEBUG_MYTOOLS_IA32 {
-PEI_DEPEX PEI_DEPEX Optional$(INF_OUTPUT)/$(MODULE_NAME).depex
-GUIDED A31280AD-481E-41B6-95E8-127F4C984779 PROCESSING_REQUIRED = TRUE {
- PE32 PE32$(INF_OUTPUT)/$(MODULE_NAME).efi
- UISTRING="$(MODULE_NAME)" Optional
-}
- }
-
[Rule.Common.DXE_CORE]
FILE DXE_CORE = $(NAMED_GUID) {
PE32 PE32 $(INF_OUTPUT)/$(MODULE_NAME).efi
UI STRING="$(MODULE_NAME)" Optional
}
--
2.18.0.windows.1
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#40006): https://edk2.groups.io/g/devel/message/40006
Mute This Topic: https://groups.io/mt/31507438/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[edk2-devel] [edk2-platforms] [patch 3/7] Platform/RPi3: Update UefiDecompressLib instance
REF: https://bugzilla.tianocore.org/show_bug.cgi?id=1722
BaseUefiDecompressLib in MdePkg is the
base UEFI decompress Library.
BaseUefiTianoCustomDecompressLib in MdeModulePkg
implements the base UEFI decompress functionality and
Tiano decompress functionality.
1. TIANOCOMPRESSED rule in fdf is not used, so remove it.
2. Platform doesn't use the TianoCompress, so do
not have to use BaseUefiTianoCustomDecompressLib,
can use the BaseUefiDecompressLib in MdePkg directly.
3. A common UefiDecompressLib resolution can apply to
all module types now. So keep the common one in
[LibraryClasses.common] section and remove all others.
Cc: Ard Biesheuvel
Cc: Leif Lindholm
Cc: Michael D Kinney
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Dandan Bi
---
Platform/RaspberryPi/RPi3/RPi3.dsc | 3 ---
Platform/RaspberryPi/RPi3/RPi3.fdf | 9 -
2 files changed, 12 deletions(-)
diff --git a/Platform/RaspberryPi/RPi3/RPi3.dsc
b/Platform/RaspberryPi/RPi3/RPi3.dsc
index f1143b1471..dcdfa10290 100644
--- a/Platform/RaspberryPi/RPi3/RPi3.dsc
+++ b/Platform/RaspberryPi/RPi3/RPi3.dsc
@@ -178,31 +178,28 @@
HobLib|MdePkg/Library/DxeCoreHobLib/DxeCoreHobLib.inf
MemoryAllocationLib|MdeModulePkg/Library/DxeCoreMemoryAllocationLib/DxeCoreMemoryAllocationLib.inf
DxeCoreEntryPoint|MdePkg/Library/DxeCoreEntryPoint/DxeCoreEntryPoint.inf
ReportStatusCodeLib|IntelFrameworkModulePkg/Library/DxeReportStatusCodeLibFramework/DxeReportStatusCodeLib.inf
ExtractGuidedSectionLib|MdePkg/Library/DxeExtractGuidedSectionLib/DxeExtractGuidedSectionLib.inf
-
UefiDecompressLib|MdePkg/Library/BaseUefiDecompressLib/BaseUefiDecompressLib.inf
PerformanceLib|MdeModulePkg/Library/DxeCorePerformanceLib/DxeCorePerformanceLib.inf
[LibraryClasses.common.DXE_DRIVER]
ReportStatusCodeLib|IntelFrameworkModulePkg/Library/DxeReportStatusCodeLibFramework/DxeReportStatusCodeLib.inf
SecurityManagementLib|MdeModulePkg/Library/DxeSecurityManagementLib/DxeSecurityManagementLib.inf
PerformanceLib|MdeModulePkg/Library/DxePerformanceLib/DxePerformanceLib.inf
MemoryAllocationLib|MdePkg/Library/UefiMemoryAllocationLib/UefiMemoryAllocationLib.inf
[LibraryClasses.common.UEFI_APPLICATION]
-
UefiDecompressLib|MdeModulePkg/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTianoCustomDecompressLib.inf
PerformanceLib|MdeModulePkg/Library/DxePerformanceLib/DxePerformanceLib.inf
MemoryAllocationLib|MdePkg/Library/UefiMemoryAllocationLib/UefiMemoryAllocationLib.inf
HiiLib|MdeModulePkg/Library/UefiHiiLib/UefiHiiLib.inf
ShellLib|ShellPkg/Library/UefiShellLib/UefiShellLib.inf
FileHandleLib|MdePkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf
ReportStatusCodeLib|MdeModulePkg/Library/DxeReportStatusCodeLib/DxeReportStatusCodeLib.inf
[LibraryClasses.common.UEFI_DRIVER]
ReportStatusCodeLib|IntelFrameworkModulePkg/Library/DxeReportStatusCodeLibFramework/DxeReportStatusCodeLib.inf
-
UefiDecompressLib|MdeModulePkg/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTianoCustomDecompressLib.inf
ExtractGuidedSectionLib|MdePkg/Library/DxeExtractGuidedSectionLib/DxeExtractGuidedSectionLib.inf
PerformanceLib|MdeModulePkg/Library/DxePerformanceLib/DxePerformanceLib.inf
MemoryAllocationLib|MdePkg/Library/UefiMemoryAllocationLib/UefiMemoryAllocationLib.inf
[LibraryClasses.common.DXE_RUNTIME_DRIVER]
diff --git a/Platform/RaspberryPi/RPi3/RPi3.fdf
b/Platform/RaspberryPi/RPi3/RPi3.fdf
index 22813d453c..85f2187545 100644
--- a/Platform/RaspberryPi/RPi3/RPi3.fdf
+++ b/Platform/RaspberryPi/RPi3/RPi3.fdf
@@ -386,19 +386,10 @@ READ_LOCK_STATUS = TRUE
PEI_DEPEX PEI_DEPEX Optional $(INF_OUTPUT)/$(MODULE_NAME).depex
TE TE Align = Auto $(INF_OUTPUT)/$(MODULE_NAME).efi
UI STRING="$(MODULE_NAME)" Optional
}
-[Rule.Common.PEIM.TIANOCOMPRESSED]
- FILE PEIM = $(NAMED_GUID) DEBUG_MYTOOLS_IA32 {
-PEI_DEPEX PEI_DEPEX Optional$(INF_OUTPUT)/$(MODULE_NAME).depex
-GUIDED A31280AD-481E-41B6-95E8-127F4C984779 PROCESSING_REQUIRED = TRUE {
- PE32 PE32$(INF_OUTPUT)/$(MODULE_NAME).efi
- UISTRING="$(MODULE_NAME)" Optional
-}
- }
-
[Rule.Common.DXE_CORE]
FILE DXE_CORE = $(NAMED_GUID) {
PE32 PE32 $(INF_OUTPUT)/$(MODULE_NAME).efi
UI STRING="$(MODULE_NAME)" Optional
}
--
2.18.0.windows.1
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#40002): https://edk2.groups.io/g/devel/message/40002
Mute This Topic: https://groups.io/mt/31507429/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[edk2-devel] [edk2-platforms] [patch 6/7] Platform: Remove useless code
TIANOCOMPRESSED rule in fdf is not used, so remove it.
Cc: Ard Biesheuvel
Cc: Leif Lindholm
Cc: Michael D Kinney
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Dandan Bi
---
Platform/ARM/SgiPkg/SgiPlatform.fdf | 9 -
Platform/Socionext/DeveloperBox/DeveloperBox.fdf | 9 -
.../Socionext/SynQuacerEvalBoard/SynQuacerEvalBoard.fdf | 9 -
3 files changed, 27 deletions(-)
diff --git a/Platform/ARM/SgiPkg/SgiPlatform.fdf
b/Platform/ARM/SgiPkg/SgiPlatform.fdf
index 3d450a8e28..b163dab5c3 100644
--- a/Platform/ARM/SgiPkg/SgiPlatform.fdf
+++ b/Platform/ARM/SgiPkg/SgiPlatform.fdf
@@ -292,19 +292,10 @@ READ_LOCK_STATUS = TRUE
PEI_DEPEX PEI_DEPEX Optional $(INF_OUTPUT)/$(MODULE_NAME).depex
TE TE Align = Auto$(INF_OUTPUT)/$(MODULE_NAME).efi
UI STRING="$(MODULE_NAME)" Optional
}
-[Rule.Common.PEIM.TIANOCOMPRESSED]
- FILE PEIM = $(NAMED_GUID) DEBUG_MYTOOLS_IA32 {
-PEI_DEPEX PEI_DEPEX Optional$(INF_OUTPUT)/$(MODULE_NAME).depex
-GUIDED A31280AD-481E-41B6-95E8-127F4C984779 PROCESSING_REQUIRED = TRUE {
- PE32 PE32$(INF_OUTPUT)/$(MODULE_NAME).efi
- UISTRING="$(MODULE_NAME)" Optional
-}
- }
-
[Rule.Common.DXE_CORE]
FILE DXE_CORE = $(NAMED_GUID) {
PE32 PE32 $(INF_OUTPUT)/$(MODULE_NAME).efi
UI STRING="$(MODULE_NAME)" Optional
}
diff --git a/Platform/Socionext/DeveloperBox/DeveloperBox.fdf
b/Platform/Socionext/DeveloperBox/DeveloperBox.fdf
index e6b42fc202..5309a77c1a 100644
--- a/Platform/Socionext/DeveloperBox/DeveloperBox.fdf
+++ b/Platform/Socionext/DeveloperBox/DeveloperBox.fdf
@@ -440,19 +440,10 @@ CAPSULE_HEADER_INIT_VERSION = 0x1
PEI_DEPEX PEI_DEPEX Optional $(INF_OUTPUT)/$(MODULE_NAME).depex
TE TE Align = Auto$(INF_OUTPUT)/$(MODULE_NAME).efi
UI STRING="$(MODULE_NAME)" Optional
}
-[Rule.Common.PEIM.TIANOCOMPRESSED]
- FILE PEIM = $(NAMED_GUID) DEBUG_MYTOOLS_IA32 {
-PEI_DEPEX PEI_DEPEX Optional$(INF_OUTPUT)/$(MODULE_NAME).depex
-GUIDED A31280AD-481E-41B6-95E8-127F4C984779 PROCESSING_REQUIRED = TRUE {
- PE32 PE32$(INF_OUTPUT)/$(MODULE_NAME).efi
- UISTRING="$(MODULE_NAME)" Optional
-}
- }
-
[Rule.Common.DXE_CORE]
FILE DXE_CORE = $(NAMED_GUID) {
PE32 PE32 $(INF_OUTPUT)/$(MODULE_NAME).efi
UI STRING="$(MODULE_NAME)" Optional
}
diff --git a/Platform/Socionext/SynQuacerEvalBoard/SynQuacerEvalBoard.fdf
b/Platform/Socionext/SynQuacerEvalBoard/SynQuacerEvalBoard.fdf
index 3f47781fe9..1e07f579a8 100644
--- a/Platform/Socionext/SynQuacerEvalBoard/SynQuacerEvalBoard.fdf
+++ b/Platform/Socionext/SynQuacerEvalBoard/SynQuacerEvalBoard.fdf
@@ -390,19 +390,10 @@ FMP_PAYLOAD = FmpPayloadSystemFirmwarePkcs7
PEI_DEPEX PEI_DEPEX Optional $(INF_OUTPUT)/$(MODULE_NAME).depex
TE TE Align = Auto$(INF_OUTPUT)/$(MODULE_NAME).efi
UI STRING="$(MODULE_NAME)" Optional
}
-[Rule.Common.PEIM.TIANOCOMPRESSED]
- FILE PEIM = $(NAMED_GUID) DEBUG_MYTOOLS_IA32 {
-PEI_DEPEX PEI_DEPEX Optional$(INF_OUTPUT)/$(MODULE_NAME).depex
-GUIDED A31280AD-481E-41B6-95E8-127F4C984779 PROCESSING_REQUIRED = TRUE {
- PE32 PE32$(INF_OUTPUT)/$(MODULE_NAME).efi
- UISTRING="$(MODULE_NAME)" Optional
-}
- }
-
[Rule.Common.DXE_CORE]
FILE DXE_CORE = $(NAMED_GUID) {
PE32 PE32 $(INF_OUTPUT)/$(MODULE_NAME).efi
UI STRING="$(MODULE_NAME)" Optional
}
--
2.18.0.windows.1
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#40005): https://edk2.groups.io/g/devel/message/40005
Mute This Topic: https://groups.io/mt/31507437/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [edk2-devel] [patch 04/11] MdeModulePkg/Core: Remove PcdFrameworkCompatibilitySupport usage
> -Original Message- > From: Wu, Hao A > Sent: Monday, May 6, 2019 9:23 AM > To: devel@edk2.groups.io; Bi, Dandan > Cc: Gao, Liming > Subject: RE: [edk2-devel] [patch 04/11] MdeModulePkg/Core: Remove > PcdFrameworkCompatibilitySupport usage > > > -Original Message- > > From: devel@edk2.groups.io [mailto:devel@edk2.groups.io] On Behalf Of > > Dandan Bi > > Sent: Monday, April 29, 2019 10:16 AM > > To: devel@edk2.groups.io > > Cc: Gao, Liming > > Subject: [edk2-devel] [patch 04/11] MdeModulePkg/Core: Remove > > PcdFrameworkCompatibilitySupport usage > > > > REF: https://bugzilla.tianocore.org/show_bug.cgi?id=1464 > > > > Currently Framework compatibility is not needed and > > PcdFrameworkCompatibilitySupport will be removed from edk2. > > So remove the usage of this PCD firstly. > > > > Cc: Liming Gao > > Signed-off-by: Dandan Bi > > --- > > MdeModulePkg/Core/Dxe/DxeMain.inf | 6 +- > > MdeModulePkg/Core/Dxe/Image/Image.c | 132 > > +--- MdeModulePkg/Core/Dxe/Image/Image.h | > > 85 +- MdeModulePkg/Core/Pei/FwVol/FwVol.c | 65 -- > > > MdeModulePkg/Core/Pei/PeiMain.inf | 1 - > > 5 files changed, 3 insertions(+), 286 deletions(-) > > > > diff --git a/MdeModulePkg/Core/Dxe/DxeMain.inf > > b/MdeModulePkg/Core/Dxe/DxeMain.inf > > index 8dee5bee0a..61161bee28 100644 > > --- a/MdeModulePkg/Core/Dxe/DxeMain.inf > > +++ b/MdeModulePkg/Core/Dxe/DxeMain.inf > > @@ -1,11 +1,11 @@ > > ## @file > > # This is core module in DXE phase. > > # > > # It provides an implementation of DXE Core that is compliant with DXE > > CIS. > > # > > -# Copyright (c) 2006 - 2018, Intel Corporation. All rights > > reserved. > > +# Copyright (c) 2006 - 2019, Intel Corporation. All rights > > +reserved. > > # SPDX-License-Identifier: BSD-2-Clause-Patent # ## > > > > [Defines] > > @@ -130,11 +130,10 @@ > > > > [Protocols] > >## PRODUCES > >## SOMETIMES_CONSUMES > >gEfiDecompressProtocolGuid > > - gEfiLoadPeImageProtocolGuid ## SOMETIMES_PRODUCES # > > Produces when PcdFrameworkCompatibilitySupport is set > > A couple of questions. > > Is '#include ' in > MdeModulePkg\Core\Dxe\DxeMain.h still needed? > > Can we remove EFI_PE32_IMAGE_PROTOCOL altogether? Seems to me > there is no other consumer within edk2. > > Best Regards, > Hao Wu Hi Hao, 1. Yes, since following definitions in are still used in MdeModulePkg\Core\Dxe\Image\Image.c #define EFI_LOAD_PE_IMAGE_ATTRIBUTE_RUNTIME_REGISTRATION 0x01 #define EFI_LOAD_PE_IMAGE_ATTRIBUTE_DEBUG_IMAGE_INFO_TABLE_REGISTRATION 0x02 2. I also think we can remove this protocol, but I prefer a separate patch (not covered by this patch series) to remove it and solve the dependency issue in 1 together. Is it OK to you? Thanks, Dandan > > >gEfiSimpleFileSystemProtocolGuid ## SOMETIMES_CONSUMES > >gEfiLoadFileProtocolGuid ## SOMETIMES_CONSUMES > >gEfiLoadFile2ProtocolGuid ## SOMETIMES_CONSUMES > >gEfiBusSpecificDriverOverrideProtocolGuid ## SOMETIMES_CONSUMES > >gEfiDriverFamilyOverrideProtocolGuid ## SOMETIMES_CONSUMES > > @@ -171,13 +170,10 @@ > >gEfiVariableWriteArchProtocolGuid ## CONSUMES > >gEfiVariableArchProtocolGuid ## CONSUMES > >gEfiCapsuleArchProtocolGuid ## CONSUMES > >gEfiWatchdogTimerArchProtocolGuid ## CONSUMES > > > > -[FeaturePcd] > > - > gEfiMdeModulePkgTokenSpaceGuid.PcdFrameworkCompatibilitySupport > > ## CONSUMES > > - > > [Pcd] > > > > > gEfiMdeModulePkgTokenSpaceGuid.PcdLoadFixAddressBootTimeCodePage > Nu > > mber## SOMETIMES_CONSUMES > > > > > gEfiMdeModulePkgTokenSpaceGuid.PcdLoadFixAddressRuntimeCodePageN > um > > ber ## SOMETIMES_CONSUMES > >gEfiMdeModulePkgTokenSpaceGuid.PcdLoadModuleAtFixAddressEnable > > ## CONSUMES > > > gEfiMdeModulePkgTokenSpaceGuid.PcdMaxEfiSystemTablePointerAddress > > ## CONSUMES > > diff --git a/MdeModulePkg/Core/Dxe/Image/Image.c > > b/MdeModulePkg/Core/Dxe/Image/Image.c > > index de5b8bed27..22a87ecf6d 100644 > > --- a/MdeModulePkg/Core/Dxe/Image/Image.c > > +++ b/MdeModulePkg/Core/Dxe/Image/Image.c > > @@ -1,9 +1,9 @@ > > /** @file > >Core image handling services to load and unload PeImage. > > > > -Copyri
Re: [edk2-devel] [patch 04/11] MdeModulePkg/Core: Remove PcdFrameworkCompatibilitySupport usage
Hi Hao and Liming, Any comments for this patch itself? As for whether delete the header definition of EFI_PE32_IMAGE_PROTOCOL , it is another topic. Liming, do you have any comments on this one? Thanks, Dandan > -Original Message- > From: Wu, Hao A > Sent: Monday, May 6, 2019 10:55 AM > To: Bi, Dandan ; devel@edk2.groups.io > Cc: Gao, Liming > Subject: RE: [edk2-devel] [patch 04/11] MdeModulePkg/Core: Remove > PcdFrameworkCompatibilitySupport usage > > > -Original Message- > > From: Bi, Dandan > > Sent: Monday, May 06, 2019 10:48 AM > > To: Wu, Hao A; devel@edk2.groups.io > > Cc: Gao, Liming; Bi, Dandan > > Subject: RE: [edk2-devel] [patch 04/11] MdeModulePkg/Core: Remove > > PcdFrameworkCompatibilitySupport usage > > > > > -Original Message- > > > From: Wu, Hao A > > > Sent: Monday, May 6, 2019 9:23 AM > > > To: devel@edk2.groups.io; Bi, Dandan > > > Cc: Gao, Liming > > > Subject: RE: [edk2-devel] [patch 04/11] MdeModulePkg/Core: Remove > > > PcdFrameworkCompatibilitySupport usage > > > > > > > -Original Message- > > > > From: devel@edk2.groups.io [mailto:devel@edk2.groups.io] On Behalf > > > > Of Dandan Bi > > > > Sent: Monday, April 29, 2019 10:16 AM > > > > To: devel@edk2.groups.io > > > > Cc: Gao, Liming > > > > Subject: [edk2-devel] [patch 04/11] MdeModulePkg/Core: Remove > > > > PcdFrameworkCompatibilitySupport usage > > > > > > > > REF: https://bugzilla.tianocore.org/show_bug.cgi?id=1464 > > > > > > > > Currently Framework compatibility is not needed and > > > > PcdFrameworkCompatibilitySupport will be removed from edk2. > > > > So remove the usage of this PCD firstly. > > > > > > > > Cc: Liming Gao > > > > Signed-off-by: Dandan Bi > > > > --- > > > > MdeModulePkg/Core/Dxe/DxeMain.inf | 6 +- > > > > MdeModulePkg/Core/Dxe/Image/Image.c | 132 > > > > +--- MdeModulePkg/Core/Dxe/Image/Image.h > > > > +| > > > > 85 +- MdeModulePkg/Core/Pei/FwVol/FwVol.c | 65 > > > > -- > > > > > > > MdeModulePkg/Core/Pei/PeiMain.inf | 1 - > > > > 5 files changed, 3 insertions(+), 286 deletions(-) > > > > > > > > diff --git a/MdeModulePkg/Core/Dxe/DxeMain.inf > > > > b/MdeModulePkg/Core/Dxe/DxeMain.inf > > > > index 8dee5bee0a..61161bee28 100644 > > > > --- a/MdeModulePkg/Core/Dxe/DxeMain.inf > > > > +++ b/MdeModulePkg/Core/Dxe/DxeMain.inf > > > > @@ -1,11 +1,11 @@ > > > > ## @file > > > > # This is core module in DXE phase. > > > > # > > > > # It provides an implementation of DXE Core that is compliant > > > > with DXE > > CIS. > > > > # > > > > -# Copyright (c) 2006 - 2018, Intel Corporation. All rights > > > > reserved. > > > > +# Copyright (c) 2006 - 2019, Intel Corporation. All rights > > > > +reserved. > > > > # SPDX-License-Identifier: BSD-2-Clause-Patent # ## > > > > > > > > [Defines] > > > > @@ -130,11 +130,10 @@ > > > > > > > > [Protocols] > > > >## PRODUCES > > > >## SOMETIMES_CONSUMES > > > >gEfiDecompressProtocolGuid > > > > - gEfiLoadPeImageProtocolGuid ## SOMETIMES_PRODUCES > # > > > > Produces when PcdFrameworkCompatibilitySupport is set > > > > > > A couple of questions. > > > > > > Is '#include ' in > > > MdeModulePkg\Core\Dxe\DxeMain.h still needed? > > > > > > Can we remove EFI_PE32_IMAGE_PROTOCOL altogether? Seems to me > there > > > is no other consumer within edk2. > > > > > > Best Regards, > > > Hao Wu > > > > Hi Hao, > > > > 1. Yes, since following definitions in are > > still used in MdeModulePkg\Core\Dxe\Image\Image.c > > #define EFI_LOAD_PE_IMAGE_ATTRIBUTE_RUNTIME_REGISTRATION > > 0x01 > > #define > > > EFI_LOAD_PE_IMAGE_ATTRIBUTE_DEBUG_IMAGE_INFO_TABLE_REGISTRA > TIO > > N 0x02 > > OK. I overlooked that these definitions are still being used. > > > > > 2. I also think we can remove this protocol, but I prefer a separate > > patch (not covered by this patch series) to remove it an
Re: [edk2-devel] [PATCH v1 1/1] ShellPkg/UefiShellBcfgCommandLib: Fix '-opt' option
Also agree to update Shell Spec to add description for "#" in "-opt" part to make it consistent with other options since this patch has updated the code behavior to be consistent. For the patch Reviewed-by: Bi Dandan Thanks, Dandan > -Original Message- > From: Carsey, Jaben > Sent: Tuesday, May 07, 2019 10:36 PM > To: Gao, Zhichao ; devel@edk2.groups.io; Ni, Ray > ; jw...@jwatt.org > Cc: Bi, Dandan > Subject: RE: [edk2-devel] [PATCH v1 1/1] > ShellPkg/UefiShellBcfgCommandLib: Fix '-opt' option > > Zhichao, > I can help submit errata for shell spec if needed. > > Per patch, > I agree. This looks good. > Reviewed-by: Jaben Carsey > > > > -Original Message- > > From: Gao, Zhichao > > Sent: Tuesday, May 07, 2019 2:52 AM > > To: devel@edk2.groups.io; Ni, Ray ; jw...@jwatt.org > > Cc: Carsey, Jaben ; Bi, Dandan > > > > Subject: RE: [edk2-devel] [PATCH v1 1/1] > > ShellPkg/UefiShellBcfgCommandLib: Fix '-opt' option > > Importance: High > > > > This patch looks good for me. > > Reviewed-by: Zhichao Gao > > > > But when I view the command in UEFI SHELL 2.2 spec: > > ... > > bcfg driver|boot [-opt # [[filename]|["data"]] | [KeyData > UnicodeChar>*]] > > ... > > -opt > > Modify the optional data associated with a driver or boot option. > > Followed either by the filename of the file which contains the binary > > data to be associated with the driver or boot option optional data, or > > else the quote- delimited data that will be associated with the driver > > or boot option optional data. > > ... > > > > This description lack the comment of '#' parameter and that may make > > the consumer confused. Usually consumers would regard it as the same > > in other option, such as ' bcfg driver|boot [rm #]'. The '#' is > > clearly descripted as a hexadecimal parameter: > > rm > > Remove an option. The # parameter lists the option number to remove in > > hexadecimal. > > > > So I think we should update the shell spec by the way. > > > > Thanks, > > Zhichao > > > > > -Original Message- > > > From: devel@edk2.groups.io [mailto:devel@edk2.groups.io] On Behalf > > > Of > > Ni, > > > Ray > > > Sent: Monday, May 6, 2019 10:02 PM > > > To: jw...@jwatt.org; devel@edk2.groups.io > > > Cc: Carsey, Jaben ; Bi, Dandan > > > > > > Subject: Re: [edk2-devel] [PATCH v1 1/1] > > ShellPkg/UefiShellBcfgCommandLib: > > > Fix '-opt' option > > > > > > Dandan, > > > Can you please help to review? > > > > > > Thanks, > > > Ray > > > > > > > -Original Message- > > > > From: jw...@jwatt.org [mailto:jw...@jwatt.org] > > > > Sent: Monday, May 6, 2019 9:03 PM > > > > To: devel@edk2.groups.io > > > > Cc: Carsey, Jaben ; Ni, Ray > > > > > > > > Subject: [PATCH v1 1/1] ShellPkg/UefiShellBcfgCommandLib: Fix '-opt' > > > > option > > > > > > > > From: Jonathan Watt > > > > > > > > For all other bcfg commands the "#" (option number) argument(s) > > > > are treated as hexedecimal values regardless of whether or not > > > > they are prefixed by "0x". This change fixes '-opt' to handle its "#" > > > > (option number) argument consistently with the other commands. > > > > > > > > Making this change removes a potential footgun whereby a user that > > > > has been using a number without a "0x" prefix with other bcfg > > > > commands finds that, on using that exact same number with '-opt', > > > > it has this time unexpectedly been interpreted as a decimal number > > > > and they have modified > > > > (corrupted) an unrelated load option. For example, a user may > > > > have been specifying "10" to other commands to have them act on > > > > the 16th option (because simply "10", without any prefix, is how > > > > 'bcfg boot dump' displayed the option number for the 16th option). > > > > Unfortunately for them, if they also use '-opt' with "10" it would > > > > unexpectedly and inconsistently act on the 10th option. > > > > > > > > CC: Jaben Carsey > > > > CC: Ray Ni > > > > Signed-off-by: Jonathan Watt > > > > --- > > > > > > > > > ShellPkg/Library/UefiShellBcfgCommandLib/UefiShellBcfgCommandLib.c > > | > > > > 2 > > > > +- > > > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > > > > > diff --git > > > > > > > a/ShellPkg/Library/UefiShellBcfgCommandLib/UefiShellBcfgCommandLib.c > > > > > > > b/ShellPkg/Library/UefiShellBcfgCommandLib/UefiShellBcfgCommandLib.c > > > > index d033c7c1dc59..e8b48b4990dd 100644 > > > > --- > > > > > > > a/ShellPkg/Library/UefiShellBcfgCommandLib/UefiShellBcfgCommandLib.c > > > > +++ > > > > > > > b/ShellPkg/Library/UefiShellBcfgCommandLib/UefiShellBcfgCommandLib.c > > > > @@ -1019,7 +1019,7 @@ BcfgAddOpt( > > > >// > > > >// Get the index of the variable we are changing. > > > >// > > > > - Status = ShellConvertStringToUint64(Walker, &Intermediate, > > > > FALSE, TRUE); > > > > + Status = ShellConvertStringToUint64(Walker, &Intermediate, > > > > + TRUE, TRUE); > > > >if (EFI_ERROR(Status) || (((UINT16)Intermediate) != > > > > Intermediate) > > > > || StrStr(W
[edk2-devel] [edk2-platforms] [patch v2 1/7] Platform/AMD: Update UefiDecompressLib instance
REF: https://bugzilla.tianocore.org/show_bug.cgi?id=1722 BaseUefiDecompressLib in MdePkg is the base UEFI decompress Library. BaseUefiTianoCustomDecompressLib in MdeModulePkg implements the base UEFI decompress functionality and Tiano decompress functionality. 1. TIANOCOMPRESSED rule in OverdriveBoard.fdf is not used, so remove it. 2. Platform doesn't use the TianoCompress, so do not have to use BaseUefiTianoCustomDecompressLib, can use the BaseUefiDecompressLib in MdePkg directly. 3. A common UefiDecompressLib resolution can apply to all module types now. So keep the common one in [LibraryClasses.common] section and remove all others. Cc: Ard Biesheuvel Cc: Leif Lindholm Cc: Michael D Kinney Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Dandan Bi --- Platform/AMD/OverdriveBoard/OverdriveBoard.dsc | 5 - Platform/AMD/OverdriveBoard/OverdriveBoard.fdf | 9 - 2 files changed, 14 deletions(-) diff --git a/Platform/AMD/OverdriveBoard/OverdriveBoard.dsc b/Platform/AMD/OverdriveBoard/OverdriveBoard.dsc index 616553172b..39b5dad154 100644 --- a/Platform/AMD/OverdriveBoard/OverdriveBoard.dsc +++ b/Platform/AMD/OverdriveBoard/OverdriveBoard.dsc @@ -186,11 +186,10 @@ [LibraryClasses.common.PEI_CORE] HobLib|MdePkg/Library/PeiHobLib/PeiHobLib.inf MemoryAllocationLib|MdePkg/Library/PeiMemoryAllocationLib/PeiMemoryAllocationLib.inf PeiCoreEntryPoint|MdePkg/Library/PeiCoreEntryPoint/PeiCoreEntryPoint.inf PerformanceLib|MdeModulePkg/Library/PeiPerformanceLib/PeiPerformanceLib.inf PeCoffGetEntryPointLib|MdePkg/Library/BasePeCoffGetEntryPointLib/BasePeCoffGetEntryPointLib.inf - UefiDecompressLib|MdePkg/Library/BaseUefiDecompressLib/BaseUefiDecompressLib.inf ExtractGuidedSectionLib|MdePkg/Library/PeiExtractGuidedSectionLib/PeiExtractGuidedSectionLib.inf PeiServicesTablePointerLib|ArmPkg/Library/PeiServicesTablePointerLib/PeiServicesTablePointerLib.inf [LibraryClasses.common.PEIM] @@ -199,21 +198,19 @@ [LibraryClasses.common.PEIM] MemoryAllocationLib|MdePkg/Library/PeiMemoryAllocationLib/PeiMemoryAllocationLib.inf PeimEntryPoint|MdePkg/Library/PeimEntryPoint/PeimEntryPoint.inf PerformanceLib|MdeModulePkg/Library/PeiPerformanceLib/PeiPerformanceLib.inf PeCoffGetEntryPointLib|MdePkg/Library/BasePeCoffGetEntryPointLib/BasePeCoffGetEntryPointLib.inf PeiResourcePublicationLib|MdePkg/Library/PeiResourcePublicationLib/PeiResourcePublicationLib.inf - UefiDecompressLib|MdePkg/Library/BaseUefiDecompressLib/BaseUefiDecompressLib.inf ExtractGuidedSectionLib|MdePkg/Library/PeiExtractGuidedSectionLib/PeiExtractGuidedSectionLib.inf PeiServicesTablePointerLib|ArmPkg/Library/PeiServicesTablePointerLib/PeiServicesTablePointerLib.inf [LibraryClasses.common.DXE_CORE] HobLib|MdePkg/Library/DxeCoreHobLib/DxeCoreHobLib.inf MemoryAllocationLib|MdeModulePkg/Library/DxeCoreMemoryAllocationLib/DxeCoreMemoryAllocationLib.inf DxeCoreEntryPoint|MdePkg/Library/DxeCoreEntryPoint/DxeCoreEntryPoint.inf ExtractGuidedSectionLib|MdePkg/Library/DxeExtractGuidedSectionLib/DxeExtractGuidedSectionLib.inf - UefiDecompressLib|MdePkg/Library/BaseUefiDecompressLib/BaseUefiDecompressLib.inf PerformanceLib|MdeModulePkg/Library/DxeCorePerformanceLib/DxeCorePerformanceLib.inf [LibraryClasses.common.DXE_DRIVER] SecurityManagementLib|MdeModulePkg/Library/DxeSecurityManagementLib/DxeSecurityManagementLib.inf PerformanceLib|MdeModulePkg/Library/DxePerformanceLib/DxePerformanceLib.inf @@ -227,17 +224,15 @@ [LibraryClasses.common.DXE_RUNTIME_DRIVER] !if $(TARGET) != RELEASE DebugLib|MdePkg/Library/DxeRuntimeDebugLibSerialPort/DxeRuntimeDebugLibSerialPort.inf !endif [LibraryClasses.common.UEFI_APPLICATION] - UefiDecompressLib|MdeModulePkg/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTianoCustomDecompressLib.inf PerformanceLib|MdeModulePkg/Library/DxePerformanceLib/DxePerformanceLib.inf MemoryAllocationLib|MdePkg/Library/UefiMemoryAllocationLib/UefiMemoryAllocationLib.inf HiiLib|MdeModulePkg/Library/UefiHiiLib/UefiHiiLib.inf [LibraryClasses.common.UEFI_DRIVER] - UefiDecompressLib|MdeModulePkg/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTianoCustomDecompressLib.inf ExtractGuidedSectionLib|MdePkg/Library/DxeExtractGuidedSectionLib/DxeExtractGuidedSectionLib.inf PerformanceLib|MdeModulePkg/Library/DxePerformanceLib/DxePerformanceLib.inf MemoryAllocationLib|MdePkg/Library/UefiMemoryAllocationLib/UefiMemoryAllocationLib.inf [LibraryClasses.ARM] diff --git a/Platform/AMD/OverdriveBoard/OverdriveBoard.fdf b/Platform/AMD/OverdriveBoard/OverdriveBoard.fdf index a058665bcc..2aaf83084e 100644 --- a/Platform/AMD/OverdriveBoard/OverdriveBoard.fdf +++ b/Platform/AMD/OverdriveBoard/OverdriveBoard.fdf @@ -416,19 +416,10 @@ [Rule.Common.PEIM.Binary] PEI_DEPEX PEI_DEPEX Optional |.depex TE TE Align = Auto |.efi UI STRING="$(MODULE_NAME)
[edk2-devel] [edk2-platforms] [patch v2 3/7] Platform/RPi3: Update UefiDecompressLib instance
REF: https://bugzilla.tianocore.org/show_bug.cgi?id=1722
BaseUefiDecompressLib in MdePkg is the
base UEFI decompress Library.
BaseUefiTianoCustomDecompressLib in MdeModulePkg
implements the base UEFI decompress functionality and
Tiano decompress functionality.
1. TIANOCOMPRESSED rule in fdf is not used, so remove it.
2. Platform doesn't use the TianoCompress, so do
not have to use BaseUefiTianoCustomDecompressLib,
can use the BaseUefiDecompressLib in MdePkg directly.
3. A common UefiDecompressLib resolution can apply to
all module types now. So keep the common one in
[LibraryClasses.common] section and remove all others.
Cc: Ard Biesheuvel
Cc: Leif Lindholm
Cc: Michael D Kinney
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Dandan Bi
---
Platform/RaspberryPi/RPi3/RPi3.dsc | 3 ---
Platform/RaspberryPi/RPi3/RPi3.fdf | 9 -
2 files changed, 12 deletions(-)
diff --git a/Platform/RaspberryPi/RPi3/RPi3.dsc
b/Platform/RaspberryPi/RPi3/RPi3.dsc
index f1143b1471..dcdfa10290 100644
--- a/Platform/RaspberryPi/RPi3/RPi3.dsc
+++ b/Platform/RaspberryPi/RPi3/RPi3.dsc
@@ -178,31 +178,28 @@ [LibraryClasses.common.DXE_CORE]
HobLib|MdePkg/Library/DxeCoreHobLib/DxeCoreHobLib.inf
MemoryAllocationLib|MdeModulePkg/Library/DxeCoreMemoryAllocationLib/DxeCoreMemoryAllocationLib.inf
DxeCoreEntryPoint|MdePkg/Library/DxeCoreEntryPoint/DxeCoreEntryPoint.inf
ReportStatusCodeLib|IntelFrameworkModulePkg/Library/DxeReportStatusCodeLibFramework/DxeReportStatusCodeLib.inf
ExtractGuidedSectionLib|MdePkg/Library/DxeExtractGuidedSectionLib/DxeExtractGuidedSectionLib.inf
-
UefiDecompressLib|MdePkg/Library/BaseUefiDecompressLib/BaseUefiDecompressLib.inf
PerformanceLib|MdeModulePkg/Library/DxeCorePerformanceLib/DxeCorePerformanceLib.inf
[LibraryClasses.common.DXE_DRIVER]
ReportStatusCodeLib|IntelFrameworkModulePkg/Library/DxeReportStatusCodeLibFramework/DxeReportStatusCodeLib.inf
SecurityManagementLib|MdeModulePkg/Library/DxeSecurityManagementLib/DxeSecurityManagementLib.inf
PerformanceLib|MdeModulePkg/Library/DxePerformanceLib/DxePerformanceLib.inf
MemoryAllocationLib|MdePkg/Library/UefiMemoryAllocationLib/UefiMemoryAllocationLib.inf
[LibraryClasses.common.UEFI_APPLICATION]
-
UefiDecompressLib|MdeModulePkg/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTianoCustomDecompressLib.inf
PerformanceLib|MdeModulePkg/Library/DxePerformanceLib/DxePerformanceLib.inf
MemoryAllocationLib|MdePkg/Library/UefiMemoryAllocationLib/UefiMemoryAllocationLib.inf
HiiLib|MdeModulePkg/Library/UefiHiiLib/UefiHiiLib.inf
ShellLib|ShellPkg/Library/UefiShellLib/UefiShellLib.inf
FileHandleLib|MdePkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf
ReportStatusCodeLib|MdeModulePkg/Library/DxeReportStatusCodeLib/DxeReportStatusCodeLib.inf
[LibraryClasses.common.UEFI_DRIVER]
ReportStatusCodeLib|IntelFrameworkModulePkg/Library/DxeReportStatusCodeLibFramework/DxeReportStatusCodeLib.inf
-
UefiDecompressLib|MdeModulePkg/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTianoCustomDecompressLib.inf
ExtractGuidedSectionLib|MdePkg/Library/DxeExtractGuidedSectionLib/DxeExtractGuidedSectionLib.inf
PerformanceLib|MdeModulePkg/Library/DxePerformanceLib/DxePerformanceLib.inf
MemoryAllocationLib|MdePkg/Library/UefiMemoryAllocationLib/UefiMemoryAllocationLib.inf
[LibraryClasses.common.DXE_RUNTIME_DRIVER]
diff --git a/Platform/RaspberryPi/RPi3/RPi3.fdf
b/Platform/RaspberryPi/RPi3/RPi3.fdf
index 22813d453c..85f2187545 100644
--- a/Platform/RaspberryPi/RPi3/RPi3.fdf
+++ b/Platform/RaspberryPi/RPi3/RPi3.fdf
@@ -386,19 +386,10 @@ [Rule.Common.PEIM]
PEI_DEPEX PEI_DEPEX Optional $(INF_OUTPUT)/$(MODULE_NAME).depex
TE TE Align = Auto $(INF_OUTPUT)/$(MODULE_NAME).efi
UI STRING="$(MODULE_NAME)" Optional
}
-[Rule.Common.PEIM.TIANOCOMPRESSED]
- FILE PEIM = $(NAMED_GUID) DEBUG_MYTOOLS_IA32 {
-PEI_DEPEX PEI_DEPEX Optional$(INF_OUTPUT)/$(MODULE_NAME).depex
-GUIDED A31280AD-481E-41B6-95E8-127F4C984779 PROCESSING_REQUIRED = TRUE {
- PE32 PE32$(INF_OUTPUT)/$(MODULE_NAME).efi
- UISTRING="$(MODULE_NAME)" Optional
-}
- }
-
[Rule.Common.DXE_CORE]
FILE DXE_CORE = $(NAMED_GUID) {
PE32 PE32 $(INF_OUTPUT)/$(MODULE_NAME).efi
UI STRING="$(MODULE_NAME)" Optional
}
--
2.18.0.windows.1
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#40156): https://edk2.groups.io/g/devel/message/40156
Mute This Topic: https://groups.io/mt/31539222/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[edk2-devel] [edk2-platforms] [patch v2 5/7] Silicon/Hisilicon: Update UefiDecompressLib instance
REF: https://bugzilla.tianocore.org/show_bug.cgi?id=1722 BaseUefiDecompressLib in MdePkg is the base UEFI decompress Library. BaseUefiTianoCustomDecompressLib in MdeModulePkg implements the base UEFI decompress functionality and Tiano decompress functionality. 1. TIANOCOMPRESSED rule in fdf is not used, so remove it. 2. Platform doesn't use the TianoCompress, so do not have to use BaseUefiTianoCustomDecompressLib, can use the BaseUefiDecompressLib in MdePkg directly. 3. A common UefiDecompressLib resolution can apply to all module types now. So keep the common one in [LibraryClasses.common] section and remove all others. Cc: Ard Biesheuvel Cc: Leif Lindholm Cc: Michael D Kinney Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Dandan Bi --- Silicon/Hisilicon/Hisilicon.dsc.inc | 5 - Silicon/Hisilicon/Hisilicon.fdf.inc | 9 - 2 files changed, 14 deletions(-) diff --git a/Silicon/Hisilicon/Hisilicon.dsc.inc b/Silicon/Hisilicon/Hisilicon.dsc.inc index a2ade57451..8a9812b9ed 100644 --- a/Silicon/Hisilicon/Hisilicon.dsc.inc +++ b/Silicon/Hisilicon/Hisilicon.dsc.inc @@ -138,11 +138,10 @@ [LibraryClasses.common.PEI_CORE] PeiCoreEntryPoint|MdePkg/Library/PeiCoreEntryPoint/PeiCoreEntryPoint.inf PerformanceLib|MdeModulePkg/Library/PeiPerformanceLib/PeiPerformanceLib.inf ReportStatusCodeLib|MdeModulePkg/Library/PeiReportStatusCodeLib/PeiReportStatusCodeLib.inf OemHookStatusCodeLib|MdeModulePkg/Library/OemHookStatusCodeLibNull/OemHookStatusCodeLibNull.inf PeCoffGetEntryPointLib|MdePkg/Library/BasePeCoffGetEntryPointLib/BasePeCoffGetEntryPointLib.inf - UefiDecompressLib|MdePkg/Library/BaseUefiDecompressLib/BaseUefiDecompressLib.inf ExtractGuidedSectionLib|MdePkg/Library/PeiExtractGuidedSectionLib/PeiExtractGuidedSectionLib.inf PeiServicesTablePointerLib|ArmPkg/Library/PeiServicesTablePointerLib/PeiServicesTablePointerLib.inf PcdLib|MdePkg/Library/PeiPcdLib/PeiPcdLib.inf BaseMemoryLib|MdePkg/Library/BaseMemoryLib/BaseMemoryLib.inf @@ -155,11 +154,10 @@ [LibraryClasses.common.PEIM] PerformanceLib|MdeModulePkg/Library/PeiPerformanceLib/PeiPerformanceLib.inf ReportStatusCodeLib|MdeModulePkg/Library/PeiReportStatusCodeLib/PeiReportStatusCodeLib.inf OemHookStatusCodeLib|MdeModulePkg/Library/OemHookStatusCodeLibNull/OemHookStatusCodeLibNull.inf PeCoffGetEntryPointLib|MdePkg/Library/BasePeCoffGetEntryPointLib/BasePeCoffGetEntryPointLib.inf PeiResourcePublicationLib|MdePkg/Library/PeiResourcePublicationLib/PeiResourcePublicationLib.inf - UefiDecompressLib|MdePkg/Library/BaseUefiDecompressLib/BaseUefiDecompressLib.inf ExtractGuidedSectionLib|MdePkg/Library/PeiExtractGuidedSectionLib/PeiExtractGuidedSectionLib.inf PeiServicesTablePointerLib|ArmPkg/Library/PeiServicesTablePointerLib/PeiServicesTablePointerLib.inf ## Fixed compile error after upgrade to 14.10 @@ -172,11 +170,10 @@ [LibraryClasses.common.DXE_CORE] HobLib|MdePkg/Library/DxeCoreHobLib/DxeCoreHobLib.inf MemoryAllocationLib|MdeModulePkg/Library/DxeCoreMemoryAllocationLib/DxeCoreMemoryAllocationLib.inf DxeCoreEntryPoint|MdePkg/Library/DxeCoreEntryPoint/DxeCoreEntryPoint.inf ReportStatusCodeLib|IntelFrameworkModulePkg/Library/DxeReportStatusCodeLibFramework/DxeReportStatusCodeLib.inf ExtractGuidedSectionLib|MdePkg/Library/DxeExtractGuidedSectionLib/DxeExtractGuidedSectionLib.inf - UefiDecompressLib|MdePkg/Library/BaseUefiDecompressLib/BaseUefiDecompressLib.inf DxeServicesLib|MdePkg/Library/DxeServicesLib/DxeServicesLib.inf PerformanceLib|MdeModulePkg/Library/DxeCorePerformanceLib/DxeCorePerformanceLib.inf [LibraryClasses.common.DXE_DRIVER] ReportStatusCodeLib|IntelFrameworkModulePkg/Library/DxeReportStatusCodeLibFramework/DxeReportStatusCodeLib.inf @@ -184,11 +181,10 @@ [LibraryClasses.common.DXE_DRIVER] SecurityManagementLib|MdeModulePkg/Library/DxeSecurityManagementLib/DxeSecurityManagementLib.inf PerformanceLib|MdeModulePkg/Library/DxePerformanceLib/DxePerformanceLib.inf MemoryAllocationLib|MdePkg/Library/UefiMemoryAllocationLib/UefiMemoryAllocationLib.inf [LibraryClasses.common.UEFI_APPLICATION] - UefiDecompressLib|MdeModulePkg/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTianoCustomDecompressLib.inf PerformanceLib|MdeModulePkg/Library/DxePerformanceLib/DxePerformanceLib.inf MemoryAllocationLib|MdePkg/Library/UefiMemoryAllocationLib/UefiMemoryAllocationLib.inf HiiLib|MdeModulePkg/Library/UefiHiiLib/UefiHiiLib.inf [LibraryClasses.common.UEFI_DRIVER,LibraryClasses.common.UEFI_APPLICATION] @@ -196,11 +192,10 @@ [LibraryClasses.common.UEFI_DRIVER,LibraryClasses.common.UEFI_APPLICATION] ReportStatusCodeLib|MdeModulePkg/Library/DxeReportStatusCodeLib/DxeReportStatusCodeLib.inf UefiBootManagerLib|MdeModulePkg/Library/UefiBootManagerLib/UefiBootManagerLib.inf [LibraryClasses.common.UEFI_DRIVER] ReportStatusCodeLib|IntelFrameworkModulePkg/Library/DxeReportStatusCodeLibFram
[edk2-devel] [edk2-platforms] [patch v2 2/7] Platform/LeMaker: Update UefiDecompressLib instance
REF: https://bugzilla.tianocore.org/show_bug.cgi?id=1722 BaseUefiDecompressLib in MdePkg is the base UEFI decompress Library. BaseUefiTianoCustomDecompressLib in MdeModulePkg implements the base UEFI decompress functionality and Tiano decompress functionality. 1. TIANOCOMPRESSED rule in fdf is not used, so remove it. 2. Platform doesn't use the TianoCompress, so do not have to use BaseUefiTianoCustomDecompressLib, can use the BaseUefiDecompressLib in MdePkg directly. 3. A common UefiDecompressLib resolution can apply to all module types now. So keep the common one in [LibraryClasses.common] section and remove all others. Cc: Ard Biesheuvel Cc: Leif Lindholm Cc: Michael D Kinney Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Dandan Bi --- Platform/LeMaker/CelloBoard/CelloBoard.dsc | 5 - Platform/LeMaker/CelloBoard/CelloBoard.fdf | 9 - 2 files changed, 14 deletions(-) diff --git a/Platform/LeMaker/CelloBoard/CelloBoard.dsc b/Platform/LeMaker/CelloBoard/CelloBoard.dsc index c26d38226c..bc2f3e2076 100644 --- a/Platform/LeMaker/CelloBoard/CelloBoard.dsc +++ b/Platform/LeMaker/CelloBoard/CelloBoard.dsc @@ -170,11 +170,10 @@ [LibraryClasses.common.PEI_CORE] PeiCoreEntryPoint|MdePkg/Library/PeiCoreEntryPoint/PeiCoreEntryPoint.inf PerformanceLib|MdeModulePkg/Library/PeiPerformanceLib/PeiPerformanceLib.inf ReportStatusCodeLib|MdeModulePkg/Library/PeiReportStatusCodeLib/PeiReportStatusCodeLib.inf OemHookStatusCodeLib|MdeModulePkg/Library/OemHookStatusCodeLibNull/OemHookStatusCodeLibNull.inf PeCoffGetEntryPointLib|MdePkg/Library/BasePeCoffGetEntryPointLib/BasePeCoffGetEntryPointLib.inf - UefiDecompressLib|MdePkg/Library/BaseUefiDecompressLib/BaseUefiDecompressLib.inf ExtractGuidedSectionLib|MdePkg/Library/PeiExtractGuidedSectionLib/PeiExtractGuidedSectionLib.inf PeiServicesTablePointerLib|ArmPkg/Library/PeiServicesTablePointerLib/PeiServicesTablePointerLib.inf [LibraryClasses.common.PEIM] @@ -185,22 +184,20 @@ [LibraryClasses.common.PEIM] PerformanceLib|MdeModulePkg/Library/PeiPerformanceLib/PeiPerformanceLib.inf ReportStatusCodeLib|MdeModulePkg/Library/PeiReportStatusCodeLib/PeiReportStatusCodeLib.inf OemHookStatusCodeLib|MdeModulePkg/Library/OemHookStatusCodeLibNull/OemHookStatusCodeLibNull.inf PeCoffGetEntryPointLib|MdePkg/Library/BasePeCoffGetEntryPointLib/BasePeCoffGetEntryPointLib.inf PeiResourcePublicationLib|MdePkg/Library/PeiResourcePublicationLib/PeiResourcePublicationLib.inf - UefiDecompressLib|MdePkg/Library/BaseUefiDecompressLib/BaseUefiDecompressLib.inf ExtractGuidedSectionLib|MdePkg/Library/PeiExtractGuidedSectionLib/PeiExtractGuidedSectionLib.inf PeiServicesTablePointerLib|ArmPkg/Library/PeiServicesTablePointerLib/PeiServicesTablePointerLib.inf [LibraryClasses.common.DXE_CORE] HobLib|MdePkg/Library/DxeCoreHobLib/DxeCoreHobLib.inf MemoryAllocationLib|MdeModulePkg/Library/DxeCoreMemoryAllocationLib/DxeCoreMemoryAllocationLib.inf DxeCoreEntryPoint|MdePkg/Library/DxeCoreEntryPoint/DxeCoreEntryPoint.inf ReportStatusCodeLib|IntelFrameworkModulePkg/Library/DxeReportStatusCodeLibFramework/DxeReportStatusCodeLib.inf ExtractGuidedSectionLib|MdePkg/Library/DxeExtractGuidedSectionLib/DxeExtractGuidedSectionLib.inf - UefiDecompressLib|MdePkg/Library/BaseUefiDecompressLib/BaseUefiDecompressLib.inf PerformanceLib|MdeModulePkg/Library/DxeCorePerformanceLib/DxeCorePerformanceLib.inf [LibraryClasses.common.DXE_DRIVER] ReportStatusCodeLib|IntelFrameworkModulePkg/Library/DxeReportStatusCodeLibFramework/DxeReportStatusCodeLib.inf SecurityManagementLib|MdeModulePkg/Library/DxeSecurityManagementLib/DxeSecurityManagementLib.inf @@ -216,19 +213,17 @@ [LibraryClasses.common.DXE_RUNTIME_DRIVER] !if $(TARGET) != RELEASE DebugLib|MdePkg/Library/DxeRuntimeDebugLibSerialPort/DxeRuntimeDebugLibSerialPort.inf !endif [LibraryClasses.common.UEFI_APPLICATION] - UefiDecompressLib|MdeModulePkg/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTianoCustomDecompressLib.inf PerformanceLib|MdeModulePkg/Library/DxePerformanceLib/DxePerformanceLib.inf MemoryAllocationLib|MdePkg/Library/UefiMemoryAllocationLib/UefiMemoryAllocationLib.inf HiiLib|MdeModulePkg/Library/UefiHiiLib/UefiHiiLib.inf ReportStatusCodeLib|MdeModulePkg/Library/DxeReportStatusCodeLib/DxeReportStatusCodeLib.inf [LibraryClasses.common.UEFI_DRIVER] ReportStatusCodeLib|IntelFrameworkModulePkg/Library/DxeReportStatusCodeLibFramework/DxeReportStatusCodeLib.inf - UefiDecompressLib|MdeModulePkg/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTianoCustomDecompressLib.inf ExtractGuidedSectionLib|MdePkg/Library/DxeExtractGuidedSectionLib/DxeExtractGuidedSectionLib.inf PerformanceLib|MdeModulePkg/Library/DxePerformanceLib/DxePerformanceLib.inf MemoryAllocationLib|MdePkg/Library/UefiMemoryAllocationLib/UefiMemoryAllocationLib.inf [LibraryClasses.ARM] diff --git a/Platform/LeMaker/Cello
[edk2-devel] [edk2-platforms] [patch v2 0/7] Update UefiDecompressLib instance
REF: https://bugzilla.tianocore.org/show_bug.cgi?id=1722 BaseUefiDecompressLib in MdePkg is the base UEFI decompress Library. BaseUefiTianoCustomDecompressLib in MdeModulePkg implements the base UEFI decompress functionality and Tiano decompress functionality. 1. TIANOCOMPRESSED rule in OverdriveBoard.fdf is not used, so remove it. 2. Platform doesn't use the TianoCompress, so do not have to use BaseUefiTianoCustomDecompressLib, can use the BaseUefiDecompressLib in MdePkg directly. 3. A common UefiDecompressLib resolution can apply to all module types now. So keep the common one in [LibraryClasses.common] section and remove all others. Cc: Ard Biesheuvel Cc: Leif Lindholm Cc: Michael D Kinney Dandan Bi (7): Platform/AMD: Update UefiDecompressLib instance Platform/LeMaker: Update UefiDecompressLib instance Platform/RPi3: Update UefiDecompressLib instance Platform/SoftIron: Update UefiDecompressLib instance Silicon/Hisilicon: Update UefiDecompressLib instance Silicon/Armada7k8k: Remove TIANOCOMPRESSED rule Platform: Remove TIANOCOMPRESSED rule Platform/AMD/OverdriveBoard/OverdriveBoard.dsc | 5 - Platform/AMD/OverdriveBoard/OverdriveBoard.fdf | 9 - Platform/ARM/SgiPkg/SgiPlatform.fdf | 9 - Platform/LeMaker/CelloBoard/CelloBoard.dsc | 5 - Platform/LeMaker/CelloBoard/CelloBoard.fdf | 9 - Platform/RaspberryPi/RPi3/RPi3.dsc | 3 --- Platform/RaspberryPi/RPi3/RPi3.fdf | 9 - Platform/Socionext/DeveloperBox/DeveloperBox.fdf | 9 - .../Socionext/SynQuacerEvalBoard/SynQuacerEvalBoard.fdf | 9 - .../SoftIron/Overdrive1000Board/Overdrive1000Board.dsc | 5 - .../SoftIron/Overdrive1000Board/Overdrive1000Board.fdf | 9 - Silicon/Hisilicon/Hisilicon.dsc.inc | 5 - Silicon/Hisilicon/Hisilicon.fdf.inc | 9 - Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc| 1 - Silicon/Marvell/Armada7k8k/Armada7k8k.fdf| 9 - 15 files changed, 105 deletions(-) -- 2.18.0.windows.1 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#40153): https://edk2.groups.io/g/devel/message/40153 Mute This Topic: https://groups.io/mt/31539219/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[edk2-devel] [edk2-platforms] [patch v2 6/7] Silicon/Armada7k8k: Remove TIANOCOMPRESSED rule
REF: https://bugzilla.tianocore.org/show_bug.cgi?id=1722
1. TIANOCOMPRESSED rule in fdf is not used, so remove it.
2. The common UefiDecompressLib resolution in
[LibraryClasses.common] section can apply to
all module types. Remove the additional one.
Cc: Ard Biesheuvel
Cc: Leif Lindholm
Cc: Michael D Kinney
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Dandan Bi
---
Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc | 1 -
Silicon/Marvell/Armada7k8k/Armada7k8k.fdf | 9 -
2 files changed, 10 deletions(-)
diff --git a/Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc
b/Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc
index 545b369f27..0cf5d8447a 100644
--- a/Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc
+++ b/Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc
@@ -188,11 +188,10 @@ [LibraryClasses.common.PEIM]
[LibraryClasses.common.DXE_CORE]
HobLib|MdePkg/Library/DxeCoreHobLib/DxeCoreHobLib.inf
MemoryAllocationLib|MdeModulePkg/Library/DxeCoreMemoryAllocationLib/DxeCoreMemoryAllocationLib.inf
DxeCoreEntryPoint|MdePkg/Library/DxeCoreEntryPoint/DxeCoreEntryPoint.inf
ExtractGuidedSectionLib|MdePkg/Library/DxeExtractGuidedSectionLib/DxeExtractGuidedSectionLib.inf
-
UefiDecompressLib|MdePkg/Library/BaseUefiDecompressLib/BaseUefiDecompressLib.inf
DxeServicesLib|MdePkg/Library/DxeServicesLib/DxeServicesLib.inf
PerformanceLib|MdeModulePkg/Library/DxeCorePerformanceLib/DxeCorePerformanceLib.inf
[LibraryClasses.common.DXE_DRIVER]
DxeServicesLib|MdePkg/Library/DxeServicesLib/DxeServicesLib.inf
diff --git a/Silicon/Marvell/Armada7k8k/Armada7k8k.fdf
b/Silicon/Marvell/Armada7k8k/Armada7k8k.fdf
index 3a320ba64d..8a050ef987 100644
--- a/Silicon/Marvell/Armada7k8k/Armada7k8k.fdf
+++ b/Silicon/Marvell/Armada7k8k/Armada7k8k.fdf
@@ -352,19 +352,10 @@ [Rule.Common.PEIM]
PEI_DEPEX PEI_DEPEX Optional $(INF_OUTPUT)/$(MODULE_NAME).depex
TE TE Align = Auto $(INF_OUTPUT)/$(MODULE_NAME).efi
UI STRING="$(MODULE_NAME)" Optional
}
-[Rule.Common.PEIM.TIANOCOMPRESSED]
- FILE PEIM = $(NAMED_GUID) DEBUG_MYTOOLS_IA32 {
-PEI_DEPEX PEI_DEPEX Optional$(INF_OUTPUT)/$(MODULE_NAME).depex
-GUIDED A31280AD-481E-41B6-95E8-127F4C984779 PROCESSING_REQUIRED = TRUE {
- PE32 PE32$(INF_OUTPUT)/$(MODULE_NAME).efi
- UISTRING="$(MODULE_NAME)" Optional
-}
- }
-
[Rule.Common.DXE_CORE]
FILE DXE_CORE = $(NAMED_GUID) {
PE32 PE32 $(INF_OUTPUT)/$(MODULE_NAME).efi
UI STRING="$(MODULE_NAME)" Optional
}
--
2.18.0.windows.1
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#40159): https://edk2.groups.io/g/devel/message/40159
Mute This Topic: https://groups.io/mt/31539226/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[edk2-devel] [edk2-platforms] [patch v2 4/7] Platform/SoftIron: Update UefiDecompressLib instance
REF: https://bugzilla.tianocore.org/show_bug.cgi?id=1722 BaseUefiDecompressLib in MdePkg is the base UEFI decompress Library. BaseUefiTianoCustomDecompressLib in MdeModulePkg implements the base UEFI decompress functionality and Tiano decompress functionality. 1. TIANOCOMPRESSED rule in fdf is not used, so remove it. 2. Platform doesn't use the TianoCompress, so do not have to use BaseUefiTianoCustomDecompressLib, can use the BaseUefiDecompressLib in MdePkg directly. 3. A common UefiDecompressLib resolution can apply to all module types now. So keep the common one in [LibraryClasses.common] section and remove all others. Cc: Ard Biesheuvel Cc: Leif Lindholm Cc: Michael D Kinney Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Dandan Bi --- .../SoftIron/Overdrive1000Board/Overdrive1000Board.dsc | 5 - .../SoftIron/Overdrive1000Board/Overdrive1000Board.fdf | 9 - 2 files changed, 14 deletions(-) diff --git a/Platform/SoftIron/Overdrive1000Board/Overdrive1000Board.dsc b/Platform/SoftIron/Overdrive1000Board/Overdrive1000Board.dsc index 4fbc4201cf..cc4f2facd0 100644 --- a/Platform/SoftIron/Overdrive1000Board/Overdrive1000Board.dsc +++ b/Platform/SoftIron/Overdrive1000Board/Overdrive1000Board.dsc @@ -168,11 +168,10 @@ [LibraryClasses.common.PEI_CORE] PeiCoreEntryPoint|MdePkg/Library/PeiCoreEntryPoint/PeiCoreEntryPoint.inf PerformanceLib|MdeModulePkg/Library/PeiPerformanceLib/PeiPerformanceLib.inf ReportStatusCodeLib|MdeModulePkg/Library/PeiReportStatusCodeLib/PeiReportStatusCodeLib.inf OemHookStatusCodeLib|MdeModulePkg/Library/OemHookStatusCodeLibNull/OemHookStatusCodeLibNull.inf PeCoffGetEntryPointLib|MdePkg/Library/BasePeCoffGetEntryPointLib/BasePeCoffGetEntryPointLib.inf - UefiDecompressLib|MdePkg/Library/BaseUefiDecompressLib/BaseUefiDecompressLib.inf ExtractGuidedSectionLib|MdePkg/Library/PeiExtractGuidedSectionLib/PeiExtractGuidedSectionLib.inf PeiServicesTablePointerLib|ArmPkg/Library/PeiServicesTablePointerLib/PeiServicesTablePointerLib.inf BaseMemoryLib|MdePkg/Library/BaseMemoryLib/BaseMemoryLib.inf @@ -184,22 +183,20 @@ [LibraryClasses.common.PEIM] PerformanceLib|MdeModulePkg/Library/PeiPerformanceLib/PeiPerformanceLib.inf ReportStatusCodeLib|MdeModulePkg/Library/PeiReportStatusCodeLib/PeiReportStatusCodeLib.inf OemHookStatusCodeLib|MdeModulePkg/Library/OemHookStatusCodeLibNull/OemHookStatusCodeLibNull.inf PeCoffGetEntryPointLib|MdePkg/Library/BasePeCoffGetEntryPointLib/BasePeCoffGetEntryPointLib.inf PeiResourcePublicationLib|MdePkg/Library/PeiResourcePublicationLib/PeiResourcePublicationLib.inf - UefiDecompressLib|MdePkg/Library/BaseUefiDecompressLib/BaseUefiDecompressLib.inf ExtractGuidedSectionLib|MdePkg/Library/PeiExtractGuidedSectionLib/PeiExtractGuidedSectionLib.inf PeiServicesTablePointerLib|ArmPkg/Library/PeiServicesTablePointerLib/PeiServicesTablePointerLib.inf [LibraryClasses.common.DXE_CORE] HobLib|MdePkg/Library/DxeCoreHobLib/DxeCoreHobLib.inf MemoryAllocationLib|MdeModulePkg/Library/DxeCoreMemoryAllocationLib/DxeCoreMemoryAllocationLib.inf DxeCoreEntryPoint|MdePkg/Library/DxeCoreEntryPoint/DxeCoreEntryPoint.inf ReportStatusCodeLib|IntelFrameworkModulePkg/Library/DxeReportStatusCodeLibFramework/DxeReportStatusCodeLib.inf ExtractGuidedSectionLib|MdePkg/Library/DxeExtractGuidedSectionLib/DxeExtractGuidedSectionLib.inf - UefiDecompressLib|MdePkg/Library/BaseUefiDecompressLib/BaseUefiDecompressLib.inf PerformanceLib|MdeModulePkg/Library/DxeCorePerformanceLib/DxeCorePerformanceLib.inf [LibraryClasses.common.DXE_DRIVER] ReportStatusCodeLib|IntelFrameworkModulePkg/Library/DxeReportStatusCodeLibFramework/DxeReportStatusCodeLib.inf SecurityManagementLib|MdeModulePkg/Library/DxeSecurityManagementLib/DxeSecurityManagementLib.inf @@ -215,19 +212,17 @@ [LibraryClasses.common.DXE_RUNTIME_DRIVER] !if $(TARGET) != RELEASE DebugLib|MdePkg/Library/DxeRuntimeDebugLibSerialPort/DxeRuntimeDebugLibSerialPort.inf !endif [LibraryClasses.common.UEFI_APPLICATION] - UefiDecompressLib|MdeModulePkg/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTianoCustomDecompressLib.inf PerformanceLib|MdeModulePkg/Library/DxePerformanceLib/DxePerformanceLib.inf MemoryAllocationLib|MdePkg/Library/UefiMemoryAllocationLib/UefiMemoryAllocationLib.inf HiiLib|MdeModulePkg/Library/UefiHiiLib/UefiHiiLib.inf ReportStatusCodeLib|MdeModulePkg/Library/DxeReportStatusCodeLib/DxeReportStatusCodeLib.inf [LibraryClasses.common.UEFI_DRIVER] ReportStatusCodeLib|IntelFrameworkModulePkg/Library/DxeReportStatusCodeLibFramework/DxeReportStatusCodeLib.inf - UefiDecompressLib|MdeModulePkg/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTianoCustomDecompressLib.inf ExtractGuidedSectionLib|MdePkg/Library/DxeExtractGuidedSectionLib/DxeExtractGuidedSectionLib.inf PerformanceLib|MdeModulePkg/Library/DxePerformanceLib/DxePerformanceLib.inf MemoryAllocati
[edk2-devel] [edk2-platforms] [patch v2 7/7] Platform: Remove TIANOCOMPRESSED rule
REF: https://bugzilla.tianocore.org/show_bug.cgi?id=1722
TIANOCOMPRESSED rule in fdf is not used, so remove it.
Cc: Ard Biesheuvel
Cc: Leif Lindholm
Cc: Michael D Kinney
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Dandan Bi
---
Platform/ARM/SgiPkg/SgiPlatform.fdf | 9 -
Platform/Socionext/DeveloperBox/DeveloperBox.fdf | 9 -
.../Socionext/SynQuacerEvalBoard/SynQuacerEvalBoard.fdf | 9 -
3 files changed, 27 deletions(-)
diff --git a/Platform/ARM/SgiPkg/SgiPlatform.fdf
b/Platform/ARM/SgiPkg/SgiPlatform.fdf
index 3d450a8e28..b163dab5c3 100644
--- a/Platform/ARM/SgiPkg/SgiPlatform.fdf
+++ b/Platform/ARM/SgiPkg/SgiPlatform.fdf
@@ -292,19 +292,10 @@ [Rule.Common.PEIM]
PEI_DEPEX PEI_DEPEX Optional $(INF_OUTPUT)/$(MODULE_NAME).depex
TE TE Align = Auto$(INF_OUTPUT)/$(MODULE_NAME).efi
UI STRING="$(MODULE_NAME)" Optional
}
-[Rule.Common.PEIM.TIANOCOMPRESSED]
- FILE PEIM = $(NAMED_GUID) DEBUG_MYTOOLS_IA32 {
-PEI_DEPEX PEI_DEPEX Optional$(INF_OUTPUT)/$(MODULE_NAME).depex
-GUIDED A31280AD-481E-41B6-95E8-127F4C984779 PROCESSING_REQUIRED = TRUE {
- PE32 PE32$(INF_OUTPUT)/$(MODULE_NAME).efi
- UISTRING="$(MODULE_NAME)" Optional
-}
- }
-
[Rule.Common.DXE_CORE]
FILE DXE_CORE = $(NAMED_GUID) {
PE32 PE32 $(INF_OUTPUT)/$(MODULE_NAME).efi
UI STRING="$(MODULE_NAME)" Optional
}
diff --git a/Platform/Socionext/DeveloperBox/DeveloperBox.fdf
b/Platform/Socionext/DeveloperBox/DeveloperBox.fdf
index e6b42fc202..5309a77c1a 100644
--- a/Platform/Socionext/DeveloperBox/DeveloperBox.fdf
+++ b/Platform/Socionext/DeveloperBox/DeveloperBox.fdf
@@ -440,19 +440,10 @@ [Rule.Common.PEIM]
PEI_DEPEX PEI_DEPEX Optional $(INF_OUTPUT)/$(MODULE_NAME).depex
TE TE Align = Auto$(INF_OUTPUT)/$(MODULE_NAME).efi
UI STRING="$(MODULE_NAME)" Optional
}
-[Rule.Common.PEIM.TIANOCOMPRESSED]
- FILE PEIM = $(NAMED_GUID) DEBUG_MYTOOLS_IA32 {
-PEI_DEPEX PEI_DEPEX Optional$(INF_OUTPUT)/$(MODULE_NAME).depex
-GUIDED A31280AD-481E-41B6-95E8-127F4C984779 PROCESSING_REQUIRED = TRUE {
- PE32 PE32$(INF_OUTPUT)/$(MODULE_NAME).efi
- UISTRING="$(MODULE_NAME)" Optional
-}
- }
-
[Rule.Common.DXE_CORE]
FILE DXE_CORE = $(NAMED_GUID) {
PE32 PE32 $(INF_OUTPUT)/$(MODULE_NAME).efi
UI STRING="$(MODULE_NAME)" Optional
}
diff --git a/Platform/Socionext/SynQuacerEvalBoard/SynQuacerEvalBoard.fdf
b/Platform/Socionext/SynQuacerEvalBoard/SynQuacerEvalBoard.fdf
index 3f47781fe9..1e07f579a8 100644
--- a/Platform/Socionext/SynQuacerEvalBoard/SynQuacerEvalBoard.fdf
+++ b/Platform/Socionext/SynQuacerEvalBoard/SynQuacerEvalBoard.fdf
@@ -390,19 +390,10 @@ [Rule.Common.PEIM]
PEI_DEPEX PEI_DEPEX Optional $(INF_OUTPUT)/$(MODULE_NAME).depex
TE TE Align = Auto$(INF_OUTPUT)/$(MODULE_NAME).efi
UI STRING="$(MODULE_NAME)" Optional
}
-[Rule.Common.PEIM.TIANOCOMPRESSED]
- FILE PEIM = $(NAMED_GUID) DEBUG_MYTOOLS_IA32 {
-PEI_DEPEX PEI_DEPEX Optional$(INF_OUTPUT)/$(MODULE_NAME).depex
-GUIDED A31280AD-481E-41B6-95E8-127F4C984779 PROCESSING_REQUIRED = TRUE {
- PE32 PE32$(INF_OUTPUT)/$(MODULE_NAME).efi
- UISTRING="$(MODULE_NAME)" Optional
-}
- }
-
[Rule.Common.DXE_CORE]
FILE DXE_CORE = $(NAMED_GUID) {
PE32 PE32 $(INF_OUTPUT)/$(MODULE_NAME).efi
UI STRING="$(MODULE_NAME)" Optional
}
--
2.18.0.windows.1
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#40160): https://edk2.groups.io/g/devel/message/40160
Mute This Topic: https://groups.io/mt/31539227/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [edk2-devel] [edk2-platforms] [patch 1/7] Platform/AMD: Update UefiDecompressLib instance
Hi all, Thank you for the reminding and guidance. V2 patch series has been sent out. Regards, Dandan > -Original Message- > From: devel@edk2.groups.io [mailto:devel@edk2.groups.io] On Behalf Of > Laszlo Ersek > Sent: Tuesday, May 7, 2019 8:53 PM > To: devel@edk2.groups.io; leif.lindh...@linaro.org; Bi, Dandan > > Cc: Ard Biesheuvel ; Kinney, Michael D > > Subject: Re: [edk2-devel] [edk2-platforms] [patch 1/7] Platform/AMD: > Update UefiDecompressLib instance > > On 05/07/19 13:31, Leif Lindholm wrote: > > Hi Dandan, > > > > Sorry to be a pain, but could you follow the steps in > > https://github.com/tianocore/tianocore.github.io/wiki/Laszlo's-unkempt > > -git-guide-for-edk2-contributors-and-maintainers#contrib-09 > > and then regenerate these patches and send out again? > > > > That way, it is obvious from the diff which sections are being > > modified. > > ( > also needed: > > git config diff.ini.xfuncname '^\[[A-Za-z0-9_., ]+]' > > from > > https://github.com/tianocore/tianocore.github.io/wiki/Laszlo's-unkempt-git- > guide-for-edk2-contributors-and-maintainers#contrib-05 > > thanks > Laszlo > ) > > -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#40163): https://edk2.groups.io/g/devel/message/40163 Mute This Topic: https://groups.io/mt/31507427/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [edk2-devel] [edk2-platforms] [patch v2 0/7] Update UefiDecompressLib instance
> -Original Message- > From: Leif Lindholm [mailto:leif.lindh...@linaro.org] > Sent: Thursday, May 9, 2019 2:02 AM > To: Bi, Dandan > Cc: devel@edk2.groups.io; Ard Biesheuvel ; > Kinney, Michael D > Subject: Re: [edk2-platforms] [patch v2 0/7] Update UefiDecompressLib > instance > > On Wed, May 08, 2019 at 10:00:24AM +0800, Dandan Bi wrote: > > REF: https://bugzilla.tianocore.org/show_bug.cgi?id=1722 > > > > BaseUefiDecompressLib in MdePkg is the base UEFI decompress Library. > > BaseUefiTianoCustomDecompressLib in MdeModulePkg implements the > base > > UEFI decompress functionality and Tiano decompress functionality. > > > > 1. TIANOCOMPRESSED rule in OverdriveBoard.fdf is not used, so remove > > it. > > 2. Platform doesn't use the TianoCompress, so do not have to use > > BaseUefiTianoCustomDecompressLib, can use the BaseUefiDecompressLib > in > > MdePkg directly. > > 3. A common UefiDecompressLib resolution can apply to all module types > > now. So keep the common one in [LibraryClasses.common] section and > > remove all others. > > > > Cc: Ard Biesheuvel > > Cc: Leif Lindholm > > Cc: Michael D Kinney > > For the series: > Reviewed-by: Leif Lindholm > > Are you happy to push these yourself? Could you help to push them? Since I don't have the push rights. Thanks, Dandan > > Final note - it would be even better if --stat=1000 and > --stat-graph-width=20 were also used, in accordance with > https://github.com/tianocore/tianocore.github.io/wiki/Laszlo's-unkempt-git- > guide-for-edk2-contributors-and-maintainers#contrib-23 > While we have a bug in upstream git that means the cover letter still shows > truncated paths, that resolves the problem for the actual patches. > > Best Regards, > > Leif > > > Dandan Bi (7): > > Platform/AMD: Update UefiDecompressLib instance > > Platform/LeMaker: Update UefiDecompressLib instance > > Platform/RPi3: Update UefiDecompressLib instance > > Platform/SoftIron: Update UefiDecompressLib instance > > Silicon/Hisilicon: Update UefiDecompressLib instance > > Silicon/Armada7k8k: Remove TIANOCOMPRESSED rule > > Platform: Remove TIANOCOMPRESSED rule > > > > Platform/AMD/OverdriveBoard/OverdriveBoard.dsc | 5 - > > Platform/AMD/OverdriveBoard/OverdriveBoard.fdf | 9 - > > Platform/ARM/SgiPkg/SgiPlatform.fdf | 9 - > > Platform/LeMaker/CelloBoard/CelloBoard.dsc | 5 - > > Platform/LeMaker/CelloBoard/CelloBoard.fdf | 9 - > > Platform/RaspberryPi/RPi3/RPi3.dsc | 3 --- > > Platform/RaspberryPi/RPi3/RPi3.fdf | 9 - > > Platform/Socionext/DeveloperBox/DeveloperBox.fdf | 9 - > > .../Socionext/SynQuacerEvalBoard/SynQuacerEvalBoard.fdf | 9 - > > .../SoftIron/Overdrive1000Board/Overdrive1000Board.dsc | 5 - > > .../SoftIron/Overdrive1000Board/Overdrive1000Board.fdf | 9 - > > Silicon/Hisilicon/Hisilicon.dsc.inc | 5 - > > Silicon/Hisilicon/Hisilicon.fdf.inc | 9 - > > Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc| 1 - > > Silicon/Marvell/Armada7k8k/Armada7k8k.fdf| 9 - > > 15 files changed, 105 deletions(-) > > > > -- > > 2.18.0.windows.1 > > -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#40221): https://edk2.groups.io/g/devel/message/40221 Mute This Topic: https://groups.io/mt/31539219/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[edk2-devel] [patch] BaseTools/VfrCompile: clean Framework Vfr support
REF: https://bugzilla.tianocore.org/show_bug.cgi?id=1464
This commit is to do the cleanup which are missing in
previous commit 1b72fd5121b5b31918be0a9a0868a39070d4c8d4
BaseTools/VfrCompile: Remove framework VFR support
Cc: Bob Feng
Cc: Liming Gao
Signed-off-by: Dandan Bi
---
BaseTools/Source/C/VfrCompile/VfrSyntax.g | 272 +-
1 file changed, 55 insertions(+), 217 deletions(-)
diff --git a/BaseTools/Source/C/VfrCompile/VfrSyntax.g
b/BaseTools/Source/C/VfrCompile/VfrSyntax.g
index 24b30e3825..127cb8b2b2 100644
--- a/BaseTools/Source/C/VfrCompile/VfrSyntax.g
+++ b/BaseTools/Source/C/VfrCompile/VfrSyntax.g
@@ -652,16 +652,10 @@ vfrFormSetDefinition :
break;
}
SET_LINE_INFO (*FSObj,
L);
FSObj->SetGuid (&Guid);
- //
- // for framework vfr to
store formset guid used by varstore and efivarstore
- //
- if (mCompatibleMode) {
-memcpy (&mFormsetGuid,
&Guid, sizeof (EFI_GUID));
- }
FSObj->SetFormSetTitle
(_STOSID(S1->getText(), S1->getLine()));
FSObj->SetHelp
(_STOSID(S2->getText(), S2->getLine()));
>>
{
FC:Class "=" classDefinition[C] "," << {CIfrClass
CObj;SET_LINE_INFO (CObj, FC); CObj.SetClass(C);} >>
@@ -1004,16 +998,10 @@ vfrStatementVarStoreLinear :
| U64:"UINT64" "," << TypeName =
U64->getText(); LineNum = U64->getLine(); >>
| D:"EFI_HII_DATE" "," << TypeName =
D->getText(); LineNum = D->getLine(); >>
| T:"EFI_HII_TIME" "," << TypeName =
T->getText(); LineNum = T->getLine(); >>
| R:"EFI_HII_REF" "," << TypeName =
R->getText(); LineNum = R->getLine(); >>
)
- { Key "=" FID:Number "," << // Key is used to
assign Varid in Framework VFR but no use in UEFI2.1 VFR
- if (mCompatibleMode) {
- VarStoreId =
_STOU16(FID->getText(), FID->getLine());
- }
->>
- }
{
VarId "=" ID:Number "," <<
_PCATCH(
(INTN)(VarStoreId =
_STOU16(ID->getText(), ID->getLine())) != 0,
(INTN)TRUE,
@@ -1023,15 +1011,12 @@ vfrStatementVarStoreLinear :
>>
}
Name "=" SN:StringIdentifier ","
Uuid "=" guidDefinition[Guid]
<<
- if (mCompatibleMode) {
- StoreName = TypeName;
- } else {
- StoreName =
SN->getText();
- }
+
+ StoreName =
SN->getText();
_PCATCH(gCVfrDataStorage.DeclareBufferVarStore (
StoreName,
&Guid,
&gCVfrVarDataTypeDB,
TypeName,
@@ -1241,13 +1226,10 @@ vfrStatementDisableIfFormSet :
;
vfrStatementSuppressIfFormSet :
<< CIfrSuppressIf SIObj;>>
L:SuppressIf <<
- if
(mCompatibleMode) {
-
[edk2-devel] [patch 1/5] MdePkg: Merge TianoCustomDecompress algorithm into
REF: https://bugzilla.tianocore.org/show_bug.cgi?id=1722
We plan to merge the BaseUefiTianoCustomDecompressLib
in MdeModulePkg into the BaseUefDecompressLib in MdePkg.
In order to reduce the duplicated codes and maintain
easily.
This patch adds a new fdf file in BaseUefDecompressLib
(BaseUefiTianoCustomDecompressLib.inf) to keep the same
functionality and usage model with the one in MdeModulePkg,
and then update consumer to use this new one one and
remove the one in MdeModulePkg finally.
Cc: Michael D Kinney
Cc: Liming Gao
Signed-off-by: Dandan Bi
---
.../BaseUefiDecompressLib.c | 69 --
.../BaseUefiDecompressLib.uni | 6 +-
.../BaseUefiDecompressLibInternals.h | 44 +++-
.../BaseUefiTianoCustomDecompressLib.c| 213 ++
.../BaseUefiTianoCustomDecompressLib.inf | 42
MdePkg/MdePkg.dec | 5 +
MdePkg/MdePkg.dsc | 1 +
7 files changed, 363 insertions(+), 17 deletions(-)
create mode 100644
MdePkg/Library/BaseUefiDecompressLib/BaseUefiTianoCustomDecompressLib.c
create mode 100644
MdePkg/Library/BaseUefiDecompressLib/BaseUefiTianoCustomDecompressLib.inf
diff --git a/MdePkg/Library/BaseUefiDecompressLib/BaseUefiDecompressLib.c
b/MdePkg/Library/BaseUefiDecompressLib/BaseUefiDecompressLib.c
index 8e502b0fdb..d2c40bf1ca 100644
--- a/MdePkg/Library/BaseUefiDecompressLib/BaseUefiDecompressLib.c
+++ b/MdePkg/Library/BaseUefiDecompressLib/BaseUefiDecompressLib.c
@@ -1,21 +1,14 @@
/** @file
UEFI Decompress Library implementation refer to UEFI specification.
- Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.
+ Copyright (c) 2006 - 2019, Intel Corporation. All rights reserved.
Portions copyright (c) 2008 - 2009, Apple Inc. All rights reserved.
SPDX-License-Identifier: BSD-2-Clause-Patent
**/
-
-#include
-#include
-#include
-#include
-#include
-
#include "BaseUefiDecompressLibInternals.h"
/**
Read NumOfBit of bits from source into mBitBuf.
@@ -746,15 +739,15 @@ UefiDecompressGetInfo (
@retval RETURN_INVALID_PARAMETER
The source buffer specified by Source is corrupted
(not in a valid compressed format).
**/
RETURN_STATUS
-EFIAPI
-UefiDecompress (
+UefiTianoDecompress (
IN CONST VOID *Source,
IN OUT VOID*Destination,
- IN OUT VOID*Scratch OPTIONAL
+ IN OUT VOID*Scratch,
+ IN UINT32 Version
)
{
UINT32 CompSize;
UINT32 OrigSize;
SCRATCH_DATA *Sd;
@@ -784,12 +777,22 @@ UefiDecompress (
SetMem (Sd, sizeof (SCRATCH_DATA), 0);
//
// The length of the field 'Position Set Code Length Array Size' in Block
Header.
// For UEFI 2.0 de/compression algorithm(Version 1), mPBit = 4
- //
- Sd->mPBit = 4;
+ // For Tiano de/compression algorithm(Version 2), mPBit = 5
+ //
+ switch (Version) {
+case 1 :
+ Sd->mPBit = 4;
+ break;
+case 2 :
+ Sd->mPBit = 5;
+ break;
+default:
+ ASSERT (FALSE);
+ }
Sd->mSrcBase = (UINT8 *)Src;
Sd->mDstBase = Dst;
//
// CompSize and OrigSize are calculated in bytes
//
@@ -813,5 +816,45 @@ UefiDecompress (
return RETURN_INVALID_PARAMETER;
}
return RETURN_SUCCESS;
}
+
+/**
+ Decompresses a UEFI compressed source buffer.
+
+ Extracts decompressed data to its original form.
+ This function is designed so that the decompression algorithm can be
implemented
+ without using any memory services. As a result, this function is not
allowed to
+ call any memory allocation services in its implementation. It is the
caller's
+ responsibility to allocate and free the Destination and Scratch buffers.
+ If the compressed source data specified by Source is successfully
decompressed
+ into Destination, then RETURN_SUCCESS is returned. If the compressed source
data
+ specified by Source is not in a valid compressed data format,
+ then RETURN_INVALID_PARAMETER is returned.
+
+ If Source is NULL, then ASSERT().
+ If Destination is NULL, then ASSERT().
+ If the required scratch buffer size > 0 and Scratch is NULL, then ASSERT().
+
+ @param Source The source buffer containing the compressed data.
+ @param Destination The destination buffer to store the decompressed data
+ @param Scratch A temporary scratch buffer that is used to perform the
decompression.
+ This is an optional parameter that may be NULL if the
+ required scratch buffer size is 0.
+
+ @retval RETURN_SUCCESS Decompression completed successfully, and
+ the uncompressed buffer is returned in Destination.
+ @retval RETURN_INVALID_PARAMETER
+ The source buffer specified by Source is corrupted
+ (not in a valid compressed format).
+**/
+RETURN_STATUS
+EFIAPI
+UefiDe
[edk2-devel] [patch 0/5] Merge MdeModulePkg\BaseTianoCustomDecompressLib into MdePkg\BaseUefiDecompressLib
REF: https://bugzilla.tianocore.org/show_bug.cgi?id=1722
We plan to merge the BaseUefiTianoCustomDecompressLib
in MdeModulePkg into the BaseUefDecompressLib in MdePkg.
In order to reduce the duplicated codes and maintain
easily.
Patch 1 adds a new fdf file in BaseUefDecompressLib
(BaseUefiTianoCustomDecompressLib.inf) to keep the same
functionality and usage model with the one in MdeModulePkg.
Patch 2-4 update consumer to use this new one in MdePkg.
Patch 5 remove the one in MdeModulePkg finally.
Cc: Liming Gao
Cc: Jian J Wang
Cc: Hao Wu
Cc: Ray Ni
Cc: Michael D Kinney
Cc: Kelly Steele
Cc: Zailiang Sun
Cc: Yi Qian
Dandan Bi (5):
MdePkg: Merge TianoCustomDecompress algorithm into
Nt32Pkg: Update UefiDecompressLib instance path
QuarkPlatformPkg: Update UefiDecompressLib instance path
Vlv2TbltDevicePkg: Update UefiDecompressLib instance path
MdeModulePkg/Library: Remove BaseUefiTianoCustomDecompressLib
MdeModulePkg/Include/Guid/TianoDecompress.h | 22 -
.../BaseUefiTianoCustomDecompressLib.c| 1063 -
...aseUefiTianoCustomDecompressLibInternals.h | 214
.../BaseUefiTianoDecompressLib.uni| 16 -
MdeModulePkg/MdeModulePkg.dec |4 -
MdeModulePkg/MdeModulePkg.dsc |1 -
.../BaseUefiDecompressLib.c | 69 +-
.../BaseUefiDecompressLib.uni |6 +-
.../BaseUefiDecompressLibInternals.h | 44 +-
.../BaseUefiTianoCustomDecompressLib.c| 213
.../BaseUefiTianoCustomDecompressLib.inf | 11 +-
MdePkg/MdePkg.dec |5 +
MdePkg/MdePkg.dsc |1 +
Nt32Pkg/Nt32Pkg.dsc |2 +-
QuarkPlatformPkg/Quark.dsc|2 +-
QuarkPlatformPkg/QuarkMin.dsc |2 +-
Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc |2 +-
Vlv2TbltDevicePkg/PlatformPkgIA32.dsc |2 +-
Vlv2TbltDevicePkg/PlatformPkgX64.dsc |2 +-
19 files changed, 332 insertions(+), 1349 deletions(-)
delete mode 100644 MdeModulePkg/Include/Guid/TianoDecompress.h
delete mode 100644
MdeModulePkg/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTianoCustomDecompressLib.c
delete mode 100644
MdeModulePkg/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTianoCustomDecompressLibInternals.h
delete mode 100644
MdeModulePkg/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTianoDecompressLib.uni
create mode 100644
MdePkg/Library/BaseUefiDecompressLib/BaseUefiTianoCustomDecompressLib.c
rename {MdeModulePkg/Library/BaseUefiTianoCustomDecompressLib =>
MdePkg/Library/BaseUefiDecompressLib}/BaseUefiTianoCustomDecompressLib.inf (76%)
--
2.18.0.windows.1
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#40473): https://edk2.groups.io/g/devel/message/40473
Mute This Topic: https://groups.io/mt/31602928/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[edk2-devel] [patch 2/5] Nt32Pkg: Update UefiDecompressLib instance path
REF: https://bugzilla.tianocore.org/show_bug.cgi?id=1722 Since we will merger the BaseUefiTianoCustomDecompressLib in MdeModulePkg into BaseUefiDecompressLib in MdePkg and remove the one in MdeModulePkg. So here update the Platform to use the UefiDecompressLib instance in MdePkg. Cc: Ray Ni Cc: Hao Wu Signed-off-by: Dandan Bi --- Nt32Pkg/Nt32Pkg.dsc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Nt32Pkg/Nt32Pkg.dsc b/Nt32Pkg/Nt32Pkg.dsc index 306b7c7a2d..71079f098e 100644 --- a/Nt32Pkg/Nt32Pkg.dsc +++ b/Nt32Pkg/Nt32Pkg.dsc @@ -118,11 +118,11 @@ [LibraryClasses] UefiRuntimeLib|MdePkg/Library/UefiRuntimeLib/UefiRuntimeLib.inf UefiLib|MdePkg/Library/UefiLib/UefiLib.inf UefiHiiServicesLib|MdeModulePkg/Library/UefiHiiServicesLib/UefiHiiServicesLib.inf HiiLib|MdeModulePkg/Library/UefiHiiLib/UefiHiiLib.inf DevicePathLib|MdePkg/Library/UefiDevicePathLibDevicePathProtocol/UefiDevicePathLibDevicePathProtocol.inf - UefiDecompressLib|MdeModulePkg/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTianoCustomDecompressLib.inf + UefiDecompressLib|MdePkg/Library/BaseUefiDecompressLib/BaseUefiTianoCustomDecompressLib.inf PeiServicesTablePointerLib|MdePkg/Library/PeiServicesTablePointerLib/PeiServicesTablePointerLib.inf PeiServicesLib|MdePkg/Library/PeiServicesLib/PeiServicesLib.inf DxeServicesLib|MdePkg/Library/DxeServicesLib/DxeServicesLib.inf DxeServicesTableLib|MdePkg/Library/DxeServicesTableLib/DxeServicesTableLib.inf UefiBootManagerLib|MdeModulePkg/Library/UefiBootManagerLib/UefiBootManagerLib.inf -- 2.18.0.windows.1 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#40475): https://edk2.groups.io/g/devel/message/40475 Mute This Topic: https://groups.io/mt/31602932/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[edk2-devel] [patch 4/5] Vlv2TbltDevicePkg: Update UefiDecompressLib instance path
REF: https://bugzilla.tianocore.org/show_bug.cgi?id=1722 Since we will merger the BaseUefiTianoCustomDecompressLib in MdeModulePkg into BaseUefiDecompressLib in MdePkg and remove the one in MdeModulePkg. So here update the Platform to use the UefiDecompressLib instance in MdePkg. Cc: Zailiang Sun Cc: Yi Qian Signed-off-by: Dandan Bi --- Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc | 2 +- Vlv2TbltDevicePkg/PlatformPkgIA32.dsc | 2 +- Vlv2TbltDevicePkg/PlatformPkgX64.dsc| 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc b/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc index 4a10840c5c..b874829b08 100644 --- a/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc +++ b/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc @@ -130,11 +130,11 @@ [LibraryClasses.common] UefiRuntimeLib|MdePkg/Library/UefiRuntimeLib/UefiRuntimeLib.inf UefiLib|MdePkg/Library/UefiLib/UefiLib.inf HiiLib|MdeModulePkg/Library/UefiHiiLib/UefiHiiLib.inf UefiHiiServicesLib|MdeModulePkg/Library/UefiHiiServicesLib/UefiHiiServicesLib.inf DevicePathLib|MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.inf - UefiDecompressLib|MdeModulePkg/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTianoCustomDecompressLib.inf + UefiDecompressLib|MdePkg/Library/BaseUefiDecompressLib/BaseUefiTianoCustomDecompressLib.inf PeiServicesTablePointerLib|MdePkg/Library/PeiServicesTablePointerLibIdt/PeiServicesTablePointerLibIdt.inf PeiServicesLib|MdePkg/Library/PeiServicesLib/PeiServicesLib.inf DxeServicesLib|MdePkg/Library/DxeServicesLib/DxeServicesLib.inf DxeServicesTableLib|MdePkg/Library/DxeServicesTableLib/DxeServicesTableLib.inf UefiCpuLib|UefiCpuPkg/Library/BaseUefiCpuLib/BaseUefiCpuLib.inf diff --git a/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc b/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc index a99a5dfd5a..085d058f61 100644 --- a/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc +++ b/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc @@ -130,11 +130,11 @@ [LibraryClasses.common] UefiRuntimeLib|MdePkg/Library/UefiRuntimeLib/UefiRuntimeLib.inf UefiLib|MdePkg/Library/UefiLib/UefiLib.inf HiiLib|MdeModulePkg/Library/UefiHiiLib/UefiHiiLib.inf UefiHiiServicesLib|MdeModulePkg/Library/UefiHiiServicesLib/UefiHiiServicesLib.inf DevicePathLib|MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.inf - UefiDecompressLib|MdeModulePkg/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTianoCustomDecompressLib.inf + UefiDecompressLib|MdePkg/Library/BaseUefiDecompressLib/BaseUefiTianoCustomDecompressLib.inf PeiServicesTablePointerLib|MdePkg/Library/PeiServicesTablePointerLibIdt/PeiServicesTablePointerLibIdt.inf PeiServicesLib|MdePkg/Library/PeiServicesLib/PeiServicesLib.inf DxeServicesLib|MdePkg/Library/DxeServicesLib/DxeServicesLib.inf DxeServicesTableLib|MdePkg/Library/DxeServicesTableLib/DxeServicesTableLib.inf UefiCpuLib|UefiCpuPkg/Library/BaseUefiCpuLib/BaseUefiCpuLib.inf diff --git a/Vlv2TbltDevicePkg/PlatformPkgX64.dsc b/Vlv2TbltDevicePkg/PlatformPkgX64.dsc index 0fac892bd5..e361590a4a 100644 --- a/Vlv2TbltDevicePkg/PlatformPkgX64.dsc +++ b/Vlv2TbltDevicePkg/PlatformPkgX64.dsc @@ -130,11 +130,11 @@ [LibraryClasses.common] UefiRuntimeLib|MdePkg/Library/UefiRuntimeLib/UefiRuntimeLib.inf UefiLib|MdePkg/Library/UefiLib/UefiLib.inf HiiLib|MdeModulePkg/Library/UefiHiiLib/UefiHiiLib.inf UefiHiiServicesLib|MdeModulePkg/Library/UefiHiiServicesLib/UefiHiiServicesLib.inf DevicePathLib|MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.inf - UefiDecompressLib|MdeModulePkg/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTianoCustomDecompressLib.inf + UefiDecompressLib|MdePkg/Library/BaseUefiDecompressLib/BaseUefiTianoCustomDecompressLib.inf PeiServicesTablePointerLib|MdePkg/Library/PeiServicesTablePointerLibIdt/PeiServicesTablePointerLibIdt.inf PeiServicesLib|MdePkg/Library/PeiServicesLib/PeiServicesLib.inf DxeServicesLib|MdePkg/Library/DxeServicesLib/DxeServicesLib.inf DxeServicesTableLib|MdePkg/Library/DxeServicesTableLib/DxeServicesTableLib.inf UefiCpuLib|UefiCpuPkg/Library/BaseUefiCpuLib/BaseUefiCpuLib.inf -- 2.18.0.windows.1 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#40477): https://edk2.groups.io/g/devel/message/40477 Mute This Topic: https://groups.io/mt/31602935/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[edk2-devel] [patch 3/5] QuarkPlatformPkg: Update UefiDecompressLib instance path
REF: https://bugzilla.tianocore.org/show_bug.cgi?id=1722 Since we will merger the BaseUefiTianoCustomDecompressLib in MdeModulePkg into BaseUefiDecompressLib in MdePkg and remove the one in MdeModulePkg. So here update the Platform to use the UefiDecompressLib instance in MdePkg. Cc: Liming Gao Cc: Michael D Kinney Cc: Kelly Steele Signed-off-by: Dandan Bi --- QuarkPlatformPkg/Quark.dsc| 2 +- QuarkPlatformPkg/QuarkMin.dsc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/QuarkPlatformPkg/Quark.dsc b/QuarkPlatformPkg/Quark.dsc index e5ebeb5e09..a76d3f9356 100644 --- a/QuarkPlatformPkg/Quark.dsc +++ b/QuarkPlatformPkg/Quark.dsc @@ -111,11 +111,11 @@ [LibraryClasses] UefiRuntimeLib|MdePkg/Library/UefiRuntimeLib/UefiRuntimeLib.inf UefiLib|MdePkg/Library/UefiLib/UefiLib.inf HiiLib|MdeModulePkg/Library/UefiHiiLib/UefiHiiLib.inf UefiHiiServicesLib|MdeModulePkg/Library/UefiHiiServicesLib/UefiHiiServicesLib.inf DevicePathLib|MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.inf - UefiDecompressLib|MdeModulePkg/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTianoCustomDecompressLib.inf + UefiDecompressLib|MdePkg/Library/BaseUefiDecompressLib/BaseUefiTianoCustomDecompressLib.inf PeiServicesTablePointerLib|MdePkg/Library/PeiServicesTablePointerLibIdt/PeiServicesTablePointerLibIdt.inf PeiServicesLib|MdePkg/Library/PeiServicesLib/PeiServicesLib.inf DxeServicesLib|MdePkg/Library/DxeServicesLib/DxeServicesLib.inf DxeServicesTableLib|MdePkg/Library/DxeServicesTableLib/DxeServicesTableLib.inf UefiCpuLib|UefiCpuPkg/Library/BaseUefiCpuLib/BaseUefiCpuLib.inf diff --git a/QuarkPlatformPkg/QuarkMin.dsc b/QuarkPlatformPkg/QuarkMin.dsc index c95a5fcff9..520c006c9e 100644 --- a/QuarkPlatformPkg/QuarkMin.dsc +++ b/QuarkPlatformPkg/QuarkMin.dsc @@ -99,11 +99,11 @@ [LibraryClasses] UefiRuntimeLib|MdePkg/Library/UefiRuntimeLib/UefiRuntimeLib.inf UefiLib|MdePkg/Library/UefiLib/UefiLib.inf HiiLib|MdeModulePkg/Library/UefiHiiLib/UefiHiiLib.inf UefiHiiServicesLib|MdeModulePkg/Library/UefiHiiServicesLib/UefiHiiServicesLib.inf DevicePathLib|MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.inf - UefiDecompressLib|MdeModulePkg/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTianoCustomDecompressLib.inf + UefiDecompressLib|MdePkg/Library/BaseUefiDecompressLib/BaseUefiTianoCustomDecompressLib.inf PeiServicesTablePointerLib|MdePkg/Library/PeiServicesTablePointerLibIdt/PeiServicesTablePointerLibIdt.inf PeiServicesLib|MdePkg/Library/PeiServicesLib/PeiServicesLib.inf DxeServicesLib|MdePkg/Library/DxeServicesLib/DxeServicesLib.inf DxeServicesTableLib|MdePkg/Library/DxeServicesTableLib/DxeServicesTableLib.inf UefiCpuLib|UefiCpuPkg/Library/BaseUefiCpuLib/BaseUefiCpuLib.inf -- 2.18.0.windows.1 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#40476): https://edk2.groups.io/g/devel/message/40476 Mute This Topic: https://groups.io/mt/31602933/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[edk2-devel] [patch 5/5] MdeModulePkg/Library: Remove BaseUefiTianoCustomDecompressLib
REF: https://bugzilla.tianocore.org/show_bug.cgi?id=1722
Since we have merged this one into MdePkg,
remove it now.
Cc: Liming Gao
Cc: Jian J Wang
Cc: Hao Wu
Signed-off-by: Dandan Bi
---
MdeModulePkg/Include/Guid/TianoDecompress.h | 22 -
.../BaseUefiTianoCustomDecompressLib.c| 1063 -
.../BaseUefiTianoCustomDecompressLib.inf | 43 -
...aseUefiTianoCustomDecompressLibInternals.h | 214
.../BaseUefiTianoDecompressLib.uni| 16 -
MdeModulePkg/MdeModulePkg.dec |4 -
MdeModulePkg/MdeModulePkg.dsc |1 -
7 files changed, 1363 deletions(-)
delete mode 100644 MdeModulePkg/Include/Guid/TianoDecompress.h
delete mode 100644
MdeModulePkg/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTianoCustomDecompressLib.c
delete mode 100644
MdeModulePkg/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTianoCustomDecompressLib.inf
delete mode 100644
MdeModulePkg/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTianoCustomDecompressLibInternals.h
delete mode 100644
MdeModulePkg/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTianoDecompressLib.uni
diff --git a/MdeModulePkg/Include/Guid/TianoDecompress.h
b/MdeModulePkg/Include/Guid/TianoDecompress.h
deleted file mode 100644
index 40f74f88f3..00
--- a/MdeModulePkg/Include/Guid/TianoDecompress.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/** @file
- Tiano Custom decompress Guid definition.
-
-Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.
-SPDX-License-Identifier: BSD-2-Clause-Patent
-
-**/
-
-#ifndef __TIANO_CUSTOM_DECOMPRESS_GUID_H__
-#define __TIANO_CUSTOM_DECOMPRESS_GUID_H__
-
-///
-/// The Global ID used to identify a section of an FFS file of type
-/// EFI_SECTION_GUID_DEFINED, whose contents have been compressed using
-/// Tiano Custom compression.
-///
-#define TIANO_CUSTOM_DECOMPRESS_GUID \
- { 0xA31280AD, 0x481E, 0x41B6, { 0x95, 0xE8, 0x12, 0x7F, 0x4C, 0x98, 0x47,
0x79 } }
-
-extern GUID gTianoCustomDecompressGuid;
-
-#endif
diff --git
a/MdeModulePkg/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTianoCustomDecompressLib.c
b/MdeModulePkg/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTianoCustomDecompressLib.c
deleted file mode 100644
index 38b66b1906..00
---
a/MdeModulePkg/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTianoCustomDecompressLib.c
+++ /dev/null
@@ -1,1063 +0,0 @@
-/** @file
- UEFI and Tiano Custom Decompress Library
- It will do Tiano or UEFI decompress with different verison parameter.
-
-Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.
-SPDX-License-Identifier: BSD-2-Clause-Patent
-
-**/
-
-#include "BaseUefiTianoCustomDecompressLibInternals.h"
-
-/**
- Shift mBitBuf NumOfBits left. Read in NumOfBits of bits from source.
-
- @param Sd The global scratch data
- @param NumOfBits The number of bits to shift and read.
-**/
-VOID
-FillBuf (
- IN SCRATCH_DATA *Sd,
- IN UINT16NumOfBits
- )
-{
- //
- // Left shift NumOfBits of bits in advance
- //
- Sd->mBitBuf = (UINT32) LShiftU64 (((UINT64)Sd->mBitBuf), NumOfBits);
-
- //
- // Copy data needed in bytes into mSbuBitBuf
- //
- while (NumOfBits > Sd->mBitCount) {
-NumOfBits = (UINT16) (NumOfBits - Sd->mBitCount);
-Sd->mBitBuf |= (UINT32) LShiftU64 (((UINT64)Sd->mSubBitBuf), NumOfBits);
-
-if (Sd->mCompSize > 0) {
- //
- // Get 1 byte into SubBitBuf
- //
- Sd->mCompSize--;
- Sd->mSubBitBuf = 0;
- Sd->mSubBitBuf = Sd->mSrcBase[Sd->mInBuf++];
- Sd->mBitCount = 8;
-
-} else {
- //
- // No more bits from the source, just pad zero bit.
- //
- Sd->mSubBitBuf = 0;
- Sd->mBitCount = 8;
-
-}
- }
-
- //
- // Calculate additional bit count read to update mBitCount
- //
- Sd->mBitCount = (UINT16) (Sd->mBitCount - NumOfBits);
-
- //
- // Copy NumOfBits of bits from mSubBitBuf into mBitBuf
- //
- Sd->mBitBuf |= Sd->mSubBitBuf >> Sd->mBitCount;
-}
-
-/**
- Get NumOfBits of bits out from mBitBuf
-
- Get NumOfBits of bits out from mBitBuf. Fill mBitBuf with subsequent
- NumOfBits of bits from source. Returns NumOfBits of bits that are
- popped out.
-
- @param SdThe global scratch data.
- @param NumOfBits The number of bits to pop and read.
-
- @return The bits that are popped out.
-
-**/
-UINT32
-GetBits (
- IN SCRATCH_DATA *Sd,
- IN UINT16NumOfBits
- )
-{
- UINT32 OutBits;
-
- //
- // Pop NumOfBits of Bits from Left
- //
- OutBits = (UINT32) (Sd->mBitBuf >> (BITBUFSIZ - NumOfBits));
-
- //
- // Fill up mBitBuf from source
- //
- FillBuf (Sd, NumOfBits);
-
- return OutBits;
-}
-
-/**
- Creates Huffman Code mapping table according to code length array.
-
- Creates Huffman Code mapping table for Extra Set, Char&Len Set
- and Position Set according to code length array.
- If TableBits > 16, then A
Re: [edk2-devel] [patch 4/5] Vlv2TbltDevicePkg: Update UefiDecompressLib instance path
Since it has been moved to edk2 repo, I will resend the patch and pick up the Reviewed-by tag. Thanks, Dandan > -Original Message- > From: Sun, Zailiang > Sent: Monday, May 13, 2019 10:44 AM > To: devel@edk2.groups.io; Bi, Dandan > Cc: Qian, Yi > Subject: RE: [edk2-devel] [patch 4/5] Vlv2TbltDevicePkg: Update > UefiDecompressLib instance path > > Reviewed-by: Zailiang Sun > > > -Original Message- > > From: devel@edk2.groups.io [mailto:devel@edk2.groups.io] On Behalf Of > > Dandan Bi > > Sent: Monday, May 13, 2019 10:16 AM > > To: devel@edk2.groups.io > > Cc: Sun, Zailiang ; Qian, Yi > > > > Subject: [edk2-devel] [patch 4/5] Vlv2TbltDevicePkg: Update > > UefiDecompressLib instance path > > > > REF: https://bugzilla.tianocore.org/show_bug.cgi?id=1722 > > > > Since we will merger the BaseUefiTianoCustomDecompressLib in > > MdeModulePkg into BaseUefiDecompressLib in MdePkg and remove the > one > > in MdeModulePkg. So here update the Platform to use the > > UefiDecompressLib instance in MdePkg. > > > > Cc: Zailiang Sun > > Cc: Yi Qian > > Signed-off-by: Dandan Bi > > --- > > Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc | 2 +- > > Vlv2TbltDevicePkg/PlatformPkgIA32.dsc | 2 +- > > Vlv2TbltDevicePkg/PlatformPkgX64.dsc| 2 +- > > 3 files changed, 3 insertions(+), 3 deletions(-) > > > > diff --git a/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc > > b/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc > > index 4a10840c5c..b874829b08 100644 > > --- a/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc > > +++ b/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc > > @@ -130,11 +130,11 @@ [LibraryClasses.common] > >UefiRuntimeLib|MdePkg/Library/UefiRuntimeLib/UefiRuntimeLib.inf > >UefiLib|MdePkg/Library/UefiLib/UefiLib.inf > >HiiLib|MdeModulePkg/Library/UefiHiiLib/UefiHiiLib.inf > > > > UefiHiiServicesLib|MdeModulePkg/Library/UefiHiiServicesLib/UefiHiiServ > > UefiHiiServicesLib|ice > > sLib.inf > > > > DevicePathLib|MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.inf > > - > > > UefiDecompressLib|MdeModulePkg/Library/BaseUefiTianoCustomDecompr > > essLib/BaseUefiTianoCustomDecompressLib.inf > > + > > + > > > UefiDecompressLib|MdePkg/Library/BaseUefiDecompressLib/BaseUefiTian > > oCu > > + stomDecompressLib.inf > > > > PeiServicesTablePointerLib|MdePkg/Library/PeiServicesTablePointerLibId > > PeiServicesTablePointerLib|t/P > > eiServicesTablePointerLibIdt.inf > >PeiServicesLib|MdePkg/Library/PeiServicesLib/PeiServicesLib.inf > >DxeServicesLib|MdePkg/Library/DxeServicesLib/DxeServicesLib.inf > > > > > DxeServicesTableLib|MdePkg/Library/DxeServicesTableLib/DxeServicesTabl > > eLib.inf > >UefiCpuLib|UefiCpuPkg/Library/BaseUefiCpuLib/BaseUefiCpuLib.inf > > diff --git a/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc > > b/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc > > index a99a5dfd5a..085d058f61 100644 > > --- a/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc > > +++ b/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc > > @@ -130,11 +130,11 @@ [LibraryClasses.common] > >UefiRuntimeLib|MdePkg/Library/UefiRuntimeLib/UefiRuntimeLib.inf > >UefiLib|MdePkg/Library/UefiLib/UefiLib.inf > >HiiLib|MdeModulePkg/Library/UefiHiiLib/UefiHiiLib.inf > > > > UefiHiiServicesLib|MdeModulePkg/Library/UefiHiiServicesLib/UefiHiiServ > > UefiHiiServicesLib|ice > > sLib.inf > > > > DevicePathLib|MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.inf > > - > > > UefiDecompressLib|MdeModulePkg/Library/BaseUefiTianoCustomDecompr > > essLib/BaseUefiTianoCustomDecompressLib.inf > > + > > + > > > UefiDecompressLib|MdePkg/Library/BaseUefiDecompressLib/BaseUefiTian > > oCu > > + stomDecompressLib.inf > > > > PeiServicesTablePointerLib|MdePkg/Library/PeiServicesTablePointerLibId > > PeiServicesTablePointerLib|t/P > > eiServicesTablePointerLibIdt.inf > >PeiServicesLib|MdePkg/Library/PeiServicesLib/PeiServicesLib.inf > >DxeServicesLib|MdePkg/Library/DxeServicesLib/DxeServicesLib.inf > > > > > DxeServicesTableLib|MdePkg/Library/DxeServicesTableLib/DxeServicesTabl > > eLib.inf > >UefiCpuLib|UefiCpuPkg/Library/BaseUefiCpuLib/BaseUefiCpuLib.inf > > diff --git a/Vlv2TbltDevicePkg/PlatformPkgX64.dsc > > b/Vlv2TbltDevicePkg/PlatformPkgX64.dsc > > index 0fac892bd5..e361590a4a 100644 > > --- a/Vlv2TbltDevicePkg/PlatformPkgX64.dsc > > +++ b/Vlv2TbltDevicePkg/PlatformPkgX64.dsc > > @@ -130,11 +130,11 @@ [LibraryCl
Re: [edk2-devel] [patch 4/5] Vlv2TbltDevicePkg: Update UefiDecompressLib instance path
Fix the typo. Vlv2TbltDevicePkg has been moved to edk2-platform repo. Thanks, Dandan > -Original Message- > From: devel@edk2.groups.io [mailto:devel@edk2.groups.io] On Behalf Of > Dandan Bi > Sent: Wednesday, May 15, 2019 9:11 AM > To: Sun, Zailiang ; devel@edk2.groups.io > Cc: Qian, Yi > Subject: Re: [edk2-devel] [patch 4/5] Vlv2TbltDevicePkg: Update > UefiDecompressLib instance path > > Since it has been moved to edk2 repo, I will resend the patch and pick up the > Reviewed-by tag. > > > Thanks, > Dandan > > > -Original Message- > > From: Sun, Zailiang > > Sent: Monday, May 13, 2019 10:44 AM > > To: devel@edk2.groups.io; Bi, Dandan > > Cc: Qian, Yi > > Subject: RE: [edk2-devel] [patch 4/5] Vlv2TbltDevicePkg: Update > > UefiDecompressLib instance path > > > > Reviewed-by: Zailiang Sun > > > > > -Original Message- > > > From: devel@edk2.groups.io [mailto:devel@edk2.groups.io] On Behalf > > > Of Dandan Bi > > > Sent: Monday, May 13, 2019 10:16 AM > > > To: devel@edk2.groups.io > > > Cc: Sun, Zailiang ; Qian, Yi > > > > > > Subject: [edk2-devel] [patch 4/5] Vlv2TbltDevicePkg: Update > > > UefiDecompressLib instance path > > > > > > REF: https://bugzilla.tianocore.org/show_bug.cgi?id=1722 > > > > > > Since we will merger the BaseUefiTianoCustomDecompressLib in > > > MdeModulePkg into BaseUefiDecompressLib in MdePkg and remove the > > one > > > in MdeModulePkg. So here update the Platform to use the > > > UefiDecompressLib instance in MdePkg. > > > > > > Cc: Zailiang Sun > > > Cc: Yi Qian > > > Signed-off-by: Dandan Bi > > > --- > > > Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc | 2 +- > > > Vlv2TbltDevicePkg/PlatformPkgIA32.dsc | 2 +- > > > Vlv2TbltDevicePkg/PlatformPkgX64.dsc| 2 +- > > > 3 files changed, 3 insertions(+), 3 deletions(-) > > > > > > diff --git a/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc > > > b/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc > > > index 4a10840c5c..b874829b08 100644 > > > --- a/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc > > > +++ b/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc > > > @@ -130,11 +130,11 @@ [LibraryClasses.common] > > >UefiRuntimeLib|MdePkg/Library/UefiRuntimeLib/UefiRuntimeLib.inf > > >UefiLib|MdePkg/Library/UefiLib/UefiLib.inf > > >HiiLib|MdeModulePkg/Library/UefiHiiLib/UefiHiiLib.inf > > > > > > UefiHiiServicesLib|MdeModulePkg/Library/UefiHiiServicesLib/UefiHiiSe > > > UefiHiiServicesLib|rv > > > UefiHiiServicesLib|ice > > > sLib.inf > > > > > > DevicePathLib|MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.inf > > > - > > > > > > UefiDecompressLib|MdeModulePkg/Library/BaseUefiTianoCustomDecompr > > > essLib/BaseUefiTianoCustomDecompressLib.inf > > > + > > > + > > > > > > UefiDecompressLib|MdePkg/Library/BaseUefiDecompressLib/BaseUefiTian > > > oCu > > > + stomDecompressLib.inf > > > > > > PeiServicesTablePointerLib|MdePkg/Library/PeiServicesTablePointerLib > > > PeiServicesTablePointerLib|Id > > > PeiServicesTablePointerLib|t/P > > > eiServicesTablePointerLibIdt.inf > > >PeiServicesLib|MdePkg/Library/PeiServicesLib/PeiServicesLib.inf > > >DxeServicesLib|MdePkg/Library/DxeServicesLib/DxeServicesLib.inf > > > > > > > > > DxeServicesTableLib|MdePkg/Library/DxeServicesTableLib/DxeServicesTabl > > > eLib.inf > > >UefiCpuLib|UefiCpuPkg/Library/BaseUefiCpuLib/BaseUefiCpuLib.inf > > > diff --git a/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc > > > b/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc > > > index a99a5dfd5a..085d058f61 100644 > > > --- a/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc > > > +++ b/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc > > > @@ -130,11 +130,11 @@ [LibraryClasses.common] > > >UefiRuntimeLib|MdePkg/Library/UefiRuntimeLib/UefiRuntimeLib.inf > > >UefiLib|MdePkg/Library/UefiLib/UefiLib.inf > > >HiiLib|MdeModulePkg/Library/UefiHiiLib/UefiHiiLib.inf > > > > > > UefiHiiServicesLib|MdeModulePkg/Library/UefiHiiServicesLib/UefiHiiSe > > > UefiHiiServicesLib|rv > > > UefiHiiServicesLib|ice > > > sLib.inf > > > > > > DevicePathLib|MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.inf > > > - > > > > > > UefiDecompressLib|MdeModulePkg/Library/BaseUefiTianoCustomDec
[edk2-devel] [patch v2 1/3] MdePkg: Merge TianoCustomDecompress algorithm into
REF: https://bugzilla.tianocore.org/show_bug.cgi?id=1722
We plan to merge the BaseUefiTianoCustomDecompressLib
in MdeModulePkg into the BaseUefDecompressLib in MdePkg.
In order to reduce the duplicated codes and maintain
easily.
This patch adds a new fdf file in BaseUefDecompressLib
(BaseUefiTianoCustomDecompressLib.inf) to keep the same
functionality and usage model with the one in MdeModulePkg,
and then update consumer to use this new one one and
remove the one in MdeModulePkg finally.
Cc: Michael D Kinney
Cc: Liming Gao
Signed-off-by: Dandan Bi
Reviewed-by: Liming Gao
---
.../BaseUefiDecompressLib.c | 72 --
.../BaseUefiDecompressLib.uni | 6 +-
.../BaseUefiDecompressLibInternals.h | 44 +++-
.../BaseUefiTianoCustomDecompressLib.c| 213 ++
.../BaseUefiTianoCustomDecompressLib.inf | 42
MdePkg/MdePkg.dec | 5 +
MdePkg/MdePkg.dsc | 1 +
7 files changed, 366 insertions(+), 17 deletions(-)
create mode 100644
MdePkg/Library/BaseUefiDecompressLib/BaseUefiTianoCustomDecompressLib.c
create mode 100644
MdePkg/Library/BaseUefiDecompressLib/BaseUefiTianoCustomDecompressLib.inf
diff --git a/MdePkg/Library/BaseUefiDecompressLib/BaseUefiDecompressLib.c
b/MdePkg/Library/BaseUefiDecompressLib/BaseUefiDecompressLib.c
index 8e502b0fdb..28b4bf9d8b 100644
--- a/MdePkg/Library/BaseUefiDecompressLib/BaseUefiDecompressLib.c
+++ b/MdePkg/Library/BaseUefiDecompressLib/BaseUefiDecompressLib.c
@@ -1,21 +1,14 @@
/** @file
UEFI Decompress Library implementation refer to UEFI specification.
- Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.
+ Copyright (c) 2006 - 2019, Intel Corporation. All rights reserved.
Portions copyright (c) 2008 - 2009, Apple Inc. All rights reserved.
SPDX-License-Identifier: BSD-2-Clause-Patent
**/
-
-#include
-#include
-#include
-#include
-#include
-
#include "BaseUefiDecompressLibInternals.h"
/**
Read NumOfBit of bits from source into mBitBuf.
@@ -732,29 +725,31 @@ UefiDecompressGetInfo (
then RETURN_INVALID_PARAMETER is returned.
If Source is NULL, then ASSERT().
If Destination is NULL, then ASSERT().
If the required scratch buffer size > 0 and Scratch is NULL, then ASSERT().
+ If the Version is not 1 or 2, then ASSERT().
@param Source The source buffer containing the compressed data.
@param Destination The destination buffer to store the decompressed data.
@param Scratch A temporary scratch buffer that is used to perform the
decompression.
This is an optional parameter that may be NULL if the
required scratch buffer size is 0.
+ @param Version 1 for UEFI Decompress algoruthm, 2 for Tiano Decompess
algorithm.
@retval RETURN_SUCCESS Decompression completed successfully, and
the uncompressed buffer is returned in Destination.
@retval RETURN_INVALID_PARAMETER
The source buffer specified by Source is corrupted
(not in a valid compressed format).
**/
RETURN_STATUS
-EFIAPI
-UefiDecompress (
+UefiTianoDecompress (
IN CONST VOID *Source,
IN OUT VOID*Destination,
- IN OUT VOID*Scratch OPTIONAL
+ IN OUT VOID*Scratch,
+ IN UINT32 Version
)
{
UINT32 CompSize;
UINT32 OrigSize;
SCRATCH_DATA *Sd;
@@ -762,10 +757,11 @@ UefiDecompress (
UINT8*Dst;
ASSERT (Source != NULL);
ASSERT (Destination != NULL);
ASSERT (Scratch != NULL);
+ ASSERT (Version == 1 || Version == 2);
Src = Source;
Dst = Destination;
Sd = (SCRATCH_DATA *) Scratch;
@@ -784,12 +780,22 @@ UefiDecompress (
SetMem (Sd, sizeof (SCRATCH_DATA), 0);
//
// The length of the field 'Position Set Code Length Array Size' in Block
Header.
// For UEFI 2.0 de/compression algorithm(Version 1), mPBit = 4
- //
- Sd->mPBit = 4;
+ // For Tiano de/compression algorithm(Version 2), mPBit = 5
+ //
+ switch (Version) {
+case 1 :
+ Sd->mPBit = 4;
+ break;
+case 2 :
+ Sd->mPBit = 5;
+ break;
+default:
+ ASSERT (FALSE);
+ }
Sd->mSrcBase = (UINT8 *)Src;
Sd->mDstBase = Dst;
//
// CompSize and OrigSize are calculated in bytes
//
@@ -813,5 +819,45 @@ UefiDecompress (
return RETURN_INVALID_PARAMETER;
}
return RETURN_SUCCESS;
}
+
+/**
+ Decompresses a UEFI compressed source buffer.
+
+ Extracts decompressed data to its original form.
+ This function is designed so that the decompression algorithm can be
implemented
+ without using any memory services. As a result, this function is not
allowed to
+ call any memory allocation services in its implementation. It is the
caller's
+ responsibility to allocate and free the Destination and Scratch buffers.
[edk2-devel] [patch v2 3/3] MdeModulePkg/Library: Remove BaseUefiTianoCustomDecompressLib
REF: https://bugzilla.tianocore.org/show_bug.cgi?id=1722
Since we have merged this one into MdePkg,
remove it now.
Cc: Liming Gao
Cc: Jian J Wang
Cc: Hao A Wu
Signed-off-by: Dandan Bi
---
MdeModulePkg/Include/Guid/TianoDecompress.h | 22 -
.../BaseUefiTianoCustomDecompressLib.c| 1063 -
.../BaseUefiTianoCustomDecompressLib.inf | 43 -
...aseUefiTianoCustomDecompressLibInternals.h | 214
.../BaseUefiTianoDecompressLib.uni| 16 -
MdeModulePkg/MdeModulePkg.dec |4 -
MdeModulePkg/MdeModulePkg.dsc |1 -
7 files changed, 1363 deletions(-)
delete mode 100644 MdeModulePkg/Include/Guid/TianoDecompress.h
delete mode 100644
MdeModulePkg/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTianoCustomDecompressLib.c
delete mode 100644
MdeModulePkg/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTianoCustomDecompressLib.inf
delete mode 100644
MdeModulePkg/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTianoCustomDecompressLibInternals.h
delete mode 100644
MdeModulePkg/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTianoDecompressLib.uni
diff --git a/MdeModulePkg/Include/Guid/TianoDecompress.h
b/MdeModulePkg/Include/Guid/TianoDecompress.h
deleted file mode 100644
index 40f74f88f3..00
--- a/MdeModulePkg/Include/Guid/TianoDecompress.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/** @file
- Tiano Custom decompress Guid definition.
-
-Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.
-SPDX-License-Identifier: BSD-2-Clause-Patent
-
-**/
-
-#ifndef __TIANO_CUSTOM_DECOMPRESS_GUID_H__
-#define __TIANO_CUSTOM_DECOMPRESS_GUID_H__
-
-///
-/// The Global ID used to identify a section of an FFS file of type
-/// EFI_SECTION_GUID_DEFINED, whose contents have been compressed using
-/// Tiano Custom compression.
-///
-#define TIANO_CUSTOM_DECOMPRESS_GUID \
- { 0xA31280AD, 0x481E, 0x41B6, { 0x95, 0xE8, 0x12, 0x7F, 0x4C, 0x98, 0x47,
0x79 } }
-
-extern GUID gTianoCustomDecompressGuid;
-
-#endif
diff --git
a/MdeModulePkg/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTianoCustomDecompressLib.c
b/MdeModulePkg/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTianoCustomDecompressLib.c
deleted file mode 100644
index 38b66b1906..00
---
a/MdeModulePkg/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTianoCustomDecompressLib.c
+++ /dev/null
@@ -1,1063 +0,0 @@
-/** @file
- UEFI and Tiano Custom Decompress Library
- It will do Tiano or UEFI decompress with different verison parameter.
-
-Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.
-SPDX-License-Identifier: BSD-2-Clause-Patent
-
-**/
-
-#include "BaseUefiTianoCustomDecompressLibInternals.h"
-
-/**
- Shift mBitBuf NumOfBits left. Read in NumOfBits of bits from source.
-
- @param Sd The global scratch data
- @param NumOfBits The number of bits to shift and read.
-**/
-VOID
-FillBuf (
- IN SCRATCH_DATA *Sd,
- IN UINT16NumOfBits
- )
-{
- //
- // Left shift NumOfBits of bits in advance
- //
- Sd->mBitBuf = (UINT32) LShiftU64 (((UINT64)Sd->mBitBuf), NumOfBits);
-
- //
- // Copy data needed in bytes into mSbuBitBuf
- //
- while (NumOfBits > Sd->mBitCount) {
-NumOfBits = (UINT16) (NumOfBits - Sd->mBitCount);
-Sd->mBitBuf |= (UINT32) LShiftU64 (((UINT64)Sd->mSubBitBuf), NumOfBits);
-
-if (Sd->mCompSize > 0) {
- //
- // Get 1 byte into SubBitBuf
- //
- Sd->mCompSize--;
- Sd->mSubBitBuf = 0;
- Sd->mSubBitBuf = Sd->mSrcBase[Sd->mInBuf++];
- Sd->mBitCount = 8;
-
-} else {
- //
- // No more bits from the source, just pad zero bit.
- //
- Sd->mSubBitBuf = 0;
- Sd->mBitCount = 8;
-
-}
- }
-
- //
- // Calculate additional bit count read to update mBitCount
- //
- Sd->mBitCount = (UINT16) (Sd->mBitCount - NumOfBits);
-
- //
- // Copy NumOfBits of bits from mSubBitBuf into mBitBuf
- //
- Sd->mBitBuf |= Sd->mSubBitBuf >> Sd->mBitCount;
-}
-
-/**
- Get NumOfBits of bits out from mBitBuf
-
- Get NumOfBits of bits out from mBitBuf. Fill mBitBuf with subsequent
- NumOfBits of bits from source. Returns NumOfBits of bits that are
- popped out.
-
- @param SdThe global scratch data.
- @param NumOfBits The number of bits to pop and read.
-
- @return The bits that are popped out.
-
-**/
-UINT32
-GetBits (
- IN SCRATCH_DATA *Sd,
- IN UINT16NumOfBits
- )
-{
- UINT32 OutBits;
-
- //
- // Pop NumOfBits of Bits from Left
- //
- OutBits = (UINT32) (Sd->mBitBuf >> (BITBUFSIZ - NumOfBits));
-
- //
- // Fill up mBitBuf from source
- //
- FillBuf (Sd, NumOfBits);
-
- return OutBits;
-}
-
-/**
- Creates Huffman Code mapping table according to code length array.
-
- Creates Huffman Code mapping table for Extra Set, Char&Len Set
- and Position Set according to code length array.
- If TableBits > 16, the
[edk2-devel] [patch v2 0/3] Merge MdeModulePkg\BaseTianoCustomDecompressLib into MdePkg\BaseUefiDecompressLib
REF: https://bugzilla.tianocore.org/show_bug.cgi?id=1722
V2:
1. Address the comments for patch 1 and take R-b tags from Liming.
2. Since QuarkPlatformPkg and Vlv2TbltDevicePkg has been moved
into edk2-platforms repo, drop the update for these platforms
in this v2 series, and will send seperate patches for them.
3. No change for other patches.
We plan to merge the BaseUefiTianoCustomDecompressLib
in MdeModulePkg into the BaseUefDecompressLib in MdePkg.
In order to reduce the duplicated codes and maintain
easily.
Patch 1 adds a new fdf file in BaseUefDecompressLib
(BaseUefiTianoCustomDecompressLib.inf) to keep the same
functionality and usage model with the one in MdeModulePkg.
Patch 2-4 update consumer to use this new one in MdePkg.
Patch 5 remove the one in MdeModulePkg finally.
Cc: Liming Gao
Cc: Jian J Wang
Cc: Hao A Wu
Cc: Ray Ni
Cc: Michael D Kinney
Dandan Bi (3):
MdePkg: Merge TianoCustomDecompress algorithm into
Nt32Pkg: Update UefiDecompressLib instance path
MdeModulePkg/Library: Remove BaseUefiTianoCustomDecompressLib
MdeModulePkg/Include/Guid/TianoDecompress.h | 22 -
.../BaseUefiTianoCustomDecompressLib.c| 1063 -
...aseUefiTianoCustomDecompressLibInternals.h | 214
.../BaseUefiTianoDecompressLib.uni| 16 -
MdeModulePkg/MdeModulePkg.dec |4 -
MdeModulePkg/MdeModulePkg.dsc |1 -
.../BaseUefiDecompressLib.c | 72 +-
.../BaseUefiDecompressLib.uni |6 +-
.../BaseUefiDecompressLibInternals.h | 44 +-
.../BaseUefiTianoCustomDecompressLib.c| 213
.../BaseUefiTianoCustomDecompressLib.inf | 11 +-
MdePkg/MdePkg.dec |5 +
MdePkg/MdePkg.dsc |1 +
Nt32Pkg/Nt32Pkg.dsc |2 +-
14 files changed, 330 insertions(+), 1344 deletions(-)
delete mode 100644 MdeModulePkg/Include/Guid/TianoDecompress.h
delete mode 100644
MdeModulePkg/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTianoCustomDecompressLib.c
delete mode 100644
MdeModulePkg/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTianoCustomDecompressLibInternals.h
delete mode 100644
MdeModulePkg/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTianoDecompressLib.uni
create mode 100644
MdePkg/Library/BaseUefiDecompressLib/BaseUefiTianoCustomDecompressLib.c
rename {MdeModulePkg/Library/BaseUefiTianoCustomDecompressLib =>
MdePkg/Library/BaseUefiDecompressLib}/BaseUefiTianoCustomDecompressLib.inf (76%)
--
2.18.0.windows.1
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#40628): https://edk2.groups.io/g/devel/message/40628
Mute This Topic: https://groups.io/mt/31625741/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[edk2-devel] [edk2-platforms] [patch 0/2] Update UefiDecompressLib instance path
REF: https://bugzilla.tianocore.org/show_bug.cgi?id=1722 We will merge the BaseUefiTianoCustomDecompressLib in MdeModulePkg into the BaseUefDecompressLib in MdePkg. In order to reduce the duplicated codes and maintain easily. So this patch series to update the platforms to use the one in MdePkg. Cc: Liming Gao Cc: Michael D Kinney Cc: Kelly Steele Cc: Zailiang Sun Cc: Yi Qian Dandan Bi (2): QuarkPlatformPkg: Update UefiDecompressLib instance path Vlv2TbltDevicePkg: Update UefiDecompressLib instance path Platform/Intel/QuarkPlatformPkg/Quark.dsc | 2 +- Platform/Intel/QuarkPlatformPkg/QuarkMin.dsc | 2 +- Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc | 2 +- Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc | 2 +- Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgX64.dsc| 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) -- 2.18.0.windows.1 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#40632): https://edk2.groups.io/g/devel/message/40632 Mute This Topic: https://groups.io/mt/31625788/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[edk2-devel] [edk2-platforms] [patch 2/2] Vlv2TbltDevicePkg: Update UefiDecompressLib instance path
REF: https://bugzilla.tianocore.org/show_bug.cgi?id=1722 Since we have merged the BaseUefiTianoCustomDecompressLib in MdeModulePkg into BaseUefiDecompressLib in MdePkg and will remove the one in MdeModulePkg. So here update the Platform to use the UefiDecompressLib instance in MdePkg. Cc: Zailiang Sun Cc: Yi Qian Signed-off-by: Dandan Bi Reviewed-by: Zailiang Sun --- Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc | 2 +- Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc | 2 +- Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgX64.dsc| 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc index b9faf558b7..3a3d3e29e7 100644 --- a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc +++ b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc @@ -130,11 +130,11 @@ [LibraryClasses.common] UefiRuntimeLib|MdePkg/Library/UefiRuntimeLib/UefiRuntimeLib.inf UefiLib|MdePkg/Library/UefiLib/UefiLib.inf HiiLib|MdeModulePkg/Library/UefiHiiLib/UefiHiiLib.inf UefiHiiServicesLib|MdeModulePkg/Library/UefiHiiServicesLib/UefiHiiServicesLib.inf DevicePathLib|MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.inf - UefiDecompressLib|MdeModulePkg/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTianoCustomDecompressLib.inf + UefiDecompressLib|MdePkg/Library/BaseUefiDecompressLib/BaseUefiTianoCustomDecompressLib.inf PeiServicesTablePointerLib|MdePkg/Library/PeiServicesTablePointerLibIdt/PeiServicesTablePointerLibIdt.inf PeiServicesLib|MdePkg/Library/PeiServicesLib/PeiServicesLib.inf DxeServicesLib|MdePkg/Library/DxeServicesLib/DxeServicesLib.inf DxeServicesTableLib|MdePkg/Library/DxeServicesTableLib/DxeServicesTableLib.inf UefiCpuLib|UefiCpuPkg/Library/BaseUefiCpuLib/BaseUefiCpuLib.inf diff --git a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc index 2324794841..69286bfc6f 100644 --- a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc +++ b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc @@ -130,11 +130,11 @@ [LibraryClasses.common] UefiRuntimeLib|MdePkg/Library/UefiRuntimeLib/UefiRuntimeLib.inf UefiLib|MdePkg/Library/UefiLib/UefiLib.inf HiiLib|MdeModulePkg/Library/UefiHiiLib/UefiHiiLib.inf UefiHiiServicesLib|MdeModulePkg/Library/UefiHiiServicesLib/UefiHiiServicesLib.inf DevicePathLib|MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.inf - UefiDecompressLib|MdeModulePkg/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTianoCustomDecompressLib.inf + UefiDecompressLib|MdePkg/Library/BaseUefiDecompressLib/BaseUefiTianoCustomDecompressLib.inf PeiServicesTablePointerLib|MdePkg/Library/PeiServicesTablePointerLibIdt/PeiServicesTablePointerLibIdt.inf PeiServicesLib|MdePkg/Library/PeiServicesLib/PeiServicesLib.inf DxeServicesLib|MdePkg/Library/DxeServicesLib/DxeServicesLib.inf DxeServicesTableLib|MdePkg/Library/DxeServicesTableLib/DxeServicesTableLib.inf UefiCpuLib|UefiCpuPkg/Library/BaseUefiCpuLib/BaseUefiCpuLib.inf diff --git a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgX64.dsc b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgX64.dsc index 10d44d5652..4a226cf03c 100644 --- a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgX64.dsc +++ b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgX64.dsc @@ -130,11 +130,11 @@ [LibraryClasses.common] UefiRuntimeLib|MdePkg/Library/UefiRuntimeLib/UefiRuntimeLib.inf UefiLib|MdePkg/Library/UefiLib/UefiLib.inf HiiLib|MdeModulePkg/Library/UefiHiiLib/UefiHiiLib.inf UefiHiiServicesLib|MdeModulePkg/Library/UefiHiiServicesLib/UefiHiiServicesLib.inf DevicePathLib|MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.inf - UefiDecompressLib|MdeModulePkg/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTianoCustomDecompressLib.inf + UefiDecompressLib|MdePkg/Library/BaseUefiDecompressLib/BaseUefiTianoCustomDecompressLib.inf PeiServicesTablePointerLib|MdePkg/Library/PeiServicesTablePointerLibIdt/PeiServicesTablePointerLibIdt.inf PeiServicesLib|MdePkg/Library/PeiServicesLib/PeiServicesLib.inf DxeServicesLib|MdePkg/Library/DxeServicesLib/DxeServicesLib.inf DxeServicesTableLib|MdePkg/Library/DxeServicesTableLib/DxeServicesTableLib.inf UefiCpuLib|UefiCpuPkg/Library/BaseUefiCpuLib/BaseUefiCpuLib.inf -- 2.18.0.windows.1 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#40634): https://edk2.groups.io/g/devel/message/40634 Mute This Topic: https://groups.io/mt/31625790/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[edk2-devel] [edk2-platforms] [patch 1/2] QuarkPlatformPkg: Update UefiDecompressLib instance path
REF: https://bugzilla.tianocore.org/show_bug.cgi?id=1722 Since we have merged the BaseUefiTianoCustomDecompressLib in MdeModulePkg into BaseUefiDecompressLib in MdePkg and will remove the one in MdeModulePkg. So here update the Platform to use the UefiDecompressLib instance in MdePkg. Cc: Liming Gao Cc: Michael D Kinney Cc: Kelly Steele Signed-off-by: Dandan Bi --- Platform/Intel/QuarkPlatformPkg/Quark.dsc| 2 +- Platform/Intel/QuarkPlatformPkg/QuarkMin.dsc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Platform/Intel/QuarkPlatformPkg/Quark.dsc b/Platform/Intel/QuarkPlatformPkg/Quark.dsc index e5ebeb5e09..a76d3f9356 100644 --- a/Platform/Intel/QuarkPlatformPkg/Quark.dsc +++ b/Platform/Intel/QuarkPlatformPkg/Quark.dsc @@ -111,11 +111,11 @@ [LibraryClasses] UefiRuntimeLib|MdePkg/Library/UefiRuntimeLib/UefiRuntimeLib.inf UefiLib|MdePkg/Library/UefiLib/UefiLib.inf HiiLib|MdeModulePkg/Library/UefiHiiLib/UefiHiiLib.inf UefiHiiServicesLib|MdeModulePkg/Library/UefiHiiServicesLib/UefiHiiServicesLib.inf DevicePathLib|MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.inf - UefiDecompressLib|MdeModulePkg/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTianoCustomDecompressLib.inf + UefiDecompressLib|MdePkg/Library/BaseUefiDecompressLib/BaseUefiTianoCustomDecompressLib.inf PeiServicesTablePointerLib|MdePkg/Library/PeiServicesTablePointerLibIdt/PeiServicesTablePointerLibIdt.inf PeiServicesLib|MdePkg/Library/PeiServicesLib/PeiServicesLib.inf DxeServicesLib|MdePkg/Library/DxeServicesLib/DxeServicesLib.inf DxeServicesTableLib|MdePkg/Library/DxeServicesTableLib/DxeServicesTableLib.inf UefiCpuLib|UefiCpuPkg/Library/BaseUefiCpuLib/BaseUefiCpuLib.inf diff --git a/Platform/Intel/QuarkPlatformPkg/QuarkMin.dsc b/Platform/Intel/QuarkPlatformPkg/QuarkMin.dsc index c95a5fcff9..520c006c9e 100644 --- a/Platform/Intel/QuarkPlatformPkg/QuarkMin.dsc +++ b/Platform/Intel/QuarkPlatformPkg/QuarkMin.dsc @@ -99,11 +99,11 @@ [LibraryClasses] UefiRuntimeLib|MdePkg/Library/UefiRuntimeLib/UefiRuntimeLib.inf UefiLib|MdePkg/Library/UefiLib/UefiLib.inf HiiLib|MdeModulePkg/Library/UefiHiiLib/UefiHiiLib.inf UefiHiiServicesLib|MdeModulePkg/Library/UefiHiiServicesLib/UefiHiiServicesLib.inf DevicePathLib|MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.inf - UefiDecompressLib|MdeModulePkg/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTianoCustomDecompressLib.inf + UefiDecompressLib|MdePkg/Library/BaseUefiDecompressLib/BaseUefiTianoCustomDecompressLib.inf PeiServicesTablePointerLib|MdePkg/Library/PeiServicesTablePointerLibIdt/PeiServicesTablePointerLibIdt.inf PeiServicesLib|MdePkg/Library/PeiServicesLib/PeiServicesLib.inf DxeServicesLib|MdePkg/Library/DxeServicesLib/DxeServicesLib.inf DxeServicesTableLib|MdePkg/Library/DxeServicesTableLib/DxeServicesTableLib.inf UefiCpuLib|UefiCpuPkg/Library/BaseUefiCpuLib/BaseUefiCpuLib.inf -- 2.18.0.windows.1 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#40633): https://edk2.groups.io/g/devel/message/40633 Mute This Topic: https://groups.io/mt/31625789/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [edk2-devel] [patch v2 0/3] Merge MdeModulePkg\BaseTianoCustomDecompressLib into MdePkg\BaseUefiDecompressLib
Correct the info for this patch series:
Patch 2 update consumer in edk2 repo to use this new one in MdePkg.
Patch 3 remove the one in MdeModulePkg finally.
Thanks,
Dandan
> -Original Message-
> From: devel@edk2.groups.io [mailto:devel@edk2.groups.io] On Behalf Of
> Dandan Bi
> Sent: Wednesday, May 15, 2019 10:20 AM
> To: devel@edk2.groups.io
> Cc: Gao, Liming ; Wang, Jian J
> ; Wu, Hao A ; Ni, Ray
> ; Kinney, Michael D
> Subject: [edk2-devel] [patch v2 0/3] Merge
> MdeModulePkg\BaseTianoCustomDecompressLib into
> MdePkg\BaseUefiDecompressLib
>
> REF: https://bugzilla.tianocore.org/show_bug.cgi?id=1722
>
> V2:
> 1. Address the comments for patch 1 and take R-b tags from Liming.
> 2. Since QuarkPlatformPkg and Vlv2TbltDevicePkg has been moved into
> edk2-platforms repo, drop the update for these platforms in this v2 series,
> and will send seperate patches for them.
> 3. No change for other patches.
>
> We plan to merge the BaseUefiTianoCustomDecompressLib in
> MdeModulePkg into the BaseUefDecompressLib in MdePkg.
> In order to reduce the duplicated codes and maintain easily.
> Patch 1 adds a new fdf file in BaseUefDecompressLib
> (BaseUefiTianoCustomDecompressLib.inf) to keep the same functionality
> and usage model with the one in MdeModulePkg.
> Patch 2-4 update consumer to use this new one in MdePkg.
> Patch 5 remove the one in MdeModulePkg finally.
>
> Cc: Liming Gao
> Cc: Jian J Wang
> Cc: Hao A Wu
> Cc: Ray Ni
> Cc: Michael D Kinney Dandan Bi (3):
> MdePkg: Merge TianoCustomDecompress algorithm into
> Nt32Pkg: Update UefiDecompressLib instance path
> MdeModulePkg/Library: Remove BaseUefiTianoCustomDecompressLib
>
> MdeModulePkg/Include/Guid/TianoDecompress.h | 22 -
> .../BaseUefiTianoCustomDecompressLib.c| 1063 -
> ...aseUefiTianoCustomDecompressLibInternals.h | 214
> .../BaseUefiTianoDecompressLib.uni| 16 -
> MdeModulePkg/MdeModulePkg.dec |4 -
> MdeModulePkg/MdeModulePkg.dsc |1 -
> .../BaseUefiDecompressLib.c | 72 +-
> .../BaseUefiDecompressLib.uni |6 +-
> .../BaseUefiDecompressLibInternals.h | 44 +-
> .../BaseUefiTianoCustomDecompressLib.c| 213
> .../BaseUefiTianoCustomDecompressLib.inf | 11 +-
> MdePkg/MdePkg.dec |5 +
> MdePkg/MdePkg.dsc |1 +
> Nt32Pkg/Nt32Pkg.dsc |2 +-
> 14 files changed, 330 insertions(+), 1344 deletions(-) delete mode 100644
> MdeModulePkg/Include/Guid/TianoDecompress.h
> delete mode 100644
> MdeModulePkg/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTian
> oCustomDecompressLib.c
> delete mode 100644
> MdeModulePkg/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTian
> oCustomDecompressLibInternals.h
> delete mode 100644
> MdeModulePkg/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTian
> oDecompressLib.uni
> create mode 100644
> MdePkg/Library/BaseUefiDecompressLib/BaseUefiTianoCustomDecompress
> Lib.c
> rename {MdeModulePkg/Library/BaseUefiTianoCustomDecompressLib =>
> MdePkg/Library/BaseUefiDecompressLib}/BaseUefiTianoCustomDecompres
> sLib.inf (76%)
>
> --
> 2.18.0.windows.1
>
>
>
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#40635): https://edk2.groups.io/g/devel/message/40635
Mute This Topic: https://groups.io/mt/31625741/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[edk2-devel] [patch v2 2/3] Nt32Pkg: Update UefiDecompressLib instance path
REF: https://bugzilla.tianocore.org/show_bug.cgi?id=1722 Since we will merger the BaseUefiTianoCustomDecompressLib in MdeModulePkg into BaseUefiDecompressLib in MdePkg and remove the one in MdeModulePkg. So here update the Platform to use the UefiDecompressLib instance in MdePkg. Cc: Ray Ni Cc: Hao A Wu Signed-off-by: Dandan Bi --- Nt32Pkg/Nt32Pkg.dsc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Nt32Pkg/Nt32Pkg.dsc b/Nt32Pkg/Nt32Pkg.dsc index 306b7c7a2d..71079f098e 100644 --- a/Nt32Pkg/Nt32Pkg.dsc +++ b/Nt32Pkg/Nt32Pkg.dsc @@ -118,11 +118,11 @@ [LibraryClasses] UefiRuntimeLib|MdePkg/Library/UefiRuntimeLib/UefiRuntimeLib.inf UefiLib|MdePkg/Library/UefiLib/UefiLib.inf UefiHiiServicesLib|MdeModulePkg/Library/UefiHiiServicesLib/UefiHiiServicesLib.inf HiiLib|MdeModulePkg/Library/UefiHiiLib/UefiHiiLib.inf DevicePathLib|MdePkg/Library/UefiDevicePathLibDevicePathProtocol/UefiDevicePathLibDevicePathProtocol.inf - UefiDecompressLib|MdeModulePkg/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTianoCustomDecompressLib.inf + UefiDecompressLib|MdePkg/Library/BaseUefiDecompressLib/BaseUefiTianoCustomDecompressLib.inf PeiServicesTablePointerLib|MdePkg/Library/PeiServicesTablePointerLib/PeiServicesTablePointerLib.inf PeiServicesLib|MdePkg/Library/PeiServicesLib/PeiServicesLib.inf DxeServicesLib|MdePkg/Library/DxeServicesLib/DxeServicesLib.inf DxeServicesTableLib|MdePkg/Library/DxeServicesTableLib/DxeServicesTableLib.inf UefiBootManagerLib|MdeModulePkg/Library/UefiBootManagerLib/UefiBootManagerLib.inf -- 2.18.0.windows.1 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#40630): https://edk2.groups.io/g/devel/message/40630 Mute This Topic: https://groups.io/mt/31625744/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [edk2-devel] [PATCH v1 1/1] ShellPkg/UefiShellAcpiViewCommandLib: Fix PPTT cache attributes validation
Hi Krzysztof Koch,
You patch is good to me.
Reviewed-by: Bi Dandan
I think maintainers will help push soon if they don't have additional comments.
I have just one comments for future patches since this one is small and clear.
Could you help file a Bugzilla (if not have one)to track the issue and add the
Bugzilla link into the patch if you submit patch to edk2? Thanks in advance
for cooperation and contribution.
Thanks,
Dandan
> -Original Message-
> From: devel@edk2.groups.io [mailto:devel@edk2.groups.io] On Behalf Of
> Krzysztof Koch
> Sent: Wednesday, May 15, 2019 4:24 PM
> To: devel@edk2.groups.io; Carsey, Jaben ; Ni, Ray
>
> Cc: Sami Mujawar ; nd
> Subject: Re: [edk2-devel] [PATCH v1 1/1]
> ShellPkg/UefiShellAcpiViewCommandLib: Fix PPTT cache attributes validation
>
> Hi Jaben and Ray,
>
> It's been a while since I posted this patch. Can I help you in any way to get
> this merged?
>
> Kind regards,
>
> Krzysztof Koch
>
> -Original Message-
> From: Sami Mujawar
> Sent: Thursday, May 9, 2019 14:37
> To: devel@edk2.groups.io
> Cc: jaben.car...@intel.com; ray...@intel.com; Matteo Carlini
> ; Stephanie Hughes-Fitt f...@arm.com>; nd ; Krzysztof Koch
>
> Subject: RE: [PATCH v1 1/1] ShellPkg/UefiShellAcpiViewCommandLib: Fix
> PPTT cache attributes validation
>
> Reviewed-by: Sami Mujawar
>
> Regards,
>
> Sami Mujawar
>
> -Original Message-
> From: Krzysztof Koch
> Sent: 31 January 2019 01:30 PM
> To: edk2-de...@lists.01.org
> Cc: jaben.car...@intel.com; ray...@intel.com; Matteo Carlini
> ; Stephanie Hughes-Fitt f...@arm.com>; Sami Mujawar ; nd
>
> Subject: [PATCH v1 1/1] ShellPkg/UefiShellAcpiViewCommandLib: Fix PPTT
> cache attributes validation
>
> Removed conditional pre-compiling for ARM CPUs because function
> ValidateCacheAttributes(..) is based on ACPI PPTT specification.
>
> Contributed-under: TianoCore Contribution Agreement 1.1
> Signed-off-by: Krzysztof Koch
> Reported-by: Zhichao Gao
> ---
>
> The code can be found at:
> https://github.com/KrzysztofKoch1/edk2/tree/woa_422_cache_valid_fix_v1
>
> Notes:
> v1:
> - removed conditional precompilation[Krzysztof]
>
> ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Pptt/PpttParser.c
> | 3 ---
> 1 file changed, 3 deletions(-)
>
> diff --git
> a/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Pptt/PpttParser.
> c
> b/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Pptt/PpttParser.
> c
> index
> bc56fe9ea1dd9c1e98a6a568d3f9191263bedc90..b6b420890a3494869020ed8bc
> c7b791fcf7d70f3 100644
> ---
> a/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Pptt/PpttParser.
> c
> +++
> b/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Pptt/PpttParser.
> c
> @@ -86,11 +86,9 @@ ValidateCacheAttributes (
>IN VOID* Context
>)
> {
> -#if defined(MDE_CPU_ARM) || defined (MDE_CPU_AARCH64)
>// Reference: Advanced Configuration and Power Interface (ACPI)
> Specification
>//Version 6.2 Errata A, September 2017
>// Table 5-153: Cache Type Structure
> -
>UINT8 Attributes;
>Attributes = *(UINT8*)Ptr;
>
> @@ -102,7 +100,6 @@ ValidateCacheAttributes (
>);
> return;
>}
> -#endif
> }
>
> /**
> --
> 'Guid(CE165669-3EF3-493F-B85D-6190EE5B9759)'
>
>
>
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#40698): https://edk2.groups.io/g/devel/message/40698
Mute This Topic: https://groups.io/mt/30917572/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[edk2-devel] [patch] ShellPkg/Debug1CommandsLib: Fix bugs in func DisplaySysEventLogData
REF: https://bugzilla.tianocore.org/show_bug.cgi?id=1498
This patch fix following bugs in func DisplaySysEventLogData:
1. Log increment (Log = (LOG_RECORD_FORMAT *) (LogData + Offset);)
should happened in the end of while loop, not in the very beginning.
2. DisplaySELTypes function should be used in while loop instead of
DisplaySELVarDataFormatType.
Cc: Jaben Carsey
Cc: Ray Ni
Cc: Zhichao Gao
Signed-off-by: Dandan Bi
---
.../SmbiosView/EventLogInfo.c | 20 +--
1 file changed, 14 insertions(+), 6 deletions(-)
diff --git
a/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/EventLogInfo.c
b/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/EventLogInfo.c
index b8adf438d3..984c178890 100644
--- a/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/EventLogInfo.c
+++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/EventLogInfo.c
@@ -1,9 +1,9 @@
/** @file
Module for clarifying the content of the smbios structure element info.
- Copyright (c) 2005 - 2011, Intel Corporation. All rights reserved.
+ Copyright (c) 2005 - 2019, Intel Corporation. All rights reserved.
SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#include "UefiShellDebug1CommandsLib.h"
@@ -345,20 +345,16 @@ DisplaySysEventLogData (
// Print Log info
//
Offset = 0;
Log = (LOG_RECORD_FORMAT *) LogData;
while (Log != NULL && Log->Type != END_OF_LOG && Offset < LogAreaLength) {
-//
-// Get a Event Log Record
-//
-Log = (LOG_RECORD_FORMAT *) (LogData + Offset);
if (Log != NULL) {
//
// Display Event Log Record Information
//
- DisplaySELVarDataFormatType (Log->Type, SHOW_DETAIL);
+ DisplaySELTypes (Log->Type, SHOW_DETAIL);
DisplaySELLogHeaderLen (Log->Length, SHOW_DETAIL);
Offset += Log->Length;
//
// Display Log Header Date/Time Fields
@@ -371,10 +367,14 @@ DisplaySysEventLogData (
Print (L"19");
} else if (Log != NULL && Log->Year <= 79) {
Print (L"20");
} else {
ShellPrintHiiEx(-1,-1,NULL,STRING_TOKEN
(STR_SMBIOSVIEW_EVENTLOGINFO_ERROR), gShellDebug1HiiHandle);
+//
+// Get a Event Log Record
+//
+Log = (LOG_RECORD_FORMAT *) (LogData + Offset);
continue;
}
ShellPrintHiiEx(-1,-1,NULL,
STRING_TOKEN (STR_SMBIOSVIEW_EVENTLOGINFO_TIME_SIX_VARS),
@@ -389,13 +389,21 @@ DisplaySysEventLogData (
//
// Display Variable Data Format
//
if (Log->Length <= (sizeof (LOG_RECORD_FORMAT) - 1)) {
+//
+// Get a Event Log Record
+//
+Log = (LOG_RECORD_FORMAT *) (LogData + Offset);
continue;
}
ElVdfType = Log->LogVariableData[0];
DisplayElVdfInfo (ElVdfType, Log->LogVariableData);
+ //
+ // Get a Event Log Record
+ //
+ Log = (LOG_RECORD_FORMAT *) (LogData + Offset);
}
}
}
--
2.18.0.windows.1
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#41441): https://edk2.groups.io/g/devel/message/41441
Mute This Topic: https://groups.io/mt/31816865/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [edk2-devel] [PATCH v4] SecurityPkg/SecureBootConfigDxe: Update UI according to UEFI spec
Reviewed-by: Dandan Bi
-Original Message-
From: Tan, Ming
Sent: Tuesday, April 2, 2024 4:32 PM
To: devel@edk2.groups.io
Cc: Xu, Min M ; Yao, Jiewen ; Bi,
Dandan ; POLUDOV, FELIX
Subject: [PATCH v4] SecurityPkg/SecureBootConfigDxe: Update UI according to
UEFI spec
REF: https://bugzilla.tianocore.org/show_bug.cgi?id=4713
In UEFI_Spec_2_10_Aug29.pdf page 1694 section 35.5.4 for
EFI_BROWSER_ACTION_FORM_OPEN:
NOTE: EFI_FORM_BROWSER2_PROTOCOL.BrowserCallback() cannot be used with this
browser action because question values have not been retrieved yet.
So should not call HiiGetBrowserData() and HiiSetBrowserData() in FORM_OPEN
call back function.
Now call SecureBootExtractConfigFromVariable() and update
IfrNvData->ListCount to save the change to EFI variable, then HII use
IfrNvData->EFI
variable to control the UI.
Cc: Min Xu
Cc: Jiewen Yao
Cc: Dandan Bi
Cc: Felix Polyudov
Signed-off-by: Ming Tan
---
PR: https://github.com/tianocore/edk2/pull/5411
V4: Fix a Cc issue of miss a space.
V3: According to Dandan Bi's feedback, does not call
SecureBootExtractConfigFromVariable() at last, but call it as needed.
And add more code for update IfrNvData->ListCount.
V2: Change code style to pass uncrustify check.
.../SecureBootConfigImpl.c| 42 +++
1 file changed, 25 insertions(+), 17 deletions(-)
diff --git
a/SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigImpl.c
b/SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigImpl.c
index 2c11129526..6d4560c39b 100644
---
a/SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigImpl.c
+++ b/SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootCo
+++ nfigImpl.c
@@ -3366,6 +3366,8 @@ SecureBootExtractConfigFromVariable (
ConfigData->FileEnrollType = UNKNOWN_FILE_TYPE; } +
ConfigData->ListCount = Private->ListCount;+ // // If it is Physical
Presence User, set the PhysicalPresent to true. //@@ -4541,12 +4543,13 @@
SecureBootCallback (
EFI_HII_POPUP_PROTOCOL *HiiPopup; EFI_HII_POPUP_SELECTION
UserSelection; - Status = EFI_SUCCESS;- SecureBootEnable =
NULL;- SecureBootMode = NULL;- SetupMode = NULL;- File
= NULL;- EnrollKeyErrorCode = None_Error;+ Status =
EFI_SUCCESS;+ SecureBootEnable = NULL;+ SecureBootMode = NULL;+
SetupMode= NULL;+ File = NULL;+
EnrollKeyErrorCode = None_Error;+ GetBrowserDataResult = FALSE;if ((This
== NULL) || (Value == NULL) || (ActionRequest == NULL)) { return
EFI_INVALID_PARAMETER;@@ -4565,15 +4568,12 @@ SecureBootCallback (
return EFI_OUT_OF_RESOURCES; } - GetBrowserDataResult =
HiiGetBrowserData (&gSecureBootConfigFormSetGuid, mSecureBootStorageName,
BufferSize, (UINT8 *)IfrNvData);- if (Action == EFI_BROWSER_ACTION_FORM_OPEN)
{ if (QuestionId == KEY_SECURE_BOOT_MODE) { // // Update secure
boot strings when opening this form //- Status =
UpdateSecureBootString (Private);- SecureBootExtractConfigFromVariable
(Private, IfrNvData);+ Status = UpdateSecureBootString
(Private); mIsEnterSecureBootForm = TRUE; } else { //@@
-4587,23 +4587,22 @@ SecureBootCallback (
(QuestionId == KEY_SECURE_BOOT_DBT_OPTION)) {
CloseEnrolledFile (Private->FileContext);- } else if (QuestionId ==
KEY_SECURE_BOOT_DELETE_ALL_LIST) {-//-// Update ListCount field
in varstore-// Button "Delete All Signature List" is-// enable
when ListCount is greater than 0.-//-IfrNvData->ListCount =
Private->ListCount; } } goto EXIT; } + GetBrowserDataResult =
HiiGetBrowserData (&gSecureBootConfigFormSetGuid, mSecureBootStorageName,
BufferSize, (UINT8 *)IfrNvData);+ if (Action == EFI_BROWSER_ACTION_RETRIEVE)
{ Status = EFI_UNSUPPORTED; if (QuestionId == KEY_SECURE_BOOT_MODE) {
if (mIsEnterSecureBootForm) {+if (GetBrowserDataResult) {+
SecureBootExtractConfigFromVariable (Private, IfrNvData);+}+
Value->u8 = SECURE_BOOT_MODE_STANDARD; Status= EFI_SUCCESS;
}@@ -4764,6 +4763,8 @@ SecureBootCallback (
L"Only Physical Presence User could delete PK in custom
mode!", NULL );+} else {+
SecureBootExtractConfigFromVariable (Private, IfrNvData); }
} }@@ -4827,6 +4828,7 @@ SecureBootCallback (
SECUREBOOT_DELETE_SIGNATURE_LIST_FORM,
OPTION_SIGNATURE_LIST_QUESTION_ID );+IfrNvData->ListCount =
Private->ListCount; break;//@@ -4851,6 +4853,7 @@
SecureBootCallback (
SECUREBOOT_DELETE_SIGNATURE_LIST_FORM,
OPTION
Re: [edk2-devel] [PATCH v3] SecurityPkg/OpalPasswordDxe: Update UI according to UEFI spec
Reviewed-by: Dandan Bi
Thanks,
Dandan
-Original Message-
From: Kuo, CindyX
Sent: Thursday, April 11, 2024 11:11 AM
To: devel@edk2.groups.io
Cc: Kuo, CindyX ; Yao, Jiewen ;
Kumar, Rahul R ; Bi, Dandan ;
Tan, Ming ; Chen, Arthur G ; Chen,
Xiao X ; Chen, Tina
Subject: [PATCH v3] SecurityPkg/OpalPasswordDxe: Update UI according to UEFI
spec
REF: https://bugzilla.tianocore.org/show_bug.cgi?id=4735
Should not call HiiGetBrowserData() and HiiSetBrowserData() in FORM_OPEN call
back function.
Those APIs are called within OpalHiiSetBrowserData/OpalHiiGetBrowserData
which have been used by OpalHii.c.
1. Change callback action from FORM_OPEN to RETRIEVE.
2. Create dummy label with suppressif statement in VFR for form update usage.
3. Add HiiUpdateForm() to force reparsing the IFR binary.
Cc: Jiewen Yao
Cc: Rahul Kumar
Cc: Dandan Bi
Cc: Ming Tan
Cc: Arthur Chen
Cc: Xiao X Chen
Cc: Tina Chen
Signed-off-by: CindyX Kuo
---
.../Tcg/Opal/OpalPassword/OpalDriver.h| 1 +
SecurityPkg/Tcg/Opal/OpalPassword/OpalHii.c | 84 ---
.../Tcg/Opal/OpalPassword/OpalHiiFormValues.h | 6 ++
.../Tcg/Opal/OpalPassword/OpalPasswordDxe.inf | 1 +
.../Opal/OpalPassword/OpalPasswordForm.vfr| 8 +-
5 files changed, 87 insertions(+), 13 deletions(-)
diff --git a/SecurityPkg/Tcg/Opal/OpalPassword/OpalDriver.h
b/SecurityPkg/Tcg/Opal/OpalPassword/OpalDriver.h
index 2089bd81b6..1a4671c602 100644
--- a/SecurityPkg/Tcg/Opal/OpalPassword/OpalDriver.h
+++ b/SecurityPkg/Tcg/Opal/OpalPassword/OpalDriver.h
@@ -23,6 +23,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
#include
#include
+#include
#include
#include
diff --git a/SecurityPkg/Tcg/Opal/OpalPassword/OpalHii.c
b/SecurityPkg/Tcg/Opal/OpalPassword/OpalHii.c
index 8035f44ebe..47af4fee40 100644
--- a/SecurityPkg/Tcg/Opal/OpalPassword/OpalHii.c
+++ b/SecurityPkg/Tcg/Opal/OpalPassword/OpalHii.c
@@ -40,6 +40,7 @@ EFI_HII_HANDLE gHiiPackageListHandle = NULL; //
const EFI_GUID gHiiPackageListGuid = PACKAGE_LIST_GUID;
const EFI_GUID gHiiSetupVariableGuid = SETUP_VARIABLE_GUID;
+const EFI_GUID gOpalSetupFormSetGuid = SETUP_FORMSET_GUID;
//
// Structure that contains state of the HII @@ -611,10 +612,15 @@
DriverCallback (
EFI_BROWSER_ACTION_REQUEST*ActionRequest
)
{
- HII_KEYHiiKey;
- UINT8 HiiKeyId;
- UINT32 PpRequest;
- OPAL_DISK *OpalDisk;
+ HII_KEY HiiKey;
+ UINT8 HiiKeyId;
+ UINT32 PpRequest;
+ OPAL_DISK *OpalDisk;
+ EFI_STATUS Status;
+ VOID*StartOpCodeHandle;
+ VOID*EndOpCodeHandle;
+ EFI_IFR_GUID_LABEL *StartLabel;
+ EFI_IFR_GUID_LABEL *EndLabel;
if (ActionRequest != NULL) {
*ActionRequest = EFI_BROWSER_ACTION_REQUEST_NONE; @@ -632,15 +638,69 @@
DriverCallback (
HiiKey.Raw = QuestionId;
HiiKeyId = (UINT8)HiiKey.KeyBits.Id;
- if (Action == EFI_BROWSER_ACTION_FORM_OPEN) {
-switch (HiiKeyId) {
- case HII_KEY_ID_VAR_SUPPORTED_DISKS:
-DEBUG ((DEBUG_INFO, "HII_KEY_ID_VAR_SUPPORTED_DISKS\n"));
-return HiiPopulateMainMenuForm ();
+ if (Action == EFI_BROWSER_ACTION_RETRIEVE) {
+if ((HiiKeyId == HII_KEY_ID_VAR_SUPPORTED_DISKS) || (HiiKeyId ==
HII_KEY_ID_VAR_SELECTED_DISK_AVAILABLE_ACTIONS)) {
+ //
+ // Allocate space for creation of UpdateData Buffer
+ //
+ StartOpCodeHandle = HiiAllocateOpCodeHandle ();
+ if (StartOpCodeHandle == NULL) {
+return EFI_OUT_OF_RESOURCES;
+ }
+
+ EndOpCodeHandle = HiiAllocateOpCodeHandle ();
+ if (EndOpCodeHandle == NULL) {
+return EFI_OUT_OF_RESOURCES;
+ }
+
+ //
+ // Create Hii Extend Label OpCode as the start opcode
+ //
+ StartLabel = (EFI_IFR_GUID_LABEL *)HiiCreateGuidOpCode
(StartOpCodeHandle, &gEfiIfrTianoGuid, NULL, sizeof (EFI_IFR_GUID_LABEL));
+ StartLabel->ExtendOpCode = EFI_IFR_EXTEND_OP_LABEL;
+
+ //
+ // Create Hii Extend Label OpCode as the end opcode
+ //
+ EndLabel = (EFI_IFR_GUID_LABEL *)HiiCreateGuidOpCode
(EndOpCodeHandle, &gEfiIfrTianoGuid, NULL, sizeof (EFI_IFR_GUID_LABEL));
+ EndLabel->ExtendOpCode = EFI_IFR_EXTEND_OP_LABEL;
+
+ switch (HiiKeyId) {
+case HII_KEY_ID_VAR_SUPPORTED_DISKS:
+ DEBUG ((DEBUG_INFO, "HII_KEY_ID_VAR_SUPPORTED_DISKS\n"));
+ Status = HiiPopulateMainMenuForm ();
+
+ StartLabel->Number = OPAL_MAIN_MENU_LABEL_START;
+ EndLabel->Number = OPAL_MAIN_MENU_LABEL_END;
+ HiiUpdateForm (
+gHiiPackageListHandle,
+(EFI_GUID *)&gOpalSetupFormSetGuid,
+FORMID_VALUE_MAIN_MENU,
+StartOpCodeHandle,
+EndOpCodeHandle
+);
+ break;
+
+case HII_KEY_ID_VAR_SELECTED_DISK_AVAILABLE_ACTIONS:
+ DEBUG ((DEBUG_INFO,
"HII_KEY_ID_VAR_SELECT
Re: [edk2-devel] MdeModulePkg: Fix MAT SplitRecord() Logic introduce one bug and will cause SUT reset when boot to windows
bute = TempRecord.Attribute;" to
> "NewRecord->Attribute = TempRecord.Attribute | EFI_MEMORY_XP;", SUT can
> boot to windows.
>
> @taylor.d.be...@gmail.com Could you please help to send one formal fix patch
> for this issue?
> Thanks!
>
> Best Regards,
> Yanbo Huang
>
> -Original Message-
> From: devel@edk2.groups.io On Behalf Of Taylor
> Beebe
> Sent: Tuesday, November 28, 2023 2:18 AM
> To: devel@edk2.groups.io
> Cc: Wang, Jian J ; Gao, Liming
> ; Bi, Dandan
> Subject: [edk2-devel] [PATCH v5 10/16] MdeModulePkg: Fix MAT
> SplitRecord() Logic
>
> SplitRecord() does not handle the case where a memory descriptor describes an
> image region plus extra pages before or after the image region. This patch
> fixes this case by carving off the unrelated regions into their own
> descriptors.
>
> Cc: Jian J Wang
> Cc: Liming Gao
> Cc: Dandan Bi
> Signed-off-by: Taylor Beebe
> Reviewed-by: Liming Gao
> ---
> MdeModulePkg/Library/ImagePropertiesRecordLib/ImagePropertiesRecordLib.c |
> 56 ++--
> 1 file changed, 27 insertions(+), 29 deletions(-)
>
> diff --git
> a/MdeModulePkg/Library/ImagePropertiesRecordLib/ImagePropertiesRecordL
> ib.c
> b/MdeModulePkg/Library/ImagePropertiesRecordLib/ImagePropertiesRecordL
> ib.c index 7c0ecd07c1bb..9d4082280bf5 100644
> ---
> a/MdeModulePkg/Library/ImagePropertiesRecordLib/ImagePropertiesRecordL
> ib.c
> +++ b/MdeModulePkg/Library/ImagePropertiesRecordLib/ImagePropertiesRec
> +++ or
> +++ dLib.c
> @@ -323,7 +323,6 @@ SplitRecord (
> UINT64 PhysicalEnd;
> UINTNNewRecordCount;
> UINTNTotalNewRecordCount;
> - BOOLEAN IsLastRecordData;
>
> if (MaxSplitRecordCount == 0) {
> CopyMem (NewRecord, OldRecord, DescriptorSize); @@ -344,35 +343,16 @@
> SplitRecord (
> NewImageRecord = GetImageRecordByAddress (PhysicalStart, PhysicalEnd -
> PhysicalStart, ImageRecordList);
> if (NewImageRecord == NULL) {
> //
> - // No more image covered by this range, stop
> + // No more images cover this range, check if we've reached the end of
> the old descriptor. If not,
> + // add the remaining range to the new descriptor list.
> //
> - if ((PhysicalEnd > PhysicalStart) && (ImageRecord != NULL)) {
> -//
> -// If this is still address in this record, need record.
> -//
> -NewRecord= PREVIOUS_MEMORY_DESCRIPTOR (NewRecord,
> DescriptorSize);
> -IsLastRecordData = FALSE;
> -if ((NewRecord->Attribute & EFI_MEMORY_XP) != 0) {
> - IsLastRecordData = TRUE;
> -}
> -
> -if (IsLastRecordData) {
> - //
> - // Last record is DATA, just merge it.
> - //
> - NewRecord->NumberOfPages = EfiSizeToPages (PhysicalEnd -
> NewRecord->PhysicalStart);
> -} else {
> - //
> - // Last record is CODE, create a new DATA entry.
> - //
> - NewRecord= NEXT_MEMORY_DESCRIPTOR (NewRecord,
> DescriptorSize);
> - NewRecord->Type = TempRecord.Type;
> - NewRecord->PhysicalStart = TempRecord.PhysicalStart;
> - NewRecord->VirtualStart = 0;
> - NewRecord->NumberOfPages = TempRecord.NumberOfPages;
> - NewRecord->Attribute = TempRecord.Attribute | EFI_MEMORY_XP;
> - TotalNewRecordCount++;
> -}
> + if (PhysicalEnd > PhysicalStart) {
> +NewRecord->Type = TempRecord.Type;
> +NewRecord->PhysicalStart = PhysicalStart;
> +NewRecord->VirtualStart = 0;
> +NewRecord->NumberOfPages = EfiSizeToPages (PhysicalEnd -
> PhysicalStart);
> +NewRecord->Attribute = TempRecord.Attribute;
> +TotalNewRecordCount++;
> }
>
> break;
> @@ -380,6 +360,24 @@ SplitRecord (
>
> ImageRecord = NewImageRecord;
>
> +//
> +// Update PhysicalStart to exclude the portion before the image buffer
> +//
> +if (TempRecord.PhysicalStart < ImageRecord->ImageBase) {
> + NewRecord->Type = TempRecord.Type;
> + NewRecord->PhysicalStart = TempRecord.PhysicalStart;
> + NewRecord->VirtualStart = 0;
> + NewRecord->NumberOfPages = EfiSizeToPages (ImageRecord->ImageBase -
> TempRecord.PhysicalStart);
> + NewRecord->Attribute = TempRecord.Attribute;
> + TotalNewRecordCount++;
> +
> + PhysicalStart= ImageRecord->
