From nobody Sat Jan 18 02:27:15 2025
Delivered-To: importer@patchew.org
Authentication-Results: mx.zohomail.com;
	dkim=fail;
	spf=none (zoho.com: 198.145.21.10 is neither permitted nor denied by domain
 of lists.01.org)  smtp.mailfrom=edk2-devel-bounces@lists.01.org
Return-Path: <edk2-devel-bounces@lists.01.org>
Received: from ml01.01.org (ml01.01.org [198.145.21.10]) by mx.zohomail.com
	with SMTPS id 1513168000194155.56094251318837;
 Wed, 13 Dec 2017 04:26:40 -0800 (PST)
Received: from [127.0.0.1] (localhost [IPv6:::1])
	by ml01.01.org (Postfix) with ESMTP id 28CCA2214E356;
	Wed, 13 Dec 2017 04:21:59 -0800 (PST)
Received: from mail-wr0-x244.google.com (mail-wr0-x244.google.com
 [IPv6:2a00:1450:400c:c0c::244])
 (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
 (No client certificate requested)
 by ml01.01.org (Postfix) with ESMTPS id C376721A10968
 for <edk2-devel@lists.01.org>; Wed, 13 Dec 2017 04:21:56 -0800 (PST)
Received: by mail-wr0-x244.google.com with SMTP id l22so1924026wrc.11
 for <edk2-devel@lists.01.org>; Wed, 13 Dec 2017 04:26:36 -0800 (PST)
Received: from vanye.hemma.eciton.net
 (cpc92316-cmbg19-2-0-cust118.5-4.cable.virginm.net. [82.12.0.119])
 by smtp.gmail.com with ESMTPSA id b78sm1584050wmi.18.2017.12.13.04.26.32
 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);
 Wed, 13 Dec 2017 04:26:33 -0800 (PST)
X-Original-To: edk2-devel@lists.01.org
Received-SPF: none (zoho.com: 198.145.21.10 is neither permitted nor denied by
 domain of lists.01.org) client-ip=198.145.21.10;
 envelope-from=edk2-devel-bounces@lists.01.org; helo=ml01.01.org;
Received-SPF: Pass (sender SPF authorized) identity=mailfrom;
 client-ip=2a00:1450:400c:c0c::244; helo=mail-wr0-x244.google.com;
 envelope-from=leif.lindholm@linaro.org; receiver=edk2-devel@lists.01.org
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google;
 h=from:to:cc:subject:date:message-id:in-reply-to:references;
 bh=riKQHdcYnCqc/mxJNtCN6rysV0NebiniLB5a2XOQLbA=;
 b=BHEUHLrexzjfCZSaFFkYl4INAaCSdCeF9aGhz3AKvTJt1+qWYUQNR+LCbtgKG0J7gu
 kJDV7z60UxqK3UAQs19Fxg9Dx5K7F/PNhkcfV3caEgxfLBesRT0LihjKrGdF8goOD2Dz
 Z/vCQ0Zq/s1cpBBmbXEuzqsVVDc+WySBKlkQI=
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=1e100.net; s=20161025;
 h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to
 :references;
 bh=riKQHdcYnCqc/mxJNtCN6rysV0NebiniLB5a2XOQLbA=;
 b=fSps3B4St/C+1ICg8yADcqRk/Qfn770/efpySZtg+YW0xVFz5hWnuBXaxFacIR+KNG
 UeqKIpPLxMgtXHbi+GBHiS/3CVYylTRBxMT+iqGWfaOPQbvjzl+IyB3XBTiwTtI9Ug+i
 dU2iHL/dyznA0M1i/e0FjXFwwtx4Wk+DigpiBvXU/mRIs26M5cYiQiZDi2BqOroIN+Qw
 r8rOWfddKc5xkfhUiD3kpJhRHi0zFB/c4WQHPkKdQCzHX7S/nlDctwywNsXHzM1nAaFE
 pHvGbBOdG9fvFSkfPi3sbw2g4oFUDQHHRnYStmOe8HyLjcDZh+1PbCF/cRrEGXbRjYz5
 SCNg==
