summaryrefslogtreecommitdiffstats
path: root/templates/feature/agl-jailhouse
diff options
context:
space:
mode:
Diffstat (limited to 'templates/feature/agl-jailhouse')
-rw-r--r--templates/feature/agl-jailhouse/50_bblayers.conf.inc4
-rw-r--r--templates/feature/agl-jailhouse/50_local.conf.inc22
2 files changed, 20 insertions, 6 deletions
diff --git a/templates/feature/agl-jailhouse/50_bblayers.conf.inc b/templates/feature/agl-jailhouse/50_bblayers.conf.inc
index d3ed39d5..c8963ac2 100644
--- a/templates/feature/agl-jailhouse/50_bblayers.conf.inc
+++ b/templates/feature/agl-jailhouse/50_bblayers.conf.inc
@@ -1,7 +1,5 @@
BBLAYERS =+ " \
${METADIR}/meta-agl-devel/meta-agl-jailhouse \
${METADIR}/bsp/meta-arm/meta-arm \
+ ${METADIR}/bsp/meta-arm/meta-arm-toolchain \
"
-
-# Up-to-date meta-arm depends on meta-arm-toolchain
-#BBLAYERS =+ "${METADIR}/bsp/meta-arm/meta-arm-toolchain"
diff --git a/templates/feature/agl-jailhouse/50_local.conf.inc b/templates/feature/agl-jailhouse/50_local.conf.inc
index 081c53fb..620c0a5f 100644
--- a/templates/feature/agl-jailhouse/50_local.conf.inc
+++ b/templates/feature/agl-jailhouse/50_local.conf.inc
@@ -6,8 +6,8 @@ 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_MEM = "-m 1G"
+QB_OPT_APPEND_append = " -device intel-iommu,intremap=on,x-buggy-eim=on -device intel-hda,addr=1b.0 -device hda-duplex -serial none -serial stdio -serial telnet:localhost:4321,server,nowait -serial telnet:localhost:5432,server,nowait"
+QB_MEM = "-m 2048"
# use override with higher priority than x86-64
QB_MACHINE_qemux86-64 = "-machine q35,kernel_irqchip=split -smp 4"
@@ -17,10 +17,26 @@ QB_CPU_KVM_qemux86-64 = "-cpu host,-kvm-pv-eoi,-kvm-pv-ipi,-kvm-asyncpf,-kvm-ste
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"
+QB_SERIAL_OPT = "-serial none -serial stdio -serial telnet:localhost:4321,server,nowait -serial telnet:localhost:5432,server,nowait -vga virtio"
# jailhouse needs ttyS1 in the agl-qemu.cell as debug console.
# restrict the SERIAL_CONSOLES to ttyS0 only
SERIAL_CONSOLES = "115200;ttyS0"
KERNEL_CONSOLE = "ttyS0"
+
+# For Kernel modules
+MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "kernel-modules"
+
+# For a custom jailhouse kernel from git.kiszka.org
+PREFERRED_PROVIDER_virtual/kernel = "linux-jailhouse-custom"
+
+# prevent most external kernel module from being built
+MOST_DRIVERS = ""
+LTTNGUST_forcevariable := ""
+LTTNGTOOLS_forcevariable := ""
+LTTNGMODULES_forcevariable := ""
+
+# Disable perf build
+PERF_forcevariable := ""
+