aboutsummaryrefslogtreecommitdiffstats
path: root/common/recipes-kernel
diff options
context:
space:
mode:
authorAwais Belal <awais_belal@mentor.com>2016-10-14 11:39:42 +0500
committerAwais Belal <awais_belal@mentor.com>2016-10-14 15:22:09 +0500
commitb09328865615ad4af3ed1966e2d0233baa361d0f (patch)
treebb4bbaa7f1ab5282292cba5dc5c097e652ca1e8c /common/recipes-kernel
parent22be29ebd41abb764a16901f6b2f023a5c84d35a (diff)
downloadmeta-amd-b09328865615ad4af3ed1966e2d0233baa361d0f.tar.gz
meta-amd-b09328865615ad4af3ed1966e2d0233baa361d0f.tar.bz2
meta-amd-b09328865615ad4af3ed1966e2d0233baa361d0f.zip
linux-yocto/rt: consolidate common settings where possible
This consolidates common settings between standard and RT type kernel across the BSPs. Signed-off-by: Awais Belal <awais_belal@mentor.com>
Diffstat (limited to 'common/recipes-kernel')
-rw-r--r--common/recipes-kernel/linux/linux-yocto-common_4.4.inc25
-rw-r--r--common/recipes-kernel/linux/linux-yocto-rt_4.4.bbappend26
-rw-r--r--common/recipes-kernel/linux/linux-yocto_4.4.bbappend49
3 files changed, 27 insertions, 73 deletions
diff --git a/common/recipes-kernel/linux/linux-yocto-common_4.4.inc b/common/recipes-kernel/linux/linux-yocto-common_4.4.inc
new file mode 100644
index 00000000..6089f7db
--- /dev/null
+++ b/common/recipes-kernel/linux/linux-yocto-common_4.4.inc
@@ -0,0 +1,25 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
+
+PR := "${INC_PR}.1"
+
+KMACHINE_amdx86 ?= "common-pc-64"
+SRCREV_meta_amdx86 ?= "e66032e2d93da24c6b9137dbbe66008c77f6d4aa"
+LINUX_VERSION_amdx86 ?= "4.4.20"
+
+SRC_URI_append_amdx86 += " \
+ file://linux-yocto-amd-patches.scc \
+ file://logo.cfg \
+ file://console.cfg \
+ file://drm.cfg \
+ file://sound.cfg \
+ file://hid.cfg \
+ file://enable-imc.cfg \
+ file://efi-partition.cfg \
+ file://usb-serial.cfg \
+ file://wifi-drivers.cfg \
+ file://disable-intel-graphics.cfg \
+ ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'file://enable-bluetooth.cfg', 'file://disable-bluetooth.cfg', d)} \
+ ${@bb.utils.contains('DISTRO', 'mel', 'file://enable-kgdb.cfg', 'file://disable-kgdb.cfg', d)} \
+"
+
+KERNEL_FEATURES_append_amdx86 = " cfg/smp.scc cfg/sound.scc"
diff --git a/common/recipes-kernel/linux/linux-yocto-rt_4.4.bbappend b/common/recipes-kernel/linux/linux-yocto-rt_4.4.bbappend
index 8794cb26..63333b20 100644
--- a/common/recipes-kernel/linux/linux-yocto-rt_4.4.bbappend
+++ b/common/recipes-kernel/linux/linux-yocto-rt_4.4.bbappend
@@ -1,28 +1,4 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
-
-PR := "${INC_PR}.1"
+require linux-yocto-common_4.4.inc
KBRANCH_amdx86 ?= "standard/preempt-rt/base"
-KMACHINE_amdx86 ?= "common-pc-64"
-
SRCREV_machine_amdx86 ?= "76a02384d86df7b7499755f1650b5299740f5473"
-SRCREV_meta_amdx86 ?= "e66032e2d93da24c6b9137dbbe66008c77f6d4aa"
-LINUX_VERSION_amdx86 ?= "4.4.20"
-
-SRC_URI_append_amdx86 += " \
- file://linux-yocto-amd-patches.scc \
- file://logo.cfg \
- file://console.cfg \
- file://drm.cfg \
- file://sound.cfg \
- file://hid.cfg \
- file://enable-imc.cfg \
- file://efi-partition.cfg \
- file://usb-serial.cfg \
- file://wifi-drivers.cfg \
- file://disable-intel-graphics.cfg \
- ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'file://enable-bluetooth.cfg', 'file://disable-bluetooth.cfg', d)} \
- ${@bb.utils.contains('DISTRO', 'mel', 'file://enable-kgdb.cfg', 'file://disable-kgdb.cfg', d)} \
-"
-
-KERNEL_FEATURES_append_amdx86 = " cfg/smp.scc cfg/sound.scc"
diff --git a/common/recipes-kernel/linux/linux-yocto_4.4.bbappend b/common/recipes-kernel/linux/linux-yocto_4.4.bbappend
index c6956f2e..62fb3dd9 100644
--- a/common/recipes-kernel/linux/linux-yocto_4.4.bbappend
+++ b/common/recipes-kernel/linux/linux-yocto_4.4.bbappend
@@ -1,29 +1,7 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
-
-PR := "${INC_PR}.1"
+require linux-yocto-common_4.4.inc
KBRANCH_amdx86 ?= "standard/base"
-KMACHINE_amdx86 ?= "common-pc-64"
-
SRCREV_machine_amdx86 ?= "7d1401a0dd9bebfe49937ca7d9785972e0cc76d0"
-SRCREV_meta_amdx86 ?= "e66032e2d93da24c6b9137dbbe66008c77f6d4aa"
-LINUX_VERSION_amdx86 ?= "4.4.20"
-
-SRC_URI_append_amdx86 += " \
- file://linux-yocto-amd-patches.scc \
- file://logo.cfg \
- file://console.cfg \
- file://drm.cfg \
- file://sound.cfg \
- file://hid.cfg \
- file://enable-imc.cfg \
- file://efi-partition.cfg \
- file://usb-serial.cfg \
- file://wifi-drivers.cfg \
- file://disable-intel-graphics.cfg \
- ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'file://enable-bluetooth.cfg', 'file://disable-bluetooth.cfg', d)} \
- ${@bb.utils.contains('DISTRO', 'mel', 'file://enable-kgdb.cfg', 'file://disable-kgdb.cfg', d)} \
-"
SRC_URI_append_radeon += " \
file://radeon-microcode.cfg \
@@ -31,29 +9,4 @@ SRC_URI_append_radeon += " \
file://radeon-gpu-config.cfg \
"
-KERNEL_FEATURES_append_amdx86 = " cfg/smp.scc cfg/sound.scc"
-
-# Drop the keyring fix coming in from mel-updates
-# the 4.1.18 kernel has it already.
-SRC_URI_remove = "file://kernel-keyring-CVE-2016-0728.patch"
-
-# strip trailing ';' to workaround bb.fetch.URI bug
-python () {
- src_uri = d.getVar('SRC_URI', True).split()
- d.setVar('SRC_URI', ' '.join(s.rstrip(";") for s in src_uri))
-}
-
-do_validate_branches_append() {
- # Drop a config generating spurious warnings
- sed -i '/CONFIG_DRM_I915_PRELIMINARY_HW_SUPPORT/d' ${WORKDIR}/${KMETA}/features/i915/i915.cfg
-}
-#
-# Work around race in linux-yocto recipe for archive files.
-# This is fixed properly in the master branch with:
-# http://patchwork.openembedded.org/patch/107179/
-#
-python do_ar_patched_prepend() {
- bb.utils.mkdirhier("${STAGING_KERNEL_BUILDDIR}")
- bb.utils.mkdirhier("${STAGING_KERNEL_DIR}")
-}