diff options
author | Kevin Hao <kexin.hao@windriver.com> | 2015-06-05 00:17:49 -0400 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-06-05 16:42:01 +0100 |
commit | be0c6ecd47a6dd88a0f641f1c8211a0479e3275c (patch) | |
tree | e80e8303c46c7d7eee1ad84eaceb5d6751c83d44 /meta-yocto-bsp | |
parent | ffaa0f1b8ab9460399b440ed295c8fed7c678993 (diff) | |
download | poky-be0c6ecd47a6dd88a0f641f1c8211a0479e3275c.tar.gz |
meta-yocto-bsp: bump to linux-yocto 3.19 for the non-x86 BSPs
Boot test for all these boards.
(From meta-yocto rev: 916f6100d24db663d1cc1ffb0e7fa5b696686988)
Signed-off-by: Kevin Hao <kexin.hao@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta-yocto-bsp')
4 files changed, 12 insertions, 3 deletions
diff --git a/meta-yocto-bsp/conf/machine/beaglebone.conf b/meta-yocto-bsp/conf/machine/beaglebone.conf index fb0189d5d7..0daebf35ce 100644 --- a/meta-yocto-bsp/conf/machine/beaglebone.conf +++ b/meta-yocto-bsp/conf/machine/beaglebone.conf | |||
@@ -22,7 +22,7 @@ EXTRA_IMAGECMD_jffs2 = "-lnp " | |||
22 | SERIAL_CONSOLE = "115200 ttyO0" | 22 | SERIAL_CONSOLE = "115200 ttyO0" |
23 | 23 | ||
24 | PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" | 24 | PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" |
25 | PREFERRED_VERSION_linux-yocto ?= "3.14%" | 25 | PREFERRED_VERSION_linux-yocto ?= "3.19%" |
26 | 26 | ||
27 | KERNEL_IMAGETYPE = "zImage" | 27 | KERNEL_IMAGETYPE = "zImage" |
28 | KERNEL_DEVICETREE = "am335x-bone.dtb am335x-boneblack.dtb" | 28 | 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 9cb84bc037..45ef23745c 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 ?= "3.14%" | 14 | PREFERRED_VERSION_linux-yocto ?= "3.19%" |
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 43bdce4b1c..f372f32ba6 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 ?= "3.14%" | 17 | PREFERRED_VERSION_linux-yocto ?= "3.19%" |
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_3.19.bbappend b/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_3.19.bbappend index cd3e242e14..e6aea1c405 100644 --- a/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_3.19.bbappend +++ b/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_3.19.bbappend | |||
@@ -1,11 +1,20 @@ | |||
1 | KBRANCH_genericx86 = "standard/common-pc" | 1 | KBRANCH_genericx86 = "standard/common-pc" |
2 | KBRANCH_genericx86-64 = "standard/common-pc-64/base" | 2 | KBRANCH_genericx86-64 = "standard/common-pc-64/base" |
3 | KBRANCH_edgerouter = "standard/edgerouter" | ||
4 | KBRANCH_beaglebone = "standard/beaglebone" | ||
5 | KBRANCH_mpc8315e-rdb = "standard/fsl-mpc8315e-rdb" | ||
3 | 6 | ||
4 | KMACHINE_genericx86 ?= "common-pc" | 7 | KMACHINE_genericx86 ?= "common-pc" |
5 | KMACHINE_genericx86-64 ?= "common-pc-64" | 8 | KMACHINE_genericx86-64 ?= "common-pc-64" |
6 | 9 | ||
7 | SRCREV_machine_genericx86 ?= "0befa35f40997c90936047e57fbbdd7edbf7e525" | 10 | SRCREV_machine_genericx86 ?= "0befa35f40997c90936047e57fbbdd7edbf7e525" |
8 | SRCREV_machine_genericx86-64 ?= "0befa35f40997c90936047e57fbbdd7edbf7e525" | 11 | SRCREV_machine_genericx86-64 ?= "0befa35f40997c90936047e57fbbdd7edbf7e525" |
12 | SRCREV_machine_edgerouter ?= "2a5e3b16afa1e599df55aa4c3341c66f317172c9" | ||
13 | SRCREV_machine_beaglebone ?= "2a5e3b16afa1e599df55aa4c3341c66f317172c9" | ||
14 | SRCREV_machine_mpc8315e-rdb ?= "2d5ac895707436a0d9afcbb96cd3b68a6e443771" | ||
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" | ||