diff options
author | Manish Pandey <manish.pandey2@arm.com> | 2020-11-24 12:04:42 +0000 |
---|---|---|
committer | TrustedFirmware Code Review <review@review.trustedfirmware.org> | 2020-11-24 12:04:42 +0000 |
commit | 38f7e32eac5b2e0f0a7b5aa9132472cf31929737 (patch) | |
tree | 4cbc9297be98cf0ff72588d0c24b49568188fddd | |
parent | 9272a8fd7bd40089fadd91889fe1b0ea22b7bc75 (diff) | |
parent | de7091a1f596bf2be54750110f74f1e266ec1693 (diff) | |
download | trusted-firmware-a-38f7e32eac5b2e0f0a7b5aa9132472cf31929737.tar.gz |
Merge changes I5ad52909,Iea3214a2 into integration
* changes:
fdts: Add VirtIO network device to Morello FVP
fdts: Remove "virtio-rng" from Morello FVP
-rw-r--r-- | fdts/morello-fvp.dts | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/fdts/morello-fvp.dts b/fdts/morello-fvp.dts index 2218b2aaf9..699dc23464 100644 --- a/fdts/morello-fvp.dts +++ b/fdts/morello-fvp.dts @@ -80,8 +80,14 @@ interrupts = <GIC_SPI 96 IRQ_TYPE_LEVEL_HIGH>; }; + virtio_net@1c180000 { + compatible = "virtio,mmio"; + reg = <0x0 0x1c180000 0x0 0x200>; + interrupts = <GIC_SPI 102 IRQ_TYPE_LEVEL_HIGH>; + }; + virtio_rng@1c190000 { - compatible = "virtio,mmio","virtio-rng"; + compatible = "virtio,mmio"; reg = <0x0 0x1c190000 0x0 0x200>; interrupts = <GIC_SPI 101 IRQ_TYPE_LEVEL_HIGH>; }; |