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),