Some changes

WOA-Project · Feb 1, 2024 · 401dbb2 · 401dbb2
1 parent 177fcf4
commit 401dbb2
Show file tree

Hide file tree

Showing 6 changed files with 98 additions and 46 deletions.
diff --git a/Platforms/SurfaceDuo1Pkg/SurfaceDuo1.dsc b/Platforms/SurfaceDuo1Pkg/SurfaceDuo1.dsc
@@ -1,13 +1,13 @@
-## @file
 #
-#  Copyright (c) 2011-2015, ARM Limited. All rights reserved.
+#  Copyright (c) 2011 - 2022, ARM Limited. All rights reserved.
 #  Copyright (c) 2014, Linaro Limited. All rights reserved.
-#  Copyright (c) 2015 - 2016, Intel Corporation. All rights reserved.
+#  Copyright (c) 2015 - 2020, Intel Corporation. All rights reserved.
 #  Copyright (c) 2018, Bingxing Wang. All rights reserved.
+#  Copyright (c) Microsoft Corporation.
 #
 #  SPDX-License-Identifier: BSD-2-Clause-Patent
 #
-##
+#
 
 ################################################################################
 #
@@ -36,10 +36,11 @@
   DB_DEFAULT_FILE1               = SurfaceDuoFamilyPkg/Include/Resources/db.bin.p7
   DBX_DEFAULT_FILE1              = SurfaceDuoFamilyPkg/Include/Resources/dbx.bin
 
-  DXE_CRYPTO_SERVICES = STANDARD
-  DXE_CRYPTO_ARCH = AARCH64
-  PEI_CRYPTO_SERVICES = NONE 
-  SMM_CRYPTO_SERVICES = NONE
+  DXE_CRYPTO_SERVICES           = STANDARD
+  PEI_CRYPTO_SERVICES           = NONE
+  STANDALONEMM_CRYPTO_SERVICES  = NONE
+  SMM_CRYPTO_SERVICES           = NONE
+  DXE_CRYPTO_ARCH               = AARCH64
 
 [PcdsFixedAtBuild.common]
   # Platform-specific

diff --git a/Platforms/SurfaceDuo1Pkg/SurfaceDuo1NoSb.dsc b/Platforms/SurfaceDuo1Pkg/SurfaceDuo1NoSb.dsc
@@ -1,13 +1,13 @@
-## @file
 #
-#  Copyright (c) 2011-2015, ARM Limited. All rights reserved.
+#  Copyright (c) 2011 - 2022, ARM Limited. All rights reserved.
 #  Copyright (c) 2014, Linaro Limited. All rights reserved.
-#  Copyright (c) 2015 - 2016, Intel Corporation. All rights reserved.
+#  Copyright (c) 2015 - 2020, Intel Corporation. All rights reserved.
 #  Copyright (c) 2018, Bingxing Wang. All rights reserved.
+#  Copyright (c) Microsoft Corporation.
 #
 #  SPDX-License-Identifier: BSD-2-Clause-Patent
 #
-##
+#
 
 ################################################################################
 #
@@ -36,10 +36,11 @@
   DB_DEFAULT_FILE1               = SurfaceDuoFamilyPkg/Include/Resources/db.bin.p7
   DBX_DEFAULT_FILE1              = SurfaceDuoFamilyPkg/Include/Resources/dbx.bin
 
-  DXE_CRYPTO_SERVICES = STANDARD
-  DXE_CRYPTO_ARCH = AARCH64
-  PEI_CRYPTO_SERVICES = NONE 
-  SMM_CRYPTO_SERVICES = NONE
+  DXE_CRYPTO_SERVICES           = STANDARD
+  PEI_CRYPTO_SERVICES           = NONE
+  STANDALONEMM_CRYPTO_SERVICES  = NONE
+  SMM_CRYPTO_SERVICES           = NONE
+  DXE_CRYPTO_ARCH               = AARCH64
 
 [PcdsFixedAtBuild.common]
   # Platform-specific

diff --git a/Platforms/SurfaceDuo2Pkg/SurfaceDuo2.dsc b/Platforms/SurfaceDuo2Pkg/SurfaceDuo2.dsc
@@ -1,13 +1,13 @@
-## @file
 #
-#  Copyright (c) 2011-2015, ARM Limited. All rights reserved.
+#  Copyright (c) 2011 - 2022, ARM Limited. All rights reserved.
 #  Copyright (c) 2014, Linaro Limited. All rights reserved.
-#  Copyright (c) 2015 - 2016, Intel Corporation. All rights reserved.
+#  Copyright (c) 2015 - 2020, Intel Corporation. All rights reserved.
 #  Copyright (c) 2018, Bingxing Wang. All rights reserved.
