summaryrefslogtreecommitdiffstats
path: root/meta-yocto-bsp
diff options
context:
space:
mode:
authorKevin Hao <kexin.hao@windriver.com>2017-03-16 19:23:29 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-03-16 22:12:07 +0000
commit8e9769773fd6d04402581c005bb423530a726457 (patch)
tree11bc747ac80bb45d49574bf6f43fe9f657529a0b /meta-yocto-bsp
parentda577c7d37a0e35f948370da333306aea2cef5cc (diff)
downloadpoky-8e9769773fd6d04402581c005bb423530a726457.tar.gz
meta-yocto-bsp: bump to the latest linux stable kernel for the non-x86 BSPs
Bump to the latest stable kernel for 4.1, 4.4, 4,9 and 4.10. Also set the default kernel to 4.10. (From meta-yocto rev: fbb8276e16976b5188efe5a9ee9bdda1ff44d931) Signed-off-by: Kevin Hao <kexin.hao@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta-yocto-bsp')
-rw-r--r--meta-yocto-bsp/conf/machine/beaglebone.conf2
-rw-r--r--meta-yocto-bsp/conf/machine/edgerouter.conf2
-rw-r--r--meta-yocto-bsp/conf/machine/mpc8315e-rdb.conf2
-rw-r--r--meta-yocto-bsp/recipes-kernel/linux/linux-yocto_4.1.bbappend12
-rw-r--r--meta-yocto-bsp/recipes-kernel/linux/linux-yocto_4.10.bbappend12
-rw-r--r--meta-yocto-bsp/recipes-kernel/linux/linux-yocto_4.4.bbappend12
-rw-r--r--meta-yocto-bsp/recipes-kernel/linux/linux-yocto_4.9.bbappend12
7 files changed, 33 insertions, 21 deletions
diff --git a/meta-yocto-bsp/conf/machine/beaglebone.conf b/meta-yocto-bsp/conf/machine/beaglebone.conf
index 2d1d9f03cd..4019e25a1e 100644
--- a/meta-yocto-bsp/conf/machine/beaglebone.conf
+++ b/meta-yocto-bsp/conf/machine/beaglebone.conf
@@ -23,7 +23,7 @@ do_image_wic[depends] += "mtools-native:do_populate_sysroot dosfstools-native:do
23SERIAL_CONSOLE = "115200 ttyO0" 23SERIAL_CONSOLE = "115200 ttyO0"
24 24
25PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" 25PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto"
26PREFERRED_VERSION_linux-yocto ?= "4.9%" 26PREFERRED_VERSION_linux-yocto ?= "4.10%"
27 27
28KERNEL_IMAGETYPE = "zImage" 28KERNEL_IMAGETYPE = "zImage"
29KERNEL_DEVICETREE = "am335x-bone.dtb am335x-boneblack.dtb" 29KERNEL_DEVICETREE = "am335x-bone.dtb am335x-boneblack.dtb"
diff --git a/meta-yocto-bsp/conf/machine/edgerouter.conf b/meta-yocto-bsp/conf/machine/edgerouter.conf
index 8e7a1376dc..a9cb1f55d9 100644
--- a/meta-yocto-bsp/conf/machine/edgerouter.conf
+++ b/meta-yocto-bsp/conf/machine/edgerouter.conf
@@ -11,7 +11,7 @@ KERNEL_ALT_IMAGETYPE = "vmlinux.bin"
11KERNEL_IMAGE_STRIP_EXTRA_SECTIONS = ".comment" 11KERNEL_IMAGE_STRIP_EXTRA_SECTIONS = ".comment"
12 12
13PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" 13PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto"
14PREFERRED_VERSION_linux-yocto ?= "4.9%" 14PREFERRED_VERSION_linux-yocto ?= "4.10%"
15 15
16SERIAL_CONSOLE = "115200 ttyS0" 16SERIAL_CONSOLE = "115200 ttyS0"
17USE_VT ?= "0" 17USE_VT ?= "0"
diff --git a/meta-yocto-bsp/conf/machine/mpc8315e-rdb.conf b/meta-yocto-bsp/conf/machine/mpc8315e-rdb.conf
index fa02edc554..66dbd6944e 100644
--- a/meta-yocto-bsp/conf/machine/mpc8315e-rdb.conf
+++ b/meta-yocto-bsp/conf/machine/mpc8315e-rdb.conf
@@ -14,7 +14,7 @@ SERIAL_CONSOLE = "115200 ttyS0"
14 14
15MACHINE_FEATURES = "keyboard pci ext2 ext3 serial" 15MACHINE_FEATURES = "keyboard pci ext2 ext3 serial"
16 16
17PREFERRED_VERSION_linux-yocto ?= "4.9%" 17PREFERRED_VERSION_linux-yocto ?= "4.10%"
18PREFERRED_PROVIDER_virtual/kernel = "linux-yocto" 18PREFERRED_PROVIDER_virtual/kernel = "linux-yocto"
19 19
20PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg" 20PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg"
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 5614ebbd2a..1828f77bca 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
@@ -9,9 +9,9 @@ KMACHINE_genericx86-64 ?= "common-pc-64"
9 9
10SRCREV_machine_genericx86 ?= "aadda25ee787681666f1d7961cd6c5a641da678d" 10SRCREV_machine_genericx86 ?= "aadda25ee787681666f1d7961cd6c5a641da678d"
11SRCREV_machine_genericx86-64 ?= "aadda25ee787681666f1d7961cd6c5a641da678d" 11SRCREV_machine_genericx86-64 ?= "aadda25ee787681666f1d7961cd6c5a641da678d"
12SRCREV_machine_edgerouter ?= "34753ac5e7c52bd1f0144c0a5ce9f0c6345f99d8" 12SRCREV_machine_edgerouter ?= "2ce56d130ddff67f43ec857cc51cd347666a0078"
13SRCREV_machine_beaglebone ?= "da5b7beb9866d5de72d61f297c682224e3e62ab5" 13SRCREV_machine_beaglebone ?= "235de25be3f143b91dcc69479b770722c508889e"
14SRCREV_machine_mpc8315e-rdb ?= "34753ac5e7c52bd1f0144c0a5ce9f0c6345f99d8" 14SRCREV_machine_mpc8315e-rdb ?= "2ce56d130ddff67f43ec857cc51cd347666a0078"
15 15
16COMPATIBLE_MACHINE_genericx86 = "genericx86" 16COMPATIBLE_MACHINE_genericx86 = "genericx86"
17COMPATIBLE_MACHINE_genericx86-64 = "genericx86-64" 17COMPATIBLE_MACHINE_genericx86-64 = "genericx86-64"
@@ -21,6 +21,6 @@ COMPATIBLE_MACHINE_mpc8315e-rdb = "mpc8315e-rdb"
21 21
22LINUX_VERSION_genericx86 = "4.1.37" 22LINUX_VERSION_genericx86 = "4.1.37"
23LINUX_VERSION_genericx86-64 = "4.1.37" 23LINUX_VERSION_genericx86-64 = "4.1.37"
24LINUX_VERSION_edgerouter = "4.1.37" 24LINUX_VERSION_edgerouter = "4.1.38"
25LINUX_VERSION_beaglebone = "4.1.37" 25LINUX_VERSION_beaglebone = "4.1.38"
26LINUX_VERSION_mpc8315e-rdb = "4.1.37" 26LINUX_VERSION_mpc8315e-rdb = "4.1.38"
diff --git a/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_4.10.bbappend b/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_4.10.bbappend
index 976cee3fe2..8e5665bd0b 100644
--- a/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_4.10.bbappend
+++ b/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_4.10.bbappend
@@ -3,12 +3,24 @@ KBRANCH_genericx86-64 = "standard/base"
3 3
4KMACHINE_genericx86 ?= "common-pc" 4KMACHINE_genericx86 ?= "common-pc"
5KMACHINE_genericx86-64 ?= "common-pc-64" 5KMACHINE_genericx86-64 ?= "common-pc-64"
6KBRANCH_edgerouter = "standard/edgerouter"
7KBRANCH_beaglebone = "standard/beaglebone"
8KBRANCH_mpc8315e-rdb = "standard/fsl-mpc8315e-rdb"
6 9
7SRCREV_machine_genericx86 ?= "b259a5d744e8955a03405c6b59c5a61724755ea8" 10SRCREV_machine_genericx86 ?= "b259a5d744e8955a03405c6b59c5a61724755ea8"
8SRCREV_machine_genericx86-64 ?= "b259a5d744e8955a03405c6b59c5a61724755ea8" 11SRCREV_machine_genericx86-64 ?= "b259a5d744e8955a03405c6b59c5a61724755ea8"
12SRCREV_machine_edgerouter ?= "827a1164b155110c65f028a13a6c5699be93bbc3"
13SRCREV_machine_beaglebone ?= "827a1164b155110c65f028a13a6c5699be93bbc3"
14SRCREV_machine_mpc8315e-rdb ?= "fc1a68a9046707a9709075afc99eb3b5a2237c4b"
9 15
10COMPATIBLE_MACHINE_genericx86 = "genericx86" 16COMPATIBLE_MACHINE_genericx86 = "genericx86"
11COMPATIBLE_MACHINE_genericx86-64 = "genericx86-64" 17COMPATIBLE_MACHINE_genericx86-64 = "genericx86-64"
18COMPATIBLE_MACHINE_edgerouter = "edgerouter"
19COMPATIBLE_MACHINE_beaglebone = "beaglebone"
20COMPATIBLE_MACHINE_mpc8315e-rdb = "mpc8315e-rdb"
12 21
13LINUX_VERSION_genericx86 = "4.10" 22LINUX_VERSION_genericx86 = "4.10"
14LINUX_VERSION_genericx86-64 = "4.10" 23LINUX_VERSION_genericx86-64 = "4.10"
24LINUX_VERSION_edgerouter = "4.10.2"
25LINUX_VERSION_beaglebone = "4.10.2"
26LINUX_VERSION_mpc8315e-rdb = "4.10.2"
diff --git a/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_4.4.bbappend b/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_4.4.bbappend
index d92bfc0f51..b499a6677c 100644
--- a/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_4.4.bbappend
+++ b/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_4.4.bbappend
@@ -9,9 +9,9 @@ KBRANCH_mpc8315e-rdb = "standard/fsl-mpc8315e-rdb"
9 9
10SRCREV_machine_genericx86 ?= "ad8b1d659ddd2699ebf7d50ef9de8940b157bfc2" 10SRCREV_machine_genericx86 ?= "ad8b1d659ddd2699ebf7d50ef9de8940b157bfc2"
11SRCREV_machine_genericx86-64 ?= "ad8b1d659ddd2699ebf7d50ef9de8940b157bfc2" 11SRCREV_machine_genericx86-64 ?= "ad8b1d659ddd2699ebf7d50ef9de8940b157bfc2"
12SRCREV_machine_edgerouter ?= "ad8b1d659ddd2699ebf7d50ef9de8940b157bfc2" 12SRCREV_machine_edgerouter ?= "cebe1ad56aebd89e0de29412e19433fb441bf13c"
13SRCREV_machine_beaglebone ?= "ad8b1d659ddd2699ebf7d50ef9de8940b157bfc2" 13SRCREV_machine_beaglebone ?= "cebe1ad56aebd89e0de29412e19433fb441bf13c"
14SRCREV_machine_mpc8315e-rdb ?= "b01922f8b85d96b9f6996b17ed0995c6f782fdbf" 14SRCREV_machine_mpc8315e-rdb ?= "06c0dbdcba374ca7f92a53d69292d6bb7bc9b0f3"
15 15
16COMPATIBLE_MACHINE_genericx86 = "genericx86" 16COMPATIBLE_MACHINE_genericx86 = "genericx86"
17COMPATIBLE_MACHINE_genericx86-64 = "genericx86-64" 17COMPATIBLE_MACHINE_genericx86-64 = "genericx86-64"
@@ -21,6 +21,6 @@ COMPATIBLE_MACHINE_mpc8315e-rdb = "mpc8315e-rdb"
21 21
22LINUX_VERSION_genericx86 = "4.4.41" 22LINUX_VERSION_genericx86 = "4.4.41"
23LINUX_VERSION_genericx86-64 = "4.4.41" 23LINUX_VERSION_genericx86-64 = "4.4.41"
24LINUX_VERSION_edgerouter = "4.4.41" 24LINUX_VERSION_edgerouter = "4.4.53"
25LINUX_VERSION_beaglebone = "4.4.41" 25LINUX_VERSION_beaglebone = "4.4.53"
26LINUX_VERSION_mpc8315e-rdb = "4.4.41" 26LINUX_VERSION_mpc8315e-rdb = "4.4.53"
diff --git a/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_4.9.bbappend b/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_4.9.bbappend
index b730934243..766adb759b 100644
--- a/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_4.9.bbappend
+++ b/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_4.9.bbappend
@@ -9,9 +9,9 @@ KBRANCH_mpc8315e-rdb = "standard/fsl-mpc8315e-rdb"
9 9
10SRCREV_machine_genericx86 ?= "95c0a80ee83f1cf8e59d733f36e8a9dfd50a0098" 10SRCREV_machine_genericx86 ?= "95c0a80ee83f1cf8e59d733f36e8a9dfd50a0098"
11SRCREV_machine_genericx86-64 ?= "95c0a80ee83f1cf8e59d733f36e8a9dfd50a0098" 11SRCREV_machine_genericx86-64 ?= "95c0a80ee83f1cf8e59d733f36e8a9dfd50a0098"
12SRCREV_machine_edgerouter ?= "c85c54f5bf53b98afe8105e91bffcdb6c60afe8f" 12SRCREV_machine_edgerouter ?= "95c0a80ee83f1cf8e59d733f36e8a9dfd50a0098"
13SRCREV_machine_beaglebone ?= "c85c54f5bf53b98afe8105e91bffcdb6c60afe8f" 13SRCREV_machine_beaglebone ?= "95c0a80ee83f1cf8e59d733f36e8a9dfd50a0098"
14SRCREV_machine_mpc8315e-rdb ?= "6b67f448d63917f5ea306eb293cd9844077e4a61" 14SRCREV_machine_mpc8315e-rdb ?= "7744d762ee37396dfab60f21a2b974c5b94c47b4"
15 15
16COMPATIBLE_MACHINE_genericx86 = "genericx86" 16COMPATIBLE_MACHINE_genericx86 = "genericx86"
17COMPATIBLE_MACHINE_genericx86-64 = "genericx86-64" 17COMPATIBLE_MACHINE_genericx86-64 = "genericx86-64"
@@ -21,6 +21,6 @@ COMPATIBLE_MACHINE_mpc8315e-rdb = "mpc8315e-rdb"
21 21
22LINUX_VERSION_genericx86 = "4.9.13" 22LINUX_VERSION_genericx86 = "4.9.13"
23LINUX_VERSION_genericx86-64 = "4.9.13" 23LINUX_VERSION_genericx86-64 = "4.9.13"
24LINUX_VERSION_edgerouter = "4.9.8" 24LINUX_VERSION_edgerouter = "4.9.13"
25LINUX_VERSION_beaglebone = "4.9.8" 25LINUX_VERSION_beaglebone = "4.9.13"
26LINUX_VERSION_mpc8315e-rdb = "4.9.8" 26LINUX_VERSION_mpc8315e-rdb = "4.9.13"