Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

generic CI test #120

Closed
wants to merge 4 commits into from
Closed

generic CI test #120

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
77e8b30
vm_arm, zynqmp: make Petalinux 2018.3 the default
chrisguikema Jan 25, 2024
b51b5aa
vm_arm, trivial: allow zynqmp to use arping module
chrisguikema Jan 25, 2024
a5b058b
Merge chrisguikema/zynqmp_2018_3
axel-h Jan 26, 2024
d7d648c
dummy change
axel-h Jan 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
name: Camkes VM Examples

on:
pull_request_target:
pull_request_target: # !!!!!
types: [opened, reopened, synchronize, labeled]

# downgrade permissions to read-only as you would have in a standard PR action
Expand Down
6 changes: 4 additions & 2 deletions components/VM_Arm/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
)
Expand Down Expand Up @@ -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"
)

Expand Down
4 changes: 4 additions & 0 deletions components/VM_Arm/plat_include/zynqmp/plat/vmlinux.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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[] = {};

Expand Down
Loading