Merge chrisguikema/zynqmp_2018_3

Signed-off-by: Axel Heider <[email protected]>
seL4 · Jan 26, 2024 · a5b058b · a5b058b
2 parents 2ed6228 + b51b5aa
commit a5b058b
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/components/VM_Arm/CMakeLists.txt b/components/VM_Arm/CMakeLists.txt
@@ -42,7 +42,7 @@ config_option(
     VM_VIRTIO_NET_ARPING
     "Enable virtio net arping module"
     DEPENDS
-    "KernelPlatformExynos5410 OR KernelPlatformExynos5422 OR KernelPlatformTx2 OR KernelPlatformQEMUArmVirt;VmPCISupport"
+    "KernelPlatformExynos5410 OR KernelPlatformExynos5422 OR KernelPlatformTx2 OR KernelPlatformQEMUArmVirt OR KernelPlatformZynqmp;VmPCISupport"
     DEFAULT
     OFF
 )
@@ -140,7 +140,9 @@ config_option(
 config_choice(
     VmZynqmpPetalinuxVersion
     ZYNQMP_PETALINUX_VERSION
-    "The version of Petalinux to use"
+    "The version of Petalinux to use. Default is 2018.3, which will images compatible \
+    with the seL4 device tree"
+    "2018_3;VmZynqmpPetalinux2018_3;ZYNQMP_PETALINUX_2018_3;KernelPlatformZynqmp"
     "2021_1;VmZynqmpPetalinux2021_1;ZYNQMP_PETALINUX_2021_1;KernelPlatformZynqmp"
 )
 

diff --git a/components/VM_Arm/plat_include/zynqmp/plat/vmlinux.h b/components/VM_Arm/plat_include/zynqmp/plat/vmlinux.h
@@ -11,7 +11,11 @@
 
 #pragma once
 
+#ifdef CONFIG_ZYNQMP_PETALINUX_2018_3
 #define GIC_NODE_PATH "/amba_apu@0/interrupt-controller@f9010000"
+#else
+#define GIC_NODE_PATH "/axi/interrupt-controller@f9010000"
+#endif
 
 static const int linux_pt_irqs[] = {};