diff options
5 files changed, 29 insertions, 3 deletions
diff --git a/meta-yocto-bsp/conf/machine/beaglebone-yocto.conf b/meta-yocto-bsp/conf/machine/beaglebone-yocto.conf index 990c967416..8d0f62bf67 100644 --- a/meta-yocto-bsp/conf/machine/beaglebone-yocto.conf +++ b/meta-yocto-bsp/conf/machine/beaglebone-yocto.conf @@ -23,7 +23,7 @@ do_image_wic[depends] += "mtools-native:do_populate_sysroot dosfstools-native:do SERIAL_CONSOLE = "115200 ttyO0" PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" -PREFERRED_VERSION_linux-yocto ?= "4.12%" +PREFERRED_VERSION_linux-yocto ?= "4.15%" KERNEL_IMAGETYPE = "zImage" KERNEL_DEVICETREE = "am335x-bone.dtb am335x-boneblack.dtb am335x-bonegreen.dtb" diff --git a/meta-yocto-bsp/conf/machine/edgerouter.conf b/meta-yocto-bsp/conf/machine/edgerouter.conf index ab5a6fc404..acfd69c2bc 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 ?= "4.12%" +PREFERRED_VERSION_linux-yocto ?= "4.15%" 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 371a3db3d0..04c54f2710 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 ?= "4.12%" +PREFERRED_VERSION_linux-yocto ?= "4.15%" PREFERRED_PROVIDER_virtual/kernel = "linux-yocto" PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg" diff --git a/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_4.14.bbappend b/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_4.14.bbappend index 3f73eea118..5130707dd7 100644 --- a/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_4.14.bbappend +++ b/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_4.14.bbappend @@ -1,14 +1,27 @@ KBRANCH_genericx86 = "v4.14/standard/base" KBRANCH_genericx86-64 = "v4.14/standard/base" +KBRANCH_edgerouter = "v4.14/standard/edgerouter" +KBRANCH_beaglebone-yocto = "v4.14/standard/beaglebone" +KBRANCH_mpc8315e-rdb = "v4.14/standard/fsl-mpc8315e-rdb" KMACHINE_genericx86 ?= "common-pc" KMACHINE_genericx86-64 ?= "common-pc-64" +KMACHINE_beaglebone-yocto ?= "beaglebone" SRCREV_machine_genericx86 ?= "1d50ce210b0536eb9a66d1e56ae215f92176444a" SRCREV_machine_genericx86-64 ?= "1d50ce210b0536eb9a66d1e56ae215f92176444a" +SRCREV_machine_edgerouter ?= "f2dc94f77d19ab65a832bad6f42662c509d2ef9e" +SRCREV_machine_beaglebone-yocto ?= "6c1a02d4a9c227eca356911715a52cf92457ec16" +SRCREV_machine_mpc8315e-rdb ?= "7e9a0b017be7b685e094638f4bdaa33a7df8f7c0" COMPATIBLE_MACHINE_genericx86 = "genericx86" COMPATIBLE_MACHINE_genericx86-64 = "genericx86-64" +COMPATIBLE_MACHINE_edgerouter = "edgerouter" +COMPATIBLE_MACHINE_beaglebone-yocto = "beaglebone-yocto" +COMPATIBLE_MACHINE_mpc8315e-rdb = "mpc8315e-rdb" LINUX_VERSION_genericx86 = "4.14.30" LINUX_VERSION_genericx86-64 = "4.14.30" +LINUX_VERSION_edgerouter = "4.14.30" +LINUX_VERSION_beaglebone-yocto = "4.14.30" +LINUX_VERSION_mpc8315e-rdb = "4.14.30" diff --git a/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_4.15.bbappend b/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_4.15.bbappend index 9ae1735469..c0c6ad92da 100644 --- a/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_4.15.bbappend +++ b/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_4.15.bbappend @@ -1,14 +1,27 @@ KBRANCH_genericx86 = "v4.15/standard/base" KBRANCH_genericx86-64 = "v4.15/standard/base" +KBRANCH_edgerouter = "v4.15/standard/edgerouter" +KBRANCH_beaglebone-yocto = "v4.15/standard/beaglebone" +KBRANCH_mpc8315e-rdb = "v4.15/standard/fsl-mpc8315e-rdb" KMACHINE_genericx86 ?= "common-pc" KMACHINE_genericx86-64 ?= "common-pc-64" +KMACHINE_beaglebone-yocto ?= "beaglebone" SRCREV_machine_genericx86 ?= "f73fd8783a3e7529902366ba75aafb81c19ec3c9" SRCREV_machine_genericx86-64 ?= "f73fd8783a3e7529902366ba75aafb81c19ec3c9" +SRCREV_machine_edgerouter ?= "f73fd8783a3e7529902366ba75aafb81c19ec3c9" +SRCREV_machine_beaglebone-yocto ?= "f73fd8783a3e7529902366ba75aafb81c19ec3c9" +SRCREV_machine_mpc8315e-rdb ?= "cc2711c4f3b83b5cd78358e7c949fdbb6076e25b" COMPATIBLE_MACHINE_genericx86 = "genericx86" COMPATIBLE_MACHINE_genericx86-64 = "genericx86-64" +COMPATIBLE_MACHINE_edgerouter = "edgerouter" +COMPATIBLE_MACHINE_beaglebone-yocto = "beaglebone-yocto" +COMPATIBLE_MACHINE_mpc8315e-rdb = "mpc8315e-rdb" LINUX_VERSION_genericx86 = "4.15.13" LINUX_VERSION_genericx86-64 = "4.15.13" +LINUX_VERSION_edgerouter = "4.15.13" +LINUX_VERSION_beaglebone-yocto = "4.15.13" +LINUX_VERSION_mpc8315e-rdb = "4.15.13" |