From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web10.819.1646071047814241258 for ; Mon, 28 Feb 2022 09:57:28 -0800 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: patrik.berglund@arm.com) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 7A6A91042; Mon, 28 Feb 2022 09:57:27 -0800 (PST) Received: from e123756.cambridge.arm.com (e123756.cambridge.arm.com [10.1.199.49]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id E36D93F70D; Mon, 28 Feb 2022 09:57:26 -0800 (PST) From: "Patrik Berglund" To: devel@edk2.groups.io Cc: Sami Mujawar , Patrik Berglund Subject: [PATCH edk2-platforms v2 1/1] Platform/VExpressPkg: Avoid overriding defines Date: Mon, 28 Feb 2022 17:57:17 +0000 Message-Id: <20220228175717.35336-1-patrik.berglund@arm.com> X-Mailer: git-send-email 2.17.1 From: Patrik Berglund 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 --- 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