Skip to content

Commit 401dbb2

Browse files
gus33000gus33000
committed
Some changes
1 parent 177fcf4 commit 401dbb2

File tree

6 files changed

+98
-46
lines changed

6 files changed

+98
-46
lines changed

‎Platforms/SurfaceDuo1Pkg/SurfaceDuo1.dsc‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
## @file
21
#
3-
# Copyright (c) 2011-2015, ARM Limited. All rights reserved.
2+
# Copyright (c) 2011 - 2022, ARM Limited. All rights reserved.
43
# Copyright (c) 2014, Linaro Limited. All rights reserved.
5-
# Copyright (c) 2015 - 2016, Intel Corporation. All rights reserved.
4+
# Copyright (c) 2015 - 2020, Intel Corporation. All rights reserved.
65
# Copyright (c) 2018, Bingxing Wang. All rights reserved.
6+
# Copyright (c) Microsoft Corporation.
77
#
88
# SPDX-License-Identifier: BSD-2-Clause-Patent
99
#
10-
##
10+
#
1111

1212
################################################################################
1313
#
@@ -36,10 +36,11 @@
3636
DB_DEFAULT_FILE1 = SurfaceDuoFamilyPkg/Include/Resources/db.bin.p7
3737
DBX_DEFAULT_FILE1 = SurfaceDuoFamilyPkg/Include/Resources/dbx.bin
3838

39-
DXE_CRYPTO_SERVICES = STANDARD
40-
DXE_CRYPTO_ARCH = AARCH64
41-
PEI_CRYPTO_SERVICES = NONE
42-
SMM_CRYPTO_SERVICES = NONE
39+
DXE_CRYPTO_SERVICES = STANDARD
40+
PEI_CRYPTO_SERVICES = NONE
41+
STANDALONEMM_CRYPTO_SERVICES = NONE
42+
SMM_CRYPTO_SERVICES = NONE
43+
DXE_CRYPTO_ARCH = AARCH64
4344

4445
[PcdsFixedAtBuild.common]
4546
# Platform-specific

‎Platforms/SurfaceDuo1Pkg/SurfaceDuo1NoSb.dsc‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
## @file
21
#
3-
# Copyright (c) 2011-2015, ARM Limited. All rights reserved.
2+
# Copyright (c) 2011 - 2022, ARM Limited. All rights reserved.
43
# Copyright (c) 2014, Linaro Limited. All rights reserved.
5-
# Copyright (c) 2015 - 2016, Intel Corporation. All rights reserved.
4+
# Copyright (c) 2015 - 2020, Intel Corporation. All rights reserved.
65
# Copyright (c) 2018, Bingxing Wang. All rights reserved.
6+
# Copyright (c) Microsoft Corporation.
77
#
88
# SPDX-License-Identifier: BSD-2-Clause-Patent
99
#
10-
##
10+
#
1111

1212
################################################################################
1313
#
@@ -36,10 +36,11 @@
3636
DB_DEFAULT_FILE1 = SurfaceDuoFamilyPkg/Include/Resources/db.bin.p7
3737
DBX_DEFAULT_FILE1 = SurfaceDuoFamilyPkg/Include/Resources/dbx.bin
3838

39-
DXE_CRYPTO_SERVICES = STANDARD
40-
DXE_CRYPTO_ARCH = AARCH64
41-
PEI_CRYPTO_SERVICES = NONE
42-
SMM_CRYPTO_SERVICES = NONE
39+
DXE_CRYPTO_SERVICES = STANDARD
40+
PEI_CRYPTO_SERVICES = NONE
41+
STANDALONEMM_CRYPTO_SERVICES = NONE
42+
SMM_CRYPTO_SERVICES = NONE
43+
DXE_CRYPTO_ARCH = AARCH64
4344

4445
[PcdsFixedAtBuild.common]
4546
# Platform-specific

‎Platforms/SurfaceDuo2Pkg/SurfaceDuo2.dsc‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
## @file
21
#
3-
# Copyright (c) 2011-2015, ARM Limited. All rights reserved.
2+
# Copyright (c) 2011 - 2022, ARM Limited. All rights reserved.
43
# Copyright (c) 2014, Linaro Limited. All rights reserved.
5-
# Copyright (c) 2015 - 2016, Intel Corporation. All rights reserved.
4+
# Copyright (c) 2015 - 2020, Intel Corporation. All rights reserved.
65
# Copyright (c) 2018, Bingxing Wang. All rights reserved.
6+
# Copyright (c) Microsoft Corporation.
77
#
88
# SPDX-License-Identifier: BSD-2-Clause-Patent
99
#
10-
##
10+
#
1111

