summaryrefslogtreecommitdiffstats
path: root/meta-yocto-bsp
diff options
context:
space:
mode:
authorKevin Hao <kexin.hao@windriver.com>2015-06-05 04:17:49 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-06-05 15:42:01 (GMT)
commitbe0c6ecd47a6dd88a0f641f1c8211a0479e3275c (patch)
treee80e8303c46c7d7eee1ad84eaceb5d6751c83d44 /meta-yocto-bsp
parentffaa0f1b8ab9460399b440ed295c8fed7c678993 (diff)
downloadpoky-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')
-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_3.19.bbappend9
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 fb0189d..0daebf3 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 "
22SERIAL_CONSOLE = "115200 ttyO0" 22SERIAL_CONSOLE = "115200 ttyO0"
23 23
24PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" 24PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto"
25PREFERRED_VERSION_linux-yocto ?= "3.14%" 25PREFERRED_VERSION_linux-yocto ?= "3.19%"
26 26
27KERNEL_IMAGETYPE = "zImage" 27KERNEL_IMAGETYPE = "zImage"
28KERNEL_DEVICETREE = "am335x-bone.dtb am335x-boneblack.dtb" 28KERNEL_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 9cb84bc..45ef237 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 ?= "3.14%" 14PREFERRED_VERSION_linux-yocto ?= "3.19%"
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 43bdce4..f372f32 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 ?= "3.14%" 17PREFERRED_VERSION_linux-yocto ?= "3.19%"
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_3.19.bbappend b/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_3.19.bbappend
index cd3e242..e6aea1c 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 @@
1KBRANCH_genericx86 = "standard/common-pc" 1KBRANCH_genericx86 = "standard/common-pc"
2KBRANCH_genericx86-64 = "standard/common-pc-64/base" 2KBRANCH_genericx86-64 = "standard/common-pc-64/base"
3KBRANCH_edgerouter = "standard/edgerouter"
4KBRANCH_beaglebone = "standard/beaglebone"
5KBRANCH_mpc8315e-rdb = "standard/fsl-mpc8315e-rdb"
3 6
4KMACHINE_genericx86 ?= "common-pc" 7KMACHINE_genericx86 ?= "common-pc"
5KMACHINE_genericx86-64 ?= "common-pc-64" 8KMACHINE_genericx86-64 ?= "common-pc-64"
6 9
7SRCREV_machine_genericx86 ?= "0befa35f40997c90936047e57fbbdd7edbf7e525" 10SRCREV_machine_genericx86 ?= "0befa35f40997c90936047e57fbbdd7edbf7e525"
8SRCREV_machine_genericx86-64 ?= "0befa35f40997c90936047e57fbbdd7edbf7e525" 11SRCREV_machine_genericx86-64 ?= "0befa35f40997c90936047e57fbbdd7edbf7e525"
12SRCREV_machine_edgerouter ?= "2a5e3b16afa1e599df55aa4c3341c66f317172c9"
13SRCREV_machine_beaglebone ?= "2a5e3b16afa1e599df55aa4c3341c66f317172c9"
14SRCREV_machine_mpc8315e-rdb ?= "2d5ac895707436a0d9afcbb96cd3b68a6e443771"
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"