1. Patchew
  2. EDK2
  3. View series

[edk2-devel] [PATCH] Marvell/Armada80x0McBin: Enable usb keyboard, nvme boot

Jeremy Linton posted 1 patch 4 years, 11 months ago
Failed in applying to current master (apply log)
Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc | 3 +++
Silicon/Marvell/Armada7k8k/Armada7k8k.fdf     | 2 ++
2 files changed, 5 insertions(+)
[edk2-devel] [PATCH] Marvell/Armada80x0McBin: Enable usb keyboard, nvme boot
Posted by Jeremy Linton 4 years, 11 months ago 
Add a USB keyboard flag, which is needed when a graphical console
is enabled. Also add a nvme boot option for users that choose
that instead of sata or mmc.

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Jeremy Linton <jeremy.linton@arm.com>
---
 Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc | 3 +++
 Silicon/Marvell/Armada7k8k/Armada7k8k.fdf     | 2 ++
 2 files changed, 5 insertions(+)

diff --git a/Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc b/Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc
index 27e52f5af5..89d617fde4 100644
--- a/Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc
+++ b/Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc
@@ -90,6 +90,7 @@
   UefiBootManagerLib|MdeModulePkg/Library/UefiBootManagerLib/UefiBootManagerLib.inf
   UefiHiiServicesLib|MdeModulePkg/Library/UefiHiiServicesLib/UefiHiiServicesLib.inf
   UefiRuntimeLib|MdePkg/Library/UefiRuntimeLib/UefiRuntimeLib.inf
+  UefiUsbLib|MdePkg/Library/UefiUsbLib/UefiUsbLib.inf
 
   PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf
 
@@ -505,6 +506,7 @@
   MdeModulePkg/Bus/Pci/XhciDxe/XhciDxe.inf
   MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBusDxe.inf
   MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorageDxe.inf
+  MdeModulePkg/Bus/Usb/UsbKbDxe/UsbKbDxe.inf
 
   # SD/MMC
   MdeModulePkg/Bus/Sd/EmmcDxe/EmmcDxe.inf
@@ -516,6 +518,7 @@
   ArmPkg/Drivers/ArmPciCpuIo2Dxe/ArmPciCpuIo2Dxe.inf
   MdeModulePkg/Bus/Pci/PciHostBridgeDxe/PciHostBridgeDxe.inf
   MdeModulePkg/Bus/Pci/PciBusDxe/PciBusDxe.inf
+  MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressDxe.inf
 
   # Console packages
   MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatformDxe.inf
diff --git a/Silicon/Marvell/Armada7k8k/Armada7k8k.fdf b/Silicon/Marvell/Armada7k8k/Armada7k8k.fdf
index 47e3bc4f82..f59cc1f263 100644
--- a/Silicon/Marvell/Armada7k8k/Armada7k8k.fdf
+++ b/Silicon/Marvell/Armada7k8k/Armada7k8k.fdf
@@ -151,6 +151,7 @@ FvNameGuid         = 5eda4200-2c5f-43cb-9da3-0baf74b1b30c
   INF MdeModulePkg/Bus/Pci/XhciDxe/XhciDxe.inf
   INF MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBusDxe.inf
   INF MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorageDxe.inf
+  INF MdeModulePkg/Bus/Usb/UsbKbDxe/UsbKbDxe.inf
 
   # SD/MMC
   INF MdeModulePkg/Bus/Sd/EmmcDxe/EmmcDxe.inf
@@ -162,6 +163,7 @@ FvNameGuid         = 5eda4200-2c5f-43cb-9da3-0baf74b1b30c
   INF ArmPkg/Drivers/ArmPciCpuIo2Dxe/ArmPciCpuIo2Dxe.inf
   INF MdeModulePkg/Bus/Pci/PciHostBridgeDxe/PciHostBridgeDxe.inf
   INF MdeModulePkg/Bus/Pci/PciBusDxe/PciBusDxe.inf
+  INF MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressDxe.inf
 
   # Multiple Console IO support
   INF MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatformDxe.inf
-- 
2.13.7


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#41547): https://edk2.groups.io/g/devel/message/41547
Mute This Topic: https://groups.io/mt/31828270/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [edk2-devel] [PATCH] Marvell/Armada80x0McBin: Enable usb keyboard, nvme boot
Posted by Leif Lindholm 4 years, 11 months ago 
On Tue, May 28, 2019 at 06:43:13PM -0500, Jeremy Linton wrote:
> Add a USB keyboard flag, which is needed when a graphical console
> is enabled. Also add a nvme boot option for users that choose
> that instead of sata or mmc.
> 
> Contributed-under: TianoCore Contribution Agreement 1.1

