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
This commit is contained in:
Tim He
2015-05-08 03:13:37 +00:00
committed by timhe
parent 7849538e0e
commit f4e7aa05a3
26 changed files with 1320 additions and 38 deletions

View File

@@ -1,6 +1,6 @@
/** @file
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
@@ -1763,10 +1763,12 @@ PlatformBdsPolicyBehavior (
//
Timeout = 0xFFFF;
goto FULL_CONFIGURATION;
}
if (SystemConfiguration.QuietBoot) {
EnableQuietBoot (PcdGetPtr(PcdLogoFile));
}
if (SystemConfiguration.QuietBoot) {
EnableQuietBoot (PcdGetPtr(PcdLogoFile));
} else {
PlatformBdsDiagnostics (IGNORE, FALSE, BaseMemoryTest);
}
@@ -1951,10 +1953,12 @@ FULL_CONFIGURATION:
if (DeferredImageExist) {
//
// After user authentication, the deferred drivers was loaded again.
// Here, need to ensure the deferred drivers are connected.
// Here, need to ensure the deferred drivers are connected.
//
Status = PlatformBdsConnectConsole (gPlatformConsole);
if (EFI_ERROR (Status)) {
Status = PlatformBdsConnectConsole (gPlatformConsole);
if (EFI_ERROR (Status)) {
PlatformBdsNoConsoleAction ();
}
PlatformBdsConnectSequence ();
}
}