+#  Copyright (c) Microsoft Corporation.
 #
 #  SPDX-License-Identifier: BSD-2-Clause-Patent
 #
-##
+#
 
 ################################################################################
 #
@@ -36,10 +36,11 @@
   DB_DEFAULT_FILE1               = SurfaceDuoFamilyPkg/Include/Resources/db.bin.p7
   DBX_DEFAULT_FILE1              = SurfaceDuoFamilyPkg/Include/Resources/dbx.bin
 
-  DXE_CRYPTO_SERVICES = STANDARD
-  DXE_CRYPTO_ARCH = AARCH64
-  PEI_CRYPTO_SERVICES = NONE 
-  SMM_CRYPTO_SERVICES = NONE
+  DXE_CRYPTO_SERVICES           = STANDARD
+  PEI_CRYPTO_SERVICES           = NONE
+  STANDALONEMM_CRYPTO_SERVICES  = NONE
+  SMM_CRYPTO_SERVICES           = NONE
+  DXE_CRYPTO_ARCH               = AARCH64
 
 [PcdsFixedAtBuild.common]
   # Platform-specific

diff --git a/Platforms/SurfaceDuo2Pkg/SurfaceDuo2NoSb.dsc b/Platforms/SurfaceDuo2Pkg/SurfaceDuo2NoSb.dsc
@@ -1,13 +1,13 @@
-## @file
 #
-#  Copyright (c) 2011-2015, ARM Limited. All rights reserved.
+#  Copyright (c) 2011 - 2022, ARM Limited. All rights reserved.
 #  Copyright (c) 2014, Linaro Limited. All rights reserved.
-#  Copyright (c) 2015 - 2016, Intel Corporation. All rights reserved.
+#  Copyright (c) 2015 - 2020, Intel Corporation. All rights reserved.
 #  Copyright (c) 2018, Bingxing Wang. All rights reserved.
+#  Copyright (c) Microsoft Corporation.
 #
 #  SPDX-License-Identifier: BSD-2-Clause-Patent
 #
-##
+#
 
 ################################################################################
 #
@@ -36,10 +36,11 @@
   DB_DEFAULT_FILE1               = SurfaceDuoFamilyPkg/Include/Resources/db.bin.p7
   DBX_DEFAULT_FILE1              = SurfaceDuoFamilyPkg/Include/Resources/dbx.bin
 
-  DXE_CRYPTO_SERVICES = STANDARD
-  DXE_CRYPTO_ARCH = AARCH64
-  PEI_CRYPTO_SERVICES = NONE 
-  SMM_CRYPTO_SERVICES = NONE
+  DXE_CRYPTO_SERVICES           = STANDARD
+  PEI_CRYPTO_SERVICES           = NONE
+  STANDALONEMM_CRYPTO_SERVICES  = NONE
+  SMM_CRYPTO_SERVICES           = NONE
+  DXE_CRYPTO_ARCH               = AARCH64
 
 [PcdsFixedAtBuild.common]
   # Platform-specific

diff --git a/Platforms/SurfaceDuoFamilyPkg/SurfaceDuoFamily.dsc.inc b/Platforms/SurfaceDuoFamilyPkg/SurfaceDuoFamily.dsc.inc
@@ -9,17 +9,6 @@
 #
 ##
 
-[BuildOptions.common]
-  *_CLANGDWARF_AARCH64_CC_FLAGS = -Wno-unused-const-variable -Wno-sometimes-uninitialized -Wno-unaligned-access -D CLANG
-  *_*_*_CC_FLAGS = -march=armv8.2-a+crypto+rcpc -DUSE_MEMORY_FOR_SERIAL_OUTPUT=$(USE_MEMORY_FOR_SERIAL_OUTPUT) -DUSE_SCREEN_FOR_SERIAL_OUTPUT=$(USE_SCREEN_FOR_SERIAL_OUTPUT)
-
-[BuildOptions.common.EDKII.DXE_CORE,BuildOptions.common.EDKII.DXE_DRIVER,BuildOptions.common.EDKII.UEFI_DRIVER,BuildOptions.common.EDKII.UEFI_APPLICATION]
-  *_*_*_DLINK_FLAGS = -z common-page-size=0x1000
-
-[BuildOptions.common.EDKII.DXE_RUNTIME_DRIVER]
-  *_*_ARM_DLINK_FLAGS = -z common-page-size=0x1000
-  *_*_AARCH64_DLINK_FLAGS = -z common-page-size=0x10000
-
 [PcdsFeatureFlag.common]
   gArmTokenSpaceGuid.PcdCpuDxeProduceDebugSupport|FALSE
 
@@ -651,3 +640,26 @@
 
   UefiTestingPkg/FunctionalSystemTests/MpManagement/App/MpManagementTestApp.inf
   UefiTestingPkg/FunctionalSystemTests/MpManagement/Driver/MpManagement.inf
