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

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

[Patrik Berglund]

From: Patrik Berglund <patrik.berglund@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.berglund@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

Re: [PATCH edk2-platforms v2 1/1] Platform/VExpressPkg: Avoid overriding defines

[Sami Mujawar]

Hi Patrik,

Thank you for this patch.

These changes look good to me.

Reviewed-by: Sami Mujawar <sami.mujawar@arm.com>

Regards,

Sami Mujawar


On 28/02/2022 05:57 PM, patrik.berglund@arm.com wrote:
> From: Patrik Berglund <patrik.berglund@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.berglund@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

IMPORTANT NOTICE: The contents of this email and any attachments are confidential and may also be privileged. If you are not the intended recipient, please notify the sender immediately and do not disclose the contents to any other person, use it for any purpose, or store or copy the information in any medium. Thank you.

Re: [PATCH edk2-platforms v2 1/1] Platform/VExpressPkg: Avoid overriding defines

[Sami Mujawar]

Thanks.

Pushed as c9e377b00fc0..958fc02b1593

Regards,

Sami Mujawar


On 28/02/2022 05:57 PM, patrik.berglund@arm.com wrote:
> From: Patrik Berglund <patrik.berglund@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.berglund@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

IMPORTANT NOTICE: The contents of this email and any attachments are confidential and may also be privileged. If you are not the intended recipient, please notify the sender immediately and do not disclose the contents to any other person, use it for any purpose, or store or copy the information in any medium. Thank you.