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/PlatformPkgConfig.dsc | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'Vlv2TbltDevicePkg/PlatformPkgConfig.dsc')

diff --git a/Vlv2TbltDevicePkg/PlatformPkgConfig.dsc b/Vlv2TbltDevicePkg/PlatformPkgConfig.dsc
index ec24fed40..db50b9322 100644
--- a/Vlv2TbltDevicePkg/PlatformPkgConfig.dsc
+++ b/Vlv2TbltDevicePkg/PlatformPkgConfig.dsc
@@ -1,7 +1,7 @@
 #/** @file
 # platform configuration file.
 #
-# Copyright (c) 2012  - 2014, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2012  - 2015, Intel Corporation. All rights reserved.<BR>
 #                                                                                  

 # This program and the accompanying materials are licensed and made available under

 # the terms and conditions of the BSD License that accompanies this distribution.  

@@ -43,6 +43,7 @@ DEFINE CLKGEN_CONFIG_EXTRA_ENABLE=TRUE
 #
 DEFINE USE_HPET_TIMER = FALSE
 
+
 #
 # Feature selection
 #
-- 
cgit v1.2.3