Skip to contentSkip to conversation

Revert "yocto-bsp: explicitly set preferred version for reference boards"

PATCH New Kevin Hao 1 participant 2 messages Jan 11, 2021

lore
Share & tools
lore

Kevin Hao

author
#0 lore raw

PATCH 1/2 Revert "yocto-bsp: explicitly set preferred version for reference boards"

This reverts commit da27ca50eebf80463cb8d7b85f3b705254823413.

We usually select the preferred kernel version in the machine conf. This is also what recommend in the BSP Developer's Guide. The beaglebone-yocto and edgerouter have already done this in their machine conf files. Resetting it in the layer conf is redundant. So revert this patch first, we will also explicitly select the kernel version for the x86 machines in the following patch.

---
 meta-yocto-bsp/conf/layer.conf | 6 ------
 1 file changed, 6 deletions(-)
meta-yocto-bsp/conf/layer.conf +0 -6
index eb9f55ea978f..bf0c1bfece96 100644
@@ -5,12 +5,6 @@ BBPATH .= ":${LAYERDIR}"
 BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \
             ${LAYERDIR}/recipes-*/*/*.bbappend"
 
-
-PREFERRED_VERSION_linux-yocto_genericx86 ?= "5.8%"
-PREFERRED_VERSION_linux-yocto_genericx86-64 ?= "5.8%"
-PREFERRED_VERSION_linux-yocto_edgerouter ?= "5.8%"
-PREFERRED_VERSION_linux-yocto_beaglebone-yocto ?= "5.8%"
-
 BBFILE_COLLECTIONS += "yoctobsp"
 BBFILE_PATTERN_yoctobsp = "^${LAYERDIR}/"
 BBFILE_PRIORITY_yoctobsp = "5"
Signature · 1 line
2.29.2
author
#1 lore raw

PATCH 2/2 meta-yocto-bsp: Bump the kernel to v5.10

Build and boot for all these machines and also explicitly set the preferred kernel version for the x86 machines so that we can override the default setting in oe-core.

---
 .../conf/machine/beaglebone-yocto.conf        |  2 +-
 meta-yocto-bsp/conf/machine/edgerouter.conf   |  2 +-
 .../machine/include/genericx86-common.inc     |  1 +
 .../linux/linux-yocto_5.10.bbappend           | 23 +++++++++++++++++++
 4 files changed, 26 insertions(+), 2 deletions(-)
 create mode 100644 meta-yocto-bsp/recipes-kernel/linux/linux-yocto_5.10.bbappend
meta-yocto-bsp/conf/machine/beaglebone-yocto.conf +1 -1
index 523472ab1287..f8368ebd0eef 100644
@@ -24,7 +24,7 @@ SERIAL_CONSOLES ?= "115200;ttyS0 115200;ttyO0 115200;ttyAMA0"
 SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
 
 PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto"
-PREFERRED_VERSION_linux-yocto ?= "5.8%"
+PREFERRED_VERSION_linux-yocto ?= "5.10%"
 
 KERNEL_IMAGETYPE = "zImage"
 KERNEL_DEVICETREE = "am335x-bone.dtb am335x-boneblack.dtb am335x-bonegreen.dtb"
meta-yocto-bsp/conf/machine/edgerouter.conf +1 -1
index 75bc5e5f28e7..fbe33be9d157 100644
@@ -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 ?= "5.8%"
+PREFERRED_VERSION_linux-yocto ?= "5.10%"
 
 SERIAL_CONSOLES = "115200;ttyS0"
 USE_VT ?= "0"
meta-yocto-bsp/conf/machine/include/genericx86-common.inc +1 -0
index a6c396c79e53..1de069011dc2 100644
@@ -2,6 +2,7 @@ include conf/machine/include/x86-base.inc
 require conf/machine/include/qemuboot-x86.inc
 MACHINE_FEATURES += "wifi efi pcbios"
 
+PREFERRED_VERSION_linux-yocto ?= "5.10%"
 PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto"
 PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg"
 XSERVER ?= "${XSERVER_X86_BASE} \
meta-yocto-bsp/recipes-kernel/linux/linux-yocto_5.10.bbappend new file +23 -0
new file mode 100644
index 000000000000..d6c5424fc7db
@@ -0,0 +1,23 @@
+KBRANCH_genericx86  = "v5.10/standard/base"
+KBRANCH_genericx86-64  = "v5.10/standard/base"
+KBRANCH_edgerouter = "v5.10/standard/edgerouter"
+KBRANCH_beaglebone-yocto = "v5.10/standard/beaglebone"
+
+KMACHINE_genericx86 ?= "common-pc"
+KMACHINE_genericx86-64 ?= "common-pc-64"
+KMACHINE_beaglebone-yocto ?= "beaglebone"
+
+SRCREV_machine_genericx86 ?= "f08df324ccdbc73b9f0c2de2826a2843bcdf651b"
+SRCREV_machine_genericx86-64 ?= "f08df324ccdbc73b9f0c2de2826a2843bcdf651b"
+SRCREV_machine_edgerouter ?= "1f3d7b6a85e98317771367e70824f7803ff9ca30"
+SRCREV_machine_beaglebone-yocto ?= "f08df324ccdbc73b9f0c2de2826a2843bcdf651b"
+
+COMPATIBLE_MACHINE_genericx86 = "genericx86"
+COMPATIBLE_MACHINE_genericx86-64 = "genericx86-64"
+COMPATIBLE_MACHINE_edgerouter = "edgerouter"
+COMPATIBLE_MACHINE_beaglebone-yocto = "beaglebone-yocto"
+
+LINUX_VERSION_genericx86 = "5.10.5"
+LINUX_VERSION_genericx86-64 = "5.10.5"
+LINUX_VERSION_edgerouter = "5.10.5"
+LINUX_VERSION_beaglebone-yocto = "5.10.5"
Signature · 1 line
2.29.2