UefiPayloadPkg/UefiPayloadPkg.dsc | 10 +++++++++- UefiPayloadPkg/UefiPayloadPkg.fdf | 2 ++ 2 files changed, 11 insertions(+), 1 deletion(-)
From: Gua Guo <gua.guo@intel.com>
Crypto in serveral case will use old version or latest version,
Platform may choose to only update Crypto drivers without updating
whole UPL, in this case the Crypto driver will provide by platform
payload outside the common UPL binary.
Cc: Chasel Chiu <chasel.chiu@intel.com>
Cc: Guo Dong <guo.dong@intel.com>
Cc: Sean Rhodes <sean@starlabs.systems>
Cc: James Lu <james.lu@intel.com>
Cc: Gua Guo <gua.guo@intel.com>
Signed-off-by: Gua Guo <gua.guo@intel.com>
---
UefiPayloadPkg/UefiPayloadPkg.dsc | 10 +++++++++-
UefiPayloadPkg/UefiPayloadPkg.fdf | 2 ++
2 files changed, 11 insertions(+), 1 deletion(-)
diff --git a/UefiPayloadPkg/UefiPayloadPkg.dsc b/UefiPayloadPkg/UefiPayloadPkg.dsc
index 4f195c1e52..2c4013bd9d 100644
--- a/UefiPayloadPkg/UefiPayloadPkg.dsc
+++ b/UefiPayloadPkg/UefiPayloadPkg.dsc
@@ -37,12 +37,18 @@
DEFINE ATA_ENABLE = TRUE
DEFINE SD_ENABLE = TRUE
DEFINE PS2_MOUSE_ENABLE = TRUE
- DEFINE CRYPTO_PROTOCOL_SUPPORT = FALSE
DEFINE SD_MMC_TIMEOUT = 1000000
DEFINE USE_CBMEM_FOR_CONSOLE = FALSE
DEFINE BOOTSPLASH_IMAGE = FALSE
DEFINE NVME_ENABLE = TRUE
DEFINE CAPSULE_SUPPORT = FALSE
+
+ #
+ # Crypto Support
+ #
+ DEFINE CRYPTO_PROTOCOL_SUPPORT = FALSE
+ DEFINE CRYPTO_DRIVER_EXTERNAL_SUPPORT = FALSE
+
#
# Setup Universal Payload
#
@@ -860,11 +866,13 @@
# Misc
#
!if $(CRYPTO_PROTOCOL_SUPPORT) == TRUE
+!if $(CRYPTO_DRIVER_EXTERNAL_SUPPORT) == FALSE
CryptoPkg/Driver/CryptoDxe.inf {
<LibraryClasses>
BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf
TlsLib|CryptoPkg/Library/TlsLib/TlsLib.inf
}
+!endif
!endif
#------------------------------
diff --git a/UefiPayloadPkg/UefiPayloadPkg.fdf b/UefiPayloadPkg/UefiPayloadPkg.fdf
index 7d04a8cffd..c1b1e35f32 100644
--- a/UefiPayloadPkg/UefiPayloadPkg.fdf
+++ b/UefiPayloadPkg/UefiPayloadPkg.fdf
@@ -154,8 +154,10 @@ INF MdeModulePkg/Universal/ReportStatusCodeRouter/RuntimeDxe/ReportStatusCodeRou
INF MdeModulePkg/Universal/StatusCodeHandler/RuntimeDxe/StatusCodeHandlerRuntimeDxe.inf
!if $(CRYPTO_PROTOCOL_SUPPORT) == TRUE
+!if $(CRYPTO_DRIVER_EXTERNAL_SUPPORT) == FALSE
INF CryptoPkg/Driver/CryptoDxe.inf
!endif
+!endif
!if $(SECURITY_STUB_ENABLE) == TRUE
INF MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxe.inf
!endif
--
2.39.2.windows.1
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#114365): https://edk2.groups.io/g/devel/message/114365
Mute This Topic: https://groups.io/mt/103948651/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-
Thanks Gua! Reviewed-by: Chasel Chiu <chasel.chiu@intel.com> > -----Original Message----- > From: Guo, Gua <gua.guo@intel.com> > Sent: Wednesday, January 24, 2024 9:09 PM > To: devel@edk2.groups.io > Cc: Guo, Gua <gua.guo@intel.com>; Chiu, Chasel <chasel.chiu@intel.com>; > Dong, Guo <guo.dong@intel.com>; Rhodes, Sean <sean@starlabs.systems>; Lu, > James <james.lu@intel.com> > Subject: [PATCH v2] UefiPayloadPkg/Crypto: Support external Crypto drivers. > > From: Gua Guo <gua.guo@intel.com> > > > Crypto in serveral case will use old version or latest version, > > Platform may choose to only update Crypto drivers without updating > > whole UPL, in this case the Crypto driver will provide by platform > > payload outside the common UPL binary. > > > > Cc: Chasel Chiu <chasel.chiu@intel.com> > > Cc: Guo Dong <guo.dong@intel.com> > > Cc: Sean Rhodes <sean@starlabs.systems> > > Cc: James Lu <james.lu@intel.com> > > Cc: Gua Guo <gua.guo@intel.com> > > Signed-off-by: Gua Guo <gua.guo@intel.com> > > --- > > UefiPayloadPkg/UefiPayloadPkg.dsc | 10 +++++++++- > > UefiPayloadPkg/UefiPayloadPkg.fdf | 2 ++ > > 2 files changed, 11 insertions(+), 1 deletion(-) > > > > diff --git a/UefiPayloadPkg/UefiPayloadPkg.dsc > b/UefiPayloadPkg/UefiPayloadPkg.dsc > > index 4f195c1e52..2c4013bd9d 100644 > > --- a/UefiPayloadPkg/UefiPayloadPkg.dsc > > +++ b/UefiPayloadPkg/UefiPayloadPkg.dsc > > @@ -37,12 +37,18 @@ > > DEFINE ATA_ENABLE = TRUE > > DEFINE SD_ENABLE = TRUE > > DEFINE PS2_MOUSE_ENABLE = TRUE > > - DEFINE CRYPTO_PROTOCOL_SUPPORT = FALSE > > DEFINE SD_MMC_TIMEOUT = 1000000 > > DEFINE USE_CBMEM_FOR_CONSOLE = FALSE > > DEFINE BOOTSPLASH_IMAGE = FALSE > > DEFINE NVME_ENABLE = TRUE > > DEFINE CAPSULE_SUPPORT = FALSE > > + > > + # > > + # Crypto Support > > + # > > + DEFINE CRYPTO_PROTOCOL_SUPPORT = FALSE > > + DEFINE CRYPTO_DRIVER_EXTERNAL_SUPPORT = FALSE > > + > > # > > # Setup Universal Payload > > # > > @@ -860,11 +866,13 @@ > > # Misc > > # > > !if $(CRYPTO_PROTOCOL_SUPPORT) == TRUE > > +!if $(CRYPTO_DRIVER_EXTERNAL_SUPPORT) == FALSE > > CryptoPkg/Driver/CryptoDxe.inf { > > <LibraryClasses> > > BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf > > TlsLib|CryptoPkg/Library/TlsLib/TlsLib.inf > > } > > +!endif > > !endif > > > > #------------------------------ > > diff --git a/UefiPayloadPkg/UefiPayloadPkg.fdf > b/UefiPayloadPkg/UefiPayloadPkg.fdf > > index 7d04a8cffd..c1b1e35f32 100644 > > --- a/UefiPayloadPkg/UefiPayloadPkg.fdf > > +++ b/UefiPayloadPkg/UefiPayloadPkg.fdf > > @@ -154,8 +154,10 @@ INF > MdeModulePkg/Universal/ReportStatusCodeRouter/RuntimeDxe/ReportStatusCo > deRou > > INF > MdeModulePkg/Universal/StatusCodeHandler/RuntimeDxe/StatusCodeHandlerR > untimeDxe.inf > > > > !if $(CRYPTO_PROTOCOL_SUPPORT) == TRUE > > +!if $(CRYPTO_DRIVER_EXTERNAL_SUPPORT) == FALSE > > INF CryptoPkg/Driver/CryptoDxe.inf > > !endif > > +!endif > > !if $(SECURITY_STUB_ENABLE) == TRUE > > INF MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxe.inf > > !endif > > -- > > 2.39.2.windows.1 > > -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#114428): https://edk2.groups.io/g/devel/message/114428 Mute This Topic: https://groups.io/mt/103948651/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=-=-=-=-=-=-=-=-=-=-=-
Reviewed-by: James Lu <james.lu@intel.com> Thanks, James -----Original Message----- From: Guo, Gua <gua.guo@intel.com> Sent: Thursday, January 25, 2024 1:09 PM To: devel@edk2.groups.io Cc: Guo, Gua <gua.guo@intel.com>; Chiu, Chasel <chasel.chiu@intel.com>; Dong, Guo <guo.dong@intel.com>; Rhodes, Sean <sean@starlabs.systems>; Lu, James <james.lu@intel.com> Subject: [PATCH v2] UefiPayloadPkg/Crypto: Support external Crypto drivers. From: Gua Guo <gua.guo@intel.com> Crypto in serveral case will use old version or latest version, Platform may choose to only update Crypto drivers without updating whole UPL, in this case the Crypto driver will provide by platform payload outside the common UPL binary. Cc: Chasel Chiu <chasel.chiu@intel.com> Cc: Guo Dong <guo.dong@intel.com> Cc: Sean Rhodes <sean@starlabs.systems> Cc: James Lu <james.lu@intel.com> Cc: Gua Guo <gua.guo@intel.com> Signed-off-by: Gua Guo <gua.guo@intel.com> --- UefiPayloadPkg/UefiPayloadPkg.dsc | 10 +++++++++- UefiPayloadPkg/UefiPayloadPkg.fdf | 2 ++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/UefiPayloadPkg/UefiPayloadPkg.dsc b/UefiPayloadPkg/UefiPayloadPkg.dsc index 4f195c1e52..2c4013bd9d 100644 --- a/UefiPayloadPkg/UefiPayloadPkg.dsc +++ b/UefiPayloadPkg/UefiPayloadPkg.dsc @@ -37,12 +37,18 @@ DEFINE ATA_ENABLE = TRUE DEFINE SD_ENABLE = TRUE DEFINE PS2_MOUSE_ENABLE = TRUE - DEFINE CRYPTO_PROTOCOL_SUPPORT = FALSE DEFINE SD_MMC_TIMEOUT = 1000000 DEFINE USE_CBMEM_FOR_CONSOLE = FALSE DEFINE BOOTSPLASH_IMAGE = FALSE DEFINE NVME_ENABLE = TRUE DEFINE CAPSULE_SUPPORT = FALSE + + # + # Crypto Support + # + DEFINE CRYPTO_PROTOCOL_SUPPORT = FALSE + DEFINE CRYPTO_DRIVER_EXTERNAL_SUPPORT = FALSE + # # Setup Universal Payload # @@ -860,11 +866,13 @@ # Misc # !if $(CRYPTO_PROTOCOL_SUPPORT) == TRUE +!if $(CRYPTO_DRIVER_EXTERNAL_SUPPORT) == FALSE CryptoPkg/Driver/CryptoDxe.inf { <LibraryClasses> BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf TlsLib|CryptoPkg/Library/TlsLib/TlsLib.inf } +!endif !endif #------------------------------ diff --git a/UefiPayloadPkg/UefiPayloadPkg.fdf b/UefiPayloadPkg/UefiPayloadPkg.fdf index 7d04a8cffd..c1b1e35f32 100644 --- a/UefiPayloadPkg/UefiPayloadPkg.fdf +++ b/UefiPayloadPkg/UefiPayloadPkg.fdf @@ -154,8 +154,10 @@ INF MdeModulePkg/Universal/ReportStatusCodeRouter/RuntimeDxe/ReportStatusCodeRou INF MdeModulePkg/Universal/StatusCodeHandler/RuntimeDxe/StatusCodeHandlerRuntimeDxe.inf !if $(CRYPTO_PROTOCOL_SUPPORT) == TRUE +!if $(CRYPTO_DRIVER_EXTERNAL_SUPPORT) == FALSE INF CryptoPkg/Driver/CryptoDxe.inf !endif +!endif !if $(SECURITY_STUB_ENABLE) == TRUE INF MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxe.inf !endif -- 2.39.2.windows.1 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#114366): https://edk2.groups.io/g/devel/message/114366 Mute This Topic: https://groups.io/mt/103948651/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=-=-=-=-=-=-=-=-=-=-=-
© 2016 - 2024 Red Hat, Inc.