From patchwork Fri Dec 15 16:59:23 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leif Lindholm X-Patchwork-Id: 122132 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp720410qgn; Fri, 15 Dec 2017 08:59:32 -0800 (PST) X-Google-Smtp-Source: ACJfBov34gi4RqQ1UEe2iNsRVI6ALNiZuSyqnjcQwA0WlXHCzsVIoIy+bwWNJZAQsi+UzDt17/WN X-Received: by 10.101.98.150 with SMTP id f22mr8747252pgv.180.1513357172877; Fri, 15 Dec 2017 08:59:32 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1513357172; cv=none; d=google.com; s=arc-20160816; b=VellfbD/X5UgOUxPovwHQ2IfRREsbdO3LzVBsRyi9atpgHSjHAo31gN1H3vtpytfpu qznUcpzK3ba31KFGoB0EthuaK/A/VrxrCNRphCewekz19QzSRdMMOrEFawrkFx5S2/aD gwrXLlw2PqHDzqUHiNA057NomTp8HMs8bAJJPFLjcpET2YEJexarJxgVZdp2nkNBy2pA py26LBGTVW0yHXOYLddvSfHejKxwGsSVywzfoKdXGpTG55WZbT+zn7rnv5lDVEkzuDWr rwesOikTJIXkb424A0dY5QJQPz3bEX1PstZpbMZOuLsL+T+1oByW+3Yc+JZGdXOYXWxM pFJg== 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=XeLmIJjXcHx4hwfop5CfPLoGWsW6oypRCmiVpFLL8MQ=; b=EWo6+Dk9UpQbDz42iU8POohxJW3ZLFMfwJYJIFsQU6N2OWm7fG16IJ88BXzyy/BTeN mVUp/58bwrXvk6dzIK2Essx0H1EEFss+7CSOD0HrFR1E+nqHGPpXaOtnXcv+PDcviGHm TPJblfJvgd8DZl4QsX6ywIV+2eNK8CJTojshPLDxVNRu6d0bPY9ZFbAW//T0Gk8nRb25 7vIb+NHX6pTyU4TS/lKArl5nMjqD1XrTw3gRXBmqh1nDPvzAZ4YmUnJrRtMRN7a6xKDU iMx10Azwxs4hF+M64JfFJA9hCQHV3FmmNKSHhL4s/N/9WuOf0HE+goZaIdye5tHerTjg 4aWw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=D4azB7CP; spf=pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 2001:19d0:306:5::1 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. [2001:19d0:306:5::1]) by mx.google.com with ESMTPS id z14si4833925pgr.243.2017.12.15.08.59.32 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 15 Dec 2017 08:59:32 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 2001:19d0:306:5::1 as permitted sender) client-ip=2001:19d0:306:5::1; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=D4azB7CP; spf=pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 2001:19d0:306:5::1 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 14230221E06B3; Fri, 15 Dec 2017 08:54:49 -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 5E9552217CE4B for ; Fri, 15 Dec 2017 08:54:48 -0800 (PST) Received: by mail-wr0-x244.google.com with SMTP id k61so8600111wrc.4 for ; Fri, 15 Dec 2017 08:59:30 -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=tdhDyUB/mi/67RvaAuCUrWgsgleonhHPagHrhrlXyc0=; b=D4azB7CPG6iJ7Nb5E0S2367YCKvaqcGmfT46ieMsxkViQTbOddhRhJXAwyKb9E7nyw 4LxPBPsuSJnhvKu+/oVPQgfVbyZQZ4Vsn+t6jaZY9lPQ6IeK2teLgWKhV4lerF/SESQZ Ef4IPrNT0L5qJPhID0H2hD0VisvTqTmBlo6Ks= 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=tdhDyUB/mi/67RvaAuCUrWgsgleonhHPagHrhrlXyc0=; b=qiVnpIi9Xjf7ZyYg2sJM8g14jzMXh7TiP/G5z/5/aTMRMvbpPk7FdCGix7NFB/2/qm V0cVg0eiA1Culgbl1DndeVEQ5FHzeY9ab/nY80rb75BMJy1yJjhd89qibN5ynldv8EIk T+e4cfGqJE6TyoGb7RtHUF+Nsw+KPqisC5HoSAO/B6b4/Y6ipaOw1pKP6cs/ewEdKfGk g11HMiMw0hN9SEtySKHltnWkMKTTN4pNQ/3F9uR2dM1BsM6W9DcSak5o31SpD96hnp2Y yJJ3T33yjJbmdWxw+rv8bHOF62g9dxNSiUsjHureT0xqePHYdFCGqjh5rUCW7yCpYdeE DNwg== X-Gm-Message-State: AKGB3mJNVx4EhYAqfcUwtOwnLtcsL8YjOTpBtXghCWJv6FKAKWx6bE8B PlWiHxs1q0r0cb46xgycWaJKw176Q1g= X-Received: by 10.223.182.73 with SMTP id i9mr1813980wre.113.1513357169009; Fri, 15 Dec 2017 08:59:29 -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 f18sm4570440wrg.66.2017.12.15.08.59.27 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 15 Dec 2017 08:59:27 -0800 (PST) From: Leif Lindholm To: edk2-devel@lists.01.org Date: Fri, 15 Dec 2017 16:59:23 +0000 Message-Id: <20171215165925.12306-2-leif.lindholm@linaro.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20171215165925.12306-1-leif.lindholm@linaro.org> References: <20171215165925.12306-1-leif.lindholm@linaro.org> Subject: [edk2] [PATCH v2 1/3] MdePkg: restrict UefiMultiPhase.h contents if VFRCOMPILE defined 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 , Liming Gao 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. Instead, reshuffle these definitions to the start of the file, and put the rest of the file behind #ifndef VFRCOMPILE to permit direct inclusion in .vfr source files. Cc: Michael D Kinney Cc: Liming Gao Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Leif Lindholm --- MdePkg/Include/Uefi/UefiMultiPhase.h | 44 ++++++++++---------- 1 file changed, 23 insertions(+), 21 deletions(-) -- 2.11.0 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel Signed-off-by: Leif Lindholm diff --git a/MdePkg/Include/Uefi/UefiMultiPhase.h b/MdePkg/Include/Uefi/UefiMultiPhase.h index 0dcbb1b9ee..67ecc4c27c 100644 --- a/MdePkg/Include/Uefi/UefiMultiPhase.h +++ b/MdePkg/Include/Uefi/UefiMultiPhase.h @@ -15,6 +15,28 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. #ifndef __UEFI_MULTIPHASE_H__ #define __UEFI_MULTIPHASE_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 + +#ifndef VFRCOMPILE #include /// /// Enumeration of memory types introduced in UEFI. @@ -156,27 +178,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 @@ -229,5 +230,6 @@ typedef struct { /// WIN_CERTIFICATE_UEFI_GUID AuthInfo; } EFI_VARIABLE_AUTHENTICATION_2; +#endif // VFRCOMPILE #endif From patchwork Fri Dec 15 16:59:24 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leif Lindholm X-Patchwork-Id: 122133 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp720455qgn; Fri, 15 Dec 2017 08:59:35 -0800 (PST) X-Google-Smtp-Source: ACJfBosxQlId84Akw/PXQDh1uEJSl8F4qDwQ7ZeFIBPYfjekLdtGpicdJVZkcRAo3PK+/glQu7Wb X-Received: by 10.101.101.205 with SMTP id y13mr12654751pgv.249.1513357175545; Fri, 15 Dec 2017 08:59:35 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1513357175; cv=none; d=google.com; s=arc-20160816; b=0cw2lYouIYiKTNLKRSqanb65LI6HNp2ZwQ22/4X82k5+dtERZMZZlaVg+W5k2CZPDh V/6ondt2dM8LJQ+0bjLB9aRIXRDGHRrI8AYBQZ9qagvGAiL4ZOJ0Kn6KDWtOhuhOa148 K25lkbVThNeCvGJCJ8OaC3C/gSHxHxwqstkwIPagItRZo93EFNB50eH8GYeR8rK700bU gJrLSBtGlpzCKABFIWZKt+LoCBT2C5dpa+hguQRQXZnKPuMp4S6N98QlApQAYbYVA9MF VMSVMZwTELSbtTXpnS05nIu/y2c5Uj/OhaPBTrZDK0pCXAVBdyQ1eJENtuZ99Sa9gweX jQug== 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=PgZkjo8Ywktw1cn2DQBA34geW7vDk2yNhpfNTfKANJM=; b=oewtSV84YyJ89go7i56gJISbtzNK0X4tUGTdOFnF22/yevT9RzsdjE45RJi8L1iD8q 2djc+VHlYQRLJmzRTv2ZbuNk9lANjhFuueRH/rNGXaTKVLgKBjGwSkO6/iWPh1hNSMiw 19xKDe1olJsirIqQs3VNynAHch5gPoWlouPa6rWp1OOXGdf7c0YIcNDn5Eb6+VGtkn4f nJtDTXR/HU2Lu1qBxagkSlvE0+D0gvjyS0FTGYnSD9Nv5wc//GTgxYOKmIQC1mOXi0De UHbJ2b+bZTADPaaEC2cvOEuUh5kprr52m+bhZ6PVa9foLCNMQIF3sOM3vx4LU6fu0+uI 4FJQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=g1A5o1/G; spf=pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 2001:19d0:306:5::1 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. [2001:19d0:306:5::1]) by mx.google.com with ESMTPS id y2si5279360pli.150.2017.12.15.08.59.35 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 15 Dec 2017 08:59:35 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 2001:19d0:306:5::1 as permitted sender) client-ip=2001:19d0:306:5::1; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=g1A5o1/G; spf=pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 2001:19d0:306:5::1 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 514B8221E06B8; Fri, 15 Dec 2017 08:54:51 -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 BDB84221E06AE for ; Fri, 15 Dec 2017 08:54:49 -0800 (PST) Received: by mail-wr0-x244.google.com with SMTP id l11so2536353wrc.11 for ; Fri, 15 Dec 2017 08:59:32 -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=a2aRwiUF6f8sXygcN9j9FQJLy1WYbepZSB4fC+Zml/c=; b=g1A5o1/GTNfbvJDKw9lk2qHrLbos7kxd5RVwNORmvKQLdn6ReqK9jzCNdEMMtN57O5 YDlbuN6lLAuXx5ShVrKvRZJb15dx8NHmmANyBs2BM/h13eRpd/VHWHk6xqNUqyxigP0O gCBn7doldlcm579vao48iXVWrIkcloRq6/lSg= 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=a2aRwiUF6f8sXygcN9j9FQJLy1WYbepZSB4fC+Zml/c=; b=DP0Rok/6mlKvfj1sgxCC2WBM6zRt2OeAnPg2uzi4y0VMmNFSdUWC4lN7E2G5qDpMl6 kpRLMFX4dloUrWULqb8NzqAm8oOyeNfn1QRLyPNTYwvOsaiCmHOGmagGT7IT52YFGrfV X9MpK3kyg3eRiE7LFnpjisyhXmZ0XTDY6ugbcxnScTMTmHYfF8OLo1zTZXxFZ+FBkE/6 8wsmLUbFcD8hvAjlBQudEjOQH1wvGGYWH5fszjNiSPAnX6uMlz3a6Ei2rJaamCJoMqAc YDppeZ2YDFohzCiGX8JLrC4V5tfmmU1cDwJgA54s1lFdtfUG1mALxb4PLMtCa9A7sLZ6 R9rg== X-Gm-Message-State: AKGB3mJIui2aKCs5txXPQHgZlk5bCTk0Xp/ROQkELXf8dG69ooavBh1a izdvycOKfE57mkgsPT9jRU+41RREmqs= X-Received: by 10.223.147.195 with SMTP id 61mr2406117wrp.176.1513357170508; Fri, 15 Dec 2017 08:59:30 -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 f18sm4570440wrg.66.2017.12.15.08.59.29 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 15 Dec 2017 08:59:29 -0800 (PST) From: Leif Lindholm To: edk2-devel@lists.01.org Date: Fri, 15 Dec 2017 16:59:24 +0000 Message-Id: <20171215165925.12306-3-leif.lindholm@linaro.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20171215165925.12306-1-leif.lindholm@linaro.org> References: <20171215165925.12306-1-leif.lindholm@linaro.org> Subject: [edk2] [PATCH v2 2/3] MdeModulePkg: use central variable definitions in DriverSampleDxe 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: Eric Dong , Star Zeng MIME-Version: 1.0 Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" Use UefiMultiPhase.h in Vfr.vfr instead of duplicating EFI_VARIABLE_* definitions. Cc: Star Zeng Cc: Eric Dong Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Leif Lindholm --- MdeModulePkg/Universal/DriverSampleDxe/Vfr.vfr | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) -- 2.11.0 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel Reviewed-by: Star Zeng Signed-off-by: Leif Lindholm diff --git a/MdeModulePkg/Universal/DriverSampleDxe/Vfr.vfr b/MdeModulePkg/Universal/DriverSampleDxe/Vfr.vfr index c1682913fa..b1017d9fd0 100644 --- a/MdeModulePkg/Universal/DriverSampleDxe/Vfr.vfr +++ b/MdeModulePkg/Universal/DriverSampleDxe/Vfr.vfr @@ -14,6 +14,7 @@ //**/ +#include #include "NVDataStruc.h" // @@ -35,14 +36,6 @@ #define EFI_FRONT_PAGE_SUBCLASS 0x02 #define EFI_SINGLE_USE_SUBCLASS 0x03 -// -// EFI Variable attributes -// -#define EFI_VARIABLE_NON_VOLATILE 0x00000001 -#define EFI_VARIABLE_BOOTSERVICE_ACCESS 0x00000002 -#define EFI_VARIABLE_RUNTIME_ACCESS 0x00000004 -#define EFI_VARIABLE_READ_ONLY 0x00000008 - #define EFI_USER_INFO_ACCESS_SETUP_ADMIN_GUID \ { 0x85b75607, 0xf7ce, 0x471e, { 0xb7, 0xe4, 0x2a, 0xea, 0x5f, 0x72, 0x32, 0xee } } From patchwork Fri Dec 15 16:59:25 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leif Lindholm X-Patchwork-Id: 122134 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp720496qgn; Fri, 15 Dec 2017 08:59:38 -0800 (PST) X-Google-Smtp-Source: ACJfBosbHIOw+gfM0S4EIpOd9hBDwn+v14NsZzYu7UetmuNJnI8ae2YvAWXH69WsZy/yO8KLwri/ X-Received: by 10.84.128.197 with SMTP id a63mr14229587pla.340.1513357177947; Fri, 15 Dec 2017 08:59:37 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1513357177; cv=none; d=google.com; s=arc-20160816; b=ykZ66SAvE4bye5MZfrojs/LilhZvlUmCFuJGiQ8Xq2sZIoor/ZE43Z8W6edYBpRtM7 onny237BhOJwV+oFYGM3woQIEAcRWuENo33hhLIySDxXkZj0IASgipFQ/1lw/AgFT+AL 1VHUlayVEmc2Kt6X6//CcT+AYRNxD9FHlhbFpDmZR0Ein6UwCLvm1VaUPMOL/e3x/xIg Zjvl7OzZhHAqZx4RtMIC7xF3zUJ+EAAg8JeS4d7BfK7Jcuh8BHVfr6FFhYVXKStb7FL1 yrvwfZcUwCupGK1UmsayXsvEBb6omCXf7tLEquJDWAaHpop4ctazxH9eVbnNuxFEqs5M rhTQ== 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=/lilu1H57N6rTnlWhmeUcIlu6HJDCyHBdjVz4zTsiGA=; b=GywYshFfLdUWlNPAtELAcfiSqQEbMserb+/Rq7mWO6q/BNt433w+C0zl6ICG43+gdj of8pZ94w6tC0S+NYZJHAWQyRR8CsCP3A+GQ++PJw/hbqtG5zTCXCZpqWa1UmafDH2Q2+ n75L81TSP8lrSCLNmHqTVSbNXYabhijynellUbD8eouaV4yeAKGuJoRAfxPn9FAAVBeR 4mQK3PSagQwL6VrKUOQaint2aAjQllHQVlItZ0FQzCtf8LfResdSsud2GXjYiWgluRae //DDT+6357QCW37j5T1SXP5bswfm13bEEY0viz/MmhSCM1eTerFp2oWIasZBnCxjdZDw ZwQQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=J5ptbaYl; 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 i136si4893614pgc.293.2017.12.15.08.59.37 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 15 Dec 2017 08:59:37 -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=J5ptbaYl; 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 92265221E06AE; Fri, 15 Dec 2017 08:54:53 -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 4810B221E06B6 for ; Fri, 15 Dec 2017 08:54:51 -0800 (PST) Received: by mail-wr0-x244.google.com with SMTP id g53so8632665wra.2 for ; Fri, 15 Dec 2017 08:59:33 -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=CQbH6s8faW5HWQegykLBqlgaV7jZ8aKQGAznsgdjpxc=; b=J5ptbaYltEft4f9B6VsqNW3KIFYjCME362qW70fUDE4YkIOBfNZwP3v5oUue9BS2X9 S3/KdN4KepGU4fYruItMohnMjdT09OwZD+8kLkfUwwoQ1t/3IQGCMXxQ8RPD9th3Rwyx uoTLxvRt30JAzhAOZ/8NiJyKLbGkepK6Tnef0= 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=CQbH6s8faW5HWQegykLBqlgaV7jZ8aKQGAznsgdjpxc=; b=SwACBPOUY6r0UfD5PnsHQpM4cj/dKyyunnv+P9ng6kmBpzOEcwR4xwDyca4KBZ2JRB u6LU+7jTwjGRDo7HZhtrnUn2ziGgaEUxPcF703frWTOqtFWV5MxrvX20gcWMo0evvwzO bxNY0n9Aihpvl0BoW9139amDLTYouZukoN+KAi35psTjPlHh9ZvDwKRR53RUoyCXKJJ/ S7kW5WcASK8n+vIAlj7e19cR+6wfRP8HYS4dxNr6c3snUv39a72rBFMgYFg+MVHyKHha MvNrbqLDExpTEsZciBE159K377KkjS+yf52l9fVue38JHtiCD7GvwxeB1rE+/50O5ggS /cAg== X-Gm-Message-State: AKGB3mIrNbnJ7r26sk8rJ8arGt84ZvjSKxfOKJevDG25XulqcR3EWuju vJdmgfccEzbx4TTlKXKy9XMTJqVx/SY= X-Received: by 10.223.157.41 with SMTP id k41mr6531011wre.281.1513357171938; Fri, 15 Dec 2017 08:59:31 -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 f18sm4570440wrg.66.2017.12.15.08.59.30 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 15 Dec 2017 08:59:30 -0800 (PST) From: Leif Lindholm To: edk2-devel@lists.01.org Date: Fri, 15 Dec 2017 16:59:25 +0000 Message-Id: <20171215165925.12306-4-leif.lindholm@linaro.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20171215165925.12306-1-leif.lindholm@linaro.org> References: <20171215165925.12306-1-leif.lindholm@linaro.org> Subject: [edk2] [PATCH v2 3/3] EmbeddedPkg: use central variable definitions in .vfr files 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: Ard Biesheuvel MIME-Version: 1.0 Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" Use UefiMultiPhase.h in Vfr.vfr instead of duplicating EFI_VARIABLE_* definitions. Cc: Ard Biesheuvel Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Leif Lindholm --- EmbeddedPkg/Drivers/ConsolePrefDxe/ConsolePrefHii.vfr | 9 +-------- EmbeddedPkg/Drivers/DtPlatformDxe/DtPlatformHii.vfr | 9 +-------- 2 files changed, 2 insertions(+), 16 deletions(-) -- 2.11.0 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel Reviewed-by: Ard Biesheuvel diff --git a/EmbeddedPkg/Drivers/ConsolePrefDxe/ConsolePrefHii.vfr b/EmbeddedPkg/Drivers/ConsolePrefDxe/ConsolePrefHii.vfr index a1e603abf0..725fbf52a5 100644 --- a/EmbeddedPkg/Drivers/ConsolePrefDxe/ConsolePrefHii.vfr +++ b/EmbeddedPkg/Drivers/ConsolePrefDxe/ConsolePrefHii.vfr @@ -12,16 +12,9 @@ * **/ +#include #include "ConsolePrefDxe.h" -// -// EFI Variable attributes -// -#define EFI_VARIABLE_NON_VOLATILE 0x00000001 -#define EFI_VARIABLE_BOOTSERVICE_ACCESS 0x00000002 -#define EFI_VARIABLE_RUNTIME_ACCESS 0x00000004 -#define EFI_VARIABLE_READ_ONLY 0x00000008 - formset guid = CONSOLE_PREF_FORMSET_GUID, title = STRING_TOKEN(STR_FORM_SET_TITLE), diff --git a/EmbeddedPkg/Drivers/DtPlatformDxe/DtPlatformHii.vfr b/EmbeddedPkg/Drivers/DtPlatformDxe/DtPlatformHii.vfr index 3516746c4d..80c6f36425 100644 --- a/EmbeddedPkg/Drivers/DtPlatformDxe/DtPlatformHii.vfr +++ b/EmbeddedPkg/Drivers/DtPlatformDxe/DtPlatformHii.vfr @@ -12,16 +12,9 @@ * **/ +#include #include "DtPlatformDxe.h" -// -// EFI Variable attributes -// -#define EFI_VARIABLE_NON_VOLATILE 0x00000001 -#define EFI_VARIABLE_BOOTSERVICE_ACCESS 0x00000002 -#define EFI_VARIABLE_RUNTIME_ACCESS 0x00000004 -#define EFI_VARIABLE_READ_ONLY 0x00000008 - formset guid = DT_PLATFORM_FORMSET_GUID, title = STRING_TOKEN(STR_FORM_SET_TITLE),