From patchwork Wed Dec 13 12:26:30 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leif Lindholm X-Patchwork-Id: 121760 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp5403608qgn; Wed, 13 Dec 2017 04:26:44 -0800 (PST) X-Google-Smtp-Source: ACJfBoviqPzQlNxNSXQGKCDXdZCiuMqe84/9yHb+iMEkCAij34qesSPWwLBtNVEuQFQSfIYKnNOK X-Received: by 10.159.194.6 with SMTP id x6mr5484344pln.99.1513168004493; Wed, 13 Dec 2017 04:26:44 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1513168004; cv=none; d=google.com; s=arc-20160816; b=HLWXUf7xtFdSlXiHfSu+AQJQmMQT17QVgLdgZ3hUT5O4aticvIf+6Hf2q8BtJPo2MR +W3Mv9ipxcKgvvJcVyWJrCl+pfOz351Xvjoc9RJ/PtcsDzvHSw61U+xpGdyhUHa41G/t /1LNJuuoQC7KBqtHIaUOnZkmj+7u3Xsjj8oi/TxiQWIELtH8HOv8V+fLQhALSkBHx+0H cL+7UHVOKFWNbf/nBlMVcPdRsCTvP8T2b7zPswrDw9Z+u0B3EDKm4jcu+56w+qiBp3wm Cq93b09JEmiDcaPCrjPsyVLm2a+clupOMjsIDKYl3vQjIvyu5DA4cAB3SQCqFzO92Uqz VQIQ== 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=A0baD9m0q7e56+tYhtC8uBwqRgsVIeOUIZ/c+ebe7RA=; b=HzNfFHeDOxQiPVzmMf+GkIjwNEGsf60TD9extIpLlx2hJ7KeMHFvQ5GielbM0Ee8xi 7QaNNJQBZOyiiX1cwq0+tI1ymu3yyX29IlB0pYy6zpSeT+0gslTDASCvteXve54WDSz7 SseOBfI4UGJjZmZxEp6vS/rbEIkrD3QyTQNbu0SBgdrDf9euJFvo3Mr3IdHcpD6175fI jH4ky0NhKdq15ZnBptPodwK5MfIApislVSgrI70x9tAbLtxf/eLDAMrHxvVA7ckfpWyL oBL6FkVyjxZ6/Xh6bi2SQZggKmjKGn7bbFLqsZ6HSDLAnWB4dNoufYCgzh+8qGeSJcqu kKlQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=M+1nPHM2; 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 5si1304567plx.33.2017.12.13.04.26.44 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 13 Dec 2017 04:26:44 -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=M+1nPHM2; 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 9B8F720356261; Wed, 13 Dec 2017 04:22:03 -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:c09::244; helo=mail-wm0-x244.google.com; envelope-from=leif.lindholm@linaro.org; receiver=edk2-devel@lists.01.org Received: from mail-wm0-x244.google.com (mail-wm0-x244.google.com [IPv6:2a00:1450:400c:c09::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 07C4421A10968 for ; Wed, 13 Dec 2017 04:21:59 -0800 (PST) Received: by mail-wm0-x244.google.com with SMTP id g130so21645284wme.0 for ; Wed, 13 Dec 2017 04:26:39 -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=fcPkztwUuPbYZGttbTHhVDCSmKAa+6TFAIQeRUX9GBo=; b=M+1nPHM2SmbCUdKAZCeZ5TPHOxFMgZVhhWNw+wjV4n2CsBVB9XIW7EOFESBtW1p29P cNzIttNDtETQO5erUQZj/Z1hie44IZRacV2Dp+5yTPTlIKO0VyDdGDqS1sSAgWjyHW19 B9HyaSIdohkvDDWH+lH6pG4HHgfjrvMzaZ+So= 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=fcPkztwUuPbYZGttbTHhVDCSmKAa+6TFAIQeRUX9GBo=; b=rS2CKPyrnxEi1z9KWIbyUeovjX1b/z0iQvdAtUl+n8WRVZdMuxX9dTeCv816hqyJbV p5x6eldtp2RgttslBz9FycnZEE0npJQgISoECG/YH31UGQuG8Oe8oAutNnqWhJPDrZwK lqfoU8wtYs0WWoA3NAt3GM/YhX3m52DplBkkcAgSSM4OlCDSINxnHsND9FlTh9+tgpM1 hlnKHJPW65c/bqnFBFlP1MqMz0dWMBcvuR49hC/o01dDzvhDu4qYxrSmNAhq6DLTqSFu v01xqlKXB4IOPTFaniJjbDKUKl/SBKNSZz9wQADVOKDZ6OKncWKbUkmLftin6WXDuI9v bMsw== X-Gm-Message-State: AKGB3mJzOOi67e2TXHauYO9L4n8ZrCF9IRYb/KvvtwGEeoXESmD34aWL x5VSSIUkT6sR7tfnt3KSxIbfZ+c27H8= X-Received: by 10.28.69.136 with SMTP id l8mr1735129wmi.19.1513167998215; Wed, 13 Dec 2017 04:26:38 -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.36 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 13 Dec 2017 04:26:37 -0800 (PST) From: Leif Lindholm To: edk2-devel@lists.01.org Date: Wed, 13 Dec 2017 12:26:30 +0000 Message-Id: <20171213122630.17023-4-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 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 UefiMultiPhaseDefinitions.h in Vfr.vfr instead of duplicating the 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 diff --git a/EmbeddedPkg/Drivers/ConsolePrefDxe/ConsolePrefHii.vfr b/EmbeddedPkg/Drivers/ConsolePrefDxe/ConsolePrefHii.vfr index a1e603abf0..19371b3157 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..8e5d34dadb 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),