[meta-arm,3/9] arm-autonomy/xen-devicetree: Fixes and updates for N1SDP

Submitted by Diego Sueiro on Sept. 3, 2020, 11:40 a.m. | Patch ID: 176005

Details

Message ID 8fe9774d507e2b8e732b011d34ba0b4de3fd8a88.1599133172.git.diego.sueiro@arm.com
State New
Headers show

Commit Message

Diego Sueiro Sept. 3, 2020, 11:40 a.m.
The N1SDP machine now uses the dtb generated by the tf-a recipe and for
now we are only interested in the single-chip mode.

The xen-n1sdp.dtsi needs to be updated by adding the extra
'soc' root path to have the dtc being enable to process the
nodes customizations.

Change-Id: I46eaec23d25f6c4a4b6ed86661d451ace590706d
Issue-Id: SCM-1065
Signed-off-by: Diego Sueiro <diego.sueiro@arm.com>
---
 .../xen-devicetree/files/xen-n1sdp.dtsi            | 46 +++++++++++-----------
 .../xen-devicetree/xen-devicetree.bbappend         |  2 +
 2 files changed, 26 insertions(+), 22 deletions(-)

Patch hide | download patch | download mbox

diff --git a/meta-arm-autonomy/dynamic-layers/meta-arm-bsp/recipes-extended/xen-devicetree/files/xen-n1sdp.dtsi b/meta-arm-autonomy/dynamic-layers/meta-arm-bsp/recipes-extended/xen-devicetree/files/xen-n1sdp.dtsi
index 01ec14a..e3c3294 100644
--- a/meta-arm-autonomy/dynamic-layers/meta-arm-bsp/recipes-extended/xen-devicetree/files/xen-n1sdp.dtsi
+++ b/meta-arm-autonomy/dynamic-layers/meta-arm-bsp/recipes-extended/xen-devicetree/files/xen-n1sdp.dtsi
@@ -11,29 +11,31 @@ 
     /delete-node/ pmu;
     /delete-node/ spe-pmu;
 
-    /*
-     * disable IOMMU until we have a proper support in xen
-     */
-    /delete-node/ iommu@4f000000;
-    /delete-node/ iommu@4f400000;
+    soc {
+        /*
+         * disable IOMMU until we have a proper support in xen
+         */
+        /delete-node/ iommu@4f000000;
+        /delete-node/ iommu@4f400000;
 
-    /*
-     * Set extra registers required for PCI quirks to communicate with SCP
-     * and remove invalid properties due to removal
-     */
-    pcie@68000000 {
-        reg = <0 0x68000000 0 0x1200000>,
-                <0 0x06000000 0 0x80000>,
-                <0 0x62000000 0 0x80000>;
-        /delete-property/ msi-map;
-        /delete-property/ iommu-map;
-    };
+        /*
+         * Set extra registers required for PCI quirks to communicate with SCP
+         * and remove invalid properties due to removal
+        */
+        pcie@68000000 {
+            reg = <0 0x68000000 0 0x1200000>,
+                    <0 0x06000000 0 0x80000>,
+                    <0 0x62000000 0 0x80000>;
+            /delete-property/ msi-map;
+            /delete-property/ iommu-map;
+        };
 
-    pcie@70000000 {
-        reg = <0 0x70000000 0 0x1200000>,
-                <0 0x06000000 0 0x80000>,
-                <0 0x60000000 0 0x80000>;
-        /delete-property/ msi-map;
-        /delete-property/ iommu-map;
+        pcie@70000000 {
+            reg = <0 0x70000000 0 0x1200000>,
+                    <0 0x06000000 0 0x80000>,
+                    <0 0x60000000 0 0x80000>;
+            /delete-property/ msi-map;
+            /delete-property/ iommu-map;
+        };
     };
 };
diff --git a/meta-arm-autonomy/dynamic-layers/meta-arm-bsp/recipes-extended/xen-devicetree/xen-devicetree.bbappend b/meta-arm-autonomy/dynamic-layers/meta-arm-bsp/recipes-extended/xen-devicetree/xen-devicetree.bbappend
index 006d0b7..3787488 100644
--- a/meta-arm-autonomy/dynamic-layers/meta-arm-bsp/recipes-extended/xen-devicetree/xen-devicetree.bbappend
+++ b/meta-arm-autonomy/dynamic-layers/meta-arm-bsp/recipes-extended/xen-devicetree/xen-devicetree.bbappend
@@ -9,6 +9,8 @@  XEN_DEVICETREE_DTSI_MERGE_append_juno = " xen-juno.dtsi"
 # Add a dtb snippet to remove pmu and iommu in dom0 on N1SDP
 SRC_URI_append_n1sdp = " file://xen-n1sdp.dtsi"
 XEN_DEVICETREE_DTSI_MERGE_append_n1sdp = " xen-n1sdp.dtsi"
+XEN_DEVICETREE_DEPEND_n1sdp = "virtual/trusted-firmware-a:do_deploy"
+XEN_DEVICETREE_DTBS_n1sdp = "n1sdp-single-chip.dtb"
 
 # Board specific configs
 XEN_DEVICETREE_DOM0_BOOTARGS_append_juno = " root=/dev/sda1 rootwait"