diff options
author | Bruce Ashfield <bruce.ashfield@windriver.com> | 2013-08-25 05:20:57 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-08-26 11:29:46 +0100 |
commit | b3357d5d5ab0d8497c911931f66637a89261f22b (patch) | |
tree | 72d5aac7b5851996d07b9a24f832669775ad112f | |
parent | d7571c0390d53bc9a481277944efae688eee0448 (diff) | |
download | poky-b3357d5d5ab0d8497c911931f66637a89261f22b.tar.gz |
yocto-bsp: add 3.10 bbappend and update routerstationpro's preferred version
Now that the 3.10 yocto kernel tree is available, meta-yocto-bsp needs a
bbappend with the relevant SRCREVs defined.
Note: that only the routerstationpro is updated to 3.10, and the other reference
BSPs continue to use their existing preferred versions.
(From meta-yocto rev: 8e3688ea98ad06a64218a67d5ee4c96165766686)
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta-yocto-bsp/conf/machine/routerstationpro.conf | 2 | ||||
-rw-r--r-- | meta-yocto-bsp/recipes-kernel/linux/linux-yocto_3.10.bbappend | 20 |
2 files changed, 21 insertions, 1 deletions
diff --git a/meta-yocto-bsp/conf/machine/routerstationpro.conf b/meta-yocto-bsp/conf/machine/routerstationpro.conf index d9575eb309..281d3f6e00 100644 --- a/meta-yocto-bsp/conf/machine/routerstationpro.conf +++ b/meta-yocto-bsp/conf/machine/routerstationpro.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.8%" | 14 | PREFERRED_VERSION_linux-yocto ?= "3.10%" |
15 | 15 | ||
16 | PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg" | 16 | PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg" |
17 | XSERVER ?= "xserver-xorg \ | 17 | XSERVER ?= "xserver-xorg \ |
diff --git a/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_3.10.bbappend b/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_3.10.bbappend new file mode 100644 index 0000000000..1ac014edc0 --- /dev/null +++ b/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_3.10.bbappend | |||
@@ -0,0 +1,20 @@ | |||
1 | KBRANCH_atom-pc = "standard/common-pc/atom-pc" | ||
2 | KBRANCH_genericx86 = "standard/common-pc/atom-pc" | ||
3 | KBRANCH_routerstationpro = "standard/routerstationpro" | ||
4 | KBRANCH_mpc8315e-rdb = "standard/fsl-mpc8315e-rdb" | ||
5 | KBRANCH_beagleboard = "standard/beagleboard" | ||
6 | |||
7 | SRCREV_machine_atom-pc ?= "6c1528b2b78d1ec7e75bb7a9880074ec35aa1aa0" | ||
8 | SRCREV_machine_genericx86 ?= "f20047520a57322f05d95a18a5fbd082fb15cb87" | ||
9 | SRCREV_machine_routerstationpro ?= "3991d03bd450e9363d5b6e97ede0628ba073db79" | ||
10 | SRCREV_machine_mpc8315e-rdb ?= "8d8339af518104db03f9c36b82f4372569e55b0a" | ||
11 | SRCREV_machine_beagleboard ?= "6c1528b2b78d1ec7e75bb7a9880074ec35aa1aa0" | ||
12 | |||
13 | COMPATIBLE_MACHINE_mpc8315e-rdb = "mpc8315e-rdb" | ||
14 | COMPATIBLE_MACHINE_routerstationpro = "routerstationpro" | ||
15 | COMPATIBLE_MACHINE_beagleboard = "beagleboard" | ||
16 | COMPATIBLE_MACHINE_atom-pc = "atom-pc" | ||
17 | COMPATIBLE_MACHINE_genericx86 = "genericx86" | ||
18 | |||
19 | # routerstationpro has a flash size of 16mb | ||
20 | KERNEL_IMAGE_MAXSIZE_routerstationpro = "16777216" | ||