Reviewed-By: Olivier Martin <[email protected]> > -----Original Message----- > From: Laszlo Ersek [mailto:[email protected]] > Sent: 14 February 2015 22:02 > To: [email protected]; [email protected]; Peter Maydell; Ard > Biesheuvel; Drew Jones; Wei Huang; Donald Dutile; Wei Liu > Subject: [edk2] [PATCH 25/27] > ArmVirtualizationPkg/ArmVirtualizationQemu: add USB keyboard input > > Similarly to the previous patch, we can now multiplex input from the > USB > keyboard. > > Contributed-under: TianoCore Contribution Agreement 1.0 > Signed-off-by: Laszlo Ersek <[email protected]> > --- > ArmPlatformPkg/ArmVirtualizationPkg/ArmVirtualization.dsc.inc | 3 +++ > ArmPlatformPkg/ArmVirtualizationPkg/ArmVirtualizationQemu.dsc | 24 > ++++++++++++++++++-- > ArmPlatformPkg/ArmVirtualizationPkg/ArmVirtualizationQemu.fdf | 8 > +++++++ > 3 files changed, 33 insertions(+), 2 deletions(-) > > diff --git > a/ArmPlatformPkg/ArmVirtualizationPkg/ArmVirtualization.dsc.inc > b/ArmPlatformPkg/ArmVirtualizationPkg/ArmVirtualization.dsc.inc > index 70b14fb..a1e10d7 100644 > --- a/ArmPlatformPkg/ArmVirtualizationPkg/ArmVirtualization.dsc.inc > +++ b/ArmPlatformPkg/ArmVirtualizationPkg/ArmVirtualization.dsc.inc > @@ -104,6 +104,9 @@ > PciLib|MdePkg/Library/BasePciLibPciExpress/BasePciLibPciExpress.inf > > PciExpressLib|ArmPlatformPkg/ArmVirtualizationPkg/Library/BaseCachingPc > iExpressLib/BaseCachingPciExpressLib.inf > > + # USB Libraries > + UefiUsbLib|MdePkg/Library/UefiUsbLib/UefiUsbLib.inf > + > [LibraryClasses.common.SEC] > PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf > > ArmPlatformSecExtraActionLib|ArmPlatformPkg/Library/DebugSecExtraAction > Lib/DebugSecExtraActionLib.inf > diff --git > a/ArmPlatformPkg/ArmVirtualizationPkg/ArmVirtualizationQemu.dsc > b/ArmPlatformPkg/ArmVirtualizationPkg/ArmVirtualizationQemu.dsc > index a1ec455..8baca88 100644 > --- a/ArmPlatformPkg/ArmVirtualizationPkg/ArmVirtualizationQemu.dsc > +++ b/ArmPlatformPkg/ArmVirtualizationPkg/ArmVirtualizationQemu.dsc > @@ -127,13 +127,25 @@ > gArmPlatformTokenSpaceGuid.PcdDefaultBootType|0 > > # > - # Use the serial console (ConIn & ConOut) and the Graphic driver > (ConOut) > + # Use the serial console (ConIn & ConOut), the USB keyboard (ConIn), > and the > + # Graphic driver (ConOut). > # > # For the PCI VGA device path to work, you must start QEMU with the > option > # '-device VGA,addr=01.0' (see "Pci(0x1,0x0)"). > # > + # For the USB keyboard device path to work, the following QEMU > options are > + # needed (see "docs/usb2.txt" and "docs/ich9-ehci-uhci.cfg"): > + # > + # -device ich9-usb-ehci1,multifunction=on,addr=1d.7,id=ehci > + # -device ich9-usb- > uhci1,multifunction=on,addr=1d.0,masterbus=ehci.0,firstport=0 > + # -device ich9-usb- > uhci2,multifunction=on,addr=1d.1,masterbus=ehci.0,firstport=2 > + # -device ich9-usb- > uhci3,multifunction=on,addr=1d.2,masterbus=ehci.0,firstport=4 > + # -device usb-kbd,bus=ehci.0 > + # > + # Note the match between addr=1d.7 and Pci(0x1D,0x7). > + # > gArmPlatformTokenSpaceGuid.PcdDefaultConOutPaths|L"VenHw(D3987D4B- > 971A-435F-8CAF- > 4967EB627241)/Uart(38400,8,N,1)/VenVt100();PciRoot(0x0)/Pci(0x1,0x0)/Ac > piAdr(0x80010100)" > - gArmPlatformTokenSpaceGuid.PcdDefaultConInPaths|L"VenHw(D3987D4B- > 971A-435F-8CAF-4967EB627241)/Uart(38400,8,N,1)/VenVt100()" > + gArmPlatformTokenSpaceGuid.PcdDefaultConInPaths|L"VenHw(D3987D4B- > 971A-435F-8CAF- > 4967EB627241)/Uart(38400,8,N,1)/VenVt100();PciRoot(0x0)/Pci(0x1D,0x7)/U > SB(0x0,0x0)" > gArmPlatformTokenSpaceGuid.PcdPlatformBootTimeOut|3 > > # > @@ -332,3 +344,11 @@ > > BltLib|OptionRomPkg/Library/FrameBufferBltLib/FrameBufferBltLib.inf > } > OvmfPkg/PlatformDxe/Platform.inf > + > + # > + # Usb Support > + # > + MdeModulePkg/Bus/Pci/UhciDxe/UhciDxe.inf > + MdeModulePkg/Bus/Pci/EhciDxe/EhciDxe.inf > + MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBusDxe.inf > + MdeModulePkg/Bus/Usb/UsbKbDxe/UsbKbDxe.inf > diff --git > a/ArmPlatformPkg/ArmVirtualizationPkg/ArmVirtualizationQemu.fdf > b/ArmPlatformPkg/ArmVirtualizationPkg/ArmVirtualizationQemu.fdf > index 1d20d4e..ea41269 100644 > --- a/ArmPlatformPkg/ArmVirtualizationPkg/ArmVirtualizationQemu.fdf > +++ b/ArmPlatformPkg/ArmVirtualizationPkg/ArmVirtualizationQemu.fdf > @@ -210,6 +210,14 @@ READ_LOCK_STATUS = TRUE > INF OvmfPkg/QemuVideoDxe/QemuVideoDxe.inf > INF OvmfPkg/PlatformDxe/Platform.inf > > + # > + # Usb Support > + # > + INF MdeModulePkg/Bus/Pci/UhciDxe/UhciDxe.inf > + INF MdeModulePkg/Bus/Pci/EhciDxe/EhciDxe.inf > + INF MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBusDxe.inf > + INF MdeModulePkg/Bus/Usb/UsbKbDxe/UsbKbDxe.inf > + > [FV.FVMAIN_COMPACT] > FvAlignment = 16 > ERASE_POLARITY = 1 > -- > 1.8.3.1 > > > > ----------------------------------------------------------------------- > ------- > Dive into the World of Parallel Programming. The Go Parallel Website, > sponsored by Intel and developed in partnership with Slashdot Media, is > your > hub for all things parallel software development, from weekly thought > leadership blogs to news, videos, case studies, tutorials and more. > Take a > look and join the conversation now. http://goparallel.sourceforge.net/ > _______________________________________________ > edk2-devel mailing list > [email protected] > https://lists.sourceforge.net/lists/listinfo/edk2-devel
------------------------------------------------------------------------------ Download BIRT iHub F-Type - The Free Enterprise-Grade BIRT Server from Actuate! Instantly Supercharge Your Business Reports and Dashboards with Interactivity, Sharing, Native Excel Exports, App Integration & more Get technology previously reserved for billion-dollar corporations, FREE http://pubads.g.doubleclick.net/gampad/clk?id=190641631&iu=/4140/ostg.clktrk _______________________________________________ edk2-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/edk2-devel