X-Gm-Message-State: AKGB3mI7aS5RpYglwMTayr8Mp45w65DRY0MkMvnvs/PXlYSX6bXtVj7c
 6QDTdlAtfH4WxSvEReHzwGl5wa4bIhY=
X-Google-Smtp-Source: 
 ACJfBotTqGpy/M/xD97BKmpJ+2TeaHTpgqDyv7Hc91QjD6u4Ub20ilYyYJLzJidN4UMsb2diBXL4Zw==
X-Received: by 10.223.148.69 with SMTP id 63mr2342137wrq.89.1513167994835;
 Wed, 13 Dec 2017 04:26:34 -0800 (PST)
From: Leif Lindholm <leif.lindholm@linaro.org>
To: edk2-devel@lists.01.org
Date: Wed, 13 Dec 2017 12:26:28 +0000
Message-Id: <20171213122630.17023-2-leif.lindholm@linaro.org>
X-Mailer: git-send-email 2.11.0
In-Reply-To: <20171213122630.17023-1-leif.lindholm@linaro.org>
References: <20171213122630.17023-1-leif.lindholm@linaro.org>
Subject: [edk2] [PATCH 1/3] MdePkg: break #defines out of
 Uefi/UefiMultiPhase.h
X-BeenThere: edk2-devel@lists.01.org
X-Mailman-Version: 2.1.22
Precedence: list
List-Id: EDK II Development  <edk2-devel.lists.01.org>
List-Unsubscribe: <https://lists.01.org/mailman/options/edk2-devel>,
 <mailto:edk2-devel-request@lists.01.org?subject=unsubscribe>
List-Archive: <http://lists.01.org/pipermail/edk2-devel/>
List-Post: <mailto:edk2-devel@lists.01.org>
List-Help: <mailto:edk2-devel-request@lists.01.org?subject=help>
List-Subscribe: <https://lists.01.org/mailman/listinfo/edk2-devel>,
 <mailto:edk2-devel-request@lists.01.org?subject=subscribe>
Cc: Michael D Kinney <michael.d.kinney@intel.com>,
 Eric Dong <eric.dong@intel.com>, Star Zeng <star.zeng@intel.com>,
 Liming Gao <liming.gao@intel.com>, Ard Biesheuvel <ard.biesheuvel@linaro.org>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Errors-To: edk2-devel-bounces@lists.01.org
Sender: "edk2-devel" <edk2-devel-bounces@lists.01.org>
X-ZohoMail-DKIM: fail (Header signature does not verify)
X-ZohoMail: RDKM_2  RSF_4  Z_629925259 SPT_0
Content-Type: text/plain; charset="utf-8"

Turns out all .vfr files in the tree interacting with DynamicPcds
manually copy the same set of EFI_VARIABLE_* definitions, since the rest
of UefiMultiPhase.h is incompatible with VfrCompile.

Split these out into a separate header file UefiMultiPhaseDefinitions.h
in order to make it possible to include just that portion into .vfr
files. Then include that from UefiMultiPhase.h.

Cc: Michael D Kinney <michael.d.kinney@intel.com>
Cc: Liming Gao <liming.gao@intel.com>
Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Cc: Star Zeng <star.zeng@intel.com>
Cc: Eric Dong <eric.dong@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Leif Lindholm <leif.lindholm@linaro.org>
---
 MdePkg/Include/Uefi/UefiMultiPhase.h            | 23 +-----------
 MdePkg/Include/Uefi/UefiMultiPhaseDefinitions.h | 39 ++++++++++++++++++++
 2 files changed, 41 insertions(+), 21 deletions(-)

