From: Patrik Berglund <patrik.bergl...@arm.com> The definition of macros (e.g. SECURE_BOOT_ENABLE and others) in ArmVExpress.dsc.inc overrides the setting configured in the platform DSC file, thereby preventing the configurations from being enabled. Therefore, add checks to only define the macros if not already defined in the platform DSC file.
Signed-off-by: Patrik Berglund <patrik.bergl...@arm.com> --- Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc b/Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc index d6f31ecda42f..c75efe0ccf0a 100644 --- a/Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc +++ b/Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc @@ -1,21 +1,33 @@ # -# Copyright (c) 2011-2020, Arm Limited. All rights reserved. +# Copyright (c) 2011-2022, Arm Limited. All rights reserved. # # SPDX-License-Identifier: BSD-2-Clause-Patent # # [Defines] +!ifndef SECURE_BOOT_ENABLE SECURE_BOOT_ENABLE = FALSE +!endif +!ifndef INCLUDE_TFTP_COMMAND INCLUDE_TFTP_COMMAND = TRUE +!endif # # Network definition # +!ifndef NETWORK_SNP_ENABLE DEFINE NETWORK_SNP_ENABLE = FALSE +!endif +!ifndef NETWORK_IP6_ENABLE DEFINE NETWORK_IP6_ENABLE = FALSE +!endif +!ifndef NETWORK_TLS_ENABLE DEFINE NETWORK_TLS_ENABLE = FALSE +!endif +!ifndef NETWORK_HTTP_BOOT_ENABLE DEFINE NETWORK_HTTP_BOOT_ENABLE = FALSE +!endif [BuildOptions.common] *_*_*_CC_FLAGS = -DDISABLE_NEW_DEPRECATED_INTERFACES -- 2.17.1 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#87107): https://edk2.groups.io/g/devel/message/87107 Mute This Topic: https://groups.io/mt/89456767/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
