diff options
4 files changed, 26 insertions, 3 deletions
diff --git a/meta-yocto-bsp/conf/machine/beaglebone-yocto.conf b/meta-yocto-bsp/conf/machine/beaglebone-yocto.conf index 618af40306..b3d960a8cd 100644 --- a/meta-yocto-bsp/conf/machine/beaglebone-yocto.conf +++ b/meta-yocto-bsp/conf/machine/beaglebone-yocto.conf | |||
@@ -24,7 +24,7 @@ SERIAL_CONSOLES ?= "115200;ttyS0 115200;ttyO0 115200;ttyAMA0" | |||
24 | SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" | 24 | SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" |
25 | 25 | ||
26 | PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" | 26 | PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" |
27 | PREFERRED_VERSION_linux-yocto ?= "5.13%" | 27 | PREFERRED_VERSION_linux-yocto ?= "5.14%" |
28 | 28 | ||
29 | KERNEL_IMAGETYPE = "zImage" | 29 | KERNEL_IMAGETYPE = "zImage" |
30 | KERNEL_DEVICETREE = "am335x-bone.dtb am335x-boneblack.dtb am335x-bonegreen.dtb" | 30 | 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 9c95f4632f..32be4b9c39 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 ?= "5.13%" | 14 | PREFERRED_VERSION_linux-yocto ?= "5.14%" |
15 | 15 | ||
16 | SERIAL_CONSOLES = "115200;ttyS0" | 16 | SERIAL_CONSOLES = "115200;ttyS0" |
17 | USE_VT ?= "0" | 17 | USE_VT ?= "0" |
diff --git a/meta-yocto-bsp/conf/machine/include/genericx86-common.inc b/meta-yocto-bsp/conf/machine/include/genericx86-common.inc index adc8ca879a..4651b37e5d 100644 --- a/meta-yocto-bsp/conf/machine/include/genericx86-common.inc +++ b/meta-yocto-bsp/conf/machine/include/genericx86-common.inc | |||
@@ -2,7 +2,7 @@ include conf/machine/include/x86/x86-base.inc | |||
2 | require conf/machine/include/x86/qemuboot-x86.inc | 2 | require conf/machine/include/x86/qemuboot-x86.inc |
3 | MACHINE_FEATURES += "wifi efi pcbios" | 3 | MACHINE_FEATURES += "wifi efi pcbios" |
4 | 4 | ||
5 | PREFERRED_VERSION_linux-yocto ?= "5.13%" | 5 | PREFERRED_VERSION_linux-yocto ?= "5.14%" |
6 | PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" | 6 | PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" |
7 | PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg" | 7 | PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg" |
8 | XSERVER ?= "${XSERVER_X86_BASE} \ | 8 | XSERVER ?= "${XSERVER_X86_BASE} \ |
diff --git a/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_5.14.bbappend b/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_5.14.bbappend new file mode 100644 index 0000000000..52371ff66a --- /dev/null +++ b/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_5.14.bbappend | |||
@@ -0,0 +1,23 @@ | |||
1 | KBRANCH:genericx86 = "v5.14/standard/base" | ||
2 | KBRANCH:genericx86-64 = "v5.14/standard/base" | ||
3 | KBRANCH:edgerouter = "v5.14/standard/edgerouter" | ||
4 | KBRANCH:beaglebone-yocto = "v5.14/standard/beaglebone" | ||
5 | |||
6 | KMACHINE:genericx86 ?= "common-pc" | ||
7 | KMACHINE:genericx86-64 ?= "common-pc-64" | ||
8 | KMACHINE:beaglebone-yocto ?= "beaglebone" | ||
9 | |||
10 | SRCREV_machine:genericx86 ?= "7ae156be3bdbf033839f7f3ec2e9a0ffffb18818" | ||
11 | SRCREV_machine:genericx86-64 ?= "7ae156be3bdbf033839f7f3ec2e9a0ffffb18818" | ||
12 | SRCREV_machine:edgerouter ?= "7ae156be3bdbf033839f7f3ec2e9a0ffffb18818" | ||
13 | SRCREV_machine:beaglebone-yocto ?= "7ae156be3bdbf033839f7f3ec2e9a0ffffb18818" | ||
14 | |||
15 | COMPATIBLE_MACHINE:genericx86 = "genericx86" | ||
16 | COMPATIBLE_MACHINE:genericx86-64 = "genericx86-64" | ||
17 | COMPATIBLE_MACHINE:edgerouter = "edgerouter" | ||
18 | COMPATIBLE_MACHINE:beaglebone-yocto = "beaglebone-yocto" | ||
19 | |||
20 | LINUX_VERSION:genericx86 = "5.14.6" | ||
21 | LINUX_VERSION:genericx86-64 = "5.14.6" | ||
22 | LINUX_VERSION:edgerouter = "5.14.6" | ||
23 | LINUX_VERSION:beaglebone-yocto = "5.14.6" | ||