summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorczhang46 <czhang46@6f19259b-4bc3-4df7-8a09-765794883524>2012-08-01 08:09:15 +0000
committerczhang46 <czhang46@6f19259b-4bc3-4df7-8a09-765794883524>2012-08-01 08:09:15 +0000
commit0a57b95918cd78bc9c5dee6ce0e146dead8f6965 (patch)
tree231d5dbed4b7e5265b0b485093cd142fba183081
parentcf98e61d1a6aea646f8f4063d950c2f3f2a00596 (diff)
downloadedk2-platforms-0a57b95918cd78bc9c5dee6ce0e146dead8f6965.tar.xz
Move PcdConInConnectOnDemand initlization to PlatformBds constructor so that hotkey service can act accordingly
Signed-off-by: Chao Zhang<chao.b.zhang@intel.com> Reviewed-by: Ni Ruiyu<ruiyu.ni@intel.com> git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@13577 6f19259b-4bc3-4df7-8a09-765794883524
-rw-r--r--IntelFrameworkModulePkg/Universal/BdsDxe/Hotkey.c11
1 files changed, 8 insertions, 3 deletions
diff --git a/IntelFrameworkModulePkg/Universal/BdsDxe/Hotkey.c b/IntelFrameworkModulePkg/Universal/BdsDxe/Hotkey.c
index f81002b549..d3bb1ef478 100644
--- a/IntelFrameworkModulePkg/Universal/BdsDxe/Hotkey.c
+++ b/IntelFrameworkModulePkg/Universal/BdsDxe/Hotkey.c
@@ -662,11 +662,16 @@ InitializeHotkeyService (
EFI_KEY_OPTION *KeyOption;
//
- // Export our capability - EFI_BOOT_OPTION_SUPPORT_KEY and EFI_BOOT_OPTION_SUPPORT_APP
+ // Export our capability - EFI_BOOT_OPTION_SUPPORT_KEY and EFI_BOOT_OPTION_SUPPORT_APP.
// with maximum number of key presses of 3
+ // Do not report the hotkey capability if PcdConInConnectOnDemand is enabled.
//
- BootOptionSupport = EFI_BOOT_OPTION_SUPPORT_KEY | EFI_BOOT_OPTION_SUPPORT_APP;
- SET_BOOT_OPTION_SUPPORT_KEY_COUNT (BootOptionSupport, 3);
+ BootOptionSupport = EFI_BOOT_OPTION_SUPPORT_APP;
+ if (!PcdGetBool (PcdConInConnectOnDemand)) {
+ BootOptionSupport |= EFI_BOOT_OPTION_SUPPORT_KEY;
+ SET_BOOT_OPTION_SUPPORT_KEY_COUNT (BootOptionSupport, 3);
+ }
+
Status = gRT->SetVariable (
L"BootOptionSupport",
&gEfiGlobalVariableGuid,