[edk2-devel] [PATCH 1/1] Platform/VExpressPkg: Avoid overriding defines

Patrik Berglund patrik.berglund at arm.com
Mon Feb 28 16:27:21 UTC 2022


From: Patrik Berglund <patrik.berglund at arm.com>

Signed-off-by: Patrik Berglund <patrik.berglund at arm.com>
Change-Id: I27c48ee3de3e43716af14706edb4db9aeff91adb
---
 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 (#87104): https://edk2.groups.io/g/devel/message/87104
Mute This Topic: https://groups.io/mt/89454957/1813853
Group Owner: devel+owner at edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [edk2-devel-archive at redhat.com]
-=-=-=-=-=-=-=-=-=-=-=-





More information about the edk2-devel-archive mailing list