From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from EUR05-AM6-obe.outbound.protection.outlook.com (EUR05-AM6-obe.outbound.protection.outlook.com [40.107.22.65]) by mx.groups.io with SMTP id smtpd.web08.9333.1646239152818565335 for ; Wed, 02 Mar 2022 08:39:13 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@armh.onmicrosoft.com header.s=selector2-armh-onmicrosoft-com header.b=DTRampuO; spf=pass (domain: arm.com, ip: 40.107.22.65, 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=VPDbSutHQXQZU+eqVD2PhFXRBxGVtSNpSYseMRlcqso=; b=DTRampuOj0xWxJqYA8zQ2XBYYBz7z8awOACJwjyL8DwJziGjmmtEfwr5q1CgHwHM9vSwFfwl1x4HrDBL+APLPQmrkMGs/L7DaznxIQWq3uER90E/YkYcCrDkaAxJ1iz3solZlPUwJtcjZ2MJ/44deIjLmsspPQ0X2106WcUZ+eo= Received: from AM6PR04CA0072.eurprd04.prod.outlook.com (2603:10a6:20b:f0::49) by VI1PR08MB4015.eurprd08.prod.outlook.com (2603:10a6:803:e1::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5017.24; Wed, 2 Mar 2022 16:39:09 +0000 Received: from AM5EUR03FT064.eop-EUR03.prod.protection.outlook.com (2603:10a6:20b:f0:cafe::e1) by AM6PR04CA0072.outlook.office365.com (2603:10a6:20b:f0::49) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5038.14 via Frontend Transport; Wed, 2 Mar 2022 16:39:09 +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 AM5EUR03FT064.mail.protection.outlook.com (10.152.17.53) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5017.27 via Frontend Transport; Wed, 2 Mar 2022 16:39:08 +0000 Received: ("Tessian outbound 31aeb3346a45:v113"); Wed, 02 Mar 2022 16:39:08 +0000 X-CheckRecipientChecked: true X-CR-MTA-CID: 948c127699636a58 X-CR-MTA-TID: 64aa7808 Received: from 6ee62fa35c9e.2 by 64aa7808-outbound-1.mta.getcheckrecipient.com id 82D0CEF0-7134-4F28-BE68-FE271B29D5F3.1; Wed, 02 Mar 2022 16:38:56 +0000 Received: from EUR04-VI1-obe.outbound.protection.outlook.com by 64aa7808-outbound-1.mta.getcheckrecipient.com with ESMTPS id 6ee62fa35c9e.2 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384); Wed, 02 Mar 2022 16:38:56 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=cYsQ4R911U1uKjLYQAIHvnQxsP6MG9LHJoN2JsRQjYZMua1RqGt8O77RQ/k6jS3gI8fGOa1fLK+qC1J5uov+bcQEC5GAv/UYZS1jGq0fnYE6wxo6WyoRRfJnQAar5So7gFeJJy44v6uvjsJ+ddKokt2WI/CkhxiaPWlx3o4Tczm3RWQCdBaS4VCQgrDPbLz6Y2WYfYOnhxEwL/AfhGYPik+NI9NXdzJI4UF8IHV4+xcTTdQhFMm4oYB48kGntZylBjc3OG2l4TBtASxsEqsbhZ2pBtYdYuIVTg8MKOsu7va6xRdsACZNyAV++4W0VFapqMD8ezzhVUza/IhGi0HMKw== 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=VPDbSutHQXQZU+eqVD2PhFXRBxGVtSNpSYseMRlcqso=; b=NQeRE/BaDPLKfzxnqq1cq0gQVvsMBTG9Jn3Vi8jp5PN30NGogPdmadekTRYLGb+n6JbbqBRU+NdI7YJuqtkpzK+n2zQTQjW7gyMppEeV2mLNmXk2dZANhKZqyXbfeIVOiNJOcELFE1jfYsE4Ke/DlfosksU2nNGdsO1nBFtM+FxRv7jj4lw/1TzOfFajertOqRUHGLqVanpWqW3gzA61MHYZCzjucketdyv2IC1HB5l7TpAum8YtL2xLUzVtBI7CWK0tGkxpojUXCbA+U/es///A9CvQ4hr++lvgHB0alMlOrD61FWqnGjxAQhi4AbFGsmWNcuMaDZGoP5Evt5BEzw== 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=VPDbSutHQXQZU+eqVD2PhFXRBxGVtSNpSYseMRlcqso=; b=DTRampuOj0xWxJqYA8zQ2XBYYBz7z8awOACJwjyL8DwJziGjmmtEfwr5q1CgHwHM9vSwFfwl1x4HrDBL+APLPQmrkMGs/L7DaznxIQWq3uER90E/YkYcCrDkaAxJ1iz3solZlPUwJtcjZ2MJ/44deIjLmsspPQ0X2106WcUZ+eo= 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 VI1PR08MB3887.eurprd08.prod.outlook.com (2603:10a6:803:c2::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5038.14; Wed, 2 Mar 2022 16:38:55 +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; Wed, 2 Mar 2022 16:38:55 +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: <890579c0-9964-675b-4acf-cf93a540cb26@arm.com> Date: Wed, 2 Mar 2022 16:38:57 +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: LO4P123CA0493.GBRP123.PROD.OUTLOOK.COM (2603:10a6:600:1ab::12) To AS8PR08MB6806.eurprd08.prod.outlook.com (2603:10a6:20b:39b::12) MIME-Version: 1.0 X-MS-Office365-Filtering-Correlation-Id: b5717717-032c-4344-1d8f-08d9fc6b2c73 X-MS-TrafficTypeDiagnostic: VI1PR08MB3887:EE_|AM5EUR03FT064:EE_|VI1PR08MB4015: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: 3esKrW9bjvQycK1bskjbUlvO6JCNvgAQTJPnJQ1jnEmrA4MuJXdwsRTclsTukk4hLnY5mJGiGlDzcb4eWwxo8zr/B/hUgfeItPxP/7pjVDajtlHylNXk33tBqCWbLYNXfGHoorCfCSQ/lisoEO19S/p6LXrYyoHSrax9yJ4yF3l2s0aotjFLm841qLJ6fr4MnH+3NrSjxzowrnEGeG6l0NVz4LZSh+wUzEayDOxCfdL6TIONLYz7RatX5QnIXS3lW2Z3Njothfs43h64ZtCTljHnLrLe46Z5uzBQyQOD7gGU1cSR4QpIbQBcjLuRSEHiVvxoH2AwJvD0sg4C8mrs3aaR3KuEqYaHPyuzFwS/bLjQxwcO1NqgvfDpA+gGKkGwRB6iQJzMB8fwK9knS90bwfx7Dmq4VsPgv4HWiKyfWba85gGjI0brPfvfTCFjd3U28iUGbXaYGnW8IA4kXASQ4rLeoU3x7B82ljsdnB/iJpWqEve+HykEbjN+Gff6iVhAGUlXmR2r6FD0W71m5vuIgyXbKIcIEoisFR711pJp/YSSeTuZLwVxGMZII0sLX0Zpx9WdSVZSX2G/CM1dcpT9Ycp31PVQqy0XXgiLwCfFpcUP7UACSLC8mnGDkGeLFJljUY10E+5caIE52+Jb3Z5+IgTBuo3WNm7R+MP9Xpgf0TFw6h0LhYtSbe6PjwEg1lBUGpY8O3nYzErFtm7poWvCeTxvqC8pc5M7c4pmMbK5j8FT2o65oyeFg5yUpF7aiaZZdGLVD7QDzM0jsUrxIJlOgA== 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)(66476007)(66556008)(38350700002)(508600001)(38100700002)(66946007)(2616005)(316002)(6636002)(31686004)(37006003)(6486002)(6506007)(6512007)(86362001)(8676002)(186003)(53546011)(52116002)(26005)(2906002)(5660300002)(8936002)(44832011)(83380400001)(6862004)(31696002)(36756003)(45980500001)(43740500002);DIR:OUT;SFP:1101; X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR08MB3887 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: AM5EUR03FT064.eop-EUR03.prod.protection.outlook.com X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id-Prvs: 0372c5e9-6252-433a-fcf5-08d9fc6b238c X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 8seucT8JyzgVrC2vy0YmPMpOTm73g5Tz9BZWBA5kE1QnNzelXpUTcBiCvKgDfgQnZME10cVJIaGYAg76RJqxbvUk+/J6SlvN/yYSIoIJrPYvMFZ1sdBxoHJBVIPvGxaG0jfWX1Oz45E4xMd0CtGbnyn4TQiVA4sketLS+bYx897R0+Q3Faft3xnqDzfTon274ijVerEN6n95JOSi8xJOTYMGX6L0/o2dYKeNRDkS2VspwzMsCIqlJtoP0rIeAyHP6+Tw2s0yQAHtVqo73meGG4F1e1Abn1j97X6vuXrxDUI4JGqDFUxQ8KfSqD7sDva6AvdHmpF6R1jZHFXFdbar+7bgcvDecL4jrTC4G/h9TE3cUilj18Rqz+d3FzUy7Gzp/Qmm9HqDhaPxT69TOoUh+vb3HRJIOm/mZXUtbPDVtcFXOcq07LAITXrAwCkX/pfyJSUqhIjtG1jxIBP1PodhjwnQdIEgFlDdSYtBhlc7gUSxnIVT0uJ2lUeUXrpl3+hmJmLIARk5bUuspKUvYHm7qWgmOLV7JuVs7pZoZ0yaHPUVHjrg4uHT3rT/HV3PelCS2N7jNjjluK+JPjPY37/R6O/hMCaPDCKGJAYL7hzZTN9hzIEZ0uL+FY8879QPQehLWwxJa1OCrNB0KncTKQSFp+ZjJNwOsnxZI3Yq+TrkU6HrqCNbsGVJeGU8/144tgnfbvxBZ6oov5Itf7Kp1thevA== 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)(36840700001)(46966006)(40470700004)(86362001)(8936002)(316002)(5660300002)(2616005)(336012)(31696002)(44832011)(82310400004)(70206006)(70586007)(8676002)(2906002)(26005)(186003)(356005)(6506007)(6862004)(36756003)(81166007)(53546011)(6486002)(508600001)(83380400001)(37006003)(6636002)(36860700001)(6512007)(31686004)(47076005)(40460700003)(43740500002);DIR:OUT;SFP:1101; X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Mar 2022 16:39:08.6609 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: b5717717-032c-4344-1d8f-08d9fc6b2c73 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: AM5EUR03FT064.eop-EUR03.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR08MB4015 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: quoted-printable Content-Language: en-GB Hi Patrik, Thank you for this patch. These changes look good to me. Reviewed-by: Sami Mujawar 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.