From 5f12f5bfb6a4a500f0a2b72010adb9481d9b175b Mon Sep 17 00:00:00 2001
From: Baikal Electronics <support@baikalelectronics.ru>
Date: Mon, 17 Apr 2023 16:28:10 +0300
Subject: [PATCH] Add support for Linux kernel 6.1 and u-boot v2023.04

---
 meta-baikal/conf/machine/bfk3.conf                          | 2 +-
 meta-baikal/recipes-bsp/u-boot/u-boot-environment.inc       | 2 +-
 meta-baikal/recipes-bsp/u-boot/u-boot_2022.10.bbappend      | 6 +++---
 .../linux/{linux-baikal_5.15.bb => linux-baikal_6.1.bb}     | 6 +++---
 4 files changed, 8 insertions(+), 8 deletions(-)
 rename meta-baikal/recipes-kernel/linux/{linux-baikal_5.15.bb => linux-baikal_6.1.bb} (92%)

diff --git a/meta-baikal/conf/machine/bfk3.conf b/meta-baikal/conf/machine/bfk3.conf
index 34879cf..c2f3873 100644
--- a/meta-baikal/conf/machine/bfk3.conf
+++ b/meta-baikal/conf/machine/bfk3.conf
@@ -10,4 +10,4 @@ UBOOT_MACHINE = "baikal_bfk3_defconfig"
 KBUILD_DEFCONFIG = "bfk3_defconfig"
 KERNEL_DEVICETREE = "baikal-t1/bfk3.dtb"
 PREFERRED_PROVIDER_virtual/kernel = "linux-baikal"
-PREFERRED_VERSION_virtual/kernel = "5.15%"
+#PREFERRED_VERSION_virtual/kernel = "6.1%"
diff --git a/meta-baikal/recipes-bsp/u-boot/u-boot-environment.inc b/meta-baikal/recipes-bsp/u-boot/u-boot-environment.inc
index ad76977..698d01c 100644
--- a/meta-baikal/recipes-bsp/u-boot/u-boot-environment.inc
+++ b/meta-baikal/recipes-bsp/u-boot/u-boot-environment.inc
@@ -5,7 +5,7 @@ PROVIDES:${PN}-baikal-env = "${PN}-baikal-env"
 FILES:${PN}-baikal-env = "${WORKDIR}/${MACHINE}.bin ${WORKDIR}/${MACHINE}.env"
 
 ENV_SIZE = "0x10000"
-UBOOT_DEF_ENV = "${MACHINE}.def-2022"
+UBOOT_DEF_ENV = "${MACHINE}.def-2023"
 
 BOOTROM_DIR = "sdk_bt/baikal/src/bootrom"
 
diff --git a/meta-baikal/recipes-bsp/u-boot/u-boot_2022.10.bbappend b/meta-baikal/recipes-bsp/u-boot/u-boot_2022.10.bbappend
index c163c7f..16352db 100644
--- a/meta-baikal/recipes-bsp/u-boot/u-boot_2022.10.bbappend
+++ b/meta-baikal/recipes-bsp/u-boot/u-boot_2022.10.bbappend
@@ -1,10 +1,10 @@
 LIC_FILES_CHKSUM = "file://Licenses/README;md5=2ca5f2c35c8cc335f0a19756634782f1"
 
-SRC_URI = "git://git@swgit/uboot.git;protocol=ssh;branch=baikal_mips;name=uboot \
+SRC_URI = "git://git@swgit/uboot.git;protocol=ssh;branch=baikal_mips_upstream;name=uboot \
 git://git@swgit/sdk_bt.git/;protocol=ssh;destsuffix=git/sdk_bt;branch=testing;name=sdk_bt"
 
-SRCREV_uboot = "0769e6fc0854541fe5982e0323823250758cd2d0"
-SRCREV_sdk_bt = "e1e52862e947017ef3b5988632bac2726eb105e2"
+SRCREV_uboot = "7f42ca4b9efb14e72e782f4232d9ec60f283bf9d"
+SRCREV_sdk_bt = "d1831d2deebdca284aa056a667444d79464086b7"
 
 
 S = "${WORKDIR}/git"
diff --git a/meta-baikal/recipes-kernel/linux/linux-baikal_5.15.bb b/meta-baikal/recipes-kernel/linux/linux-baikal_6.1.bb
similarity index 92%
rename from meta-baikal/recipes-kernel/linux/linux-baikal_5.15.bb
rename to meta-baikal/recipes-kernel/linux/linux-baikal_6.1.bb
index 1d327ab..c29b4c4 100644
--- a/meta-baikal/recipes-kernel/linux/linux-baikal_5.15.bb
+++ b/meta-baikal/recipes-kernel/linux/linux-baikal_6.1.bb
@@ -6,9 +6,9 @@ inherit kernel-uimage
 KERNEL_IMAGETYPE = "uImage"
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
-SRC_URI = "git://git@swgit/kernel_t1_mainline.git;protocol=ssh;branch=baikal-5.15.y-sdk5.9"
-SRCREV = "849fadc2c93a6822c819397e754ab4ffe14f22b8"
-LINUX_VERSION ?= "5.15.61"
+SRC_URI = "git://git@swgit/kernel_t1_mainline.git;protocol=ssh;branch=baikal-6.1.y-sdk6.1"
+SRCREV = "54ab2c56660f2bf0a7dd55a5b4015da3198b4c1c"
+LINUX_VERSION ?= "6.1"
 
 DEPENDS += "openssl-native util-linux-native"
 DEPENDS += "gmp-native libmpc-native"
-- 
2.39.5