summaryrefslogtreecommitdiffstats
path: root/templates/feature/agl-jailhouse
diff options
context:
space:
mode:
authorScott Murray <scott.murray@konsulko.com>2021-08-20 13:57:33 -0400
committerScott Murray <scott.murray@konsulko.com>2021-11-17 14:19:36 -0500
commita8dbd14daaac8b5c52326262dbc43975836cc0df (patch)
treee52e3eaaa084ddf2d3fb44158cd0f2d5c9140178 /templates/feature/agl-jailhouse
parentf9dcc4101b86d14f583319786286a72b63cbbc98 (diff)
Convert to new override syntax
This is effectively a manual cherry-pick of commit: 37d3b1b316470fdcfebc59d5522bfbfefc025ff6 from the master branch with additional review and fixups. The intent of these changes is to minimize the effort to backport fixes from the master branch, which has been updated in preparation for the switch to the next Yocto LTS release in early 2022. Bug-AGL: SPEC-4144 Signed-off-by: Scott Murray <scott.murray@konsulko.com> Change-Id: Ic649d942ac043edc52976a3d4190590bb1c125e7
Diffstat (limited to 'templates/feature/agl-jailhouse')
-rw-r--r--templates/feature/agl-jailhouse/50_local.conf.inc14
1 files changed, 7 insertions, 7 deletions
diff --git a/templates/feature/agl-jailhouse/50_local.conf.inc b/templates/feature/agl-jailhouse/50_local.conf.inc
index 081c53fb..0acefaa3 100644
--- a/templates/feature/agl-jailhouse/50_local.conf.inc
+++ b/templates/feature/agl-jailhouse/50_local.conf.inc
@@ -1,20 +1,20 @@
#### JAILHOUSE
-IMAGE_INSTALL_append = " jailhouse jailhouse-demos"
+IMAGE_INSTALL:append = " jailhouse jailhouse-demos"
PREFERRED_VERSION_linux-raspberrypi = "5.4%"
-RPI_KERNEL_DEVICETREE_OVERLAYS_append = " overlays/jailhouse-memory.dtbo"
+RPI_KERNEL_DEVICETREE_OVERLAYS:append = " overlays/jailhouse-memory.dtbo"
#Qemu Boot Config
# qemu flags for jailhouse
-QB_OPT_APPEND_append = " -device intel-iommu,intremap=on,x-buggy-eim=on -device intel-hda,addr=1b.0 -device hda-duplex"
+QB_OPT_APPEND:append = " -device intel-iommu,intremap=on,x-buggy-eim=on -device intel-hda,addr=1b.0 -device hda-duplex"
QB_MEM = "-m 1G"
# use override with higher priority than x86-64
-QB_MACHINE_qemux86-64 = "-machine q35,kernel_irqchip=split -smp 4"
-QB_CPU_qemux86-64 = "-enable-kvm"
-QB_CPU_KVM_qemux86-64 = "-cpu host,-kvm-pv-eoi,-kvm-pv-ipi,-kvm-asyncpf,-kvm-steal-time,-kvmclock,-invpcid,-hypervisor"
+QB_MACHINE:qemux86-64 = "-machine q35,kernel_irqchip=split -smp 4"
+QB_CPU:qemux86-64 = "-enable-kvm"
+QB_CPU_KVM:qemux86-64 = "-cpu host,-kvm-pv-eoi,-kvm-pv-ipi,-kvm-asyncpf,-kvm-steal-time,-kvmclock,-invpcid,-hypervisor"
-QB_KERNEL_CMDLINE_APPEND_append = " intel_iommu=off memmap=82M$0x22000000"
+QB_KERNEL_CMDLINE_APPEND:append = " intel_iommu=off memmap=82M$0x22000000"
QB_KERNEL_ROOT = "/dev/vda"
QB_SERIAL_OPT = "-serial none -serial stdio -serial telnet:localhost:4321,server,nowait"