From e2c9b7f625a390522e82d91c972bd2a5a9ff1d41 Mon Sep 17 00:00:00 2001
From: Baikal Electronics <support@baikalelectronics.ru>
Date: Thu, 15 Jun 2023 17:09:07 +0300
Subject: [PATCH] SDK5.9

---
 meta-baikal/bfk3.def-2023                                 | 2 +-
 meta-baikal/conf/machine/bfk3.conf                        | 2 +-
 meta-baikal/recipes-bsp/u-boot/u-boot_2022.10.bbappend    | 4 ++--
 .../recipes-core/images/core-image-minimal.bbappend       | 8 ++++----
 .../linux/{linux-baikal_6.1.bb => linux-baikal_5.15.bb}   | 6 +++---
 5 files changed, 11 insertions(+), 11 deletions(-)
 rename meta-baikal/recipes-kernel/linux/{linux-baikal_6.1.bb => linux-baikal_5.15.bb} (88%)

diff --git a/meta-baikal/bfk3.def-2023 b/meta-baikal/bfk3.def-2023
index 480a11d..96d8411 100644
--- a/meta-baikal/bfk3.def-2023
+++ b/meta-baikal/bfk3.def-2023
@@ -100,7 +100,7 @@ initrd_high=no
 # MTD partitions
 #
 mtdids=nor2=boot_flash
-mtdparts=mtdparts=boot_flash:748k@0x0(bootloader)ro,64k@0xBB000(environment),4k@0xCB000(information)ro,24k@0xCC000(fdt)ro,15544k@0xD2000(fitimage)ro,16384k@0x0(firmware)
+mtdparts=mtdparts=boot_flash:768k@0x0(bootloader)ro,64k@0xB0000(environment),64k@0xD0000(information)ro,64k@0xE0000(fdt)ro,15552k@0xF0000(fitimage)ro,16384k@0x0(firmware)
 #
 # Main boot parameters
 #
diff --git a/meta-baikal/conf/machine/bfk3.conf b/meta-baikal/conf/machine/bfk3.conf
index c2f3873..190b95b 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 = "6.1%"
+#PREFERRED_VERSION_virtual/kernel = "5.15%"
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 34f201e..68b5912 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,8 +1,8 @@
 LIC_FILES_CHKSUM = "file://Licenses/README;md5=2ca5f2c35c8cc335f0a19756634782f1"
 
-SRC_URI = "git://git@swgit/uboot.git;protocol=ssh;branch=baikal_mips_upstream;name=uboot" 
+SRC_URI = "git://git@swgit/uboot-hosting.git;protocol=ssh;branch=baikal/mips;name=uboot" 
 
-SRCREV_uboot = "7f42ca4b9efb14e72e782f4232d9ec60f283bf9d"
+SRCREV_uboot = "fa784c0f8243ade175e80353fc42e2c1e3a52385"
 
 
 S = "${WORKDIR}/git"
diff --git a/meta-baikal/recipes-core/images/core-image-minimal.bbappend b/meta-baikal/recipes-core/images/core-image-minimal.bbappend
index 05af2a8..b986dde 100644
--- a/meta-baikal/recipes-core/images/core-image-minimal.bbappend
+++ b/meta-baikal/recipes-core/images/core-image-minimal.bbappend
@@ -23,10 +23,10 @@ baikal_deploy () {
     cp -f ${IMGDEPLOYDIR}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.cpio.lzma ${BAIKAL_IMAGES}/initramfs.lzma
 }
 
-UBOOT_SECTION_END = "765952"
-UBOOTENV_SECTION_END = "835584"
-LINUX_FDT_SECTION_END = "860160"
-FITIMAGE_SECTION_END = "16777216"
+UBOOT_SECTION_END = "786432"
+UBOOTENV_SECTION_END = "917504"
+LINUX_FDT_SECTION_END = "983040"
+FITIMAGE_SECTION_END = "15335424"
 
 check_size_fitness () {
     cur_size=$( wc -c $1 | cut -d' ' -f1)
diff --git a/meta-baikal/recipes-kernel/linux/linux-baikal_6.1.bb b/meta-baikal/recipes-kernel/linux/linux-baikal_5.15.bb
similarity index 88%
rename from meta-baikal/recipes-kernel/linux/linux-baikal_6.1.bb
rename to meta-baikal/recipes-kernel/linux/linux-baikal_5.15.bb
index c29b4c4..f68f6c0 100644
--- a/meta-baikal/recipes-kernel/linux/linux-baikal_6.1.bb
+++ b/meta-baikal/recipes-kernel/linux/linux-baikal_5.15.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-6.1.y-sdk6.1"
-SRCREV = "54ab2c56660f2bf0a7dd55a5b4015da3198b4c1c"
-LINUX_VERSION ?= "6.1"
+SRC_URI = "git://git@swgit/kernel-hosting.git;protocol=ssh;branch=baikal/mips/5.15.y"
+SRCREV = "f6bdc5ed3fc03eb0b9f72a36f2cb4dd437a08275"
+LINUX_VERSION ?= "5.15"
 
 DEPENDS += "openssl-native util-linux-native"
 DEPENDS += "gmp-native libmpc-native"
-- 
2.39.5