Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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 recipes/core/l4re.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ checkoutSCM:
buildTools: [host-toolchain, target-toolchain, flex, bison, perl]
buildToolsWeak: [dtc, uboot-tools]
buildVars: [ARCH, CROSS_COMPILE, L4RE_DEFCONFIG, L4RE_KCONFIG, L4RE_TARGETS,
L4RE_MAKECONF]
L4RE_MAKECONF, QEMU_OPTIONS]
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This variable should be used in classes/l4re-dist.yaml when the image is created. If used here, it will compile L4Re again if QEMU_OPTIONS differs...

buildScript: |
if [[ ! -e build/.bob-init-done ]] ; then
rm -rf build
Expand Down
11 changes: 11 additions & 0 deletions recipes/examples.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,9 @@ multiPackage:
exec qemu-system-x86_64 -M q35 -cpu host -enable-kvm -m 2048 \\
-smp 4 -bios \"\$FIRMWARE\" \\
-serial stdio -nographic -monitor none -cdrom \"IMAGE\"
QEMU_OPTIONS: >-
-M q35 -cpu host -enable-kvm -m 2048
-smp 4 -serial stdio -nographic -monitor none
L4RE_LAUNCH_ELF: >-
exec qemu-system-x86_64 -M q35 -cpu host -enable-kvm -m 2048
-smp 4 -serial stdio -nographic -monitor none -kernel \"IMAGE\"
Expand Down Expand Up @@ -58,6 +61,10 @@ multiPackage:
FIASCO_DEFCONFIG: arm-virt-pl2
L4RE_KCONFIG: |
CONFIG_BUILD_ARCH_arm=y
QEMU_OPTIONS: >-
-M virt,virtualization=true
-cpu cortex-a15 -smp 4 -m 1024 -serial stdio -nographic
-monitor none
L4RE_LAUNCH_ELF: >-
exec qemu-system-arm -M virt,virtualization=true
-cpu cortex-a15 -smp 4 -m 1024 -serial stdio -nographic
Expand All @@ -83,6 +90,10 @@ multiPackage:
# CONFIG_ARM_GIC_MSI is not set
CONFIG_PERFORMANCE=y
L4RE_DEFCONFIG: arm64-virt-v8a
QEMU_OPTIONS: >-
-M virt,virtualization=true
-cpu cortex-a57 -smp 4 -m 1024 -serial stdio -nographic
-monitor none
L4RE_LAUNCH_ELF: >-
exec qemu-system-aarch64 -M virt,virtualization=true
-cpu cortex-a57 -smp 4 -m 1024 -serial stdio -nographic
Expand Down