[CHERRY-PICK] CryptoPkg/generate_cryptodriver.py: Add PEI and Standal…

…one MM AARCH64 support (#698) ## Description Generates shared crypto files for PEI and Standalone MM AARCH64. This will be used for an upcoming binary release from mu_crypto_release (cherry picked from commit 440050a) - [ ] Impacts functionality? - **Functionality** - Does the change ultimately impact how firmware functions? - Examples: Add a new library, publish a new PPI, update an algorithm, ... - [ ] Impacts security? - **Security** - Does the change have a direct security impact on an application, flow, or firmware? - Examples: Crypto algorithm change, buffer overflow fix, parameter validation improvement, ... - [ ] Breaking change? - **Breaking change** - Will anyone consuming this change experience a break in build or boot behavior? - Examples: Add a new library class, move a module to a different repo, call a function in a new library class in a pre-existing module, ... - [ ] Includes tests? - **Tests** - Does the change include any explicit test code? - Examples: Unit tests, integration tests, robot tests, ... - [ ] Includes documentation? - **Documentation** - Does the change contain explicit documentation additions outside direct code modifications (and comments)? - Examples: Update readme file, add feature readme file, link to documentation on an a separate Web page, ... ## How This Was Tested - Verified PEI and Standalone MM AARCH64 files are produced in generated output. ## Integration Instructions - Use the PEI and Standalone MM AARCH64 binaries if needed for a platform following the normal shared binary integration instructions. Signed-off-by: Michael Kubacki <[email protected]>
microsoft · Jan 30, 2024 · e774afb · e774afb
1 parent adc6b12
commit e774afb
Show file tree

Hide file tree

Showing 96 changed files with 588 additions and 104 deletions.
diff --git a/CryptoPkg/CryptoPkg.ci.yaml b/CryptoPkg/CryptoPkg.ci.yaml
@@ -63,16 +63,20 @@
             "CryptoPkg/Driver/Bin/CryptoDriverBin_MINIMAL_SHA_SM3_Dxe_RELEASE_AARCH64.inf",
             "CryptoPkg/Driver/Bin/CryptoDriverBin_MINIMAL_SHA_SM3_Dxe_RELEASE_IA32.inf",
             "CryptoPkg/Driver/Bin/CryptoDriverBin_MINIMAL_SHA_SM3_Dxe_RELEASE_X64.inf",
+            "CryptoPkg/Driver/Bin/CryptoDriverBin_MINIMAL_SHA_SM3_Pei_DEBUG_AARCH64.inf",
             "CryptoPkg/Driver/Bin/CryptoDriverBin_MINIMAL_SHA_SM3_Pei_DEBUG_IA32.inf",
             "CryptoPkg/Driver/Bin/CryptoDriverBin_MINIMAL_SHA_SM3_Pei_DEBUG_X64.inf",
+            "CryptoPkg/Driver/Bin/CryptoDriverBin_MINIMAL_SHA_SM3_Pei_RELEASE_AARCH64.inf",
             "CryptoPkg/Driver/Bin/CryptoDriverBin_MINIMAL_SHA_SM3_Pei_RELEASE_IA32.inf",
             "CryptoPkg/Driver/Bin/CryptoDriverBin_MINIMAL_SHA_SM3_Pei_RELEASE_X64.inf",
             "CryptoPkg/Driver/Bin/CryptoDriverBin_MINIMAL_SHA_SM3_Smm_DEBUG_IA32.inf",
             "CryptoPkg/Driver/Bin/CryptoDriverBin_MINIMAL_SHA_SM3_Smm_DEBUG_X64.inf",
             "CryptoPkg/Driver/Bin/CryptoDriverBin_MINIMAL_SHA_SM3_Smm_RELEASE_IA32.inf",
             "CryptoPkg/Driver/Bin/CryptoDriverBin_MINIMAL_SHA_SM3_Smm_RELEASE_X64.inf",
+            "CryptoPkg/Driver/Bin/CryptoDriverBin_MINIMAL_SHA_SM3_StandaloneMm_DEBUG_AARCH64.inf",
             "CryptoPkg/Driver/Bin/CryptoDriverBin_MINIMAL_SHA_SM3_StandaloneMm_DEBUG_IA32.inf",
             "CryptoPkg/Driver/Bin/CryptoDriverBin_MINIMAL_SHA_SM3_StandaloneMm_DEBUG_X64.inf",
+            "CryptoPkg/Driver/Bin/CryptoDriverBin_MINIMAL_SHA_SM3_StandaloneMm_RELEASE_AARCH64.inf",
             "CryptoPkg/Driver/Bin/CryptoDriverBin_MINIMAL_SHA_SM3_StandaloneMm_RELEASE_IA32.inf",
             "CryptoPkg/Driver/Bin/CryptoDriverBin_MINIMAL_SHA_SM3_StandaloneMm_RELEASE_X64.inf",
             "CryptoPkg/Driver/Bin/CryptoDriverBin_SMALL_SHA_RSA_Dxe_DEBUG_AARCH64.inf",
@@ -81,16 +85,20 @@
             "CryptoPkg/Driver/Bin/CryptoDriverBin_SMALL_SHA_RSA_Dxe_RELEASE_AARCH64.inf",
             "CryptoPkg/Driver/Bin/CryptoDriverBin_SMALL_SHA_RSA_Dxe_RELEASE_IA32.inf",
             "CryptoPkg/Driver/Bin/CryptoDriverBin_SMALL_SHA_RSA_Dxe_RELEASE_X64.inf",
+            "CryptoPkg/Driver/Bin/CryptoDriverBin_SMALL_SHA_RSA_Pei_DEBUG_AARCH64.inf",
             "CryptoPkg/Driver/Bin/CryptoDriverBin_SMALL_SHA_RSA_Pei_DEBUG_IA32.inf",
             "CryptoPkg/Driver/Bin/CryptoDriverBin_SMALL_SHA_RSA_Pei_DEBUG_X64.inf",
+            "CryptoPkg/Driver/Bin/CryptoDriverBin_SMALL_SHA_RSA_Pei_RELEASE_AARCH64.inf",
             "CryptoPkg/Driver/Bin/CryptoDriverBin_SMALL_SHA_RSA_Pei_RELEASE_IA32.inf",
             "CryptoPkg/Driver/Bin/CryptoDriverBin_SMALL_SHA_RSA_Pei_RELEASE_X64.inf",
             "CryptoPkg/Driver/Bin/CryptoDriverBin_SMALL_SHA_RSA_Smm_DEBUG_IA32.inf",
             "CryptoPkg/Driver/Bin/CryptoDriverBin_SMALL_SHA_RSA_Smm_DEBUG_X64.inf",
             "CryptoPkg/Driver/Bin/CryptoDriverBin_SMALL_SHA_RSA_Smm_RELEASE_IA32.inf",
             "CryptoPkg/Driver/Bin/CryptoDriverBin_SMALL_SHA_RSA_Smm_RELEASE_X64.inf",
+            "CryptoPkg/Driver/Bin/CryptoDriverBin_SMALL_SHA_RSA_StandaloneMm_DEBUG_AARCH64.inf",
             "CryptoPkg/Driver/Bin/CryptoDriverBin_SMALL_SHA_RSA_StandaloneMm_DEBUG_IA32.inf",
             "CryptoPkg/Driver/Bin/CryptoDriverBin_SMALL_SHA_RSA_StandaloneMm_DEBUG_X64.inf",
+            "CryptoPkg/Driver/Bin/CryptoDriverBin_SMALL_SHA_RSA_StandaloneMm_RELEASE_AARCH64.inf",
             "CryptoPkg/Driver/Bin/CryptoDriverBin_SMALL_SHA_RSA_StandaloneMm_RELEASE_IA32.inf",
             "CryptoPkg/Driver/Bin/CryptoDriverBin_SMALL_SHA_RSA_StandaloneMm_RELEASE_X64.inf",
             "CryptoPkg/Driver/Bin/CryptoDriverBin_STANDARD_Dxe_DEBUG_AARCH64.inf",
@@ -99,16 +107,20 @@
             "CryptoPkg/Driver/Bin/CryptoDriverBin_STANDARD_Dxe_RELEASE_AARCH64.inf",
             "CryptoPkg/Driver/Bin/CryptoDriverBin_STANDARD_Dxe_RELEASE_IA32.inf",
             "CryptoPkg/Driver/Bin/CryptoDriverBin_STANDARD_Dxe_RELEASE_X64.inf",
+            "CryptoPkg/Driver/Bin/CryptoDriverBin_STANDARD_Pei_DEBUG_AARCH64.inf",
             "CryptoPkg/Driver/Bin/CryptoDriverBin_STANDARD_Pei_DEBUG_IA32.inf",
             "CryptoPkg/Driver/Bin/CryptoDriverBin_STANDARD_Pei_DEBUG_X64.inf",
+            "CryptoPkg/Driver/Bin/CryptoDriverBin_STANDARD_Pei_RELEASE_AARCH64.inf",
             "CryptoPkg/Driver/Bin/CryptoDriverBin_STANDARD_Pei_RELEASE_IA32.inf",
             "CryptoPkg/Driver/Bin/CryptoDriverBin_STANDARD_Pei_RELEASE_X64.inf",
             "CryptoPkg/Driver/Bin/CryptoDriverBin_STANDARD_Smm_DEBUG_IA32.inf",
             "CryptoPkg/Driver/Bin/CryptoDriverBin_STANDARD_Smm_DEBUG_X64.inf",
             "CryptoPkg/Driver/Bin/CryptoDriverBin_STANDARD_Smm_RELEASE_IA32.inf",
             "CryptoPkg/Driver/Bin/CryptoDriverBin_STANDARD_Smm_RELEASE_X64.inf",
+            "CryptoPkg/Driver/Bin/CryptoDriverBin_STANDARD_StandaloneMm_DEBUG_AARCH64.inf",
             "CryptoPkg/Driver/Bin/CryptoDriverBin_STANDARD_StandaloneMm_DEBUG_IA32.inf",
             "CryptoPkg/Driver/Bin/CryptoDriverBin_STANDARD_StandaloneMm_DEBUG_X64.inf",
+            "CryptoPkg/Driver/Bin/CryptoDriverBin_STANDARD_StandaloneMm_RELEASE_AARCH64.inf",
             "CryptoPkg/Driver/Bin/CryptoDriverBin_STANDARD_StandaloneMm_RELEASE_IA32.inf",
             "CryptoPkg/Driver/Bin/CryptoDriverBin_STANDARD_StandaloneMm_RELEASE_X64.inf",
             "CryptoPkg/Driver/Bin/CryptoDriverBin_TINY_SHA_Dxe_DEBUG_AARCH64.inf",
@@ -117,16 +129,20 @@
             "CryptoPkg/Driver/Bin/CryptoDriverBin_TINY_SHA_Dxe_RELEASE_AARCH64.inf",
             "CryptoPkg/Driver/Bin/CryptoDriverBin_TINY_SHA_Dxe_RELEASE_IA32.inf",
             "CryptoPkg/Driver/Bin/CryptoDriverBin_TINY_SHA_Dxe_RELEASE_X64.inf",
+            "CryptoPkg/Driver/Bin/CryptoDriverBin_TINY_SHA_Pei_DEBUG_AARCH64.inf",
             "CryptoPkg/Driver/Bin/CryptoDriverBin_TINY_SHA_Pei_DEBUG_IA32.inf",
             "CryptoPkg/Driver/Bin/CryptoDriverBin_TINY_SHA_Pei_DEBUG_X64.inf",
+            "CryptoPkg/Driver/Bin/CryptoDriverBin_TINY_SHA_Pei_RELEASE_AARCH64.inf",
             "CryptoPkg/Driver/Bin/CryptoDriverBin_TINY_SHA_Pei_RELEASE_IA32.inf",
             "CryptoPkg/Driver/Bin/CryptoDriverBin_TINY_SHA_Pei_RELEASE_X64.inf",
             "CryptoPkg/Driver/Bin/CryptoDriverBin_TINY_SHA_Smm_DEBUG_IA32.inf",
             "CryptoPkg/Driver/Bin/CryptoDriverBin_TINY_SHA_Smm_DEBUG_X64.inf",
             "CryptoPkg/Driver/Bin/CryptoDriverBin_TINY_SHA_Smm_RELEASE_IA32.inf",
             "CryptoPkg/Driver/Bin/CryptoDriverBin_TINY_SHA_Smm_RELEASE_X64.inf",
+            "CryptoPkg/Driver/Bin/CryptoDriverBin_TINY_SHA_StandaloneMm_DEBUG_AARCH64.inf",
             "CryptoPkg/Driver/Bin/CryptoDriverBin_TINY_SHA_StandaloneMm_DEBUG_IA32.inf",
             "CryptoPkg/Driver/Bin/CryptoDriverBin_TINY_SHA_StandaloneMm_DEBUG_X64.inf",
+            "CryptoPkg/Driver/Bin/CryptoDriverBin_TINY_SHA_StandaloneMm_RELEASE_AARCH64.inf",
             "CryptoPkg/Driver/Bin/CryptoDriverBin_TINY_SHA_StandaloneMm_RELEASE_IA32.inf",
             "CryptoPkg/Driver/Bin/CryptoDriverBin_TINY_SHA_StandaloneMm_RELEASE_X64.inf",
             ## MU_CHANGE [END]

diff --git a/CryptoPkg/Driver/Bin/Crypto.inc.dsc b/CryptoPkg/Driver/Bin/Crypto.inc.dsc
@@ -2,7 +2,7 @@
 # AUTOGENERATED BY CryptoPkg\Driver\Packaging\generate_cryptodriver.py
 # AUTOGENED AS Crypto.inc.dsc
 # DO NOT MODIFY
-# GENERATED ON: 2024-01-17 12:19:48.958198
+# GENERATED ON: 2024-01-30 12:45:20.038861
 
 [Defines]
 !ifndef CRYPTO_SERVICES

diff --git a/CryptoPkg/Driver/Bin/Crypto.pcd.MINIMAL_SHA_SM3.inc.dsc b/CryptoPkg/Driver/Bin/Crypto.pcd.MINIMAL_SHA_SM3.inc.dsc
@@ -2,7 +2,7 @@
 # AUTOGENERATED BY CryptoPkg\Driver\Packaging\generate_cryptodriver.py
 # AUTOGENED AS Crypto.pcd.MINIMAL_SHA_SM3.inc.dsc
 # DO NOT MODIFY
-# GENERATED ON: 2024-01-17 12:19:48.956215
+# GENERATED ON: 2024-01-30 12:45:20.037664
 
 # HMACSHA256 family
   gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceHmacSha256New             | TRUE

diff --git a/CryptoPkg/Driver/Bin/Crypto.pcd.SMALL_SHA_RSA.inc.dsc b/CryptoPkg/Driver/Bin/Crypto.pcd.SMALL_SHA_RSA.inc.dsc
@@ -2,7 +2,7 @@
 # AUTOGENERATED BY CryptoPkg\Driver\Packaging\generate_cryptodriver.py
 # AUTOGENED AS Crypto.pcd.SMALL_SHA_RSA.inc.dsc
 # DO NOT MODIFY
-# GENERATED ON: 2024-01-17 12:19:48.957196
+# GENERATED ON: 2024-01-30 12:45:20.038202
 
 # HMACSHA256 family
   gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceHmacSha256New             | TRUE

diff --git a/CryptoPkg/Driver/Bin/Crypto.pcd.STANDARD.inc.dsc b/CryptoPkg/Driver/Bin/Crypto.pcd.STANDARD.inc.dsc
@@ -2,7 +2,7 @@
 # AUTOGENERATED BY CryptoPkg\Driver\Packaging\generate_cryptodriver.py
 # AUTOGENED AS Crypto.pcd.STANDARD.inc.dsc
 # DO NOT MODIFY
-# GENERATED ON: 2024-01-17 12:19:48.958198
+# GENERATED ON: 2024-01-30 12:45:20.038741
 
 # HMACSHA256 family
   gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceHmacSha256New             | TRUE

diff --git a/CryptoPkg/Driver/Bin/Crypto.pcd.TINY_SHA.inc.dsc b/CryptoPkg/Driver/Bin/Crypto.pcd.TINY_SHA.inc.dsc
@@ -2,7 +2,7 @@
 # AUTOGENERATED BY CryptoPkg\Driver\Packaging\generate_cryptodriver.py
 # AUTOGENED AS Crypto.pcd.TINY_SHA.inc.dsc
 # DO NOT MODIFY
-# GENERATED ON: 2024-01-17 12:19:48.954171
+# GENERATED ON: 2024-01-30 12:45:20.036607
 
 # SHA1 family
   gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceSha1GetContextSize        | TRUE

diff --git a/CryptoPkg/Driver/Bin/CryptoDriver.DXE.inc.fdf b/CryptoPkg/Driver/Bin/CryptoDriver.DXE.inc.fdf
@@ -2,7 +2,7 @@
 # AUTOGENERATED BY CryptoPkg\Driver\Packaging\generate_cryptodriver.py
 # AUTOGENED AS CryptoDriver.DXE.inc.fdf
 # DO NOT MODIFY
-# GENERATED ON: 2024-01-17 12:19:49.032307
+# GENERATED ON: 2024-01-30 12:45:20.105154
 
 # include this in the platform DXE FV
 !ifndef DXE_CRYPTO_SERVICES

diff --git a/CryptoPkg/Driver/Bin/CryptoDriver.PEI.inc.fdf b/CryptoPkg/Driver/Bin/CryptoDriver.PEI.inc.fdf
@@ -2,7 +2,7 @@
 # AUTOGENERATED BY CryptoPkg\Driver\Packaging\generate_cryptodriver.py
 # AUTOGENED AS CryptoDriver.PEI.inc.fdf
 # DO NOT MODIFY
-# GENERATED ON: 2024-01-17 12:19:49.031311
+# GENERATED ON: 2024-01-30 12:45:20.105154
 
 # include this in the platform PEI FV
 !ifndef PEI_CRYPTO_SERVICES

diff --git a/CryptoPkg/Driver/Bin/CryptoDriver.SMM.inc.fdf b/CryptoPkg/Driver/Bin/CryptoDriver.SMM.inc.fdf
@@ -2,7 +2,7 @@
 # AUTOGENERATED BY CryptoPkg\Driver\Packaging\generate_cryptodriver.py
 # AUTOGENED AS CryptoDriver.SMM.inc.fdf
 # DO NOT MODIFY
-# GENERATED ON: 2024-01-17 12:19:49.032307
+# GENERATED ON: 2024-01-30 12:45:20.106156
 
 # include this in the platform SMM FV
 !ifndef SMM_CRYPTO_SERVICES

diff --git a/CryptoPkg/Driver/Bin/CryptoDriver.STANDALONEMM.inc.fdf b/CryptoPkg/Driver/Bin/CryptoDriver.STANDALONEMM.inc.fdf
@@ -2,7 +2,7 @@
 # AUTOGENERATED BY CryptoPkg\Driver\Packaging\generate_cryptodriver.py
 # AUTOGENED AS CryptoDriver.STANDALONEMM.inc.fdf
 # DO NOT MODIFY
-# GENERATED ON: 2024-01-17 12:19:49.033830
+# GENERATED ON: 2024-01-30 12:45:20.106156
 
 # include this in the platform STANDALONEMM FV
 !ifndef STANDALONEMM_CRYPTO_SERVICES

diff --git a/CryptoPkg/Driver/Bin/CryptoDriver.inc.dsc b/CryptoPkg/Driver/Bin/CryptoDriver.inc.dsc
@@ -2,7 +2,7 @@
 # AUTOGENERATED BY CryptoPkg\Driver\Packaging\generate_cryptodriver.py
 # AUTOGENED AS CryptoDriver.inc.dsc
 # DO NOT MODIFY
-# GENERATED ON: 2024-01-17 12:19:49.030316
+# GENERATED ON: 2024-01-30 12:45:20.104152
 
 # this is to be included by a platform :)
 [Defines]
@@ -101,10 +101,6 @@
   [Components.X64]
     CryptoPkg/Driver/Bin/CryptoDriverBin_TINY_SHA_Smm_$(TARGET)_X64.inf 
  !endif
- !if $(SMM_CRYPTO_ARCH) == AARCH64
-  [Components.AARCH64]
-    CryptoPkg/Driver/Bin/CryptoDriverBin_TINY_SHA_Smm_$(TARGET)_AARCH64.inf 
- !endif
  !if $(SMM_CRYPTO_ARCH) == IA32
   [Components.IA32]
     CryptoPkg/Driver/Bin/CryptoDriverBin_TINY_SHA_Smm_$(TARGET)_IA32.inf 
@@ -122,6 +118,10 @@
   [Components.X64]
     CryptoPkg/Driver/Bin/CryptoDriverBin_TINY_SHA_StandaloneMm_$(TARGET)_X64.inf 
  !endif
+ !if $(STANDALONEMM_CRYPTO_ARCH) == AARCH64
+  [Components.AARCH64]
+    CryptoPkg/Driver/Bin/CryptoDriverBin_TINY_SHA_StandaloneMm_$(TARGET)_AARCH64.inf 
+ !endif
 
  [Components]
    CryptoPkg/Library/BaseCryptLibOnProtocolPpi/StandaloneMmCryptLib.inf {
@@ -177,10 +177,6 @@
   [Components.X64]
     CryptoPkg/Driver/Bin/CryptoDriverBin_MINIMAL_SHA_SM3_Smm_$(TARGET)_X64.inf 
  !endif
- !if $(SMM_CRYPTO_ARCH) == AARCH64
-  [Components.AARCH64]
-    CryptoPkg/Driver/Bin/CryptoDriverBin_MINIMAL_SHA_SM3_Smm_$(TARGET)_AARCH64.inf 
- !endif
  !if $(SMM_CRYPTO_ARCH) == IA32
   [Components.IA32]
     CryptoPkg/Driver/Bin/CryptoDriverBin_MINIMAL_SHA_SM3_Smm_$(TARGET)_IA32.inf 
@@ -198,6 +194,10 @@
   [Components.X64]
     CryptoPkg/Driver/Bin/CryptoDriverBin_MINIMAL_SHA_SM3_StandaloneMm_$(TARGET)_X64.inf 
  !endif
+ !if $(STANDALONEMM_CRYPTO_ARCH) == AARCH64
+  [Components.AARCH64]
+    CryptoPkg/Driver/Bin/CryptoDriverBin_MINIMAL_SHA_SM3_StandaloneMm_$(TARGET)_AARCH64.inf 
+ !endif
 
  [Components]
    CryptoPkg/Library/BaseCryptLibOnProtocolPpi/StandaloneMmCryptLib.inf {
@@ -253,10 +253,6 @@
   [Components.X64]
     CryptoPkg/Driver/Bin/CryptoDriverBin_SMALL_SHA_RSA_Smm_$(TARGET)_X64.inf 
  !endif
- !if $(SMM_CRYPTO_ARCH) == AARCH64
-  [Components.AARCH64]
-    CryptoPkg/Driver/Bin/CryptoDriverBin_SMALL_SHA_RSA_Smm_$(TARGET)_AARCH64.inf 
- !endif
  !if $(SMM_CRYPTO_ARCH) == IA32
   [Components.IA32]
     CryptoPkg/Driver/Bin/CryptoDriverBin_SMALL_SHA_RSA_Smm_$(TARGET)_IA32.inf 
@@ -274,6 +270,10 @@
   [Components.X64]
     CryptoPkg/Driver/Bin/CryptoDriverBin_SMALL_SHA_RSA_StandaloneMm_$(TARGET)_X64.inf 
  !endif
+ !if $(STANDALONEMM_CRYPTO_ARCH) == AARCH64
+  [Components.AARCH64]
+    CryptoPkg/Driver/Bin/CryptoDriverBin_SMALL_SHA_RSA_StandaloneMm_$(TARGET)_AARCH64.inf 
+ !endif
 
  [Components]
    CryptoPkg/Library/BaseCryptLibOnProtocolPpi/StandaloneMmCryptLib.inf {
@@ -329,10 +329,6 @@
   [Components.X64]
     CryptoPkg/Driver/Bin/CryptoDriverBin_STANDARD_Smm_$(TARGET)_X64.inf 
  !endif
- !if $(SMM_CRYPTO_ARCH) == AARCH64
-  [Components.AARCH64]
-    CryptoPkg/Driver/Bin/CryptoDriverBin_STANDARD_Smm_$(TARGET)_AARCH64.inf 
- !endif
  !if $(SMM_CRYPTO_ARCH) == IA32
   [Components.IA32]
     CryptoPkg/Driver/Bin/CryptoDriverBin_STANDARD_Smm_$(TARGET)_IA32.inf 
@@ -350,6 +346,10 @@
   [Components.X64]
     CryptoPkg/Driver/Bin/CryptoDriverBin_STANDARD_StandaloneMm_$(TARGET)_X64.inf 
  !endif
+ !if $(STANDALONEMM_CRYPTO_ARCH) == AARCH64
+  [Components.AARCH64]
+    CryptoPkg/Driver/Bin/CryptoDriverBin_STANDARD_StandaloneMm_$(TARGET)_AARCH64.inf 
+ !endif
 
  [Components]
    CryptoPkg/Library/BaseCryptLibOnProtocolPpi/StandaloneMmCryptLib.inf {
@@ -402,12 +402,6 @@
     TlsLib|CryptoPkg/Library/BaseCryptLibOnProtocolPpi/SmmCryptLib.inf
 !endif
 
-!if $(SMM_CRYPTO_ARCH) == AARCH64
-  [LibraryClasses.AARCH64.DXE_SMM_DRIVER, LibraryClasses.AARCH64.SMM_CORE]
-    BaseCryptLib|CryptoPkg/Library/BaseCryptLibOnProtocolPpi/SmmCryptLib.inf
-    TlsLib|CryptoPkg/Library/BaseCryptLibOnProtocolPpi/SmmCryptLib.inf
-!endif
-
 !if $(SMM_CRYPTO_ARCH) == IA32
   [LibraryClasses.IA32.DXE_SMM_DRIVER, LibraryClasses.IA32.SMM_CORE]
     BaseCryptLib|CryptoPkg/Library/BaseCryptLibOnProtocolPpi/SmmCryptLib.inf
@@ -420,5 +414,11 @@
     TlsLib|CryptoPkg/Library/BaseCryptLibOnProtocolPpi/StandaloneMmCryptLib.inf
 !endif
 
+!if $(STANDALONEMM_CRYPTO_ARCH) == AARCH64
+  [LibraryClasses.AARCH64.MM_STANDALONE, LibraryClasses.AARCH64.MM_CORE_STANDALONE]
+    BaseCryptLib|CryptoPkg/Library/BaseCryptLibOnProtocolPpi/StandaloneMmCryptLib.inf
+    TlsLib|CryptoPkg/Library/BaseCryptLibOnProtocolPpi/StandaloneMmCryptLib.inf
+!endif
+
 # AUTOGEN ENDS
 # ****************************************************************************
diff --git a/CryptoPkg/Driver/Bin/CryptoDriverBin_MINIMAL_SHA_SM3_Dxe_DEBUG_AARCH64.inf b/CryptoPkg/Driver/Bin/CryptoDriverBin_MINIMAL_SHA_SM3_Dxe_DEBUG_AARCH64.inf
@@ -2,7 +2,7 @@
 # AUTOGENERATED BY CryptoPkg\Driver\Packaging\generate_cryptodriver.py
 # AUTOGENED AS CryptoDriverBin_MINIMAL_SHA_SM3_Dxe_DEBUG_AARCH64.inf
 # DO NOT MODIFY
-# GENERATED ON: 2024-01-17 12:19:48.999735
+# GENERATED ON: 2024-01-30 12:45:20.078156
 
 [Defines]
   INF_VERSION                    = 0x0001001B

diff --git a/CryptoPkg/Driver/Bin/CryptoDriverBin_MINIMAL_SHA_SM3_Dxe_DEBUG_IA32.inf b/CryptoPkg/Driver/Bin/CryptoDriverBin_MINIMAL_SHA_SM3_Dxe_DEBUG_IA32.inf
@@ -2,7 +2,7 @@
 # AUTOGENERATED BY CryptoPkg\Driver\Packaging\generate_cryptodriver.py
 # AUTOGENED AS CryptoDriverBin_MINIMAL_SHA_SM3_Dxe_DEBUG_IA32.inf
 # DO NOT MODIFY
-# GENERATED ON: 2024-01-17 12:19:49.000737
+# GENERATED ON: 2024-01-30 12:45:20.079154
 
 [Defines]
   INF_VERSION                    = 0x0001001B

diff --git a/CryptoPkg/Driver/Bin/CryptoDriverBin_MINIMAL_SHA_SM3_Dxe_DEBUG_X64.inf b/CryptoPkg/Driver/Bin/CryptoDriverBin_MINIMAL_SHA_SM3_Dxe_DEBUG_X64.inf
@@ -2,7 +2,7 @@
 # AUTOGENERATED BY CryptoPkg\Driver\Packaging\generate_cryptodriver.py
 # AUTOGENED AS CryptoDriverBin_MINIMAL_SHA_SM3_Dxe_DEBUG_X64.inf
 # DO NOT MODIFY
-# GENERATED ON: 2024-01-17 12:19:48.999735
+# GENERATED ON: 2024-01-30 12:45:20.078156
 
 [Defines]
   INF_VERSION                    = 0x0001001B

diff --git a/CryptoPkg/Driver/Bin/CryptoDriverBin_MINIMAL_SHA_SM3_Dxe_RELEASE_AARCH64.inf b/CryptoPkg/Driver/Bin/CryptoDriverBin_MINIMAL_SHA_SM3_Dxe_RELEASE_AARCH64.inf
@@ -2,7 +2,7 @@
 # AUTOGENERATED BY CryptoPkg\Driver\Packaging\generate_cryptodriver.py
 # AUTOGENED AS CryptoDriverBin_MINIMAL_SHA_SM3_Dxe_RELEASE_AARCH64.inf
 # DO NOT MODIFY
-# GENERATED ON: 2024-01-17 12:19:49.000737
+# GENERATED ON: 2024-01-30 12:45:20.079154
 
 [Defines]
   INF_VERSION                    = 0x0001001B

diff --git a/CryptoPkg/Driver/Bin/CryptoDriverBin_MINIMAL_SHA_SM3_Dxe_RELEASE_IA32.inf b/CryptoPkg/Driver/Bin/CryptoDriverBin_MINIMAL_SHA_SM3_Dxe_RELEASE_IA32.inf
@@ -2,7 +2,7 @@
 # AUTOGENERATED BY CryptoPkg\Driver\Packaging\generate_cryptodriver.py
 # AUTOGENED AS CryptoDriverBin_MINIMAL_SHA_SM3_Dxe_RELEASE_IA32.inf
 # DO NOT MODIFY
-# GENERATED ON: 2024-01-17 12:19:49.002250
+# GENERATED ON: 2024-01-30 12:45:20.080155
 
 [Defines]
   INF_VERSION                    = 0x0001001B

diff --git a/CryptoPkg/Driver/Bin/CryptoDriverBin_MINIMAL_SHA_SM3_Dxe_RELEASE_X64.inf b/CryptoPkg/Driver/Bin/CryptoDriverBin_MINIMAL_SHA_SM3_Dxe_RELEASE_X64.inf
@@ -2,7 +2,7 @@
 # AUTOGENERATED BY CryptoPkg\Driver\Packaging\generate_cryptodriver.py
 # AUTOGENED AS CryptoDriverBin_MINIMAL_SHA_SM3_Dxe_RELEASE_X64.inf
 # DO NOT MODIFY
-# GENERATED ON: 2024-01-17 12:19:49.000737
+# GENERATED ON: 2024-01-30 12:45:20.079154
 
 [Defines]
   INF_VERSION                    = 0x0001001B

diff --git a/CryptoPkg/Driver/Bin/CryptoDriverBin_MINIMAL_SHA_SM3_Pei_DEBUG_AARCH64.inf b/CryptoPkg/Driver/Bin/CryptoDriverBin_MINIMAL_SHA_SM3_Pei_DEBUG_AARCH64.inf
@@ -0,0 +1,27 @@
+# ****************************************************************************
+# AUTOGENERATED BY CryptoPkg\Driver\Packaging\generate_cryptodriver.py
+# AUTOGENED AS CryptoDriverBin_MINIMAL_SHA_SM3_Pei_DEBUG_AARCH64.inf
+# DO NOT MODIFY
+# GENERATED ON: 2024-01-30 12:45:20.075154
+
+[Defines]
+  INF_VERSION                    = 0x0001001B
+  BASE_NAME                      = BaseCryptoDriverPeiAARCH64
+  MODULE_UNI_FILE                = Crypto.uni
+  FILE_GUID                      = 6d653b3b-0654-4eec-8ab3-183a3e064D10
+  MODULE_TYPE                    = PEIM
+  VERSION_STRING                 = 1.0
+  PI_SPECIFICATION_VERSION       = 0x00010032
+  ENTRY_POINT                    = CryptoPeiEntry
+
+[Binaries.AARCH64]
+  PE32|edk2-basecrypto-driver-bin_extdep/MINIMAL_SHA_SM3/DEBUG/AARCH64/CryptoPei.efi|DEBUG
+  PEI_DEPEX|edk2-basecrypto-driver-bin_extdep/MINIMAL_SHA_SM3/DEBUG/CryptoPei.depex|DEBUG
+
+[Packages]
+  CryptoPkg/CryptoPkg.dec
+
+[Depex]
+  TRUE
+# AUTOGEN ENDS
+# ****************************************************************************
diff --git a/CryptoPkg/Driver/Bin/CryptoDriverBin_MINIMAL_SHA_SM3_Pei_DEBUG_IA32.inf b/CryptoPkg/Driver/Bin/CryptoDriverBin_MINIMAL_SHA_SM3_Pei_DEBUG_IA32.inf
@@ -2,7 +2,7 @@
 # AUTOGENERATED BY CryptoPkg\Driver\Packaging\generate_cryptodriver.py
 # AUTOGENED AS CryptoDriverBin_MINIMAL_SHA_SM3_Pei_DEBUG_IA32.inf
 # DO NOT MODIFY
-# GENERATED ON: 2024-01-17 12:19:48.997732
+# GENERATED ON: 2024-01-30 12:45:20.076157
 
 [Defines]
   INF_VERSION                    = 0x0001001B

diff --git a/CryptoPkg/Driver/Bin/CryptoDriverBin_MINIMAL_SHA_SM3_Pei_DEBUG_X64.inf b/CryptoPkg/Driver/Bin/CryptoDriverBin_MINIMAL_SHA_SM3_Pei_DEBUG_X64.inf
@@ -2,7 +2,7 @@
 # AUTOGENERATED BY CryptoPkg\Driver\Packaging\generate_cryptodriver.py
 # AUTOGENED AS CryptoDriverBin_MINIMAL_SHA_SM3_Pei_DEBUG_X64.inf
 # DO NOT MODIFY
-# GENERATED ON: 2024-01-17 12:19:48.996735
+# GENERATED ON: 2024-01-30 12:45:20.075154
 
 [Defines]
   INF_VERSION                    = 0x0001001B