X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=recipes-kernel%2Flinux%2Flinux_agldemo.inc;h=1126c76732bdd8a6c13ca7ea27ea22d8e50f98a0;hb=refs%2Fchanges%2F99%2F28599%2F1;hp=84b61df0ad3c16ad5e1738679c53e0c3e6e7af4b;hpb=6e44449dadb99d905a5a9e7fdb7a799785c56f8a;p=AGL%2Fmeta-agl-demo.git

diff --git a/recipes-kernel/linux/linux_agldemo.inc b/recipes-kernel/linux/linux_agldemo.inc
index 84b61df0a..1126c7673 100644
--- a/recipes-kernel/linux/linux_agldemo.inc
+++ b/recipes-kernel/linux/linux_agldemo.inc
@@ -1,7 +1,7 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/linux:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/linux:"
 
 # Enable assorted USB device support for demo systems
-AGL_KCONFIG_FRAGMENTS += " \
+AGL_KCONFIG_FRAGMENTS_DEMO += " \
     usb.cfg \
     uvc.cfg \
     hid.cfg \
@@ -13,26 +13,37 @@ AGL_KCONFIG_FRAGMENTS += " \
 "
 
 # Enable CAN device support
-AGL_KCONFIG_FRAGMENTS += "can-devices.cfg"
+AGL_KCONFIG_FRAGMENTS_DEMO += "can-devices.cfg"
 
 # Enable NFC support
-AGL_KCONFIG_FRAGMENTS += "nfc.cfg"
+AGL_KCONFIG_FRAGMENTS_DEMO += "nfc.cfg"
 
 # Enable support for TP-Link TL-W722N USB Wifi adapter (rev 1 and 2)
-AGL_KCONFIG_FRAGMENTS += "wifi.cfg"
+AGL_KCONFIG_FRAGMENTS_DEMO += "wifi.cfg"
 
 # Enable support for RTLSDR
-AGL_KCONFIG_FRAGMENTS += "rtl_sdr.cfg"
+AGL_KCONFIG_FRAGMENTS_DEMO += "rtl_sdr.cfg"
 
 # iio-dummy-device support for test IIO device
-AGL_KCONFIG_FRAGMENTS += "iiodevice.cfg"
+AGL_KCONFIG_FRAGMENTS_DEMO += "iiodevice.cfg"
 
 # External rtc support via e.g. http://wiki.seeedstudio.com/Grove-RTC/
-AGL_KCONFIG_FRAGMENTS += "rtc.cfg"
+AGL_KCONFIG_FRAGMENTS_DEMO += "rtc.cfg"
 
 # Make sure in-kernel MOST drivers are disabled to avoid conflicting
 # with our externally built ones
-AGL_KCONFIG_FRAGMENTS += "disable_most.cfg"
+AGL_KCONFIG_FRAGMENTS_DEMO += "disable_most.cfg"
 
 # Enable some things on qemuarm64 so MOST drivers will build and load.
-AGL_KCONFIG_FRAGMENTS_append_qemuarm64 = " most_deps.cfg"
+AGL_KCONFIG_FRAGMENTS_DEMO:append:qemuarm64 = " most_deps.cfg"
+
+# We don't want most of the above for the virtio guest kernels,
+# use an explicit list
+AGL_KCONFIG_FRAGMENTS_DEMO:virtio-all = " \
+    kvm-demo-can-devices.cfg \
+    kvm-demo-usb.cfg \
+    usbaudio.cfg \
+    hid.cfg \
+"
+
+AGL_KCONFIG_FRAGMENTS += "${AGL_KCONFIG_FRAGMENTS_DEMO}"
\ No newline at end of file