From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from EUR04-DB3-obe.outbound.protection.outlook.com (EUR04-DB3-obe.outbound.protection.outlook.com [40.107.6.59]) by mx.groups.io with SMTP id smtpd.web11.11528.1646319096359163976 for ; Thu, 03 Mar 2022 06:51:37 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@armh.onmicrosoft.com header.s=selector2-armh-onmicrosoft-com header.b=GXMc+nnX; spf=pass (domain: arm.com, ip: 40.107.6.59, mailfrom: sami.mujawar@arm.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=armh.onmicrosoft.com; s=selector2-armh-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=x3WN6UKALzDKWshebUWw+QYZUZUHdsININpQB99Ertk=; b=GXMc+nnXbB5rOG340smAbYPqjuUnnijPzvCy0JiCvAUMuENKKM0Pv3dXSJylDouuP0K3kBSfaFqeuuuQTnWGTMxqLQllybBKWtmN8GfwYZKoNDvWlBvFJxRAZ4/L8JlUh93VN7uMLi1LmfxuPLxtVDUFoKKRPTVgxaQPv5Lc2DU= Received: from AS8PR04CA0152.eurprd04.prod.outlook.com (2603:10a6:20b:331::7) by PR3PR08MB5708.eurprd08.prod.outlook.com (2603:10a6:102:84::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5038.14; Thu, 3 Mar 2022 14:51:32 +0000 Received: from AM5EUR03FT007.eop-EUR03.prod.protection.outlook.com (2603:10a6:20b:331:cafe::81) by AS8PR04CA0152.outlook.office365.com (2603:10a6:20b:331::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5038.14 via Frontend Transport; Thu, 3 Mar 2022 14:51:32 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 63.35.35.123) smtp.mailfrom=arm.com; dkim=pass (signature was verified) header.d=armh.onmicrosoft.com;dmarc=pass action=none header.from=arm.com; Received-SPF: Pass (protection.outlook.com: domain of arm.com designates 63.35.35.123 as permitted sender) receiver=protection.outlook.com; client-ip=63.35.35.123; helo=64aa7808-outbound-1.mta.getcheckrecipient.com; Received: from 64aa7808-outbound-1.mta.getcheckrecipient.com (63.35.35.123) by AM5EUR03FT007.mail.protection.outlook.com (10.152.16.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5017.22 via Frontend Transport; Thu, 3 Mar 2022 14:51:32 +0000 Received: ("Tessian outbound 63bb5eb69ee8:v113"); Thu, 03 Mar 2022 14:51:32 +0000 X-CheckRecipientChecked: true X-CR-MTA-CID: 8a840c27d03c905d X-CR-MTA-TID: 64aa7808 Received: from 433f31cce71c.1 by 64aa7808-outbound-1.mta.getcheckrecipient.com id 64819F5C-D8A3-4289-BEA5-05821AE154F8.1; Thu, 03 Mar 2022 14:51:21 +0000 Received: from EUR05-AM6-obe.outbound.protection.outlook.com by 64aa7808-outbound-1.mta.getcheckrecipient.com with ESMTPS id 433f31cce71c.1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384); Thu, 03 Mar 2022 14:51:21 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=WisJ/mVNttfLpO7JBB0AlPv9lc2RaARwsXVqeI2UlHgcp8N/uPSxyF/bXd+Gu6JnuzP7gspmmYEXPTp6kEbENXeAoRrevrW++QISId4EVf00gP0/nqGEXoxVhIzzE2GcrhWHIb8wJ1FN/7U1lXJPDx2XcPUN7jzMzYmeJoZDk7vqbrjZNVMp6sKAv6KXXVmHqoYROEAfEIL5cbqvJIqCRbmzwxyHsZhJQ9tgvZyulJTRwIMJ9ozaOxnVdthNE+GuuZN7uflWB9Xdxk5Ret9yuErpQorpsRLI2U0gMr1Pb/rDW9SOcGxEZINitcjOIcuTDz5G+k9UszNfK66qSM10qw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=x3WN6UKALzDKWshebUWw+QYZUZUHdsININpQB99Ertk=; b=M3YmDc9+Ik3cZwz2d/aQMIIM5wtUdUJyPMJXPgam/DJ7pWL5HmVGnLmTsDvHObX3NQKp+dW4oEZe7PKVFqz65RtfzvuMPZfQe9kbrzg7GZFpCM3onI5QD14tCFNYuryakPnTUnf3rcLHRgWA1euryET362BHF0nStqgLfqdfUYcP4X4RF+Zq+8LdGSIbfB6OmaD66gYFXAlVVW8186M/0AuuePLJ/n+Jd6pfKFxFRPMN5faFlObRpBckVANIgKZIPlIdzZ+8WcVLoy5Lqxg03YggI7REUD8SDTdiM5ACwSzsltPUqxSpIv0FPfd7vD4N1hvo3hrbAKxRUjcqj0ustQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=arm.com; dmarc=pass action=none header.from=arm.com; dkim=pass header.d=arm.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=armh.onmicrosoft.com; s=selector2-armh-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=x3WN6UKALzDKWshebUWw+QYZUZUHdsININpQB99Ertk=; b=GXMc+nnXbB5rOG340smAbYPqjuUnnijPzvCy0JiCvAUMuENKKM0Pv3dXSJylDouuP0K3kBSfaFqeuuuQTnWGTMxqLQllybBKWtmN8GfwYZKoNDvWlBvFJxRAZ4/L8JlUh93VN7uMLi1LmfxuPLxtVDUFoKKRPTVgxaQPv5Lc2DU= Authentication-Results-Original: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=arm.com; Received: from AS8PR08MB6806.eurprd08.prod.outlook.com (2603:10a6:20b:39b::12) by AS8PR08MB5974.eurprd08.prod.outlook.com (2603:10a6:20b:298::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5038.14; Thu, 3 Mar 2022 14:51:20 +0000 Received: from AS8PR08MB6806.eurprd08.prod.outlook.com ([fe80::6ca8:22eb:bdc4:21ef]) by AS8PR08MB6806.eurprd08.prod.outlook.com ([fe80::6ca8:22eb:bdc4:21ef%5]) with mapi id 15.20.5038.014; Thu, 3 Mar 2022 14:51:20 +0000 Subject: Re: [PATCH edk2-platforms v2 1/1] Platform/VExpressPkg: Avoid overriding defines To: patrik.berglund@arm.com, devel@edk2.groups.io, nd References: <20220228175717.35336-1-patrik.berglund@arm.com> From: "Sami Mujawar" Message-ID: <9eff2225-9036-193b-86b1-cafaba907ebe@arm.com> Date: Thu, 3 Mar 2022 14:51:23 +0000 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:52.0) Gecko/20100101 Thunderbird/52.0.1 In-Reply-To: <20220228175717.35336-1-patrik.berglund@arm.com> X-ClientProxiedBy: LO4P123CA0279.GBRP123.PROD.OUTLOOK.COM (2603:10a6:600:195::14) To AS8PR08MB6806.eurprd08.prod.outlook.com (2603:10a6:20b:39b::12) MIME-Version: 1.0 X-MS-Office365-Filtering-Correlation-Id: 2efac0bd-1fe3-45e4-10e3-08d9fd254ea2 X-MS-TrafficTypeDiagnostic: AS8PR08MB5974:EE_|AM5EUR03FT007:EE_|PR3PR08MB5708:EE_ X-Microsoft-Antispam-PRVS: x-checkrecipientrouted: true NoDisclaimer: true X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam-Untrusted: BCL:0; X-Microsoft-Antispam-Message-Info-Original: Qw+Ly9ngh/2svugE5EsXe7nUSY8tLVrToAnFmkcgGppcHRJxjir6f7VfmqL4SVSR2TwYJQ2FhWFRBhE5e4Z868q784MPVZDqmyhesrJkK2CkzxK+DjFnxv9RK7L4crB011MCj3IEbCJiOjCQbzut6+Bs5osebu7Y3A+gvNj0u+6j79ZwrytQrrPndGyiFj/ixzIr9Rj+Cmu6TjMFevTYPL3+VZhtTerPOdku6N8nlGX4/kQGkgoPl7ILuRy26UpvXCqKwptIn67p7U76/qviU7dXdgvlKdYho1TTrLpiwpESKZkDyMv5Y/0sX64L+6RVhZe4/IetJz622sWx3n3KwQD9Nzz1o7OQmhOHgFlZ3TR1/VE7705CiZR/784YKs/HN0FNIgafa/8ueCshDolAhk83jaF8hT7BfciGepZxwZg3UevcFKJWNfmK/y405VV0laOC8rt1lNLf7Jrc+O8Jrfea5x9Ij7S10GPKBTTvDoLKeq0PnKIxjSsb/2XEOqTmLzEkRy0EoPy5s8Vs+xJdeVinxhOZb7XcoH6V7MvFXGVAqnvGPyWlApRK5K3AlQfMYRqDDGdfX6ZU0LDtNMq/1eP5VULP8ompen268vXJ0fUeajmxD60mgAj9muwPJ5IXI5H+FsCkR5qoc8j/KmacPKgVqgq8o9D7fAdYzGHPWy9n9Y2zmay5PryM9344OC8kyOzb1hdMhEXj1TXvGCzzgQboEitx05srdkLjZf/SeT+tPPYA5qDMMfvAKfiUQhfW1DuxGac2JcCOjlkifvvQHA== X-Forefront-Antispam-Report-Untrusted: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:AS8PR08MB6806.eurprd08.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230001)(4636009)(366004)(38100700002)(8936002)(66476007)(66556008)(66946007)(38350700002)(316002)(508600001)(6512007)(8676002)(5660300002)(2906002)(6862004)(2616005)(86362001)(6486002)(31696002)(44832011)(36756003)(31686004)(186003)(26005)(37006003)(6506007)(52116002)(83380400001)(53546011)(6636002)(43740500002)(45980500001);DIR:OUT;SFP:1101; X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR08MB5974 Original-Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=arm.com; Return-Path: Sami.Mujawar@arm.com X-EOPAttributedMessage: 0 X-MS-Exchange-Transport-CrossTenantHeadersStripped: AM5EUR03FT007.eop-EUR03.prod.protection.outlook.com X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id-Prvs: 913662e4-48cf-4289-aa38-08d9fd25471c X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: U+e6EbcSvpCzGfk6qOdLbOycw6kveZ3tC2YZ4+k8qlwlmcy5sxHp624D6w8u4bjPLxfWPnwAtnuhZ81G0vWEa8neNKZ2r+Zdq6gKj1qQnumo/w4MTZeLyVWLQ6m9shMEveguZSYwYmTQn0Sp4J3iKb1vShIYCxAt91U1fhg7yz0VQt5AVbqnMidge609psgXXiEB1erZsMSVMndLOeo4Pg7i9g4eCKIFJkYDwerBoK++KSSBv5Yrl4tBtJBWUwju+ujLyzGTUHtbbN+VsEFAKNbKWkLiyWafIW9tjcKKgRK9SXYzcypfE38YQ8wxCRCtOl5p/x2o6QtYajT1BUkoWbrnfhy+FOM7FxeUpyNTwsUfBcggD7joKvYzSyid3mJKWCTrgiNe9cU6O3I7t/zw5SgzfFtTyEn9+dzc+XLIIHy4QHepeq0JfOHCzniKoEpj3VdZnWhEeYtSBHd3jz84o063jirtdOyW/YzbcjGVkcfxES7eN94XPNWM4tdJdFJ9qSCBAEh9rvkNp8fHVbIppbDgNM3RuZpBvY0oB0WO7DwvxTB8SG0xSJ1xoIcHc9m9r3+eYMwvKglqLC2sTwG6AwvHeHgg14Rl4FsNAO0Lx6e327dtwX7QAWr+WhtfMbhOdwdbEsQXZratExzGuli9U2apN/RbSRgm+AHGVvR/dzDnaz8a6aB8sZAG8ZrqKtwBZc3zlk7sBmu9B5VkODFsqQ== X-Forefront-Antispam-Report: CIP:63.35.35.123;CTRY:IE;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:64aa7808-outbound-1.mta.getcheckrecipient.com;PTR:ec2-63-35-35-123.eu-west-1.compute.amazonaws.com;CAT:NONE;SFS:(13230001)(4636009)(46966006)(40470700004)(36840700001)(81166007)(86362001)(31696002)(47076005)(508600001)(6486002)(40460700003)(36756003)(2906002)(83380400001)(356005)(31686004)(8936002)(37006003)(82310400004)(36860700001)(2616005)(6636002)(316002)(336012)(186003)(26005)(6862004)(5660300002)(6506007)(70586007)(70206006)(44832011)(8676002)(6512007)(53546011)(43740500002);DIR:OUT;SFP:1101; X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Mar 2022 14:51:32.3872 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 2efac0bd-1fe3-45e4-10e3-08d9fd254ea2 X-MS-Exchange-CrossTenant-Id: f34e5979-57d9-4aaa-ad4d-b122a662184d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=f34e5979-57d9-4aaa-ad4d-b122a662184d;Ip=[63.35.35.123];Helo=[64aa7808-outbound-1.mta.getcheckrecipient.com] X-MS-Exchange-CrossTenant-AuthSource: AM5EUR03FT007.eop-EUR03.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PR3PR08MB5708 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: quoted-printable Content-Language: en-GB Thanks. Pushed as c9e377b00fc0..958fc02b1593 Regards, Sami Mujawar On 28/02/2022 05:57 PM, patrik.berglund@arm.com wrote: > 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 =3D FALSE > +!endif > +!ifndef INCLUDE_TFTP_COMMAND > INCLUDE_TFTP_COMMAND =3D TRUE > +!endif > > # > # Network definition > # > +!ifndef NETWORK_SNP_ENABLE > DEFINE NETWORK_SNP_ENABLE =3D FALSE > +!endif > +!ifndef NETWORK_IP6_ENABLE > DEFINE NETWORK_IP6_ENABLE =3D FALSE > +!endif > +!ifndef NETWORK_TLS_ENABLE > DEFINE NETWORK_TLS_ENABLE =3D FALSE > +!endif > +!ifndef NETWORK_HTTP_BOOT_ENABLE > DEFINE NETWORK_HTTP_BOOT_ENABLE =3D FALSE > +!endif > > [BuildOptions.common] > *_*_*_CC_FLAGS =3D -DDISABLE_NEW_DEPRECATED_INTERFACES IMPORTANT NOTICE: The contents of this email and any attachments are confid= ential and may also be privileged. If you are not the intended recipient, p= lease 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.