diff options
author | Kevin Hao <kexin.hao@windriver.com> | 2017-03-16 19:23:29 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-03-16 22:12:07 +0000 |
commit | 8e9769773fd6d04402581c005bb423530a726457 (patch) | |
tree | 11bc747ac80bb45d49574bf6f43fe9f657529a0b /meta-yocto-bsp | |
parent | da577c7d37a0e35f948370da333306aea2cef5cc (diff) | |
download | poky-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')
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 | |||
23 | SERIAL_CONSOLE = "115200 ttyO0" | 23 | SERIAL_CONSOLE = "115200 ttyO0" |
24 | 24 | ||
25 | PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" | 25 | PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" |
26 | PREFERRED_VERSION_linux-yocto ?= "4.9%" | 26 | PREFERRED_VERSION_linux-yocto ?= "4.10%" |
27 | 27 | ||
28 | KERNEL_IMAGETYPE = "zImage" | 28 | KERNEL_IMAGETYPE = "zImage" |
29 | KERNEL_DEVICETREE = "am335x-bone.dtb am335x-boneblack.dtb" | 29 | KERNEL_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" | |||
11 | KERNEL_IMAGE_STRIP_EXTRA_SECTIONS = ".comment" | 11 | KERNEL_IMAGE_STRIP_EXTRA_SECTIONS = ".comment" |
12 | 12 | ||
13 | PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" | 13 | PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" |
14 | PREFERRED_VERSION_linux-yocto ?= "4.9%" | 14 | PREFERRED_VERSION_linux-yocto ?= "4.10%" |
15 | 15 | ||
16 | SERIAL_CONSOLE = "115200 ttyS0" | 16 | SERIAL_CONSOLE = "115200 ttyS0" |
17 | USE_VT ?= "0" | 17 | USE_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 | ||
15 | MACHINE_FEATURES = "keyboard pci ext2 ext3 serial" | 15 | MACHINE_FEATURES = "keyboard pci ext2 ext3 serial" |
16 | 16 | ||
17 | PREFERRED_VERSION_linux-yocto ?= "4.9%" | 17 | PREFERRED_VERSION_linux-yocto ?= "4.10%" |
18 | PREFERRED_PROVIDER_virtual/kernel = "linux-yocto" | 18 | PREFERRED_PROVIDER_virtual/kernel = "linux-yocto" |
19 | 19 | ||
20 | PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg" | 20 | PREFERRED_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 | ||
10 | SRCREV_machine_genericx86 ?= "aadda25ee787681666f1d7961cd6c5a641da678d" | 10 | SRCREV_machine_genericx86 ?= "aadda25ee787681666f1d7961cd6c5a641da678d" |
11 | SRCREV_machine_genericx86-64 ?= "aadda25ee787681666f1d7961cd6c5a641da678d" | 11 | SRCREV_machine_genericx86-64 ?= "aadda25ee787681666f1d7961cd6c5a641da678d" |
12 | SRCREV_machine_edgerouter ?= "34753ac5e7c52bd1f0144c0a5ce9f0c6345f99d8" | 12 | SRCREV_machine_edgerouter ?= "2ce56d130ddff67f43ec857cc51cd347666a0078" |
13 | SRCREV_machine_beaglebone ?= "da5b7beb9866d5de72d61f297c682224e3e62ab5" | 13 | SRCREV_machine_beaglebone ?= "235de25be3f143b91dcc69479b770722c508889e" |
14 | SRCREV_machine_mpc8315e-rdb ?= "34753ac5e7c52bd1f0144c0a5ce9f0c6345f99d8" | 14 | SRCREV_machine_mpc8315e-rdb ?= "2ce56d130ddff67f43ec857cc51cd347666a0078" |
15 | 15 | ||
16 | COMPATIBLE_MACHINE_genericx86 = "genericx86" | 16 | COMPATIBLE_MACHINE_genericx86 = "genericx86" |
17 | COMPATIBLE_MACHINE_genericx86-64 = "genericx86-64" | 17 | COMPATIBLE_MACHINE_genericx86-64 = "genericx86-64" |
@@ -21,6 +21,6 @@ COMPATIBLE_MACHINE_mpc8315e-rdb = "mpc8315e-rdb" | |||
21 | 21 | ||
22 | LINUX_VERSION_genericx86 = "4.1.37" | 22 | LINUX_VERSION_genericx86 = "4.1.37" |
23 | LINUX_VERSION_genericx86-64 = "4.1.37" | 23 | LINUX_VERSION_genericx86-64 = "4.1.37" |
24 | LINUX_VERSION_edgerouter = "4.1.37" | 24 | LINUX_VERSION_edgerouter = "4.1.38" |
25 | LINUX_VERSION_beaglebone = "4.1.37" | 25 | LINUX_VERSION_beaglebone = "4.1.38" |
26 | LINUX_VERSION_mpc8315e-rdb = "4.1.37" | 26 | LINUX_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 | ||
4 | KMACHINE_genericx86 ?= "common-pc" | 4 | KMACHINE_genericx86 ?= "common-pc" |
5 | KMACHINE_genericx86-64 ?= "common-pc-64" | 5 | KMACHINE_genericx86-64 ?= "common-pc-64" |
6 | KBRANCH_edgerouter = "standard/edgerouter" | ||
7 | KBRANCH_beaglebone = "standard/beaglebone" | ||
8 | KBRANCH_mpc8315e-rdb = "standard/fsl-mpc8315e-rdb" | ||
6 | 9 | ||
7 | SRCREV_machine_genericx86 ?= "b259a5d744e8955a03405c6b59c5a61724755ea8" | 10 | SRCREV_machine_genericx86 ?= "b259a5d744e8955a03405c6b59c5a61724755ea8" |
8 | SRCREV_machine_genericx86-64 ?= "b259a5d744e8955a03405c6b59c5a61724755ea8" | 11 | SRCREV_machine_genericx86-64 ?= "b259a5d744e8955a03405c6b59c5a61724755ea8" |
12 | SRCREV_machine_edgerouter ?= "827a1164b155110c65f028a13a6c5699be93bbc3" | ||
13 | SRCREV_machine_beaglebone ?= "827a1164b155110c65f028a13a6c5699be93bbc3" | ||
14 | SRCREV_machine_mpc8315e-rdb ?= "fc1a68a9046707a9709075afc99eb3b5a2237c4b" | ||
9 | 15 | ||
10 | COMPATIBLE_MACHINE_genericx86 = "genericx86" | 16 | COMPATIBLE_MACHINE_genericx86 = "genericx86" |
11 | COMPATIBLE_MACHINE_genericx86-64 = "genericx86-64" | 17 | COMPATIBLE_MACHINE_genericx86-64 = "genericx86-64" |
18 | COMPATIBLE_MACHINE_edgerouter = "edgerouter" | ||
19 | COMPATIBLE_MACHINE_beaglebone = "beaglebone" | ||
20 | COMPATIBLE_MACHINE_mpc8315e-rdb = "mpc8315e-rdb" | ||
12 | 21 | ||
13 | LINUX_VERSION_genericx86 = "4.10" | 22 | LINUX_VERSION_genericx86 = "4.10" |
14 | LINUX_VERSION_genericx86-64 = "4.10" | 23 | LINUX_VERSION_genericx86-64 = "4.10" |
24 | LINUX_VERSION_edgerouter = "4.10.2" | ||
25 | LINUX_VERSION_beaglebone = "4.10.2" | ||
26 | LINUX_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 | ||
10 | SRCREV_machine_genericx86 ?= "ad8b1d659ddd2699ebf7d50ef9de8940b157bfc2" | 10 | SRCREV_machine_genericx86 ?= "ad8b1d659ddd2699ebf7d50ef9de8940b157bfc2" |
11 | SRCREV_machine_genericx86-64 ?= "ad8b1d659ddd2699ebf7d50ef9de8940b157bfc2" | 11 | SRCREV_machine_genericx86-64 ?= "ad8b1d659ddd2699ebf7d50ef9de8940b157bfc2" |
12 | SRCREV_machine_edgerouter ?= "ad8b1d659ddd2699ebf7d50ef9de8940b157bfc2" | 12 | SRCREV_machine_edgerouter ?= "cebe1ad56aebd89e0de29412e19433fb441bf13c" |
13 | SRCREV_machine_beaglebone ?= "ad8b1d659ddd2699ebf7d50ef9de8940b157bfc2" | 13 | SRCREV_machine_beaglebone ?= "cebe1ad56aebd89e0de29412e19433fb441bf13c" |
14 | SRCREV_machine_mpc8315e-rdb ?= "b01922f8b85d96b9f6996b17ed0995c6f782fdbf" | 14 | SRCREV_machine_mpc8315e-rdb ?= "06c0dbdcba374ca7f92a53d69292d6bb7bc9b0f3" |
15 | 15 | ||
16 | COMPATIBLE_MACHINE_genericx86 = "genericx86" | 16 | COMPATIBLE_MACHINE_genericx86 = "genericx86" |
17 | COMPATIBLE_MACHINE_genericx86-64 = "genericx86-64" | 17 | COMPATIBLE_MACHINE_genericx86-64 = "genericx86-64" |
@@ -21,6 +21,6 @@ COMPATIBLE_MACHINE_mpc8315e-rdb = "mpc8315e-rdb" | |||
21 | 21 | ||
22 | LINUX_VERSION_genericx86 = "4.4.41" | 22 | LINUX_VERSION_genericx86 = "4.4.41" |
23 | LINUX_VERSION_genericx86-64 = "4.4.41" | 23 | LINUX_VERSION_genericx86-64 = "4.4.41" |
24 | LINUX_VERSION_edgerouter = "4.4.41" | 24 | LINUX_VERSION_edgerouter = "4.4.53" |
25 | LINUX_VERSION_beaglebone = "4.4.41" | 25 | LINUX_VERSION_beaglebone = "4.4.53" |
26 | LINUX_VERSION_mpc8315e-rdb = "4.4.41" | 26 | LINUX_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 | ||
10 | SRCREV_machine_genericx86 ?= "95c0a80ee83f1cf8e59d733f36e8a9dfd50a0098" | 10 | SRCREV_machine_genericx86 ?= "95c0a80ee83f1cf8e59d733f36e8a9dfd50a0098" |
11 | SRCREV_machine_genericx86-64 ?= "95c0a80ee83f1cf8e59d733f36e8a9dfd50a0098" | 11 | SRCREV_machine_genericx86-64 ?= "95c0a80ee83f1cf8e59d733f36e8a9dfd50a0098" |
12 | SRCREV_machine_edgerouter ?= "c85c54f5bf53b98afe8105e91bffcdb6c60afe8f" | 12 | SRCREV_machine_edgerouter ?= "95c0a80ee83f1cf8e59d733f36e8a9dfd50a0098" |
13 | SRCREV_machine_beaglebone ?= "c85c54f5bf53b98afe8105e91bffcdb6c60afe8f" | 13 | SRCREV_machine_beaglebone ?= "95c0a80ee83f1cf8e59d733f36e8a9dfd50a0098" |
14 | SRCREV_machine_mpc8315e-rdb ?= "6b67f448d63917f5ea306eb293cd9844077e4a61" | 14 | SRCREV_machine_mpc8315e-rdb ?= "7744d762ee37396dfab60f21a2b974c5b94c47b4" |
15 | 15 | ||
16 | COMPATIBLE_MACHINE_genericx86 = "genericx86" | 16 | COMPATIBLE_MACHINE_genericx86 = "genericx86" |
17 | COMPATIBLE_MACHINE_genericx86-64 = "genericx86-64" | 17 | COMPATIBLE_MACHINE_genericx86-64 = "genericx86-64" |
@@ -21,6 +21,6 @@ COMPATIBLE_MACHINE_mpc8315e-rdb = "mpc8315e-rdb" | |||
21 | 21 | ||
22 | LINUX_VERSION_genericx86 = "4.9.13" | 22 | LINUX_VERSION_genericx86 = "4.9.13" |
23 | LINUX_VERSION_genericx86-64 = "4.9.13" | 23 | LINUX_VERSION_genericx86-64 = "4.9.13" |
24 | LINUX_VERSION_edgerouter = "4.9.8" | 24 | LINUX_VERSION_edgerouter = "4.9.13" |
25 | LINUX_VERSION_beaglebone = "4.9.8" | 25 | LINUX_VERSION_beaglebone = "4.9.13" |
26 | LINUX_VERSION_mpc8315e-rdb = "4.9.8" | 26 | LINUX_VERSION_mpc8315e-rdb = "4.9.13" |