vm_arm, zynqmp: make Petalinux 2018.3 the default

The seL4 kernel uses an older device tree. In order to make the kernel device tree compatible with the VMM device tree generation, older Linux artifacts are needed. This commit makes 2018.3 the default, with the option for users to use newer artifacts if needed. Signed-off-by: Chris Guikema <[email protected]>
seL4 · Jan 28, 2024 · ffd63a1 · ffd63a1
1 parent a5565bb
commit ffd63a1
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/components/VM_Arm/CMakeLists.txt b/components/VM_Arm/CMakeLists.txt
@@ -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 use images \
+    compatible with the seL4 kernel 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[] = {};