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:c0c::243; helo=mail-wr0-x243.google.com; envelope-from=leif.lindholm@linaro.org; receiver=edk2-devel@lists.01.org Received: from mail-wr0-x243.google.com (mail-wr0-x243.google.com [IPv6:2a00:1450:400c:c0c::243]) (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 208792216D8F5 for ; Fri, 15 Dec 2017 08:54:46 -0800 (PST) Received: by mail-wr0-x243.google.com with SMTP id l11so2536245wrc.11 for ; Fri, 15 Dec 2017 08:59:29 -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; bh=Rjw6VhnOAOw3zotFcYa+LRt0qDKn6PhUQyyQGdvI+mM=; b=kvqn5lT4Lzkp1HH7pttGxtbsd4KIvtAgsemt9i8O9/K8g5nFq7CWLJPqjmzxwL2F8v TgZa1Yh2GAP1URk7Tv6ROU1yLmrc0g0HniUz4Rz1hOSbMsV2ayGfP0cTudFVyB/qWB8l nHQdMv4KjRXrxJ77SbWljIKuHLeBZz3mwcQuc= 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; bh=Rjw6VhnOAOw3zotFcYa+LRt0qDKn6PhUQyyQGdvI+mM=; b=T00sT9uerMjT+mhVQ8QqO4/DJABcWEXybGmnwyn89D3LRX3VzMbl3tvo30+SzJQqR3 2UQD6EkCSHfMoJhp2/xYqXv6qHM0mxMGopk8a8oayDv6OZe5FcjvpKfzMhjWKmvs5687 eAjLHuE8utTnzrZa1iIT+XWDI79USiTRfnWAONcAdtAOkEdVwYNrlLB/PhWQAlTqqbqo Tcnqn8E6NDt1ZQwUlrs7nuS2DEXRPymk89e4m1eZu2uAzkK3y3Ebl5thZcNUAxJepCDP SYWMVNvKVboKsYwiUv+Uksjk8NhPHNllmN83IY2qoQkLnE+1W/uqPjr6NhyTKA1pfg46 o/6Q== X-Gm-Message-State: AKGB3mISf9aQl2u5NySVcYRm4qARZOj7ryhQrd7z4Sh2jtfpwZ8EQ9iG /sUUinS+6qHta4KYtn1sz3FpzWmieos= X-Google-Smtp-Source: ACJfBovNdLZ6NRlJjcuiXE+2Vwy7/457FNdhJSpL0Yy2Gorwynukbsv0FgwIrYEXrVxXmp43e9cMpw== X-Received: by 10.223.153.4 with SMTP id x4mr4606606wrb.219.1513357167509; Fri, 15 Dec 2017 08:59:27 -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.25 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 15 Dec 2017 08:59:26 -0800 (PST) From: Leif Lindholm To: edk2-devel@lists.01.org Cc: Michael D Kinney , Liming Gao , Ard Biesheuvel , Star Zeng , Eric Dong Date: Fri, 15 Dec 2017 16:59:22 +0000 Message-Id: <20171215165925.12306-1-leif.lindholm@linaro.org> X-Mailer: git-send-email 2.11.0 Subject: [PATCH v2 0/3] Use central definitions for EFI_VARIABLE_* 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: , X-List-Received-Date: Fri, 15 Dec 2017 16:54:47 -0000 The set of variable attribute definitions in is used by C code, but VfrCompile does not seem happy with parts of that header file. Long-term, this should probably be fixed in VfrCompile, but a simple solution for now is to conditionalise the complicating segments of UefiMultiPhase.h on !VFRCOMPILE and include this directly in .vfr source. v1 -> v2: Instead of breaking parts of UefiMultiPhase.h out into a new header, conditionalise the problematic bits on !VFRCOMPILE. Leaving out the reviewed-bys on 2/3 since the underlying mechanism changes... Leif Lindholm (3): MdePkg: restrict UefiMultiPhase.h contents if VFRCOMPILE defined MdeModulePkg: use central variable definitions in DriverSampleDxe EmbeddedPkg: use central variable definitions in .vfr files EmbeddedPkg/Drivers/ConsolePrefDxe/ConsolePrefHii.vfr | 9 +--- EmbeddedPkg/Drivers/DtPlatformDxe/DtPlatformHii.vfr | 9 +--- MdeModulePkg/Universal/DriverSampleDxe/Vfr.vfr | 9 +--- MdePkg/Include/Uefi/UefiMultiPhase.h | 44 ++++++++++---------- 4 files changed, 26 insertions(+), 45 deletions(-) Cc: Michael D Kinney Cc: Liming Gao Cc: Ard Biesheuvel Cc: Star Zeng Cc: Eric Dong -- 2.11.0