From ffd63a11c4d4491b7217f8176f7dc9f921abee43 Mon Sep 17 00:00:00 2001 From: Chris Guikema Date: Thu, 25 Jan 2024 18:20:47 -0500 Subject: [PATCH] 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 --- components/VM_Arm/CMakeLists.txt | 4 +++- components/VM_Arm/plat_include/zynqmp/plat/vmlinux.h | 4 ++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/components/VM_Arm/CMakeLists.txt b/components/VM_Arm/CMakeLists.txt index 7deb35c9..c81e4565 100644 --- 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 index 0ea7db20..6a04850b 100644 --- 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[] = {};