Skip to content
This repository was archived by the owner on Mar 28, 2025. It is now read-only.

Commit 3badb2a

Browse files
Agyeman, Princemakubacki
Agyeman, Prince
authored and
makubacki
committed
KabylakeOpenBoardPkg: Add Ps2 Keyboard Support
REF: https://bugzilla.tianocore.org/show_bug.cgi?id=2228 What was done: * Added BDS Ps2 keyboard DXE driver. * Added Super I/O DXE driver to publish the SIO protocol needed by the Ps2 keyboard DXE driver. * Included a Ps2 Library to BdsDxe driver to add the Ps2 device path to ConIn and ConInDev variables. * Configured the Super I/O Pci to Isa bridge bus, device, function device info PCD. This will help the Super I/O driver identify which bridge the Super I/O is connected to. * Removed duplicate Ps2 enable PCDs. * Updated libraries to use Ps2 enable PCD defined in BoardModulePkg. Signed-off-by: Prince Agyeman <[email protected]> Reviewed-by: Chasel Chiu <[email protected]> Reviewed-by: Nate DeSimone <[email protected]> Reviewed-by: Michael Kubacki <[email protected]>
1 parent 0984a02 commit 3badb2a

11 files changed

+37
-6
lines changed

‎Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/Library/BoardAcpiLib/DxeBoardAcpiTableLib.inf

+2-1
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,10 @@
3333
MinPlatformPkg/MinPlatformPkg.dec
3434
KabylakeOpenBoardPkg/OpenBoardPkg.dec
3535
KabylakeSiliconPkg/SiPkg.dec
36+
BoardModulePkg/BoardModulePkg.dec
3637

3738
[Pcd]
38-
gKabylakeOpenBoardPkgTokenSpaceGuid.PcdPs2KbMsEnable
39+
gBoardModulePkgTokenSpaceGuid.PcdPs2KbMsEnable
3940
gMinPlatformPkgTokenSpaceGuid.PcdPciExpNative
4041
gMinPlatformPkgTokenSpaceGuid.PcdNativeAspmEnable
4142
gMinPlatformPkgTokenSpaceGuid.PcdLowPowerS0Idle

‎Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/Library/BoardAcpiLib/DxeMultiBoardAcpiSupportLib.inf

+2-1
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,10 @@
3434
MinPlatformPkg/MinPlatformPkg.dec
3535
KabylakeOpenBoardPkg/OpenBoardPkg.dec
3636
KabylakeSiliconPkg/SiPkg.dec
37+
BoardModulePkg/BoardModulePkg.dec
3738

3839
[Pcd]
39-
gKabylakeOpenBoardPkgTokenSpaceGuid.PcdPs2KbMsEnable
40+
gBoardModulePkgTokenSpaceGuid.PcdPs2KbMsEnable
4041
gKabylakeOpenBoardPkgTokenSpaceGuid.PcdPciExpNative
4142
gKabylakeOpenBoardPkgTokenSpaceGuid.PcdNativeAspmEnable
4243
gKabylakeOpenBoardPkgTokenSpaceGuid.PcdLowPowerS0Idle

‎Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/OpenBoardPkg.dsc

+6
Original file line numberDiff line numberDiff line change
@@ -312,6 +312,11 @@
312312
MdeModulePkg/Bus/Pci/PciHostBridgeDxe/PciHostBridgeDxe.inf
313313
MdeModulePkg/Bus/Pci/SataControllerDxe/SataControllerDxe.inf
314314
MdeModulePkg/Universal/Console/GraphicsOutputDxe/GraphicsOutputDxe.inf
315+
MdeModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2KeyboardDxe.inf
316+
MdeModulePkg/Universal/BdsDxe/BdsDxe.inf{
317+
<LibraryClasses>
318+
NULL|BoardModulePkg/Library/BdsPs2KbcLib/BdsPs2KbcLib.inf
319+
}
315320
UefiCpuPkg/CpuDxe/CpuDxe.inf
316321

317322
ShellPkg/Application/Shell/Shell.inf {
@@ -409,3 +414,4 @@
409414
!endif
410415
}
411416
!endif
417+
BoardModulePkg/LegacySioDxe/LegacySioDxe.inf

‎Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/OpenBoardPkg.fdf

+2
Original file line numberDiff line numberDiff line change
@@ -335,6 +335,8 @@ INF MdeModulePkg/Bus/Ata/AtaBusDxe/AtaBusDxe.inf
335335
INF MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThru.inf
336336
INF MdeModulePkg/Universal/Console/GraphicsOutputDxe/GraphicsOutputDxe.inf
337337
INF MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressDxe.inf
338+
INF BoardModulePkg/LegacySioDxe/LegacySioDxe.inf
339+
INF MdeModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2KeyboardDxe.inf
338340

339341
INF ShellPkg/Application/Shell/Shell.inf
340342

‎Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/OpenBoardPkgPcd.dsc

+6
Original file line numberDiff line numberDiff line change
@@ -308,6 +308,12 @@
308308
gMinPlatformPkgTokenSpaceGuid.PcdTestPointIbvPlatformFeature|{0x03, 0x0F, 0x07, 0x1F, 0x1F, 0x0F, 0x0F, 0x07, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}
309309
!endif
310310

311+
######################################
312+
# Board Configuration
313+
######################################
314+
gBoardModulePkgTokenSpaceGuid.PcdPs2KbMsEnable|1
315+
gBoardModulePkgTokenSpaceGuid.PcdSuperIoPciIsaBridgeDevice|{0x00, 0x00, 0x1F, 0x00}
316+
311317
[PcdsFixedAtBuild.IA32]
312318
######################################
313319
# Edk2 Configuration

