summaryrefslogtreecommitdiffstats
path: root/meta-yocto-bsp
diff options
context:
space:
mode:
authorKevin Hao <kexin.hao@windriver.com>2015-09-29 09:42:03 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-10-01 06:43:38 (GMT)
commitad9ee3d76b39a8fa883be59c31483ce08f4091f3 (patch)
tree19faa84a2970926ae1c93ae94b4e37aace045b16 /meta-yocto-bsp
parentcdc57f611699f83eabb129eb8f318e53b452b8b1 (diff)
downloadpoky-ad9ee3d76b39a8fa883be59c31483ce08f4091f3.tar.gz
meta-yocto-bsp: bump to linux-yocto 4.1 for the non-x86 BSPs
Boot test for all these boards. (From meta-yocto rev: 577768063124771d7469b1f860e5291cd8e019fc) Signed-off-by: Kevin Hao <kexin.hao@windriver.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta-yocto-bsp')
-rw-r--r--meta-yocto-bsp/conf/machine/beaglebone.conf2
-rw-r--r--meta-yocto-bsp/conf/machine/edgerouter.conf2
-rw-r--r--meta-yocto-bsp/conf/machine/mpc8315e-rdb.conf2
-rw-r--r--meta-yocto-bsp/recipes-kernel/linux/linux-yocto_4.1.bbappend9
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 0daebf3..ff46fb2 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 "
22SERIAL_CONSOLE = "115200 ttyO0" 22SERIAL_CONSOLE = "115200 ttyO0"
23 23
24PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" 24PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto"
25PREFERRED_VERSION_linux-yocto ?= "3.19%" 25PREFERRED_VERSION_linux-yocto ?= "4.1%"
26 26
27KERNEL_IMAGETYPE = "zImage" 27KERNEL_IMAGETYPE = "zImage"
28KERNEL_DEVICETREE = "am335x-bone.dtb am335x-boneblack.dtb" 28KERNEL_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 45ef237..476e690 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"
11KERNEL_IMAGE_STRIP_EXTRA_SECTIONS = ".comment" 11KERNEL_IMAGE_STRIP_EXTRA_SECTIONS = ".comment"
12 12
13PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" 13PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto"
14PREFERRED_VERSION_linux-yocto ?= "3.19%" 14PREFERRED_VERSION_linux-yocto ?= "4.1%"
15 15
16SERIAL_CONSOLE = "115200 ttyS0" 16SERIAL_CONSOLE = "115200 ttyS0"
17USE_VT ?= "0" 17USE_VT ?= "0"
diff --git a/meta-yocto-bsp/conf/machine/mpc8315e-rdb.conf b/meta-yocto-bsp/conf/machine/mpc8315e-rdb.conf
index 2beef48..036b05f 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.19%" 17PREFERRED_VERSION_linux-yocto ?= "4.1%"
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_4.1.bbappend b/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_4.1.bbappend
index a5fe0e6..104d250 100644
--- a/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_4.1.bbappend
+++ b/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_4.1.bbappend
@@ -1,11 +1,20 @@
1KBRANCH_genericx86 = "standard/base" 1KBRANCH_genericx86 = "standard/base"
2KBRANCH_genericx86-64 = "standard/base" 2KBRANCH_genericx86-64 = "standard/base"
3KBRANCH_edgerouter = "standard/edgerouter"
4KBRANCH_beaglebone = "standard/beaglebone"
5KBRANCH_mpc8315e-rdb = "standard/fsl-mpc8315e-rdb"
3 6
4KMACHINE_genericx86 ?= "common-pc" 7KMACHINE_genericx86 ?= "common-pc"
5KMACHINE_genericx86-64 ?= "common-pc-64" 8KMACHINE_genericx86-64 ?= "common-pc-64"
6 9
7SRCREV_machine_genericx86 ?= "4e30e64c44df9e59bd13239951bb8d2b5b276e6f" 10SRCREV_machine_genericx86 ?= "4e30e64c44df9e59bd13239951bb8d2b5b276e6f"
8SRCREV_machine_genericx86-64 ?= "4e30e64c44df9e59bd13239951bb8d2b5b276e6f" 11SRCREV_machine_genericx86-64 ?= "4e30e64c44df9e59bd13239951bb8d2b5b276e6f"
12SRCREV_machine_edgerouter ?= "79a31b9d23db126f8a6be3eb88fd683056a213f1"
13SRCREV_machine_beaglebone ?= "efb6ffb2ca96a364f916c9890ad023fc595e0e6e"
14SRCREV_machine_mpc8315e-rdb ?= "79a31b9d23db126f8a6be3eb88fd683056a213f1"
9 15
10COMPATIBLE_MACHINE_genericx86 = "genericx86" 16COMPATIBLE_MACHINE_genericx86 = "genericx86"
11COMPATIBLE_MACHINE_genericx86-64 = "genericx86-64" 17COMPATIBLE_MACHINE_genericx86-64 = "genericx86-64"
18COMPATIBLE_MACHINE_edgerouter = "edgerouter"
19COMPATIBLE_MACHINE_beaglebone = "beaglebone"
20COMPATIBLE_MACHINE_mpc8315e-rdb = "mpc8315e-rdb"