linux-intel: Pull in common configuration fragments

Rework things so that the common kernel configuration fragment
additions are in a new include file, linux-agl.inc, and both the
existing linux-yocto_%.bbappend and the new linux-intel_%.bbappend
in meta-intel pull it in to pick up them up.  This avoids hitting
other linux-* recipes, and allows the possibility of using the
include file in kernel recipe bbappends for other BSPs.

Change-Id: I8f4f67c444c47b6a978d95fab660d478d5f764c1
Signed-off-by: Scott Murray <scott.murray@konsulko.com>
Reviewed-on: https://gerrit.automotivelinux.org/gerrit/11129
Reviewed-by: Thomas Rini <trini@konsulko.com>
Reviewed-by: Dominig ar Foll <dominig.arfoll@fridu.net>
Tested-by: Jenkins Job builder account <agl-jobbuilder@automotivelinux.org>
ci-image-build: Jenkins Job builder account <agl-jobbuilder@automotivelinux.org>
Reviewed-by: Jan-Simon Moeller <jsmoeller@linuxfoundation.org>

diff --git a/meta-agl-bsp/meta-intel/recipes-kernel/linux/linux-intel_%.bbappend b/meta-agl-bsp/meta-intel/recipes-kernel/linux/linux-intel_%.bbappend
new file mode 100644 (file)
index 0000000..88ac94b
--- /dev/null
+++ b/meta-agl-bsp/meta-intel/recipes-kernel/linux/linux-intel_%.bbappend
@@ -0,0 +1 @@
+require 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
new file mode 100644 (file)
index 0000000..fcd0280
--- /dev/null
+++ b/meta-agl-bsp/recipes-kernel/linux/linux-agl.inc
@@ -0,0 +1,20 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/linux-yocto:"
+
+# Extra configuration options for the QEMU kernel
+SRC_URI += "file://fanotify.cfg \
+            file://uinput.cfg \
+            file://hid.cfg \
+            file://drm.cfg \
+            "
+
+# Enable support for TP-Link TL-W722N USB Wifi adapter
+SRC_URI += " file://ath9k_htc.cfg \
+           "
+
+# Enable support for RTLSDR
+SRC_URI += " file://rtl_sdr.cfg \
+           "
+
+# disk drivers for vmdk
+SRC_URI_append_qemux86 = " file://vbox-vmware-sata.cfg "
+SRC_URI_append_qemux86-64 = " file://vbox-vmware-sata.cfg "

diff --git a/meta-agl-bsp/recipes-kernel/linux/linux-yocto_%.bbappend b/meta-agl-bsp/recipes-kernel/linux/linux-yocto_%.bbappend
index fcd0280..3861120 100644 (file)
--- a/meta-agl-bsp/recipes-kernel/linux/linux-yocto_%.bbappend
+++ b/meta-agl-bsp/recipes-kernel/linux/linux-yocto_%.bbappend
@@ -1,20 +1 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/linux-yocto:"
-
-# Extra configuration options for the QEMU kernel
-SRC_URI += "file://fanotify.cfg \
-            file://uinput.cfg \
-            file://hid.cfg \
-            file://drm.cfg \
-            "
-
-# Enable support for TP-Link TL-W722N USB Wifi adapter
-SRC_URI += " file://ath9k_htc.cfg \
-           "
-
-# Enable support for RTLSDR
-SRC_URI += " file://rtl_sdr.cfg \
-           "
-
-# disk drivers for vmdk
-SRC_URI_append_qemux86 = " file://vbox-vmware-sata.cfg "
-SRC_URI_append_qemux86-64 = " file://vbox-vmware-sata.cfg "
+require linux-agl.inc