From f4e7aa05a3fe348dda4c1f491a48789ef5b7e4d1 Mon Sep 17 00:00:00 2001
From: Tim He <tim.he@intel.com>
Date: Fri, 8 May 2015 03:13:37 +0000
Subject: Sync the branch changes to trunk.

Support fTPM feature, and update the BiosID to 0.80.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Tim He <tim.he@intel.com>


git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@17362 6f19259b-4bc3-4df7-8a09-765794883524
---
 Vlv2TbltDevicePkg/Include/Guid/SetupVariable.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'Vlv2TbltDevicePkg/Include')

diff --git a/Vlv2TbltDevicePkg/Include/Guid/SetupVariable.h b/Vlv2TbltDevicePkg/Include/Guid/SetupVariable.h
index eb0a1760b0..6b9b83066e 100644
--- a/Vlv2TbltDevicePkg/Include/Guid/SetupVariable.h
+++ b/Vlv2TbltDevicePkg/Include/Guid/SetupVariable.h
@@ -1,6 +1,6 @@
 /*++
 
-  Copyright (c) 2004  - 2014, Intel Corporation. All rights reserved.<BR>
+  Copyright (c) 2004  - 2015, Intel Corporation. All rights reserved.<BR>
                                                                                    
 
   This program and the accompanying materials are licensed and made available under
@@ -1110,7 +1110,7 @@ typedef struct {
   UINT8           GfxBoost;
   UINT8           IgdThermal;
   UINT8           SEC00;
-  UINT8           SEC01;
+  UINT8           fTPM;
   UINT8           SEC02;
   UINT8           SEC03;
   UINT8           MeasuredBootEnable;
-- 
cgit v1.2.3