public inbox for devel@edk2.groups.io
 help / color / mirror / Atom feed
From: "Patrik Berglund" <patrik.berglund@arm.com>
To: devel@edk2.groups.io
Cc: Sami Mujawar <sami.mujawar@arm.com>,
	Patrik Berglund <patrik.berglund@arm.com>
Subject: [PATCH 1/1] Platform/VExpressPkg: Avoid overriding defines
Date: Mon, 28 Feb 2022 16:27:21 +0000	[thread overview]
Message-ID: <20220228162721.17441-1-patrik.berglund@arm.com> (raw)

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

Signed-off-by: Patrik Berglund <patrik.berglund@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


                 reply	other threads:[~2022-02-28 16:27 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-list from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20220228162721.17441-1-patrik.berglund@arm.com \
    --to=devel@edk2.groups.io \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox