Commit 210ac186 authored by Manish Pandey's avatar Manish Pandey Committed by TrustedFirmware Code Review
Browse files

Merge changes I99a5d96f,I89b950f0 into integration

* changes:
  lib/cpus: update MIDR value for rainier cpu
  fdts: enable virtio-rng component for morello fvp platform
parents eff2edee 3e0a861e
...@@ -80,6 +80,12 @@ ...@@ -80,6 +80,12 @@
interrupts = <GIC_SPI 96 IRQ_TYPE_LEVEL_HIGH>; interrupts = <GIC_SPI 96 IRQ_TYPE_LEVEL_HIGH>;
}; };
virtio_rng@1c190000 {
compatible = "virtio,mmio","virtio-rng";
reg = <0x0 0x1c190000 0x0 0x200>;
interrupts = <GIC_SPI 101 IRQ_TYPE_LEVEL_HIGH>;
};
ethernet@1d100000 { ethernet@1d100000 {
compatible = "smsc,lan91c111"; compatible = "smsc,lan91c111";
reg = <0x0 0x1d100000 0x0 0x10000>; reg = <0x0 0x1d100000 0x0 0x10000>;
......
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
#include <lib/utils_def.h> #include <lib/utils_def.h>
/* RAINIER MIDR for revision 0 */ /* RAINIER MIDR for revision 0 */
#define RAINIER_MIDR U(0x3f0f4100) #define RAINIER_MIDR U(0x3f0f4120)
/* Exception Syndrome register EC code for IC Trap */ /* Exception Syndrome register EC code for IC Trap */
#define RAINIER_EC_IC_TRAP U(0x1f) #define RAINIER_EC_IC_TRAP U(0x1f)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment