diff options
4 files changed, 30 insertions, 3 deletions
diff --git a/meta-yocto-bsp/conf/machine/beaglebone-yocto.conf b/meta-yocto-bsp/conf/machine/beaglebone-yocto.conf index 5cc2923903..e911e75004 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_CONSOLES = "115200;ttyO0" PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" -PREFERRED_VERSION_linux-yocto ?= "4.15%" +PREFERRED_VERSION_linux-yocto ?= "4.18%" 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 a3eeebf2f6..b7a94e9cbb 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.15%" +PREFERRED_VERSION_linux-yocto ?= "4.18%" SERIAL_CONSOLES = "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 441987a78e..6f5b9859d7 100644 --- a/meta-yocto-bsp/conf/machine/mpc8315e-rdb.conf +++ b/meta-yocto-bsp/conf/machine/mpc8315e-rdb.conf @@ -14,7 +14,7 @@ SERIAL_CONSOLES = "115200;ttyS0" MACHINE_FEATURES = "keyboard pci ext2 ext3 serial" -PREFERRED_VERSION_linux-yocto ?= "4.15%" +PREFERRED_VERSION_linux-yocto ?= "4.18%" PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg" diff --git a/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_4.18.bbappend b/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_4.18.bbappend new file mode 100644 index 0000000000..0ce757860a --- /dev/null +++ b/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_4.18.bbappend @@ -0,0 +1,27 @@ +KBRANCH_genericx86 = "v4.18/standard/base" +KBRANCH_genericx86-64 = "v4.18/standard/base" +KBRANCH_edgerouter = "v4.18/standard/edgerouter" +KBRANCH_beaglebone-yocto = "v4.18/standard/beaglebone" +KBRANCH_mpc8315e-rdb = "v4.18/standard/fsl-mpc8315e-rdb" + +KMACHINE_genericx86 ?= "common-pc" +KMACHINE_genericx86-64 ?= "common-pc-64" +KMACHINE_beaglebone-yocto ?= "beaglebone" + +SRCREV_machine_genericx86 ?= "eba03655e8e436ef6090100423bcea43e4911478" +SRCREV_machine_genericx86-64 ?= "eba03655e8e436ef6090100423bcea43e4911478" +SRCREV_machine_edgerouter ?= "eba03655e8e436ef6090100423bcea43e4911478" +SRCREV_machine_beaglebone-yocto ?= "eba03655e8e436ef6090100423bcea43e4911478" +SRCREV_machine_mpc8315e-rdb ?= "193513391ec14cb5402fcc4ed7bb2b49193842bb" + +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.18.3" +LINUX_VERSION_genericx86-64 = "4.18.3" +LINUX_VERSION_edgerouter = "4.18.3" +LINUX_VERSION_beaglebone-yocto = "4.18.3" +LINUX_VERSION_mpc8315e-rdb = "4.18.3" |