diff options
| author | vanjeff <vanjeff@6f19259b-4bc3-4df7-8a09-765794883524> | 2012-10-11 08:13:20 +0000 |
|---|---|---|
| committer | vanjeff <vanjeff@6f19259b-4bc3-4df7-8a09-765794883524> | 2012-10-11 08:13:20 +0000 |
| commit | 3eb18248cd1999ddb9861712f958467344d97d68 (patch) | |
| tree | 5dfc1e434610849859e6ad529bc5cd7be8fa366a /IntelFrameworkModulePkg/Universal/BdsDxe/Bds.h | |
| parent | 1f62484a60854a0a4f7a20e901dc0fa8609318ae (diff) | |
| download | edk2-3eb18248cd1999ddb9861712f958467344d97d68.tar.gz | |
Sync r13507, r13508, r13577, r13748 and r13814 from main trunk.
1. Update the logic to force user to reset when change configuration which need to reset.
2. Move PcdConInConnectOnDemand initlization to PlatformBds constructor so that hotkey service can act accordingly.
3. Reset system only when the pre-allocated memory is more than 1.5 of needed memory and boot mode is BOOT_WITH_DEFAULT_SETTING, or less than the needed memory.
4. Fix some corner case for LazyConIn feature.
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/branches/UDK2010.SR1@13822 6f19259b-4bc3-4df7-8a09-765794883524
Diffstat (limited to 'IntelFrameworkModulePkg/Universal/BdsDxe/Bds.h')
| -rw-r--r-- | IntelFrameworkModulePkg/Universal/BdsDxe/Bds.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/IntelFrameworkModulePkg/Universal/BdsDxe/Bds.h b/IntelFrameworkModulePkg/Universal/BdsDxe/Bds.h index 008d13e41b..0929f1d27b 100644 --- a/IntelFrameworkModulePkg/Universal/BdsDxe/Bds.h +++ b/IntelFrameworkModulePkg/Universal/BdsDxe/Bds.h @@ -1,7 +1,7 @@ /** @file
Head file for BDS Architectural Protocol implementation
-Copyright (c) 2004 - 2011, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2004 - 2012, 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
which accompanies this distribution. The full text of the license may be found at
@@ -34,6 +34,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. #include <Guid/StatusCodeDataTypeId.h>
#include <Guid/LegacyDevOrder.h>
#include <Guid/BdsHii.h>
+#include <Guid/ConnectConInEvent.h>
#include <Protocol/GenericMemoryTest.h>
#include <Protocol/FormBrowser2.h>
#include <Protocol/HiiConfigAccess.h>
|