diff --git a/layers/meta-belden-coreos-bsp/conf/machine/beaglebone.conf b/layers/meta-belden-coreos-bsp/conf/machine/beaglebone.conf index 411e6ca..c221285 100644 --- a/layers/meta-belden-coreos-bsp/conf/machine/beaglebone.conf +++ b/layers/meta-belden-coreos-bsp/conf/machine/beaglebone.conf @@ -20,10 +20,12 @@ SERIAL_CONSOLES ?= "115200;ttyS0 115200;ttyO0 115200;ttyAMA0" APPEND:append = " console=ttyS0,115200" PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" -PREFERRED_VERSION_linux-yocto ?= "5.15%" +PREFERRED_VERSION_linux-yocto ?= "6.5%" KERNEL_IMAGETYPE = "zImage" -KERNEL_DEVICETREE = "am335x-bone.dtb am335x-boneblack.dtb am335x-bonegreen.dtb" + +# ti/omap/ prefix was added in 6.5, need to be removed if someone want to build linux-yocto_6.1 +KERNEL_DEVICETREE = "ti/omap/am335x-bone.dtb ti/omap/am335x-boneblack.dtb ti/omap/am335x-bonegreen.dtb" KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT}" PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot" diff --git a/layers/meta-belden-coreos-bsp/conf/machine/eagle40-03.conf b/layers/meta-belden-coreos-bsp/conf/machine/eagle40-03.conf index bca4a27..4c2c11d 100644 --- a/layers/meta-belden-coreos-bsp/conf/machine/eagle40-03.conf +++ b/layers/meta-belden-coreos-bsp/conf/machine/eagle40-03.conf @@ -10,7 +10,7 @@ MACHINE_FEATURES += "pci usbhost x86 acpi serial efi tpm2 " # Kernel configuration # ****************************************************************************** -PREFERRED_VERSION_linux-yocto ?= "5.15%" +PREFERRED_VERSION_linux-yocto ?= "6.5%" PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" KERNEL_IMAGETYPE = "bzImage" diff --git a/layers/meta-belden-coreos-bsp/conf/machine/include/coreos-generic-machine/vm.inc b/layers/meta-belden-coreos-bsp/conf/machine/include/coreos-generic-machine/vm.inc index c4a45d2..8527082 100644 --- a/layers/meta-belden-coreos-bsp/conf/machine/include/coreos-generic-machine/vm.inc +++ b/layers/meta-belden-coreos-bsp/conf/machine/include/coreos-generic-machine/vm.inc @@ -6,7 +6,7 @@ MACHINE_FEATURES += "wifi efi" # Add an override that work for all pc image MACHINEOVERRIDES =. "vm:" -PREFERRED_VERSION_linux-yocto ?= "5.15%" +PREFERRED_VERSION_linux-yocto ?= "6.5%" PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" MACHINE_EXTRA_RRECOMMENDS += "kernel-modules linux-firmware" diff --git a/layers/meta-belden-coreos-bsp/recipes-kernel/linux/linux-yocto_5.15.bbappend b/layers/meta-belden-coreos-bsp/recipes-kernel/linux/linux-yocto_5.15.bbappend deleted file mode 100644 index 2043a18..0000000 --- a/layers/meta-belden-coreos-bsp/recipes-kernel/linux/linux-yocto_5.15.bbappend +++ /dev/null @@ -1,25 +0,0 @@ -FILESEXTRAPATHS:prepend := "${THISDIR}/files:" -KMACHINE:vm-x64 ?= "common-pc-64" -COMPATIBLE_MACHINE:vm-x64 = "vm-x64" - -# Enable some kernel features related to virtualiuzation -KERNEL_FEATURES:append:vm-x64=" cfg/virtio.scc cfg/paravirt_kvm.scc" - - -KMACHINE:eagle40-03 ?= "common-pc-64" -KBRANCH:eagle40-03 = "v5.15/standard/base" -SRCREV_machine:eagle40-03 ?= "3baf1c5c0e6084b3f4a1d2d805168d657f872e60" -COMPATIBLE_MACHINE:eagle40-03 = "eagle40-03" -LINUX_VERSION:eagle40-03 = "5.15.134" - - -KBRANCH:beaglebone = "v5.15/standard/beaglebone" -KMACHINE:beaglebone ?= "beaglebone" -SRCREV_machine:beaglebone ?= "9aabbaa89fcb21af7028e814c1f5b61171314d5a" -COMPATIBLE_MACHINE:beaglebone = "beaglebone" -LINUX_VERSION:beaglebone = "5.15.54" - -require ${@bb.utils.contains("COMBINED_FEATURES", "efi", "linux-yocto-coreos-efi.inc", "", d)} - -SRC_URI += " file://k3s_kernel_adaptions.cfg" -SRC_URI:append:vm-x64 = " file://hyperv.cfg" diff --git a/layers/meta-belden-coreos-bsp/recipes-kernel/linux/linux-yocto_6.1.bbappend b/layers/meta-belden-coreos-bsp/recipes-kernel/linux/linux-yocto_6.1.bbappend new file mode 100644 index 0000000..c46b6aa --- /dev/null +++ b/layers/meta-belden-coreos-bsp/recipes-kernel/linux/linux-yocto_6.1.bbappend @@ -0,0 +1,36 @@ +FILESEXTRAPATHS:prepend := "${THISDIR}/files:" + +# vm-x64 settings +# ============================================================================== +# The machine use the default KBRANCH, SRCREV and Linux Version set in OECore, +# so that the kernel get updated when updated OECore + +KMACHINE:vm-x64 ?= "common-pc-64" +COMPATIBLE_MACHINE:vm-x64 = "vm-x64" + +# Enable some kernel features related to virtualiuzation +KERNEL_FEATURES:append:vm-x64=" cfg/virtio.scc cfg/paravirt_kvm.scc" + +# Eagle 40-03 settings +# ============================================================================== +# The machine use the default KBRANCH, SRCREV and Linux Version set in OECore, +# so that the kernel get updated when updated OECore + +KMACHINE:eagle40-03 ?= "common-pc-64" +COMPATIBLE_MACHINE:eagle40-03 = "eagle40-03" + +# Beaglebone Settings +# ============================================================================== +# The machine use the default KBRANCH, SRCREV and Linux Version set in OECore, +# so that the kernel get updated when updated OECore + +KMACHINE:beaglebone ?= "beaglebone" +COMPATIBLE_MACHINE:beaglebone = "beaglebone" + +# CoreOS Generic Settings +# ============================================================================== + +require ${@bb.utils.contains("COMBINED_FEATURES", "efi", "linux-yocto-coreos-efi.inc", "", d)} + +SRC_URI += " file://k3s_kernel_adaptions.cfg" +SRC_URI:append:vm-x64 = " file://hyperv.cfg" diff --git a/layers/meta-belden-coreos-bsp/recipes-kernel/linux/linux-yocto_6.5.bbappend b/layers/meta-belden-coreos-bsp/recipes-kernel/linux/linux-yocto_6.5.bbappend new file mode 100644 index 0000000..6529ae1 --- /dev/null +++ b/layers/meta-belden-coreos-bsp/recipes-kernel/linux/linux-yocto_6.5.bbappend @@ -0,0 +1,37 @@ +FILESEXTRAPATHS:prepend := "${THISDIR}/files:" + +# vm-x64 settings +# ============================================================================== +# The machine use the default KBRANCH, SRCREV and Linux Version set in OECore, +# so that the kernel get updated when updated OECore + +KMACHINE:vm-x64 ?= "common-pc-64" +COMPATIBLE_MACHINE:vm-x64 = "vm-x64" + +# Enable some kernel features related to virtualiuzation +KERNEL_FEATURES:append:vm-x64=" cfg/virtio.scc cfg/paravirt_kvm.scc" + + +# Eagle 40-03 settings +# ============================================================================== +# The machine use the default KBRANCH, SRCREV and Linux Version set in OECore, +# so that the kernel get updated when updated OECore + +KMACHINE:eagle40-03 ?= "common-pc-64" +COMPATIBLE_MACHINE:eagle40-03 = "eagle40-03" + +# Beaglebone Settings +# ============================================================================== +# The machine use the default KBRANCH, SRCREV and Linux Version set in OECore, +# so that the kernel get updated when updated OECore + +KMACHINE:beaglebone ?= "beaglebone" +COMPATIBLE_MACHINE:beaglebone = "beaglebone" + +# CoreOS Generic Settings +# ============================================================================== + +require ${@bb.utils.contains("COMBINED_FEATURES", "efi", "linux-yocto-coreos-efi.inc", "", d)} + +SRC_URI += " file://k3s_kernel_adaptions.cfg" +SRC_URI:append:vm-x64 = " file://hyperv.cfg"