diff options
author | Alejandro Hernandez <alejandro.hernandez@linux.intel.com> | 2016-03-02 22:39:56 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-03-07 00:11:40 +0000 |
commit | 70c6df25b4ca917dae1fdd1d5feea5fe22727c28 (patch) | |
tree | dd5e0c0b655cba1c5f19662469c32f7f15ce496f | |
parent | ae85c4b9a6609523c293173843679733b1ede7ba (diff) | |
download | poky-70c6df25b4ca917dae1fdd1d5feea5fe22727c28.tar.gz |
linux-yocto: Update SRCREV for genericx86* for 4.1
Upgrades to stable LINUX_VERSION 4.1.18
Also fixes booting core-image-lsb since it needs preliminary graphics support 4.1
[YOCTO #9139]
(From meta-yocto rev: 7a2f8fa9e846e1873157e764aabe57538f5442ba)
Signed-off-by: Alejandro Hernandez <alejandro.hernandez@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta-yocto-bsp/conf/machine/genericx86-64.conf | 2 | ||||
-rw-r--r-- | meta-yocto-bsp/recipes-kernel/linux/linux-yocto_4.1.bbappend | 8 |
2 files changed, 6 insertions, 4 deletions
diff --git a/meta-yocto-bsp/conf/machine/genericx86-64.conf b/meta-yocto-bsp/conf/machine/genericx86-64.conf index f76e35af67..3a4ef2c880 100644 --- a/meta-yocto-bsp/conf/machine/genericx86-64.conf +++ b/meta-yocto-bsp/conf/machine/genericx86-64.conf | |||
@@ -6,3 +6,5 @@ | |||
6 | DEFAULTTUNE ?= "core2-64" | 6 | DEFAULTTUNE ?= "core2-64" |
7 | require conf/machine/include/tune-core2.inc | 7 | require conf/machine/include/tune-core2.inc |
8 | require conf/machine/include/genericx86-common.inc | 8 | require conf/machine/include/genericx86-common.inc |
9 | |||
10 | APPEND_genericx86-64 += "i915.preliminary_hw_support=1" | ||
diff --git a/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_4.1.bbappend b/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_4.1.bbappend index fb347a4511..344dbca709 100644 --- a/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_4.1.bbappend +++ b/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_4.1.bbappend | |||
@@ -7,8 +7,8 @@ KBRANCH_mpc8315e-rdb = "standard/fsl-mpc8315e-rdb" | |||
7 | KMACHINE_genericx86 ?= "common-pc" | 7 | KMACHINE_genericx86 ?= "common-pc" |
8 | KMACHINE_genericx86-64 ?= "common-pc-64" | 8 | KMACHINE_genericx86-64 ?= "common-pc-64" |
9 | 9 | ||
10 | SRCREV_machine_genericx86 ?= "2e0ac7b6c4e3ada23a84756287e9b7051ace939a" | 10 | SRCREV_machine_genericx86 ?= "dd6492b44151164242718855d6c9eebbf0018eac" |
11 | SRCREV_machine_genericx86-64 ?= "2e0ac7b6c4e3ada23a84756287e9b7051ace939a" | 11 | SRCREV_machine_genericx86-64 ?= "dd6492b44151164242718855d6c9eebbf0018eac" |
12 | SRCREV_machine_edgerouter ?= "79a31b9d23db126f8a6be3eb88fd683056a213f1" | 12 | SRCREV_machine_edgerouter ?= "79a31b9d23db126f8a6be3eb88fd683056a213f1" |
13 | SRCREV_machine_beaglebone ?= "efb6ffb2ca96a364f916c9890ad023fc595e0e6e" | 13 | SRCREV_machine_beaglebone ?= "efb6ffb2ca96a364f916c9890ad023fc595e0e6e" |
14 | SRCREV_machine_mpc8315e-rdb ?= "79a31b9d23db126f8a6be3eb88fd683056a213f1" | 14 | SRCREV_machine_mpc8315e-rdb ?= "79a31b9d23db126f8a6be3eb88fd683056a213f1" |
@@ -19,5 +19,5 @@ COMPATIBLE_MACHINE_edgerouter = "edgerouter" | |||
19 | COMPATIBLE_MACHINE_beaglebone = "beaglebone" | 19 | COMPATIBLE_MACHINE_beaglebone = "beaglebone" |
20 | COMPATIBLE_MACHINE_mpc8315e-rdb = "mpc8315e-rdb" | 20 | COMPATIBLE_MACHINE_mpc8315e-rdb = "mpc8315e-rdb" |
21 | 21 | ||
22 | LINUX_VERSION_genericx86 = "4.1.17" | 22 | LINUX_VERSION_genericx86 = "4.1.18" |
23 | LINUX_VERSION_genericx86-64 = "4.1.17" | 23 | LINUX_VERSION_genericx86-64 = "4.1.18" |