SDK5.9

diff --git a/meta-baikal/bfk3.def-2023 b/meta-baikal/bfk3.def-2023
index 480a11d6cd6acf587c4c8e3d249eccbc9db6d1a4..96d841196828d8b4bd6f30e5eed4aba76e298bd0 100644 (file)
--- 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 c2f387339c9a4b41ea1a3580a3d24e1cc694c232..190b95b2c8d1595ee337d545ec729c9d5e8b371c 100644 (file)
--- 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 34f201e59be0d78290ac532894a690876bbf867e..68b59121a7321fc30bad9ae215afeb9c291b6143 100644 (file)
--- 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 05af2a8a6ed59892e3cd86e76eb36a561ab87007..b986dde951f0c4d1dc0b57ad98168b04404a8df5 100644 (file)
--- 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_5.15.bb b/meta-baikal/recipes-kernel/linux/linux-baikal_5.15.bb
new file mode 100644 (file)
index 0000000..f68f6c0
--- /dev/null
+++ b/meta-baikal/recipes-kernel/linux/linux-baikal_5.15.bb
@@ -0,0 +1,46 @@
+require recipes-kernel/linux/linux-baikal.inc
+require recipes-kernel/linux/linux-umulti.inc
+
+inherit kernel-uimage
+
+KERNEL_IMAGETYPE = "uImage"
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
+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"
+
+KCONF_BSP_AUDIT_LEVEL = "1"
+
+COMPATIBLE_MACHINE = "^(bfk3)$"
+
+deltask package_qa
+
+baikal_deploy () {
+    if [ ! -d ${BAIKAL_IMAGES} ]; then
+        mkdir -p ${BAIKAL_IMAGES}
+    fi
+    for imageType in ${KERNEL_IMAGETYPES} ; do
+        install -m 0644 ${B}/${KERNEL_OUTPUT_DIR}/$imageType ${BAIKAL_IMAGES}/${MACHINE}.$imageType
+    done
+}
+
+baikal_deploy_vmlinux () {
+    if [ ! -d ${BAIKAL_IMAGES} ]; then
+        mkdir -p ${BAIKAL_IMAGES}
+    fi
+    cp -f ${B}/System.map ${BAIKAL_IMAGES}/${MACHINE}.System.map
+    cp -f ${B}/${KERNEL_OUTPUT_DIR}/vmlinux.bin ${BAIKAL_IMAGES}/${MACHINE}.vmlinux.bin
+    cp -f ${B}/${KERNEL_OUTPUT_DIR}/vmlinux.bin.gz ${BAIKAL_IMAGES}/${MACHINE}.vmlinux.bin.gz
+    cat ${BAIKAL_IMAGES}/${MACHINE}.vmlinux.bin | lzma -f -9 > ${BAIKAL_IMAGES}/${MACHINE}.vmlinux.bin.lzma
+
+       for dtbf in ${KERNEL_DEVICETREE}; do
+        cp -f ${B}/${KERNEL_OUTPUT_DIR}/dts/$dtbf -t ${BAIKAL_IMAGES}
+       done
+}
+
+do_deploy[prefuncs] += "baikal_deploy"
+do_deploy[prefuncs] += "baikal_deploy_vmlinux"

diff --git a/meta-baikal/recipes-kernel/linux/linux-baikal_6.1.bb b/meta-baikal/recipes-kernel/linux/linux-baikal_6.1.bb
deleted file mode 100644 (file)
index c29b4c4..0000000
--- a/meta-baikal/recipes-kernel/linux/linux-baikal_6.1.bb
+++ /dev/null
@@ -1,46 +0,0 @@
-require recipes-kernel/linux/linux-baikal.inc
-require recipes-kernel/linux/linux-umulti.inc
-
-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"
-
-DEPENDS += "openssl-native util-linux-native"
-DEPENDS += "gmp-native libmpc-native"
-
-KCONF_BSP_AUDIT_LEVEL = "1"
-
-COMPATIBLE_MACHINE = "^(bfk3)$"
-
-deltask package_qa
-
-baikal_deploy () {
-    if [ ! -d ${BAIKAL_IMAGES} ]; then
-        mkdir -p ${BAIKAL_IMAGES}
-    fi
-    for imageType in ${KERNEL_IMAGETYPES} ; do
-        install -m 0644 ${B}/${KERNEL_OUTPUT_DIR}/$imageType ${BAIKAL_IMAGES}/${MACHINE}.$imageType
-    done
-}
-
-baikal_deploy_vmlinux () {
-    if [ ! -d ${BAIKAL_IMAGES} ]; then
-        mkdir -p ${BAIKAL_IMAGES}
-    fi
-    cp -f ${B}/System.map ${BAIKAL_IMAGES}/${MACHINE}.System.map
-    cp -f ${B}/${KERNEL_OUTPUT_DIR}/vmlinux.bin ${BAIKAL_IMAGES}/${MACHINE}.vmlinux.bin
-    cp -f ${B}/${KERNEL_OUTPUT_DIR}/vmlinux.bin.gz ${BAIKAL_IMAGES}/${MACHINE}.vmlinux.bin.gz
-    cat ${BAIKAL_IMAGES}/${MACHINE}.vmlinux.bin | lzma -f -9 > ${BAIKAL_IMAGES}/${MACHINE}.vmlinux.bin.lzma
-
-       for dtbf in ${KERNEL_DEVICETREE}; do
-        cp -f ${B}/${KERNEL_OUTPUT_DIR}/dts/$dtbf -t ${BAIKAL_IMAGES}
-       done
-}
-
-do_deploy[prefuncs] += "baikal_deploy"
-do_deploy[prefuncs] += "baikal_deploy_vmlinux"