Just a note in case you had missed:
We are transitioning the licensing of edk2-platforms to
https://spdx.org/licenses/BSD-2-Clause-Patent
(As of yesterday) we have approval from Marvell to relicense these
files, so future contributions won't need the Contributed-under.
(This one does, though.)

> Signed-off-by: Jeremy Linton <jeremy.linton@arm.com>

Reviewed-by: Leif Lindholm <leif.lindholm@linaro.org>

However, the patch is garbled (lines broken and '=20' all over the
place). Could you have a look at your email setup or point me at a
(public) remote tree?

(It's possible your mail server will stop playing silly if you strip
the CRs - and SMTP eats those anyway, so I have a script to add them
back in.)

((It's also possible it's groups.io that's messing things up - you
could work around that by cc:ing me :))

/
    Leif

> ---
>  Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc | 3 +++
>  Silicon/Marvell/Armada7k8k/Armada7k8k.fdf     | 2 ++
>  2 files changed, 5 insertions(+)
> 
> diff --git a/Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc b/Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc
> index 27e52f5af5..89d617fde4 100644
> --- a/Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc
> +++ b/Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc
> @@ -90,6 +90,7 @@
>    UefiBootManagerLib|MdeModulePkg/Library/UefiBootManagerLib/UefiBootManagerLib.inf
>    UefiHiiServicesLib|MdeModulePkg/Library/UefiHiiServicesLib/UefiHiiServicesLib.inf
>    UefiRuntimeLib|MdePkg/Library/UefiRuntimeLib/UefiRuntimeLib.inf
> +  UefiUsbLib|MdePkg/Library/UefiUsbLib/UefiUsbLib.inf
>  
>    PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf
>  
> @@ -505,6 +506,7 @@
>    MdeModulePkg/Bus/Pci/XhciDxe/XhciDxe.inf
>    MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBusDxe.inf
>    MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorageDxe.inf
> +  MdeModulePkg/Bus/Usb/UsbKbDxe/UsbKbDxe.inf
>  
>    # SD/MMC
>    MdeModulePkg/Bus/Sd/EmmcDxe/EmmcDxe.inf
> @@ -516,6 +518,7 @@
>    ArmPkg/Drivers/ArmPciCpuIo2Dxe/ArmPciCpuIo2Dxe.inf
>    MdeModulePkg/Bus/Pci/PciHostBridgeDxe/PciHostBridgeDxe.inf
>    MdeModulePkg/Bus/Pci/PciBusDxe/PciBusDxe.inf
> +  MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressDxe.inf
>  
>    # Console packages
>    MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatformDxe.inf
> diff --git a/Silicon/Marvell/Armada7k8k/Armada7k8k.fdf b/Silicon/Marvell/Armada7k8k/Armada7k8k.fdf
> index 47e3bc4f82..f59cc1f263 100644
> --- a/Silicon/Marvell/Armada7k8k/Armada7k8k.fdf
> +++ b/Silicon/Marvell/Armada7k8k/Armada7k8k.fdf
> @@ -151,6 +151,7 @@ FvNameGuid         = 5eda4200-2c5f-43cb-9da3-0baf74b1b30c
>    INF MdeModulePkg/Bus/Pci/XhciDxe/XhciDxe.inf
>    INF MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBusDxe.inf
>    INF MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorageDxe.inf
> +  INF MdeModulePkg/Bus/Usb/UsbKbDxe/UsbKbDxe.inf
>  
>    # SD/MMC
>    INF MdeModulePkg/Bus/Sd/EmmcDxe/EmmcDxe.inf
> @@ -162,6 +163,7 @@ FvNameGuid         = 5eda4200-2c5f-43cb-9da3-0baf74b1b30c
>    INF ArmPkg/Drivers/ArmPciCpuIo2Dxe/ArmPciCpuIo2Dxe.inf
>    INF MdeModulePkg/Bus/Pci/PciHostBridgeDxe/PciHostBridgeDxe.inf
>    INF MdeModulePkg/Bus/Pci/PciBusDxe/PciBusDxe.inf
> +  INF MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressDxe.inf
>  
>    # Multiple Console IO support
>    INF MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatformDxe.inf
> -- 
> 2.13.7
> 
> 
> 
> 

-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#41598): https://edk2.groups.io/g/devel/message/41598
Mute This Topic: https://groups.io/mt/31828270/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [edk2-devel] [PATCH] Marvell/Armada80x0McBin: Enable usb keyboard, nvme boot
Posted by Jeremy Linton 4 years, 11 months ago 
Hi,


On 5/29/19 6:09 AM, Leif Lindholm wrote:
> On Tue, May 28, 2019 at 06:43:13PM -0500, Jeremy Linton wrote:
>> Add a USB keyboard flag, which is needed when a graphical console
>> is enabled. Also add a nvme boot option for users that choose
>> that instead of sata or mmc.
>>
>> Contributed-under: TianoCore Contribution Agreement 1.1
> 
> Just a note in case you had missed:
> We are transitioning the licensing of edk2-platforms to
> https://spdx.org/licenses/BSD-2-Clause-Patent
> (As of yesterday) we have approval from Marvell to relicense these
> files, so future contributions won't need the Contributed-under.
> (This one does, though.)

Thanks, I didn't know that.

> 
>> Signed-off-by: Jeremy Linton <jeremy.linton@arm.com>
> 
> Reviewed-by: Leif Lindholm <leif.lindholm@linaro.org>
> 
> However, the patch is garbled (lines broken and '=20' all over the
> place). Could you have a look at your email setup or point me at a
> (public) remote tree?
> 
> (It's possible your mail server will stop playing silly if you strip
> the CRs - and SMTP eats those anyway, so I have a script to add them
> back in. >
> ((It's also possible it's groups.io that's messing things up - you
> could work around that by cc:ing me :))

Ok, I will strip the CRs and resend it with you on CC. If that fails I 
will find a place to push it.


> 
> /
>      Leif
> 
>> ---
>>   Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc | 3 +++
>>   Silicon/Marvell/Armada7k8k/Armada7k8k.fdf     | 2 ++
>>   2 files changed, 5 insertions(+)
>>
>> diff --git a/Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc b/Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc
>> index 27e52f5af5..89d617fde4 100644
>> --- a/Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc
>> +++ b/Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc
>> @@ -90,6 +90,7 @@
>>     UefiBootManagerLib|MdeModulePkg/Library/UefiBootManagerLib/UefiBootManagerLib.inf
>>     UefiHiiServicesLib|MdeModulePkg/Library/UefiHiiServicesLib/UefiHiiServicesLib.inf
>>     UefiRuntimeLib|MdePkg/Library/UefiRuntimeLib/UefiRuntimeLib.inf
>> +  UefiUsbLib|MdePkg/Library/UefiUsbLib/UefiUsbLib.inf
>>   
>>     PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf
>>   
>> @@ -505,6 +506,7 @@
>>     MdeModulePkg/Bus/Pci/XhciDxe/XhciDxe.inf
>>     MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBusDxe.inf
>>     MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorageDxe.inf
>> +  MdeModulePkg/Bus/Usb/UsbKbDxe/UsbKbDxe.inf
>>   
>>     # SD/MMC
>>     MdeModulePkg/Bus/Sd/EmmcDxe/EmmcDxe.inf
>> @@ -516,6 +518,7 @@
>>     ArmPkg/Drivers/ArmPciCpuIo2Dxe/ArmPciCpuIo2Dxe.inf
>>     MdeModulePkg/Bus/Pci/PciHostBridgeDxe/PciHostBridgeDxe.inf
>>     MdeModulePkg/Bus/Pci/PciBusDxe/PciBusDxe.inf
>> +  MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressDxe.inf
>>   
>>     # Console packages
>>     MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatformDxe.inf
>> diff --git a/Silicon/Marvell/Armada7k8k/Armada7k8k.fdf b/Silicon/Marvell/Armada7k8k/Armada7k8k.fdf
>> index 47e3bc4f82..f59cc1f263 100644
>> --- a/Silicon/Marvell/Armada7k8k/Armada7k8k.fdf
>> +++ b/Silicon/Marvell/Armada7k8k/Armada7k8k.fdf
>> @@ -151,6 +151,7 @@ FvNameGuid         = 5eda4200-2c5f-43cb-9da3-0baf74b1b30c
>>     INF MdeModulePkg/Bus/Pci/XhciDxe/XhciDxe.inf
>>     INF MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBusDxe.inf
>>     INF MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorageDxe.inf
>> +  INF MdeModulePkg/Bus/Usb/UsbKbDxe/UsbKbDxe.inf
>>   
>>     # SD/MMC
>>     INF MdeModulePkg/Bus/Sd/EmmcDxe/EmmcDxe.inf
>> @@ -162,6 +163,7 @@ FvNameGuid         = 5eda4200-2c5f-43cb-9da3-0baf74b1b30c
>>     INF ArmPkg/Drivers/ArmPciCpuIo2Dxe/ArmPciCpuIo2Dxe.inf
>>     INF MdeModulePkg/Bus/Pci/PciHostBridgeDxe/PciHostBridgeDxe.inf
>>     INF MdeModulePkg/Bus/Pci/PciBusDxe/PciBusDxe.inf
>> +  INF MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressDxe.inf
>>   
>>     # Multiple Console IO support
>>     INF MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatformDxe.inf
>> -- 
>> 2.13.7
>>
>>
>> 
>>


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#41682): https://edk2.groups.io/g/devel/message/41682
Mute This Topic: https://groups.io/mt/31828270/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [edk2-devel] [PATCH] Marvell/Armada80x0McBin: Enable usb keyboard, nvme boot
Posted by Marcin Wojtas 4 years, 11 months ago 
Hi Jeremy,

śr., 29 maj 2019 o 01:43 Jeremy Linton <jeremy.linton@arm.com> napisał(a):
>
> Add a USB keyboard flag, which is needed when a graphical console
> is enabled. Also add a nvme boot option for users that choose
> that instead of sata or mmc.
>
> Contributed-under: TianoCore Contribution Agreement 1.1
> Signed-off-by: Jeremy Linton <jeremy.linton@arm.com>
> ---
>  Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc | 3 +++
>  Silicon/Marvell/Armada7k8k/Armada7k8k.fdf     | 2 ++
>  2 files changed, 5 insertions(+)
>
> diff --git a/Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc b/Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc
> index 27e52f5af5..89d617fde4 100644
> --- a/Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc
> +++ b/Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc
> @@ -90,6 +90,7 @@
>    UefiBootManagerLib|MdeModulePkg/Library/UefiBootManagerLib/UefiBootManagerLib.inf
>    UefiHiiServicesLib|MdeModulePkg/Library/UefiHiiServicesLib/UefiHiiServicesLib.inf
>    UefiRuntimeLib|MdePkg/Library/UefiRuntimeLib/UefiRuntimeLib.inf
> +  UefiUsbLib|MdePkg/Library/UefiUsbLib/UefiUsbLib.inf
>
>    PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf
>
> @@ -505,6 +506,7 @@
>    MdeModulePkg/Bus/Pci/XhciDxe/XhciDxe.inf
>    MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBusDxe.inf
>    MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorageDxe.inf
> +  MdeModulePkg/Bus/Usb/UsbKbDxe/UsbKbDxe.inf
>
>    # SD/MMC
>    MdeModulePkg/Bus/Sd/EmmcDxe/EmmcDxe.inf
> @@ -516,6 +518,7 @@
>    ArmPkg/Drivers/ArmPciCpuIo2Dxe/ArmPciCpuIo2Dxe.inf
>    MdeModulePkg/Bus/Pci/PciHostBridgeDxe/PciHostBridgeDxe.inf
>    MdeModulePkg/Bus/Pci/PciBusDxe/PciBusDxe.inf
> +  MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressDxe.inf
>
>    # Console packages
>    MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatformDxe.inf
> diff --git a/Silicon/Marvell/Armada7k8k/Armada7k8k.fdf b/Silicon/Marvell/Armada7k8k/Armada7k8k.fdf
> index 47e3bc4f82..f59cc1f263 100644
> --- a/Silicon/Marvell/Armada7k8k/Armada7k8k.fdf
> +++ b/Silicon/Marvell/Armada7k8k/Armada7k8k.fdf
> @@ -151,6 +151,7 @@ FvNameGuid         = 5eda4200-2c5f-43cb-9da3-0baf74b1b30c
>    INF MdeModulePkg/Bus/Pci/XhciDxe/XhciDxe.inf
>    INF MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBusDxe.inf
>    INF MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorageDxe.inf
> +  INF MdeModulePkg/Bus/Usb/UsbKbDxe/UsbKbDxe.inf
>
>    # SD/MMC
>    INF MdeModulePkg/Bus/Sd/EmmcDxe/EmmcDxe.inf
> @@ -162,6 +163,7 @@ FvNameGuid         = 5eda4200-2c5f-43cb-9da3-0baf74b1b30c
>    INF ArmPkg/Drivers/ArmPciCpuIo2Dxe/ArmPciCpuIo2Dxe.inf
>    INF MdeModulePkg/Bus/Pci/PciHostBridgeDxe/PciHostBridgeDxe.inf
>    INF MdeModulePkg/Bus/Pci/PciBusDxe/PciBusDxe.inf
> +  INF MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressDxe.inf
>
>    # Multiple Console IO support
>    INF MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatformDxe.inf
> --

Reviewed-by: Marcin Wojtas <mw@semihalf.com>

Thanks!
Marcin

-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#41566): https://edk2.groups.io/g/devel/message/41566
Mute This Topic: https://groups.io/mt/31828270/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-

Patchew 2.1-devel-0870f84

© 2016 - 2024 Red Hat, Inc.