From 35c0bcceea92f1342c6a6d40e906e5559a762fca Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Tue, 15 Dec 2020 09:20:30 +0000 Subject: [PATCH] arm-bsp/musca: don't include qemu.inc The oe-core qemu.inc is common configuration for the qemu machines inside oe-core. Including this to get qemuboot working has some unintended consequences, such as a kernel being selected and MACHINE_FEATURES being altered. Change this to inherit qemuboot and set the correct filesystem type directly. Change-Id: Id17e2cc67f029653517ba802c7f8f5503eea3c31 Signed-off-by: Ross Burton Signed-off-by: Jon Mason --- meta-arm-bsp/conf/machine/musca-b1.conf | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/meta-arm-bsp/conf/machine/musca-b1.conf b/meta-arm-bsp/conf/machine/musca-b1.conf index e5b77e76..5b359bc5 100644 --- a/meta-arm-bsp/conf/machine/musca-b1.conf +++ b/meta-arm-bsp/conf/machine/musca-b1.conf @@ -14,7 +14,8 @@ require conf/machine/include/tune-cortexm33.inc TCLIBC = "newlib" # For runqemu -require conf/machine/include/qemu.inc +IMAGE_FSTYPES += "ext4" +IMAGE_CLASSES += "qemuboot" QB_SYSTEM_NAME = "qemu-system-arm" QB_MACHINE = "-machine musca-b1" QB_CPU = "-cpu cortex-m33"