From: Jan-Simon Moeller <jsmoeller@linuxfoundation.org>
Date: Tue, 29 Sep 2020 16:03:45 +0000 (+0200)
Subject: Remove overlay for qemuarm.conf
X-Git-Tag: 10.91.0~55
X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F58%2F25358%2F2;p=AGL%2Fmeta-agl.git

Remove overlay for qemuarm.conf

Upstream uses now a matching machine definition. Remove our overlay.

Bug-AGL: SPEC-3613
Signed-off-by: Jan-Simon Moeller <jsmoeller@linuxfoundation.org>
Change-Id: I142de72a8a2f7b978f53e976f6b86be226c1a178
Reviewed-on: https://gerrit.automotivelinux.org/gerrit/c/AGL/meta-agl/+/25358
Tested-by: Jenkins Job builder account <agl-jobbuilder@automotivelinux.org>
ci-image-build: Jenkins Job builder account <agl-jobbuilder@automotivelinux.org>
ci-image-boot-test: Jenkins Job builder account <agl-jobbuilder@automotivelinux.org>
---

diff --git a/meta-agl-bsp/conf/machine/qemuarm.conf b/meta-agl-bsp/conf/machine/qemuarm.conf
deleted file mode 100644
index 8d41d6927..000000000
--- a/meta-agl-bsp/conf/machine/qemuarm.conf
+++ /dev/null
@@ -1,18 +0,0 @@
-#@TYPE: Machine
-#@NAME: armv7a
-#@DESCRIPTION: generic ARM 32bit
-
-require conf/machine/include/qemu.inc
-require conf/machine/include/arm/arch-armv7ve.inc
-
-KERNEL_IMAGETYPE = "zImage"
-
-SERIAL_CONSOLES ?= "38400;ttyAMA0 38400;hvc0"
-
-# For runqemu
-QB_SYSTEM_NAME = "qemu-system-arm"
-QB_MACHINE = "-machine virt"
-
-# Add the 'virtio-rng-pci' device otherwise the guest may run out of entropy
-QB_OPT_APPEND = "-show-cursor -usb -device virtio-rng-pci"
-PREFERRED_VERSION_linux-yocto ??= "4.18%"