From be0c6ecd47a6dd88a0f641f1c8211a0479e3275c Mon Sep 17 00:00:00 2001 From: Kevin Hao Date: Fri, 5 Jun 2015 00:17:49 -0400 Subject: [PATCH] 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 Signed-off-by: Bruce Ashfield Signed-off-by: Richard Purdie --- meta-yocto-bsp/conf/machine/beaglebone.conf | 2 +- meta-yocto-bsp/conf/machine/edgerouter.conf | 2 +- meta-yocto-bsp/conf/machine/mpc8315e-rdb.conf | 2 +- .../recipes-kernel/linux/linux-yocto_3.19.bbappend | 9 +++++++++ 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 fb0189d5d7..0daebf35ce 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 " SERIAL_CONSOLE = "115200 ttyO0" PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" -PREFERRED_VERSION_linux-yocto ?= "3.14%" +PREFERRED_VERSION_linux-yocto ?= "3.19%" KERNEL_IMAGETYPE = "zImage" KERNEL_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 9cb84bc037..45ef23745c 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" KERNEL_IMAGE_STRIP_EXTRA_SECTIONS = ".comment" PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" -PREFERRED_VERSION_linux-yocto ?= "3.14%" +PREFERRED_VERSION_linux-yocto ?= "3.19%" SERIAL_CONSOLE = "115200 ttyS0" USE_VT ?= "0" diff --git a/meta-yocto-bsp/conf/machine/mpc8315e-rdb.conf b/meta-yocto-bsp/conf/machine/mpc8315e-rdb.conf index 43bdce4b1c..f372f32ba6 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" MACHINE_FEATURES = "keyboard pci ext2 ext3 serial" -PREFERRED_VERSION_linux-yocto ?= "3.14%" +PREFERRED_VERSION_linux-yocto ?= "3.19%" PREFERRED_PROVIDER_virtual/kernel = "linux-yocto" PREFERRED_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 cd3e242e14..e6aea1c405 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 @@ KBRANCH_genericx86 = "standard/common-pc" KBRANCH_genericx86-64 = "standard/common-pc-64/base" +KBRANCH_edgerouter = "standard/edgerouter" +KBRANCH_beaglebone = "standard/beaglebone" +KBRANCH_mpc8315e-rdb = "standard/fsl-mpc8315e-rdb" KMACHINE_genericx86 ?= "common-pc" KMACHINE_genericx86-64 ?= "common-pc-64" SRCREV_machine_genericx86 ?= "0befa35f40997c90936047e57fbbdd7edbf7e525" SRCREV_machine_genericx86-64 ?= "0befa35f40997c90936047e57fbbdd7edbf7e525" +SRCREV_machine_edgerouter ?= "2a5e3b16afa1e599df55aa4c3341c66f317172c9" +SRCREV_machine_beaglebone ?= "2a5e3b16afa1e599df55aa4c3341c66f317172c9" +SRCREV_machine_mpc8315e-rdb ?= "2d5ac895707436a0d9afcbb96cd3b68a6e443771" COMPATIBLE_MACHINE_genericx86 = "genericx86" COMPATIBLE_MACHINE_genericx86-64 = "genericx86-64" +COMPATIBLE_MACHINE_edgerouter = "edgerouter" +COMPATIBLE_MACHINE_beaglebone = "beaglebone" +COMPATIBLE_MACHINE_mpc8315e-rdb = "mpc8315e-rdb"