meta-agl-bsp: extend qemux86-64 hardware support

[AGL/meta-agl.git] / meta-agl-bsp / recipes-kernel / linux / linux-agl.inc

diff --git a/meta-agl-bsp/recipes-kernel/linux/linux-agl.inc b/meta-agl-bsp/recipes-kernel/linux/linux-agl.inc
index 073cbc6..176878e 100644 (file)
--- a/meta-agl-bsp/recipes-kernel/linux/linux-agl.inc
+++ b/meta-agl-bsp/recipes-kernel/linux/linux-agl.inc
@@ -14,6 +14,9 @@ def find_cfgs(d):
 
 do_configure_append () {
     [ ! -f .config ] && cp -a ${WORKDIR}/defconfig .config
+    # Need to clear CONFIG_LSM for 5.1+ kernels to ensure it'll get
+    # regenerated to reflect configuration changes (e.g. SMACK).
+    sed -i '/^CONFIG_LSM/d' .config
     merge_config.sh -m .config ${@" ".join(find_cfgs(d))}
     yes '' | make oldconfig
 }
@@ -30,6 +33,7 @@ SRC_URI_append = "\
             file://drm.cfg \
             file://btusb.cfg \
             file://usbaudio.cfg \
+           file://usbmodem.cfg \
            file://i2c-led.cfg \
            file://nfc.cfg \
             "
@@ -72,6 +76,22 @@ OVERRIDES_prepend_qemux86-64 = "virtualmachine:"
 SRC_URI_append_virtualmachine = " file://vbox-vmware-sata.cfg"
 KERNEL_CONFIG_FRAGMENTS_append_virtualmachine = " ${WORKDIR}/vbox-vmware-sata.cfg"
 
+# Extra configuration for using qemux86-64 image on physical hardware
+SRC_URI_append_qemux86-64 = "\
+    file://x86-extra-graphic-devices.cfg \
+    file://x86-net-devices.cfg \
+    file://x86-security-tpm.cfg \
+    file://x86-usb-devices.cfg \
+    file://x86-upsquare.cfg \
+"
+KERNEL_CONFIG_FRAGMENTS_append_qemux86-64 = "\
+    ${WORKDIR}/x86-extra-graphic-devices.cfg \
+    ${WORKDIR}/x86-net-devices.cfg \
+    ${WORKDIR}/x86-security-tpm.cfg \
+    ${WORKDIR}/x86-usb-devices.cfg \
+    ${WORKDIR}/x86-upsquare.cfg \
+"
+
 # Enable support for smack
 KERNEL_CONFIG_FRAGMENTS_append_with-lsm-smack = "\
        ${WORKDIR}/audit.cfg \
@@ -79,9 +99,9 @@ KERNEL_CONFIG_FRAGMENTS_append_with-lsm-smack = "\
        ${WORKDIR}/smack-default-lsm.cfg \
 "
 
-# snd-aloop support for 4a
-SRC_URI_append = " file://4a-sound.cfg"
-KERNEL_CONFIG_FRAGMENTS_append = " ${WORKDIR}/4a-sound.cfg"
+# ALSA support and other sound related configuration
+SRC_URI_append = " file://sound.cfg"
+KERNEL_CONFIG_FRAGMENTS_append = " ${WORKDIR}/sound.cfg"
 
 # iio-dummy-device support for test iiodevice
 SRC_URI_append = " file://iiodevice.cfg"
@@ -91,3 +111,6 @@ KERNEL_CONFIG_FRAGMENTS_append = " ${WORKDIR}/iiodevice.cfg"
 SRC_URI_append = " file://rtc.cfg"
 KERNEL_CONFIG_FRAGMENTS_append = " ${WORKDIR}/rtc.cfg"
 
+# netfilter options
+SRC_URI_append = " file://netfilter.cfg"
+KERNEL_CONFIG_FRAGMENTS_append = " ${WORKDIR}/netfilter.cfg"