1212
################################################################################
1313
#
@@ -36,10 +36,11 @@
3636
DB_DEFAULT_FILE1 = SurfaceDuoFamilyPkg/Include/Resources/db.bin.p7
3737
DBX_DEFAULT_FILE1 = SurfaceDuoFamilyPkg/Include/Resources/dbx.bin
3838

39-
DXE_CRYPTO_SERVICES = STANDARD
40-
DXE_CRYPTO_ARCH = AARCH64
41-
PEI_CRYPTO_SERVICES = NONE
42-
SMM_CRYPTO_SERVICES = NONE
39+
DXE_CRYPTO_SERVICES = STANDARD
40+
PEI_CRYPTO_SERVICES = NONE
41+
STANDALONEMM_CRYPTO_SERVICES = NONE
42+
SMM_CRYPTO_SERVICES = NONE
43+
DXE_CRYPTO_ARCH = AARCH64
4344

4445
[PcdsFixedAtBuild.common]
4546
# Platform-specific

‎Platforms/SurfaceDuo2Pkg/SurfaceDuo2NoSb.dsc‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
## @file
21
#
3-
# Copyright (c) 2011-2015, ARM Limited. All rights reserved.
2+
# Copyright (c) 2011 - 2022, ARM Limited. All rights reserved.
43
# Copyright (c) 2014, Linaro Limited. All rights reserved.
5-
# Copyright (c) 2015 - 2016, Intel Corporation. All rights reserved.
4+
# Copyright (c) 2015 - 2020, Intel Corporation. All rights reserved.
65
# Copyright (c) 2018, Bingxing Wang. All rights reserved.
6+
# Copyright (c) Microsoft Corporation.
77
#
88
# SPDX-License-Identifier: BSD-2-Clause-Patent
99
#
10-
##
10+
#
1111

1212
################################################################################
1313
#
@@ -36,10 +36,11 @@
3636
DB_DEFAULT_FILE1 = SurfaceDuoFamilyPkg/Include/Resources/db.bin.p7
3737
DBX_DEFAULT_FILE1 = SurfaceDuoFamilyPkg/Include/Resources/dbx.bin
3838

39-
DXE_CRYPTO_SERVICES = STANDARD
40-
DXE_CRYPTO_ARCH = AARCH64
41-
PEI_CRYPTO_SERVICES = NONE
42-
SMM_CRYPTO_SERVICES = NONE
39+
DXE_CRYPTO_SERVICES = STANDARD
40+
PEI_CRYPTO_SERVICES = NONE
41+
STANDALONEMM_CRYPTO_SERVICES = NONE
42+
SMM_CRYPTO_SERVICES = NONE
43+
DXE_CRYPTO_ARCH = AARCH64
4344

4445
[PcdsFixedAtBuild.common]
4546
# Platform-specific

‎Platforms/SurfaceDuoFamilyPkg/SurfaceDuoFamily.dsc.inc‎

Lines changed: 23 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -9,17 +9,6 @@
99
#
1010
##
1111

12-
[BuildOptions.common]
13-
*_CLANGDWARF_AARCH64_CC_FLAGS = -Wno-unused-const-variable -Wno-sometimes-uninitialized -Wno-unaligned-access -D CLANG
14-
*_*_*_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)
15-
16-
[BuildOptions.common.EDKII.DXE_CORE,BuildOptions.common.EDKII.DXE_DRIVER,BuildOptions.common.EDKII.UEFI_DRIVER,BuildOptions.common.EDKII.UEFI_APPLICATION]
17-
*_*_*_DLINK_FLAGS = -z common-page-size=0x1000
18-
19-
[BuildOptions.common.EDKII.DXE_RUNTIME_DRIVER]
20-
*_*_ARM_DLINK_FLAGS = -z common-page-size=0x1000
21-
*_*_AARCH64_DLINK_FLAGS = -z common-page-size=0x10000
22-
2312
[PcdsFeatureFlag.common]
2413
gArmTokenSpaceGuid.PcdCpuDxeProduceDebugSupport|FALSE
2514

