From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=2a00:1450:400c:c09::231; helo=mail-wm0-x231.google.com; envelope-from=leif.lindholm@linaro.org; receiver=edk2-devel@lists.01.org Received: from mail-wm0-x231.google.com (mail-wm0-x231.google.com [IPv6:2a00:1450:400c:c09::231]) (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 B1DB4222630B0 for ; Thu, 22 Feb 2018 12:03:04 -0800 (PST) Received: by mail-wm0-x231.google.com with SMTP id t74so656477wme.3 for ; Thu, 22 Feb 2018 12:09:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to:user-agent; bh=7HfSRhYFi/rxHhK3xfwersYU+TQXai+9ESjHK8tPPJs=; b=jWyI+HkcMkZix5nh1syTEi5gN80ub0enMyxHp7fn1DKbFyRGqwLyQNUpX81jF5tIEE yHdGtMLx8LYfKTxMb2qTL6qsvqM0RmVnZYSrgHs946pFCu+rWDlAYE/RdDIskmRshqUa D1vJtVKCCqgYqQ3GsqzeAUj7EiBekU/1LY9+g= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to:user-agent; bh=7HfSRhYFi/rxHhK3xfwersYU+TQXai+9ESjHK8tPPJs=; b=M0+u3HvWDAu5+DBzKw60Hbp6ZSurWRTNGRbp4057fYjNqFaMRTNRB1eda7wADqfJjQ vIBpBFQh1VoDI+Yzj8RofwkFwxAIiYs7iU+LraVOO+kL6JdLh1L0f1ioG/jNNMPhG9DU bfsOplQnmqA1CAXxjURnMl0bIk3XCIAOBUgZjuenXO2Yknr4RfCA6ENTqIOFgIsaOLNB gCzpMJqo/um6XyIrScB2SG3DAXrc5aJco4BBozr4LANj+Hq3wsbH63ZXCkyTiF151dvn xkKGLSbaK37bmvAc2tWBJM1j3HtWRdyo07yRZM3vno4P9rrfvHTs6iVGBujgbeOB7/E9 uSfA== X-Gm-Message-State: APf1xPBLPNppBSnhzXVxkPqpQOBOg2zkmXnVlT+DW+fie9lHyn22Azjs 9ZoOepdmG7Am4DiDJ9972n8jMw== X-Google-Smtp-Source: AG47ELs8JfTuqt6LWhTIZpQUerxpcOM+8q3TdBCag7PONjJjKcoeFj0qkJ5c8Fv0ndof0fR9+b07ag== X-Received: by 10.28.107.213 with SMTP id a82mr268284wmi.91.1519330144051; Thu, 22 Feb 2018 12:09:04 -0800 (PST) Received: from bivouac.eciton.net (bivouac.eciton.net. [2a00:1098:0:86:1000:23:0:2]) by smtp.gmail.com with ESMTPSA id k7sm957861wrg.68.2018.02.22.12.09.01 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 22 Feb 2018 12:09:02 -0800 (PST) Date: Thu, 22 Feb 2018 20:09:00 +0000 From: Leif Lindholm To: "Zeng, Star" Cc: "edk2-devel@lists.01.org" , "Kinney, Michael D" , "Gao, Liming" Message-ID: <20180222200900.n7n3wy4dihdzlvqo@bivouac.eciton.net> References: <20171215165925.12306-1-leif.lindholm@linaro.org> <20171215165925.12306-2-leif.lindholm@linaro.org> <0C09AFA07DD0434D9E2A0C6AEB0483103B9C46A4@shsmsx102.ccr.corp.intel.com> MIME-Version: 1.0 In-Reply-To: <0C09AFA07DD0434D9E2A0C6AEB0483103B9C46A4@shsmsx102.ccr.corp.intel.com> User-Agent: NeoMutt/20170113 (1.7.2) Subject: Re: [PATCH v2 1/3] MdePkg: restrict UefiMultiPhase.h contents if VFRCOMPILE defined X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 22 Feb 2018 20:03:05 -0000 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Hi Star, I lost track of this one during my sabbatical until Ard's patch earlier today jogged my memory. On Sun, Dec 17, 2017 at 11:23:10AM +0000, Zeng, Star wrote: > You may submit a bugzilla for the long term approach as Liming > suggested in V1 patch series, and then add the bug link in this > commit log? I have raised https://bugzilla.tianocore.org/show_bug.cgi?id=878 for the enhancement. Are you OK with the patch as below (it rebases cleanly to current master) if I add the paragraph: --- https://bugzilla.tianocore.org/show_bug.cgi?id=878 has been raised to request VfrCompile is extended to support the original format. --- to the end of the commit message? Regards, Leif > > > > Thanks, > Star > -----Original Message----- > From: edk2-devel [mailto:edk2-devel-bounces@lists.01.org] On Behalf Of Leif Lindholm > Sent: Saturday, December 16, 2017 12:59 AM > To: edk2-devel@lists.01.org > Cc: Kinney, Michael D ; Gao, Liming > Subject: [edk2] [PATCH v2 1/3] MdePkg: restrict UefiMultiPhase.h contents if VFRCOMPILE defined > > 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(-) > > 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 > -- > 2.11.0 > > _______________________________________________ > edk2-devel mailing list > edk2-devel@lists.01.org > https://lists.01.org/mailman/listinfo/edk2-devel