summaryrefslogtreecommitdiffstats
path: root/meta-yocto-bsp
diff options
context:
space:
mode:
authorKevin Hao <kexin.hao@windriver.com>2014-06-17 16:13:18 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-06-17 16:56:22 (GMT)
commit7eb123023a393c26498d3fdc26180e7472386c69 (patch)
treec75d351bc0e2ff490866b5587dce1443e4407351 /meta-yocto-bsp
parent55b4cffe76384c7e728fae5ab7f502d905c7c0f8 (diff)
downloadpoky-7eb123023a393c26498d3fdc26180e7472386c69.tar.gz
mpc8315e-rdb: bump to linux-yocto 3.14
(From meta-yocto rev: d43b5963c486b8c4846d1cc8b66bf8bfcaf05d8a) 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/mpc8315e-rdb.conf2
-rw-r--r--meta-yocto-bsp/recipes-kernel/linux/linux-yocto_3.14.bbappend3
2 files changed, 4 insertions, 1 deletions
diff --git a/meta-yocto-bsp/conf/machine/mpc8315e-rdb.conf b/meta-yocto-bsp/conf/machine/mpc8315e-rdb.conf
index ab1eaa9..ef76f2a 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.10%" 17PREFERRED_VERSION_linux-yocto ?= "3.14%"
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.14.bbappend b/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_3.14.bbappend
index e0964eb..f218bb1 100644
--- a/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_3.14.bbappend
+++ b/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_3.14.bbappend
@@ -2,6 +2,7 @@ KBRANCH_genericx86 = "standard/common-pc/base"
2KBRANCH_genericx86-64 = "standard/common-pc-64/base" 2KBRANCH_genericx86-64 = "standard/common-pc-64/base"
3KBRANCH_edgerouter = "standard/edgerouter" 3KBRANCH_edgerouter = "standard/edgerouter"
4KBRANCH_beaglebone = "standard/beaglebone" 4KBRANCH_beaglebone = "standard/beaglebone"
5KBRANCH_mpc8315e-rdb = "standard/fsl-mpc8315e-rdb"
5 6
6KMACHINE_genericx86 ?= "common-pc" 7KMACHINE_genericx86 ?= "common-pc"
7KMACHINE_genericx86-64 ?= "common-pc-64" 8KMACHINE_genericx86-64 ?= "common-pc-64"
@@ -10,8 +11,10 @@ SRCREV_machine_genericx86 ?= "0143c6ebb4a2d63b241df5f608b19f483f7eb9e0"
10SRCREV_machine_genericx86-64 ?= "0143c6ebb4a2d63b241df5f608b19f483f7eb9e0" 11SRCREV_machine_genericx86-64 ?= "0143c6ebb4a2d63b241df5f608b19f483f7eb9e0"
11SRCREV_machine_edgerouter ?= "0143c6ebb4a2d63b241df5f608b19f483f7eb9e0" 12SRCREV_machine_edgerouter ?= "0143c6ebb4a2d63b241df5f608b19f483f7eb9e0"
12SRCREV_machine_beaglebone ?= "0143c6ebb4a2d63b241df5f608b19f483f7eb9e0" 13SRCREV_machine_beaglebone ?= "0143c6ebb4a2d63b241df5f608b19f483f7eb9e0"
14SRCREV_machine_mpc8315e-rdb ?= "0143c6ebb4a2d63b241df5f608b19f483f7eb9e0"
13 15
14COMPATIBLE_MACHINE_genericx86 = "genericx86" 16COMPATIBLE_MACHINE_genericx86 = "genericx86"
15COMPATIBLE_MACHINE_genericx86-64 = "genericx86-64" 17COMPATIBLE_MACHINE_genericx86-64 = "genericx86-64"
16COMPATIBLE_MACHINE_edgerouter = "edgerouter" 18COMPATIBLE_MACHINE_edgerouter = "edgerouter"
17COMPATIBLE_MACHINE_beaglebone = "beaglebone" 19COMPATIBLE_MACHINE_beaglebone = "beaglebone"
20COMPATIBLE_MACHINE_mpc8315e-rdb = "mpc8315e-rdb"