gEfiPs2PolicyProtocolGuid and PcdFastPS2Detection was missed when
resolving the conflict.
Check in the two definition to MdeModulePkg.dec to fix build failure.
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Ruiyu Ni <ruiyu...@intel.com>
Cc: Feng Tian <feng.t...@intel.com>
---
MdeModulePkg/MdeModulePkg.dec | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/MdeModulePkg/MdeModulePkg.dec b/MdeModulePkg/MdeModulePkg.dec
index 49bd105..cbedb51 100644
--- a/MdeModulePkg/MdeModulePkg.dec
+++ b/MdeModulePkg/MdeModulePkg.dec
@@ -493,6 +493,10 @@
gIpmiProtocolGuid = { 0xdbc6381f, 0x5554, 0x4d14, { 0x8f, 0xfd, 0x76,
0xd7, 0x87, 0xb8, 0xac, 0xbf } }
gSmmIpmiProtocolGuid = { 0x5169af60, 0x8c5a, 0x4243, { 0xb3, 0xe9, 0x56,
0xc5, 0x6d, 0x18, 0xee, 0x26 } }
+ ## PS/2 policy protocol abstracts the specific platform initialization and
setting.
+ # Include/Protocol/Ps2Policy.h
+ gEfiPs2PolicyProtocolGuid = { 0x4DF19259, 0xDC71, 0x4D46, { 0xBE, 0xF1,
0x35, 0x7B, 0xB5, 0x78, 0xC4, 0x18 } }
+
#
# [Error.gEfiMdeModulePkgTokenSpaceGuid]
# 0x80000001 | Invalid value provided.
@@ -738,6 +742,13 @@
# @Prompt Turn on PS2 Mouse Extended Verification
gEfiMdeModulePkgTokenSpaceGuid.PcdPs2MouseExtendedVerification|TRUE|BOOLEAN|0x00010075
+ ## Indicates if to use the optimized timing for best PS2 detection
performance.
+ # Note this PCD could be set to TRUE for best boot performance and set to
FALSE for best device compatibility.<BR><BR>
+ # TRUE - Use the optimized timing for best PS2 detection performance.<BR>
+ # FALSE - Use the normal timing to detect PS2.<BR>
+ # @Prompt Enable fast PS2 detection
+ gEfiMdeModulePkgTokenSpaceGuid.PcdFastPS2Detection|FALSE|BOOLEAN|0x00010076
+
[PcdsFeatureFlag.IA32, PcdsFeatureFlag.X64]
## Indicates if DxeIpl should switch to long mode to enter DXE phase.
# It is assumed that 64-bit DxeCore is built in firmware if it is true;
otherwise 32-bit DxeCore
--
2.7.0.windows.1
_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel
