Move PcdConInConnectOnDemand initlization to PlatformBds constructor so that hotkey...

[mirror_edk2.git] / IntelFrameworkModulePkg / Universal / BdsDxe / Hotkey.c

diff --git a/IntelFrameworkModulePkg/Universal/BdsDxe/Hotkey.c b/IntelFrameworkModulePkg/Universal/BdsDxe/Hotkey.c
index f81002b549411765f29ab5d41d04035308020c63..d3bb1ef47890b95522de36eb26741d581a1b5c1b 100644 (file)
--- a/IntelFrameworkModulePkg/Universal/BdsDxe/Hotkey.c
+++ b/IntelFrameworkModulePkg/Universal/BdsDxe/Hotkey.c
@@ -662,11 +662,16 @@ InitializeHotkeyService (
   EFI_KEY_OPTION  *KeyOption;\r
 \r
   //\r
-  // Export our capability - EFI_BOOT_OPTION_SUPPORT_KEY and EFI_BOOT_OPTION_SUPPORT_APP\r
+  // Export our capability - EFI_BOOT_OPTION_SUPPORT_KEY and EFI_BOOT_OPTION_SUPPORT_APP.\r
   // with maximum number of key presses of 3\r
+  // Do not report the hotkey capability if PcdConInConnectOnDemand is enabled.\r
   //\r
-  BootOptionSupport = EFI_BOOT_OPTION_SUPPORT_KEY | EFI_BOOT_OPTION_SUPPORT_APP;\r
-  SET_BOOT_OPTION_SUPPORT_KEY_COUNT (BootOptionSupport, 3);\r
+  BootOptionSupport = EFI_BOOT_OPTION_SUPPORT_APP;\r
+  if (!PcdGetBool (PcdConInConnectOnDemand)) {\r
+    BootOptionSupport |= EFI_BOOT_OPTION_SUPPORT_KEY;\r
+    SET_BOOT_OPTION_SUPPORT_KEY_COUNT (BootOptionSupport, 3);\r
+  }\r
+\r
   Status = gRT->SetVariable (\r
                   L"BootOptionSupport",\r
                   &gEfiGlobalVariableGuid,\r