@@ -651,3 +640,26 @@
651640

652641
UefiTestingPkg/FunctionalSystemTests/MpManagement/App/MpManagementTestApp.inf
653642
UefiTestingPkg/FunctionalSystemTests/MpManagement/Driver/MpManagement.inf
643+
644+
###################################################################################################
645+
#
646+
# BuildOptions Section - Define the module specific tool chain flags that should be used as
647+
# the default flags for a module. These flags are appended to any
648+
# standard flags that are defined by the build process. They can be
649+
# applied for any modules or only those modules with the specific
650+
# module style (EDK or EDKII) specified in [Components] section.
651+
#
652+
###################################################################################################
653+
[BuildOptions]
654+
*_CLANGDWARF_AARCH64_CC_FLAGS = -Wno-unused-const-variable -Wno-sometimes-uninitialized -Wno-unaligned-access -D CLANG
655+
*_*_*_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)
656+
657+
[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]
658+
*_*_*_DLINK_FLAGS = -z common-page-size=0x1000
659+
660+
[BuildOptions.common.EDKII.DXE_RUNTIME_DRIVER]
661+
*_*_ARM_DLINK_FLAGS = -z common-page-size=0x1000
662+
*_*_AARCH64_DLINK_FLAGS = -z common-page-size=0x10000
663+
664+
[BuildOptions.AARCH64.EDKII.MM_CORE_STANDALONE,BuildOptions.AARCH64.EDKII.MM_STANDALONE]
665+
*_*_*_CC_FLAGS = -mstrict-align -march=armv8-a

‎Platforms/SurfaceDuoFamilyPkg/SurfaceDuoFamily.fdf.inc‎

Lines changed: 39 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
1-
## @file
21
#
32
# Copyright (c) 2011-2015, ARM Limited. All rights reserved.
43
# Copyright (c) 2014-2016, Linaro Limited. All rights reserved.
5-
# Copyright (c) 2015 - 2016, Intel Corporation. All rights reserved.
4+
# Copyright (c) 2015 - 2017, Intel Corporation. All rights reserved.
5+
# Copyright (c) Microsoft Corporation.
66
#
77
# SPDX-License-Identifier: BSD-2-Clause-Patent
88
#
9-
##
109

1110
################################################################################
1211
#
@@ -125,4 +124,41 @@
125124
RAW ACPI |.acpi
126125
RAW ASL |.aml
127126
UI STRING="$(MODULE_NAME)" Optional
127+
}
128+
129+
[Rule.Common.MM_CORE_STANDALONE]
130+
FILE SEC = $(NAMED_GUID) RELOCS_STRIPPED FIXED {
131+
PE32 PE32 Align = Auto $(INF_OUTPUT)/$(MODULE_NAME).efi
132+
}
133+
134+
[Rule.Common.PEIM.BINARY]
135+
FILE PEIM = $(NAMED_GUID) {
136+
PEI_DEPEX PEI_DEPEX Optional |.depex
137+
PE32 PE32 Align = Auto |.efi
138+
UI STRING="$(MODULE_NAME)" Optional
139+
VERSION STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)
140+
}
141+
142+
[Rule.Common.DXE_DRIVER.BINARY]
143+
FILE DRIVER = $(NAMED_GUID) {
144+
DXE_DEPEX DXE_DEPEX Optional |.depex
145+
PE32 PE32 |.efi
146+
UI STRING="$(MODULE_NAME)" Optional
147+
VERSION STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)
148+
}
149+
150+
[Rule.Common.MM_STANDALONE]
151+
FILE MM_STANDALONE = $(NAMED_GUID) {
152+
SMM_DEPEX SMM_DEPEX Optional $(INF_OUTPUT)/$(MODULE_NAME).depex
153+
PE32 PE32 $(INF_OUTPUT)/$(MODULE_NAME).efi
154+
UI STRING="$(MODULE_NAME)" Optional
155+
VERSION STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)
156+
}
157+
158+
[Rule.Common.MM_STANDALONE.BINARY]
159+
FILE MM_STANDALONE = $(NAMED_GUID) {
160+
SMM_DEPEX SMM_DEPEX Optional |.depex
161+
PE32 PE32 |.efi
162+
UI STRING="$(MODULE_NAME)" Optional
163+
VERSION STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)
128164
}

0 commit comments

Comments
 (0)