SPEC-2376: Add config for QEMU arm kernels

The default yocto qemuarm machine is versatilepb which is not the right
choice for AGL (ex: Max 256M of RAM).
This patchs change qemuarm configs for using the virt machine.

Change-Id: Ib5e0ae801ba152318a2455763b1a2f1020d1858e
Bug-AGL: SPEC-2376
Signed-off-by: Corentin Labbe <clabbe@baylibre.com>

diff --git a/meta-agl-bsp/meta-core/recipes-kernel/linux/linux-yocto/qemuarm.cfg b/meta-agl-bsp/meta-core/recipes-kernel/linux/linux-yocto/qemuarm.cfg
new file mode 100644 (file)
index 0000000..e71c714
--- /dev/null
+++ b/meta-agl-bsp/meta-core/recipes-kernel/linux/linux-yocto/qemuarm.cfg
@@ -0,0 +1,6 @@
+# Necessary configs for using the virt qemu machine
+CONFIG_ARCH_MULTI_V7=y
+CONFIG_ARCH_VIRT=y
+CONFIG_SERIAL_AMBA_PL011=y
+CONFIG_PCI_HOST_GENERIC=y
+CONFIG_RTC_DRV_PL031=y

diff --git a/meta-agl-bsp/meta-core/recipes-kernel/linux/linux-yocto/virtio.cfg b/meta-agl-bsp/meta-core/recipes-kernel/linux/linux-yocto/virtio.cfg
index 9bdc2c6..d042d7d 100644 (file)
--- a/meta-agl-bsp/meta-core/recipes-kernel/linux/linux-yocto/virtio.cfg
+++ b/meta-agl-bsp/meta-core/recipes-kernel/linux/linux-yocto/virtio.cfg
@@ -2,3 +2,5 @@
 CONFIG_BLK_MQ_VIRTIO=y
 CONFIG_VIRTIO=y
 CONFIG_VIRTIO_BLK=y
+# qemuarm need virtionet
+CONFIG_VIRTIO_NET=y

diff --git a/meta-agl-bsp/meta-core/recipes-kernel/linux/linux-yocto_%.bbappend b/meta-agl-bsp/meta-core/recipes-kernel/linux/linux-yocto_%.bbappend
index d8a5839..e97b8f9 100644 (file)
--- a/meta-agl-bsp/meta-core/recipes-kernel/linux/linux-yocto_%.bbappend
+++ b/meta-agl-bsp/meta-core/recipes-kernel/linux/linux-yocto_%.bbappend
@@ -8,6 +8,9 @@ SRC_URI += "file://hciattach.cfg \
 # Enable some things on qemuarm64 so MOST drivers will build and load.
 SRC_URI_append_qemuarm64 = " file://most_deps.cfg"
 
+# Configuration for using the virt machine (and not versatilepb)
+SRC_URI_append_qemuarm = " file://qemuarm.cfg"
+
 # Build a generic v7 kernel instead of the arm926j one that upstream
 # qemuarm defaults to.
 KBUILD_DEFCONFIG_qemuarm = "multi_v7_defconfig"