+
+###################################################################################################
+#
+# BuildOptions Section - Define the module specific tool chain flags that should be used as
+#                        the default flags for a module. These flags are appended to any
+#                        standard flags that are defined by the build process. They can be
+#                        applied for any modules or only those modules with the specific
+#                        module style (EDK or EDKII) specified in [Components] section.
+#
+###################################################################################################
+[BuildOptions]
+  *_CLANGDWARF_AARCH64_CC_FLAGS = -Wno-unused-const-variable -Wno-sometimes-uninitialized -Wno-unaligned-access -D CLANG
+  *_*_*_CC_FLAGS = -march=armv8.2-a+crypto+rcpc -DUSE_MEMORY_FOR_SERIAL_OUTPUT=$(USE_MEMORY_FOR_SERIAL_OUTPUT) -DUSE_SCREEN_FOR_SERIAL_OUTPUT=$(USE_SCREEN_FOR_SERIAL_OUTPUT)
+
+[BuildOptions.common.EDKII.DXE_CORE,BuildOptions.common.EDKII.DXE_DRIVER,BuildOptions.common.EDKII.UEFI_DRIVER,BuildOptions.common.EDKII.UEFI_APPLICATION,BuildOptions.common.EDKII.MM_CORE_STANDALONE,BuildOptions.common.EDKII.MM_STANDALONE]
+  *_*_*_DLINK_FLAGS = -z common-page-size=0x1000
+
+[BuildOptions.common.EDKII.DXE_RUNTIME_DRIVER]
+  *_*_ARM_DLINK_FLAGS = -z common-page-size=0x1000
+  *_*_AARCH64_DLINK_FLAGS = -z common-page-size=0x10000
+
+[BuildOptions.AARCH64.EDKII.MM_CORE_STANDALONE,BuildOptions.AARCH64.EDKII.MM_STANDALONE]
+  *_*_*_CC_FLAGS = -mstrict-align -march=armv8-a
diff --git a/Platforms/SurfaceDuoFamilyPkg/SurfaceDuoFamily.fdf.inc b/Platforms/SurfaceDuoFamilyPkg/SurfaceDuoFamily.fdf.inc
@@ -1,12 +1,11 @@
-## @file
 #
 #  Copyright (c) 2011-2015, ARM Limited. All rights reserved.
 #  Copyright (c) 2014-2016, Linaro Limited. All rights reserved.
-#  Copyright (c) 2015 - 2016, Intel Corporation. All rights reserved.
+#  Copyright (c) 2015 - 2017, Intel Corporation. All rights reserved.
+#  Copyright (c) Microsoft Corporation.
 #
 #  SPDX-License-Identifier: BSD-2-Clause-Patent
 #
-##
 
 ################################################################################
 #
@@ -125,4 +124,41 @@
     RAW       ACPI                    |.acpi
     RAW       ASL                     |.aml
     UI        STRING="$(MODULE_NAME)" Optional
+  }
+
+[Rule.Common.MM_CORE_STANDALONE]
+  FILE SEC = $(NAMED_GUID) RELOCS_STRIPPED FIXED {
+    PE32  PE32 Align = Auto             $(INF_OUTPUT)/$(MODULE_NAME).efi
+  }
+
+[Rule.Common.PEIM.BINARY]
+  FILE PEIM = $(NAMED_GUID) {
+    PEI_DEPEX PEI_DEPEX Optional      |.depex
+    PE32      PE32     Align = Auto   |.efi
+    UI        STRING="$(MODULE_NAME)" Optional
+    VERSION   STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)
+  }
+
+[Rule.Common.DXE_DRIVER.BINARY]
+  FILE DRIVER = $(NAMED_GUID) {
+    DXE_DEPEX DXE_DEPEX Optional      |.depex
+    PE32      PE32                    |.efi
+    UI        STRING="$(MODULE_NAME)" Optional
+    VERSION   STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)
+  }
+
+[Rule.Common.MM_STANDALONE]
+  FILE MM_STANDALONE = $(NAMED_GUID) {
+    SMM_DEPEX SMM_DEPEX Optional       $(INF_OUTPUT)/$(MODULE_NAME).depex
+    PE32      PE32                     $(INF_OUTPUT)/$(MODULE_NAME).efi
+    UI        STRING="$(MODULE_NAME)" Optional
+    VERSION   STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)
+  }
+
+[Rule.Common.MM_STANDALONE.BINARY]
+ FILE MM_STANDALONE = $(NAMED_GUID) {
+   SMM_DEPEX SMM_DEPEX Optional      |.depex
+   PE32      PE32                    |.efi
+   UI        STRING="$(MODULE_NAME)" Optional
+   VERSION   STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)
   }