diff --git a/MdePkg/Include/Uefi/UefiMultiPhase.h b/MdePkg/Include/Uefi/Uef=
iMultiPhase.h
index 0dcbb1b9ee..b360c9513b 100644
--- a/MdePkg/Include/Uefi/UefiMultiPhase.h
+++ b/MdePkg/Include/Uefi/UefiMultiPhase.h
@@ -15,6 +15,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER=
 EXPRESS OR IMPLIED.
 #ifndef __UEFI_MULTIPHASE_H__
 #define __UEFI_MULTIPHASE_H__
=20
+#include "UefiMultiPhaseDefinitions.h"
+
 #include <Guid/WinCertificate.h>
 ///
 /// Enumeration of memory types introduced in UEFI.
@@ -156,27 +158,6 @@ typedef struct {
 } EFI_TABLE_HEADER;
=20
 ///
-/// Attributes of variable.
-///
-#define EFI_VARIABLE_NON_VOLATILE                            0x00000001
-#define EFI_VARIABLE_BOOTSERVICE_ACCESS                      0x00000002
-#define EFI_VARIABLE_RUNTIME_ACCESS                          0x00000004
-///
-/// This attribute is identified by the mnemonic 'HR'
-/// elsewhere in this specification.
-///
-#define EFI_VARIABLE_HARDWARE_ERROR_RECORD                   0x00000008
-///
-/// Attributes of Authenticated Variable
-///
-#define EFI_VARIABLE_TIME_BASED_AUTHENTICATED_WRITE_ACCESS   0x00000020
-#define EFI_VARIABLE_APPEND_WRITE                            0x00000040
-///
-/// NOTE: EFI_VARIABLE_AUTHENTICATED_WRITE_ACCESS is deprecated and should=
 be considered reserved.
-///
-#define EFI_VARIABLE_AUTHENTICATED_WRITE_ACCESS              0x00000010
-
-///
 /// AuthInfo is a WIN_CERTIFICATE using the wCertificateType
 /// WIN_CERTIFICATE_UEFI_GUID and the CertType
 /// EFI_CERT_TYPE_RSA2048_SHA256_GUID. If the attribute specifies
diff --git a/MdePkg/Include/Uefi/UefiMultiPhaseDefinitions.h b/MdePkg/Inclu=
de/Uefi/UefiMultiPhaseDefinitions.h
new file mode 100644
index 0000000000..df55a92dfa
--- /dev/null
+++ b/MdePkg/Include/Uefi/UefiMultiPhaseDefinitions.h
@@ -0,0 +1,39 @@
+/** @file
+  This includes some definitions introduced in UEFI that will be used in b=
oth PEI and DXE phases.
+
+Copyright (c) 2006 - 2017, Intel Corporation. All rights reserved.<BR>
+This program and the accompanying materials are licensed and made availabl=
e under
+the terms and conditions of the BSD License that accompanies this distribu=
tion.
+The full text of the license may be found at
+http://opensource.org/licenses/bsd-license.php.
+
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+
+**/
+
+#ifndef __UEFI_MULTIPHASE_DEFS_H__
+#define __UEFI_MULTIPHASE_DEFS_H__
+
+///
+/// Attributes of variable.
+///
+#define EFI_VARIABLE_NON_VOLATILE                            0x00000001
+#define EFI_VARIABLE_BOOTSERVICE_ACCESS                      0x00000002
+#define EFI_VARIABLE_RUNTIME_ACCESS                          0x00000004
+///
+/// This attribute is identified by the mnemonic 'HR'
+/// elsewhere in this specification.
+///
+#define EFI_VARIABLE_HARDWARE_ERROR_RECORD                   0x00000008
+///
+/// Attributes of Authenticated Variable
+///
+#define EFI_VARIABLE_TIME_BASED_AUTHENTICATED_WRITE_ACCESS   0x00000020
+#define EFI_VARIABLE_APPEND_WRITE                            0x00000040
+///
+/// NOTE: EFI_VARIABLE_AUTHENTICATED_WRITE_ACCESS is deprecated and should=
 be considered reserved.
+///
+#define EFI_VARIABLE_AUTHENTICATED_WRITE_ACCESS              0x00000010
+
+#endif
--=20
2.11.0

_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel