[edk2,edk2-platforms,1/1] Platform/Comcast/RDKQemu: Incorporate ArmVirtQemu changes

Message ID 20180924155410.2317-2-moorthy.baskaravenkatraman-sambamoorthy@linaro.org
State New
Headers show
Series
  • Incorporate ArmVirtQemu changes
Related show

Commit Message

Moorthy B S Sept. 24, 2018, 3:54 p.m.
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Moorthy B S <moorthy.baskaravenkatraman-sambamoorthy@linaro.org>

Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
---
 Platform/Comcast/RDKQemu/RDKQemu.dsc | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

-- 
2.17.0

_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel

Comments

Ard Biesheuvel Oct. 12, 2018, 3:39 p.m. | #1
On 24 September 2018 at 17:54, Moorthy B S
<moorthy.baskaravenkatraman-sambamoorthy@linaro.org> wrote:
> Contributed-under: TianoCore Contribution Agreement 1.1

> Signed-off-by: Moorthy B S <moorthy.baskaravenkatraman-sambamoorthy@linaro.org>

> Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>


Reviewed-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>


Pushed as 124073e4d440..6aad08ad6c9a

Thanks

> ---

>  Platform/Comcast/RDKQemu/RDKQemu.dsc | 14 +++++++++++++-

>  1 file changed, 13 insertions(+), 1 deletion(-)

>

> diff --git a/Platform/Comcast/RDKQemu/RDKQemu.dsc b/Platform/Comcast/RDKQemu/RDKQemu.dsc

> index 1301c5555efe..02ec53a85a28 100644

> --- a/Platform/Comcast/RDKQemu/RDKQemu.dsc

> +++ b/Platform/Comcast/RDKQemu/RDKQemu.dsc

> @@ -57,6 +57,7 @@ [LibraryClasses.common]

>    BootLogoLib|MdeModulePkg/Library/BootLogoLib/BootLogoLib.inf

>    PlatformBootManagerLib|ArmVirtPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf

>    CustomizedDisplayLib|MdeModulePkg/Library/CustomizedDisplayLib/CustomizedDisplayLib.inf

> +  FrameBufferBltLib|MdeModulePkg/Library/FrameBufferBltLib/FrameBufferBltLib.inf

>    QemuBootOrderLib|OvmfPkg/Library/QemuBootOrderLib/QemuBootOrderLib.inf

>    FileExplorerLib|MdeModulePkg/Library/FileExplorerLib/FileExplorerLib.inf

>    PciPcdProducerLib|ArmVirtPkg/Library/FdtPciPcdProducerLib/FdtPciPcdProducerLib.inf

> @@ -355,10 +356,20 @@ [Components.common]

>    MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.inf

>    MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDxe.inf

>    MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf

> -  MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dxe.inf

>    MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf

> +!if $(NETWORK_IP6_ENABLE) == TRUE

> +  NetworkPkg/Ip6Dxe/Ip6Dxe.inf

> +  NetworkPkg/TcpDxe/TcpDxe.inf

> +  NetworkPkg/Udp6Dxe/Udp6Dxe.inf

> +  NetworkPkg/Dhcp6Dxe/Dhcp6Dxe.inf

> +  NetworkPkg/Mtftp6Dxe/Mtftp6Dxe.inf

> +  NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf

> +  NetworkPkg/IScsiDxe/IScsiDxe.inf

> +!else

> +  MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dxe.inf

>    MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxeBcDxe.inf

>    MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf

> +!endif

>  !if $(HTTP_BOOT_ENABLE) == TRUE

>    NetworkPkg/DnsDxe/DnsDxe.inf

>    NetworkPkg/HttpUtilitiesDxe/HttpUtilitiesDxe.inf

> @@ -398,6 +409,7 @@ [Components.common]

>    #

>    # Video support

>    #

> +  OvmfPkg/QemuRamfbDxe/QemuRamfbDxe.inf

>    OvmfPkg/VirtioGpuDxe/VirtioGpu.inf

>    OvmfPkg/PlatformDxe/Platform.inf

>

> --

> 2.17.0

>

_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel

Patch

diff --git a/Platform/Comcast/RDKQemu/RDKQemu.dsc b/Platform/Comcast/RDKQemu/RDKQemu.dsc
index 1301c5555efe..02ec53a85a28 100644
--- a/Platform/Comcast/RDKQemu/RDKQemu.dsc
+++ b/Platform/Comcast/RDKQemu/RDKQemu.dsc
@@ -57,6 +57,7 @@  [LibraryClasses.common]
   BootLogoLib|MdeModulePkg/Library/BootLogoLib/BootLogoLib.inf
   PlatformBootManagerLib|ArmVirtPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf
   CustomizedDisplayLib|MdeModulePkg/Library/CustomizedDisplayLib/CustomizedDisplayLib.inf
+  FrameBufferBltLib|MdeModulePkg/Library/FrameBufferBltLib/FrameBufferBltLib.inf
   QemuBootOrderLib|OvmfPkg/Library/QemuBootOrderLib/QemuBootOrderLib.inf
   FileExplorerLib|MdeModulePkg/Library/FileExplorerLib/FileExplorerLib.inf
   PciPcdProducerLib|ArmVirtPkg/Library/FdtPciPcdProducerLib/FdtPciPcdProducerLib.inf
@@ -355,10 +356,20 @@  [Components.common]
   MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.inf
   MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDxe.inf
   MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf
-  MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dxe.inf
   MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf
+!if $(NETWORK_IP6_ENABLE) == TRUE
+  NetworkPkg/Ip6Dxe/Ip6Dxe.inf
+  NetworkPkg/TcpDxe/TcpDxe.inf
+  NetworkPkg/Udp6Dxe/Udp6Dxe.inf
+  NetworkPkg/Dhcp6Dxe/Dhcp6Dxe.inf
+  NetworkPkg/Mtftp6Dxe/Mtftp6Dxe.inf
+  NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf
+  NetworkPkg/IScsiDxe/IScsiDxe.inf
+!else
+  MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dxe.inf
   MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxeBcDxe.inf
   MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf
+!endif
 !if $(HTTP_BOOT_ENABLE) == TRUE
   NetworkPkg/DnsDxe/DnsDxe.inf
   NetworkPkg/HttpUtilitiesDxe/HttpUtilitiesDxe.inf
@@ -398,6 +409,7 @@  [Components.common]
   #
   # Video support
   #
+  OvmfPkg/QemuRamfbDxe/QemuRamfbDxe.inf
   OvmfPkg/VirtioGpuDxe/VirtioGpu.inf
   OvmfPkg/PlatformDxe/Platform.inf