aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDominig ar Foll (Intel Open Source) <dominig.arfoll@fridu.net>2017-09-18 12:42:40 +0200
committerJan-Simon Moeller <jsmoeller@linuxfoundation.org>2017-09-26 20:52:02 +0000
commit63267c5db05e85ed614bdd6436aa5c1e2794f3c5 (patch)
tree6ffb1760395b3dc5f598f5fc243d1d94b3a81434
parent88f8497b7a4cc5db87bfab6d88e49acaff2cd470 (diff)
adding a symlink to keep compatibility with linux-yocto
Change-Id: Id81cb1fe7a949850aef1b4178883c853d0e07aa1 Signed-off-by: Dominig ar Foll (Intel Open Source) <dominig.arfoll@fridu.net> Reviewed-on: https://gerrit.automotivelinux.org/gerrit/10979 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>
-rw-r--r--meta-agl-bsp/meta-intel/recipes-kernel/linux/linux-intel_4.9%.bbappend12
-rw-r--r--meta-agl-bsp/meta-intel/recipes-kernel/linux/linux-yocto_4.4%.bbappend23
l---------[-rw-r--r--]meta-agl-bsp/meta-intel/recipes-kernel/linux/linux-yocto_4.9%.bbappend13
3 files changed, 13 insertions, 35 deletions
diff --git a/meta-agl-bsp/meta-intel/recipes-kernel/linux/linux-intel_4.9%.bbappend b/meta-agl-bsp/meta-intel/recipes-kernel/linux/linux-intel_4.9%.bbappend
new file mode 100644
index 000000000..d524ebfa4
--- /dev/null
+++ b/meta-agl-bsp/meta-intel/recipes-kernel/linux/linux-intel_4.9%.bbappend
@@ -0,0 +1,12 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
+
+# adding most supported USB Bluetooth, Wifi, and Ethernet devices
+SRC_URI_append = " file://usb-devices.cfg"
+KERNEL_CONFIG_FRAGMENTS_append = " ${WORKDIR}/usb-devices.cfg"
+
+# adding support for other graphic cards to work on more PC HW
+SRC_URI_append = " file://extra-graphic-devices.cfg"
+KERNEL_CONFIG_FRAGMENTS_append = " ${WORKDIR}/extra-graphic-devices.cfg"
+
+# Enable support for usb video class for usb camera devices
+KERNEL_CONFIG_FRAGMENTS_append = " ${WORKDIR}/uvc.cfg"
diff --git a/meta-agl-bsp/meta-intel/recipes-kernel/linux/linux-yocto_4.4%.bbappend b/meta-agl-bsp/meta-intel/recipes-kernel/linux/linux-yocto_4.4%.bbappend
deleted file mode 100644
index 68149e5a2..000000000
--- a/meta-agl-bsp/meta-intel/recipes-kernel/linux/linux-yocto_4.4%.bbappend
+++ /dev/null
@@ -1,23 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
-
-# adding most supported USB Bluetooth, Wifi, and Ethernet devices
-SRC_URI_append = " file://usb-devices.cfg"
-KERNEL_CONFIG_FRAGMENTS_append = " ${WORKDIR}/usb-devices.cfg"
-
-# adding support for other graphic cards to work on more PC HW
-SRC_URI_append = " file://extra-graphic-devices.cfg"
-KERNEL_CONFIG_FRAGMENTS_append = " ${WORKDIR}/extra-graphic-devices.cfg"
-
-# Configurations for Joule
-LINUX_VERSION_INTEL_COMMON_forcevariable = "${@bb.utils.contains('INTEL_MACHINE_SUBTYPE', 'broxton-m', '4.4.36', '4.4.26', d)}"
-KBRANCH_corei7-64-intel-common_forcevariable = "${@bb.utils.contains('INTEL_MACHINE_SUBTYPE', 'broxton-m', 'standard/intel/bxt-rebase;rebaseable=1', 'standard/intel/base', d)}"
-SRCREV_machine_corei7-64-intel-common = "${@bb.utils.contains('INTEL_MACHINE_SUBTYPE', 'broxton-m', '5ec33015d3f01a8059f16715dd5bb34fac24c50c', '${SRCREV_MACHINE_INTEL_COMMON}', d)}"
-SRCREV_meta_corei7-64-intel-common = "${@bb.utils.contains('INTEL_MACHINE_SUBTYPE', 'broxton-m', 'b846fc6436aa5d4c747d620e83dfda969854d10c', '${SRCREV_META_INTEL_COMMON}', d)}"
-
-SRC_URI_prepend_intel-corei7-64 = "${@bb.utils.contains('INTEL_MACHINE_SUBTYPE', 'broxton-m', 'file://fix_branch.scc ', '', d)}"
-KERNEL_FEATURES_remove_corei7-64-intel-common = "${@bb.utils.contains('INTEL_MACHINE_SUBTYPE', 'broxton-m', 'features/amt/mei/mei.scc', '', d)}"
-KERNEL_FEATURES_append_corei7-64-intel-common = "${@bb.utils.contains('INTEL_MACHINE_SUBTYPE', 'broxton-m', ' features/mei/mei-spd.scc', '', d)}"
-SRC_URI_append = "${@bb.utils.contains('INTEL_MACHINE_SUBTYPE', 'broxton-m', ' file://security-tpm.cfg', '', d)}"
-
-# Enable support for usb video class for usb camera devices
-KERNEL_CONFIG_FRAGMENTS_append = " ${WORKDIR}/uvc.cfg"
diff --git a/meta-agl-bsp/meta-intel/recipes-kernel/linux/linux-yocto_4.9%.bbappend b/meta-agl-bsp/meta-intel/recipes-kernel/linux/linux-yocto_4.9%.bbappend
index d524ebfa4..323cbe55a 100644..120000
--- a/meta-agl-bsp/meta-intel/recipes-kernel/linux/linux-yocto_4.9%.bbappend
+++ b/meta-agl-bsp/meta-intel/recipes-kernel/linux/linux-yocto_4.9%.bbappend
@@ -1,12 +1 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
-
-# adding most supported USB Bluetooth, Wifi, and Ethernet devices
-SRC_URI_append = " file://usb-devices.cfg"
-KERNEL_CONFIG_FRAGMENTS_append = " ${WORKDIR}/usb-devices.cfg"
-
-# adding support for other graphic cards to work on more PC HW
-SRC_URI_append = " file://extra-graphic-devices.cfg"
-KERNEL_CONFIG_FRAGMENTS_append = " ${WORKDIR}/extra-graphic-devices.cfg"
-
-# Enable support for usb video class for usb camera devices
-KERNEL_CONFIG_FRAGMENTS_append = " ${WORKDIR}/uvc.cfg"
+linux-intel_4.9%.bbappend \ No newline at end of file