diff options
| author | Kevin Hao <kexin.hao@windriver.com> | 2016-09-20 11:22:59 -0400 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-09-21 21:58:06 +0100 |
| commit | 66abd36513516b25d1d63a6988e7dbf3c5952f19 (patch) | |
| tree | d1a78862e8f6b02c78a8906697d89be612769e43 | |
| parent | 3cbf23ac52a761a7f5e129c60da524048d9680e8 (diff) | |
| download | poky-66abd36513516b25d1d63a6988e7dbf3c5952f19.tar.gz | |
meta-yocto-bsp: bump to linux-yocto 4.8 for the non-x86 BSPs
Boot test for all these boards.
(From meta-yocto rev: 3fe3a876710255ad8d16fae84aea92477c144440)
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/beaglebone.conf | 2 | ||||
| -rw-r--r-- | meta-yocto-bsp/conf/machine/edgerouter.conf | 2 | ||||
| -rw-r--r-- | meta-yocto-bsp/conf/machine/mpc8315e-rdb.conf | 2 | ||||
| -rw-r--r-- | meta-yocto-bsp/recipes-kernel/linux/linux-yocto_4.8.bbappend | 12 |
4 files changed, 15 insertions, 3 deletions
diff --git a/meta-yocto-bsp/conf/machine/beaglebone.conf b/meta-yocto-bsp/conf/machine/beaglebone.conf index ea50accc2d..1b6c2dcd57 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 " | |||
| 22 | SERIAL_CONSOLE = "115200 ttyO0" | 22 | SERIAL_CONSOLE = "115200 ttyO0" |
| 23 | 23 | ||
| 24 | PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" | 24 | PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" |
| 25 | PREFERRED_VERSION_linux-yocto ?= "4.4%" | 25 | PREFERRED_VERSION_linux-yocto ?= "4.8%" |
| 26 | 26 | ||
| 27 | KERNEL_IMAGETYPE = "zImage" | 27 | KERNEL_IMAGETYPE = "zImage" |
| 28 | KERNEL_DEVICETREE = "am335x-bone.dtb am335x-boneblack.dtb" | 28 | 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 6343dfc38c..cf521e91d5 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" | |||
| 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 ?= "4.4%" | 14 | PREFERRED_VERSION_linux-yocto ?= "4.8%" |
| 15 | 15 | ||
| 16 | SERIAL_CONSOLE = "115200 ttyS0" | 16 | SERIAL_CONSOLE = "115200 ttyS0" |
| 17 | USE_VT ?= "0" | 17 | USE_VT ?= "0" |
diff --git a/meta-yocto-bsp/conf/machine/mpc8315e-rdb.conf b/meta-yocto-bsp/conf/machine/mpc8315e-rdb.conf index 1e7de09a46..a2ff07c552 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 ?= "4.4%" | 17 | PREFERRED_VERSION_linux-yocto ?= "4.8%" |
| 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_4.8.bbappend b/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_4.8.bbappend index efa11cb209..f36164fcb5 100644 --- a/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_4.8.bbappend +++ b/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_4.8.bbappend | |||
| @@ -3,12 +3,24 @@ KBRANCH_genericx86-64 = "standard/base" | |||
| 3 | 3 | ||
| 4 | KMACHINE_genericx86 ?= "common-pc" | 4 | KMACHINE_genericx86 ?= "common-pc" |
| 5 | KMACHINE_genericx86-64 ?= "common-pc-64" | 5 | KMACHINE_genericx86-64 ?= "common-pc-64" |
| 6 | KBRANCH_edgerouter = "standard/edgerouter" | ||
| 7 | KBRANCH_beaglebone = "standard/beaglebone" | ||
| 8 | KBRANCH_mpc8315e-rdb = "standard/fsl-mpc8315e-rdb" | ||
| 6 | 9 | ||
| 7 | SRCREV_machine_genericx86 ?= "a7d71794e4e38d2f861c1b1dbff761ae0b0836b3" | 10 | SRCREV_machine_genericx86 ?= "a7d71794e4e38d2f861c1b1dbff761ae0b0836b3" |
| 8 | SRCREV_machine_genericx86-64 ?= "a7d71794e4e38d2f861c1b1dbff761ae0b0836b3" | 11 | SRCREV_machine_genericx86-64 ?= "a7d71794e4e38d2f861c1b1dbff761ae0b0836b3" |
| 12 | SRCREV_machine_edgerouter ?= "eb9c19c72d40a4bb8a6a3b7b949e41e5c31c0d94" | ||
| 13 | SRCREV_machine_beaglebone ?= "eb9c19c72d40a4bb8a6a3b7b949e41e5c31c0d94" | ||
| 14 | SRCREV_machine_mpc8315e-rdb ?= "b5c48c7a5d6473373fe7f1e2e8d7b0cf57929908" | ||
| 9 | 15 | ||
| 10 | COMPATIBLE_MACHINE_genericx86 = "genericx86" | 16 | COMPATIBLE_MACHINE_genericx86 = "genericx86" |
| 11 | COMPATIBLE_MACHINE_genericx86-64 = "genericx86-64" | 17 | COMPATIBLE_MACHINE_genericx86-64 = "genericx86-64" |
| 18 | COMPATIBLE_MACHINE_edgerouter = "edgerouter" | ||
| 19 | COMPATIBLE_MACHINE_beaglebone = "beaglebone" | ||
| 20 | COMPATIBLE_MACHINE_mpc8315e-rdb = "mpc8315e-rdb" | ||
| 12 | 21 | ||
| 13 | LINUX_VERSION_genericx86 = "4.8-rc4" | 22 | LINUX_VERSION_genericx86 = "4.8-rc4" |
| 14 | LINUX_VERSION_genericx86-64 = "4.8-rc4" | 23 | LINUX_VERSION_genericx86-64 = "4.8-rc4" |
| 24 | LINUX_VERSION_edgerouter = "4.8-rc7" | ||
| 25 | LINUX_VERSION_beaglebone = "4.8-rc7" | ||
| 26 | LINUX_VERSION_mpc8315e-rdb = "4.8-rc7" | ||
