summaryrefslogtreecommitdiffstats
path: root/meta-yocto-bsp
diff options
context:
space:
mode:
Diffstat (limited to 'meta-yocto-bsp')
-rw-r--r--meta-yocto-bsp/conf/machine/beaglebone-yocto.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.18.bbappend27
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
23SERIAL_CONSOLES = "115200;ttyO0" 23SERIAL_CONSOLES = "115200;ttyO0"
24 24
25PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" 25PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto"
26PREFERRED_VERSION_linux-yocto ?= "4.15%" 26PREFERRED_VERSION_linux-yocto ?= "4.18%"
27 27
28KERNEL_IMAGETYPE = "zImage" 28KERNEL_IMAGETYPE = "zImage"
29KERNEL_DEVICETREE = "am335x-bone.dtb am335x-boneblack.dtb am335x-bonegreen.dtb" 29KERNEL_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"
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 ?= "4.15%" 14PREFERRED_VERSION_linux-yocto ?= "4.18%"
15 15
16SERIAL_CONSOLES = "115200;ttyS0" 16SERIAL_CONSOLES = "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 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"
14 14
15MACHINE_FEATURES = "keyboard pci ext2 ext3 serial" 15MACHINE_FEATURES = "keyboard pci ext2 ext3 serial"
16 16
17PREFERRED_VERSION_linux-yocto ?= "4.15%" 17PREFERRED_VERSION_linux-yocto ?= "4.18%"
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.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 @@
1KBRANCH_genericx86 = "v4.18/standard/base"
2KBRANCH_genericx86-64 = "v4.18/standard/base"
3KBRANCH_edgerouter = "v4.18/standard/edgerouter"
4KBRANCH_beaglebone-yocto = "v4.18/standard/beaglebone"
5KBRANCH_mpc8315e-rdb = "v4.18/standard/fsl-mpc8315e-rdb"
6
7KMACHINE_genericx86 ?= "common-pc"
8KMACHINE_genericx86-64 ?= "common-pc-64"
9KMACHINE_beaglebone-yocto ?= "beaglebone"
10
11SRCREV_machine_genericx86 ?= "eba03655e8e436ef6090100423bcea43e4911478"
12SRCREV_machine_genericx86-64 ?= "eba03655e8e436ef6090100423bcea43e4911478"
13SRCREV_machine_edgerouter ?= "eba03655e8e436ef6090100423bcea43e4911478"
14SRCREV_machine_beaglebone-yocto ?= "eba03655e8e436ef6090100423bcea43e4911478"
15SRCREV_machine_mpc8315e-rdb ?= "193513391ec14cb5402fcc4ed7bb2b49193842bb"
16
17COMPATIBLE_MACHINE_genericx86 = "genericx86"
18COMPATIBLE_MACHINE_genericx86-64 = "genericx86-64"
19COMPATIBLE_MACHINE_edgerouter = "edgerouter"
20COMPATIBLE_MACHINE_beaglebone-yocto = "beaglebone-yocto"
21COMPATIBLE_MACHINE_mpc8315e-rdb = "mpc8315e-rdb"
22
23LINUX_VERSION_genericx86 = "4.18.3"
24LINUX_VERSION_genericx86-64 = "4.18.3"
25LINUX_VERSION_edgerouter = "4.18.3"
26LINUX_VERSION_beaglebone-yocto = "4.18.3"
27LINUX_VERSION_mpc8315e-rdb = "4.18.3"