From b3357d5d5ab0d8497c911931f66637a89261f22b Mon Sep 17 00:00:00 2001 From: Bruce Ashfield Date: Sun, 25 Aug 2013 05:20:57 +0000 Subject: [PATCH] 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 Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- .../conf/machine/routerstationpro.conf | 2 +- .../linux/linux-yocto_3.10.bbappend | 20 +++++++++++++++++++ 2 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 meta-yocto-bsp/recipes-kernel/linux/linux-yocto_3.10.bbappend 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" KERNEL_IMAGE_STRIP_EXTRA_SECTIONS = ".comment" PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" -PREFERRED_VERSION_linux-yocto ?= "3.8%" +PREFERRED_VERSION_linux-yocto ?= "3.10%" PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg" 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 @@ +KBRANCH_atom-pc = "standard/common-pc/atom-pc" +KBRANCH_genericx86 = "standard/common-pc/atom-pc" +KBRANCH_routerstationpro = "standard/routerstationpro" +KBRANCH_mpc8315e-rdb = "standard/fsl-mpc8315e-rdb" +KBRANCH_beagleboard = "standard/beagleboard" + +SRCREV_machine_atom-pc ?= "6c1528b2b78d1ec7e75bb7a9880074ec35aa1aa0" +SRCREV_machine_genericx86 ?= "f20047520a57322f05d95a18a5fbd082fb15cb87" +SRCREV_machine_routerstationpro ?= "3991d03bd450e9363d5b6e97ede0628ba073db79" +SRCREV_machine_mpc8315e-rdb ?= "8d8339af518104db03f9c36b82f4372569e55b0a" +SRCREV_machine_beagleboard ?= "6c1528b2b78d1ec7e75bb7a9880074ec35aa1aa0" + +COMPATIBLE_MACHINE_mpc8315e-rdb = "mpc8315e-rdb" +COMPATIBLE_MACHINE_routerstationpro = "routerstationpro" +COMPATIBLE_MACHINE_beagleboard = "beagleboard" +COMPATIBLE_MACHINE_atom-pc = "atom-pc" +COMPATIBLE_MACHINE_genericx86 = "genericx86" + +# routerstationpro has a flash size of 16mb +KERNEL_IMAGE_MAXSIZE_routerstationpro = "16777216"