‎Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardAcpiLib/DxeBoardAcpiTableLib.inf

+2-1
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,10 @@
3333
MinPlatformPkg/MinPlatformPkg.dec
3434
KabylakeOpenBoardPkg/OpenBoardPkg.dec
3535
KabylakeSiliconPkg/SiPkg.dec
36+
BoardModulePkg/BoardModulePkg.dec
3637

3738
[Pcd]
38-
gKabylakeOpenBoardPkgTokenSpaceGuid.PcdPs2KbMsEnable
39+
gBoardModulePkgTokenSpaceGuid.PcdPs2KbMsEnable
3940
gKabylakeOpenBoardPkgTokenSpaceGuid.PcdPciExpNative
4041
gKabylakeOpenBoardPkgTokenSpaceGuid.PcdNativeAspmEnable
4142
gKabylakeOpenBoardPkgTokenSpaceGuid.PcdLowPowerS0Idle

‎Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardAcpiLib/DxeMultiBoardAcpiSupportLib.inf

+2-1
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,10 @@
3434
MinPlatformPkg/MinPlatformPkg.dec
3535
KabylakeOpenBoardPkg/OpenBoardPkg.dec
3636
KabylakeSiliconPkg/SiPkg.dec
37+
BoardModulePkg/BoardModulePkg.dec
3738

3839
[Pcd]
39-
gKabylakeOpenBoardPkgTokenSpaceGuid.PcdPs2KbMsEnable
40+
gBoardModulePkgTokenSpaceGuid.PcdPs2KbMsEnable
4041
gKabylakeOpenBoardPkgTokenSpaceGuid.PcdPciExpNative
4142
gKabylakeOpenBoardPkgTokenSpaceGuid.PcdNativeAspmEnable
4243
gKabylakeOpenBoardPkgTokenSpaceGuid.PcdLowPowerS0Idle

‎Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/OpenBoardPkg.dsc

+6
Original file line numberDiff line numberDiff line change
@@ -382,6 +382,11 @@
382382
MdeModulePkg/Bus/Pci/PciHostBridgeDxe/PciHostBridgeDxe.inf
383383
MdeModulePkg/Bus/Pci/SataControllerDxe/SataControllerDxe.inf
384384
MdeModulePkg/Universal/Console/GraphicsOutputDxe/GraphicsOutputDxe.inf
385+
MdeModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2KeyboardDxe.inf
386+
MdeModulePkg/Universal/BdsDxe/BdsDxe.inf{
387+
<LibraryClasses>
388+
NULL|BoardModulePkg/Library/BdsPs2KbcLib/BdsPs2KbcLib.inf
389+
}
385390
UefiCpuPkg/CpuDxe/CpuDxe.inf
386391

387392
!if gIntelFsp2WrapperTokenSpaceGuid.PcdFspModeSelection == 1
@@ -486,3 +491,4 @@
486491
!endif
487492
}
488493
!endif
494+
BoardModulePkg/LegacySioDxe/LegacySioDxe.inf

‎Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/OpenBoardPkg.fdf

+2
Original file line numberDiff line numberDiff line change
@@ -336,6 +336,8 @@ INF MdeModulePkg/Bus/Pci/SataControllerDxe/SataControllerDxe.inf
336336
INF MdeModulePkg/Bus/Ata/AtaBusDxe/AtaBusDxe.inf
337337
INF MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThru.inf
338338
INF MdeModulePkg/Universal/Console/GraphicsOutputDxe/GraphicsOutputDxe.inf
339+
INF BoardModulePkg/LegacySioDxe/LegacySioDxe.inf
340+
INF MdeModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2KeyboardDxe.inf
339341

340342
INF ShellPkg/Application/Shell/Shell.inf
341343

‎Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/OpenBoardPkgPcd.dsc

+7
Original file line numberDiff line numberDiff line change
@@ -324,6 +324,13 @@
324324
gMinPlatformPkgTokenSpaceGuid.PcdTestPointIbvPlatformFeature|{0x03, 0x0F, 0x07, 0x1F, 0x1F, 0x0F, 0x0F, 0x07, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}
325325
!endif
326326

327+
328+
######################################
329+
# Board Configuration
330+
######################################
331+
gBoardModulePkgTokenSpaceGuid.PcdPs2KbMsEnable|1
332+
gBoardModulePkgTokenSpaceGuid.PcdSuperIoPciIsaBridgeDevice|{0x00, 0x00, 0x1F, 0x00}
333+
327334
[PcdsFixedAtBuild.IA32]
328335
######################################
329336
# Edk2 Configuration

‎Platform/Intel/KabylakeOpenBoardPkg/OpenBoardPkg.dec

-2
Original file line numberDiff line numberDiff line change
@@ -288,8 +288,6 @@ gKabylakeOpenBoardPkgTokenSpaceGuid.PcdBoardUcmcGpioTableSize|0|UINT16|0x0000001
288288
# Misc
289289
gKabylakeOpenBoardPkgTokenSpaceGuid.PcdIoExpanderPresent|FALSE|BOOLEAN|0x000000EC
290290

291-
gKabylakeOpenBoardPkgTokenSpaceGuid.PcdPs2KbMsEnable|1|UINT8|0x40000009
292-
293291
gKabylakeOpenBoardPkgTokenSpaceGuid.PcdAcpiSleepState|1|UINT8|0x40000002
294292
gKabylakeOpenBoardPkgTokenSpaceGuid.PcdAcpiHibernate|1|UINT8|0x40000003
295293
gKabylakeOpenBoardPkgTokenSpaceGuid.PcdLowPowerS0Idle|0|UINT8|0x40000004

0 commit comments

Comments
 (0)