From 92faf9437b7f819fc50e092ae71f3203c825ae3c Mon Sep 17 00:00:00 2001 From: Bruce Ashfield Date: Thu, 21 Dec 2017 10:49:15 -0500 Subject: linux-yocto/4.x: configuration updates Integrating the following configuration changes to the 4.x linux yocto kernels: common-pc*.scc: Add igb to common-pc drivers mti-malta32: enable CONFIG_HIGHMEM for qemumips to support up to 2GiB RAM features/i915/i915.cfg: compile i915 as a module Signed-off-by: Bruce Ashfield Signed-off-by: Richard Purdie (cherry picked from commit b0343ff286b413745579b371f48917099e0a9bef) Signed-off-by: Armin Kuster (cherry picked from commit 9cbcc5e16c3531d1c6d17cbba8f13a6ec1413783) Signed-off-by: Armin Kuster --- meta/recipes-kernel/linux/linux-yocto-rt_4.10.bb | 2 +- meta/recipes-kernel/linux/linux-yocto-rt_4.9.bb | 4 ++-- meta/recipes-kernel/linux/linux-yocto-tiny_4.10.bb | 2 +- meta/recipes-kernel/linux/linux-yocto-tiny_4.9.bb | 2 +- meta/recipes-kernel/linux/linux-yocto_4.10.bb | 2 +- meta/recipes-kernel/linux/linux-yocto_4.9.bb | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_4.10.bb b/meta/recipes-kernel/linux/linux-yocto-rt_4.10.bb index f93d9530eb..fd31bf986c 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_4.10.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_4.10.bb @@ -12,7 +12,7 @@ python () { } SRCREV_machine ?= "c1d8c4408b8aedd88eeb6ccc89ce834dd41b3f09" -SRCREV_meta ?= "40ee48ac099c04f60d2c132031d9625a4e0c4c9e" +SRCREV_meta ?= "1d9a8200184af22f8981fa24b0e82af49c7988dd" SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.10.git;branch=${KBRANCH};name=machine \ git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.10;destsuffix=${KMETA}" diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_4.9.bb b/meta/recipes-kernel/linux/linux-yocto-rt_4.9.bb index e1bf32fdd2..d225339c14 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_4.9.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_4.9.bb @@ -11,8 +11,8 @@ python () { raise bb.parse.SkipPackage("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") } -SRCREV_machine ?= "d256d615488efc2d0b26f3eff206c6bfa765b339" -SRCREV_meta ?= "10f8ed198a4188625c9b5ac59de4d691b56a2617" +SRCREV_machine ?= "fef0184c3c1bcac27fe579bf2643c50bf861e40d" +SRCREV_meta ?= "4553798a3e73b0791f4d5065ec5ad4b45027914f" SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.9.git;branch=${KBRANCH};name=machine \ git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.9;destsuffix=${KMETA}" diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_4.10.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_4.10.bb index edaf853027..b223497693 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_4.10.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_4.10.bb @@ -10,7 +10,7 @@ KMETA = "kernel-meta" KCONF_BSP_AUDIT_LEVEL = "2" SRCREV_machine ?= "c1d8c4408b8aedd88eeb6ccc89ce834dd41b3f09" -SRCREV_meta ?= "40ee48ac099c04f60d2c132031d9625a4e0c4c9e" +SRCREV_meta ?= "1d9a8200184af22f8981fa24b0e82af49c7988dd" PV = "${LINUX_VERSION}+git${SRCPV}" diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_4.9.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_4.9.bb index 704e6758da..7effda2feb 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_4.9.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_4.9.bb @@ -10,7 +10,7 @@ KMETA = "kernel-meta" KCONF_BSP_AUDIT_LEVEL = "2" SRCREV_machine ?= "5174e51fa08d0942ddcf8b19540e90ec10eeb621" -SRCREV_meta ?= "10f8ed198a4188625c9b5ac59de4d691b56a2617" +SRCREV_meta ?= "4553798a3e73b0791f4d5065ec5ad4b45027914f" PV = "${LINUX_VERSION}+git${SRCPV}" diff --git a/meta/recipes-kernel/linux/linux-yocto_4.10.bb b/meta/recipes-kernel/linux/linux-yocto_4.10.bb index 7fcc753a70..1fe3cca2ab 100644 --- a/meta/recipes-kernel/linux/linux-yocto_4.10.bb +++ b/meta/recipes-kernel/linux/linux-yocto_4.10.bb @@ -19,7 +19,7 @@ SRCREV_machine_qemux86 ?= "c1d8c4408b8aedd88eeb6ccc89ce834dd41b3f09" SRCREV_machine_qemux86-64 ?= "c1d8c4408b8aedd88eeb6ccc89ce834dd41b3f09" SRCREV_machine_qemumips64 ?= "8bb135e71037c46175bbcc7acf387309b2e17133" SRCREV_machine ?= "c1d8c4408b8aedd88eeb6ccc89ce834dd41b3f09" -SRCREV_meta ?= "40ee48ac099c04f60d2c132031d9625a4e0c4c9e" +SRCREV_meta ?= "1d9a8200184af22f8981fa24b0e82af49c7988dd" SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.10.git;name=machine;branch=${KBRANCH}; \ git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.10;destsuffix=${KMETA}" diff --git a/meta/recipes-kernel/linux/linux-yocto_4.9.bb b/meta/recipes-kernel/linux/linux-yocto_4.9.bb index 9ddaec7d3f..82d9e4f11c 100644 --- a/meta/recipes-kernel/linux/linux-yocto_4.9.bb +++ b/meta/recipes-kernel/linux/linux-yocto_4.9.bb @@ -19,7 +19,7 @@ SRCREV_machine_qemux86 ?= "5174e51fa08d0942ddcf8b19540e90ec10eeb621" SRCREV_machine_qemux86-64 ?= "5174e51fa08d0942ddcf8b19540e90ec10eeb621" SRCREV_machine_qemumips64 ?= "db1b582e665b95ddf87b75acce3a42660289d4ca" SRCREV_machine ?= "5174e51fa08d0942ddcf8b19540e90ec10eeb621" -SRCREV_meta ?= "10f8ed198a4188625c9b5ac59de4d691b56a2617" +SRCREV_meta ?= "4553798a3e73b0791f4d5065ec5ad4b45027914f" SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.9.git;name=machine;branch=${KBRANCH}; \ git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.9;destsuffix=${KMETA}" -- cgit 1.2.3-korg