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/recipes-kernel/linux/linux-yocto_5.4.bbappend13
3 files changed, 15 insertions, 2 deletions
diff --git a/meta-yocto-bsp/conf/machine/beaglebone-yocto.conf b/meta-yocto-bsp/conf/machine/beaglebone-yocto.conf
index 08dd3a5074..5b481434bd 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"
24SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" 24SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
25 25
26PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" 26PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto"
27PREFERRED_VERSION_linux-yocto ?= "5.2%" 27PREFERRED_VERSION_linux-yocto ?= "5.4%"
28 28
29KERNEL_IMAGETYPE = "zImage" 29KERNEL_IMAGETYPE = "zImage"
30KERNEL_DEVICETREE = "am335x-bone.dtb am335x-boneblack.dtb am335x-bonegreen.dtb" 30KERNEL_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 6331368f87..d6fd934fa5 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 ?= "5.2%" 14PREFERRED_VERSION_linux-yocto ?= "5.4%"
15 15
16SERIAL_CONSOLES = "115200;ttyS0" 16SERIAL_CONSOLES = "115200;ttyS0"
17USE_VT ?= "0" 17USE_VT ?= "0"
diff --git a/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_5.4.bbappend b/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_5.4.bbappend
new file mode 100644
index 0000000000..fdcf8a7772
--- /dev/null
+++ b/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_5.4.bbappend
@@ -0,0 +1,13 @@
1KBRANCH_edgerouter = "v5.4/standard/edgerouter"
2KBRANCH_beaglebone-yocto = "v5.4/standard/beaglebone"
3
4KMACHINE_beaglebone-yocto ?= "beaglebone"
5
6SRCREV_machine_edgerouter ?= "cdda35317561d2741b396efa623ace0bd2212c16"
7SRCREV_machine_beaglebone-yocto ?= "cdda35317561d2741b396efa623ace0bd2212c16"
8
9COMPATIBLE_MACHINE_edgerouter = "edgerouter"
10COMPATIBLE_MACHINE_beaglebone-yocto = "beaglebone-yocto"
11
12LINUX_VERSION_edgerouter = "5.4.15"
13LINUX_VERSION_beaglebone-yocto = "5.4.15"