From patchwork Wed Dec 13 12:26:28 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leif Lindholm X-Patchwork-Id: 121758 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp5403525qgn; Wed, 13 Dec 2017 04:26:39 -0800 (PST) X-Google-Smtp-Source: ACJfBovg96oZr6PG8ORvbBjNY2V3i9+0tDrPlARQ5mWiWIBOMGZMfWCHBKOBwK7pAo1O5GMV/LoN X-Received: by 10.99.104.73 with SMTP id d70mr5317037pgc.333.1513167999581; Wed, 13 Dec 2017 04:26:39 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1513167999; cv=none; d=google.com; s=arc-20160816; b=PKgqcgrBzPbGBqa1gWR1haXgs8bQCmF3t9wD2F1/S1tchb6nOD2FPK3/BsAUXfVnvi yEBd6GI4b08COQ0Xl3MKncUpK/3JDv8wgvk4GUiyq/h9H5nTWaRCCPxyNaMhVESR5DZn yZpupFEb3ha6u8Spy4HPbh9WUJPisfkvgKA61XMwxRYwkDqf9yIaiQ7T18dZ6ME2L5h6 yOv41nYZQmX+5lcVGQ8QdHnbexkqgJ2g47OfrRx6IIiKDYHg6bz5Mi51k3rF7BY4l362 OSBeAvFKRO1IZJtUnZPZOFxVGwvD6Onrr6i4uEJ4lUoKOHldou/Tvj4p4jiAnkr8xTiB tOTA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=Y33rZidnc0djueyRhpSUK6fgqYXJS251B7M28qPE6K0=; b=qJz6lozfwCPG561h8nFBfvLTeZsHCjoiitUYU+JAGH96wjcdRXGVlb9DW6dG0+n+4e pITnpbIDZb0oZ77L6Zlye0eEdZWXDvN1Pb+wEYXtznsnrMW8etPd5snnn0ahe533Dl5v NyE3xvaBwMlLEOFtslN4XHuyXcxut6xBIYTYDqnmCtcjlOrq4b2V6BC0QW9gleYaypx2 mQWAcvozCvZ4Sd14SPuR67Tmt2Ksfq7TWRTYkCQiZJXeuSqmZyMeVWwrAABbZnsgRmLR fpxc7LTj5UlYczejn3Xp0hpz09xZq6rah05rUQRUpa+OXYEl7RBFSr5W0QwDgNC2fP4m //Tg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=BHEUHLre; spf=pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 198.145.21.10 as permitted sender) smtp.mailfrom=edk2-devel-bounces@lists.01.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from ml01.01.org (ml01.01.org. [198.145.21.10]) by mx.google.com with ESMTPS id z21si1208176pge.329.2017.12.13.04.26.39 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 13 Dec 2017 04:26:39 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 198.145.21.10 as permitted sender) client-ip=198.145.21.10; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=BHEUHLre; spf=pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 198.145.21.10 as permitted sender) smtp.mailfrom=edk2-devel-bounces@lists.01.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org 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) X-Original-To: edk2-devel@lists.01.org Delivered-To: edk2-devel@lists.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 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 ; Wed, 13 Dec 2017 04:21:56 -0800 (PST) Received: by mail-wr0-x244.google.com with SMTP id l22so1924026wrc.11 for ; Wed, 13 Dec 2017 04:26:36 -0800 (PST) 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-Received: by 10.223.148.69 with SMTP id 63mr2342137wrq.89.1513167994835; Wed, 13 Dec 2017 04:26:34 -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) From: Leif Lindholm 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Michael D Kinney , Eric Dong , Star Zeng , Liming Gao , Ard Biesheuvel MIME-Version: 1.0 Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" 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 Cc: Liming Gao Cc: Ard Biesheuvel Cc: Star Zeng Cc: Eric Dong Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Leif Lindholm --- MdePkg/Include/Uefi/UefiMultiPhase.h | 23 +----------- MdePkg/Include/Uefi/UefiMultiPhaseDefinitions.h | 39 ++++++++++++++++++++ 2 files changed, 41 insertions(+), 21 deletions(-) -- 2.11.0 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel diff --git a/MdePkg/Include/Uefi/UefiMultiPhase.h b/MdePkg/Include/Uefi/UefiMultiPhase.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__ +#include "UefiMultiPhaseDefinitions.h" + #include /// /// Enumeration of memory types introduced in UEFI. @@ -156,27 +158,6 @@ typedef struct { } EFI_TABLE_HEADER; /// -/// 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/Include/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 both PEI and DXE phases. + +Copyright (c) 2006 - 2017, Intel Corporation. All rights reserved.
+This program and the accompanying materials are licensed and made available under +the terms and conditions of the BSD License that accompanies this distribution. +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 IMPLIED. + +**/ + +#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