diff options
| author | Kevin Hao <kexin.hao@windriver.com> | 2014-06-17 12:13:18 -0400 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-06-17 17:56:22 +0100 |
| commit | 7eb123023a393c26498d3fdc26180e7472386c69 (patch) | |
| tree | c75d351bc0e2ff490866b5587dce1443e4407351 | |
| parent | 55b4cffe76384c7e728fae5ab7f502d905c7c0f8 (diff) | |
| download | poky-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>
| -rw-r--r-- | meta-yocto-bsp/conf/machine/mpc8315e-rdb.conf | 2 | ||||
| -rw-r--r-- | meta-yocto-bsp/recipes-kernel/linux/linux-yocto_3.14.bbappend | 3 |
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 ab1eaa9101..ef76f2a755 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.10%" | 17 | PREFERRED_VERSION_linux-yocto ?= "3.14%" |
| 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.14.bbappend b/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_3.14.bbappend index e0964eb40a..f218bb1527 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" | |||
| 2 | KBRANCH_genericx86-64 = "standard/common-pc-64/base" | 2 | KBRANCH_genericx86-64 = "standard/common-pc-64/base" |
| 3 | KBRANCH_edgerouter = "standard/edgerouter" | 3 | KBRANCH_edgerouter = "standard/edgerouter" |
| 4 | KBRANCH_beaglebone = "standard/beaglebone" | 4 | KBRANCH_beaglebone = "standard/beaglebone" |
| 5 | KBRANCH_mpc8315e-rdb = "standard/fsl-mpc8315e-rdb" | ||
| 5 | 6 | ||
| 6 | KMACHINE_genericx86 ?= "common-pc" | 7 | KMACHINE_genericx86 ?= "common-pc" |
| 7 | KMACHINE_genericx86-64 ?= "common-pc-64" | 8 | KMACHINE_genericx86-64 ?= "common-pc-64" |
| @@ -10,8 +11,10 @@ SRCREV_machine_genericx86 ?= "0143c6ebb4a2d63b241df5f608b19f483f7eb9e0" | |||
| 10 | SRCREV_machine_genericx86-64 ?= "0143c6ebb4a2d63b241df5f608b19f483f7eb9e0" | 11 | SRCREV_machine_genericx86-64 ?= "0143c6ebb4a2d63b241df5f608b19f483f7eb9e0" |
| 11 | SRCREV_machine_edgerouter ?= "0143c6ebb4a2d63b241df5f608b19f483f7eb9e0" | 12 | SRCREV_machine_edgerouter ?= "0143c6ebb4a2d63b241df5f608b19f483f7eb9e0" |
| 12 | SRCREV_machine_beaglebone ?= "0143c6ebb4a2d63b241df5f608b19f483f7eb9e0" | 13 | SRCREV_machine_beaglebone ?= "0143c6ebb4a2d63b241df5f608b19f483f7eb9e0" |
| 14 | SRCREV_machine_mpc8315e-rdb ?= "0143c6ebb4a2d63b241df5f608b19f483f7eb9e0" | ||
| 13 | 15 | ||
| 14 | COMPATIBLE_MACHINE_genericx86 = "genericx86" | 16 | COMPATIBLE_MACHINE_genericx86 = "genericx86" |
| 15 | COMPATIBLE_MACHINE_genericx86-64 = "genericx86-64" | 17 | COMPATIBLE_MACHINE_genericx86-64 = "genericx86-64" |
| 16 | COMPATIBLE_MACHINE_edgerouter = "edgerouter" | 18 | COMPATIBLE_MACHINE_edgerouter = "edgerouter" |
| 17 | COMPATIBLE_MACHINE_beaglebone = "beaglebone" | 19 | COMPATIBLE_MACHINE_beaglebone = "beaglebone" |
| 20 | COMPATIBLE_MACHINE_mpc8315e-rdb = "mpc8315e-rdb" | ||