From: Baikal Electronics <support@baikalelectronics.ru>
Date: Thu, 15 Jun 2023 14:15:01 +0000 (+0300)
Subject: SDK5.8.2
X-Git-Tag: baikal/mips/sdk5.8.2~2
X-Git-Url: https://git.baikalelectronics.ru/sdk/?a=commitdiff_plain;h=9d3185df102f1bafad9a596cdc9740b55481bba4;p=openembedded-baikal.git

SDK5.8.2
---

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..b557c4f 100644
--- a/meta-baikal/conf/machine/bfk3.conf
+++ b/meta-baikal/conf/machine/bfk3.conf
@@ -7,7 +7,7 @@ require conf/machine/include/baikal-t1.inc
 # Kernel and bootloader default configs
 UBOOT_MACHINE = "baikal_bfk3_defconfig"
 
-KBUILD_DEFCONFIG = "bfk3_defconfig"
-KERNEL_DEVICETREE = "baikal-t1/bfk3.dtb"
+KBUILD_DEFCONFIG = "baikal_bfk3_defconfig"
+KERNEL_DEVICETREE = "baikal/baikal_bfk3.dtb"
 PREFERRED_PROVIDER_virtual/kernel = "linux-baikal"
-#PREFERRED_VERSION_virtual/kernel = "6.1%"
+#PREFERRED_VERSION_virtual/kernel = "5.4%"
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..abe040d 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-linux-5.4.y;name=uboot" 
 
-SRCREV_uboot = "7f42ca4b9efb14e72e782f4232d9ec60f283bf9d"
+SRCREV_uboot = "2d8174e81eebaa30319e5b05ffc18b994fd13062"
 
 
 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..38d2c39 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)
@@ -43,8 +43,8 @@ do_baikal_build_bootrom () {
     check_size_fitness ${MACHINE}.rom ${UBOOT_SECTION_END} ${MACHINE}.u-boot.bin
     cat ${BAIKAL_IMAGES}/${MACHINE}.bin >> ${MACHINE}.rom
     check_size_fitness ${MACHINE}.rom ${UBOOTENV_SECTION_END} ${MACHINE}.bin
-    cat ${BAIKAL_IMAGES}/${MACHINE}.dtb >> ${MACHINE}.rom
-    check_size_fitness ${MACHINE}.rom ${LINUX_FDT_SECTION_END} ${MACHINE}.dtb
+    cat ${BAIKAL_IMAGES}/baikal_${MACHINE}.dtb >> ${MACHINE}.rom
+    check_size_fitness ${MACHINE}.rom ${LINUX_FDT_SECTION_END} baikal_${MACHINE}.dtb
     cat ${BAIKAL_IMAGES}/uMulti >> ${MACHINE}.rom
     check_size_fitness ${MACHINE}.rom ${FITIMAGE_SECTION_END} uMulti
 
diff --git a/meta-baikal/recipes-kernel/linux/linux-baikal_5.4.bb b/meta-baikal/recipes-kernel/linux/linux-baikal_5.4.bb
new file mode 100644
index 0000000..291e355
--- /dev/null
+++ b/meta-baikal/recipes-kernel/linux/linux-baikal_5.4.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=bbea815ee2795b2f4230826c0c6b8814"
+SRC_URI = "git://git@swgit/kernel-hosting.git;protocol=ssh;branch=baikal/mips/5.4.y"
+SRCREV = "4444232f2e957875aad83e9cf2ee8726da3fc357"
+LINUX_VERSION ?= "5.4"
+
+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
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"
diff --git a/meta-baikal/recipes-kernel/linux/linux-fit.inc b/meta-baikal/recipes-kernel/linux/linux-fit.inc
index 0de8d4f..78061c1 100644
--- a/meta-baikal/recipes-kernel/linux/linux-fit.inc
+++ b/meta-baikal/recipes-kernel/linux/linux-fit.inc
@@ -256,7 +256,7 @@ fitimage_assemble() {
 	fitimage_emit_section_kernel $1 1 "${BAIKAL_KERNEL}" "${BAIKAL_COMP_ALG}"
 
     dtbcount=1
-    fitimage_emit_section_dtb $1 1 ${MACHINE}.dtb
+    fitimage_emit_section_dtb $1 1 baikal_${MACHINE}.dtb
 
     initramfs_path="${BAIKAL_INITRAMFS}"
     if [ -e "$initramfs_path" ]; then
@@ -286,23 +286,31 @@ fitimage_assemble() {
 	fitimage_emit_section_maint $1 sectend
 
 	fitimage_emit_section_maint $1 fitend
-
+bbnote "uboot_mkimage START 0"
+bbnote "WORKDiR: ${WORKDIR}"
+bbnote "UBOOT_MKIMAGE_DTCOPTS: ${UBOOT_MKIMAGE_DTCOPTS}"
+bbnote "$1: $1"
+bbnote "$2: $2"
 	${UBOOT_MKIMAGE} \
 		${@'-D "${UBOOT_MKIMAGE_DTCOPTS}"' if len('${UBOOT_MKIMAGE_DTCOPTS}') else ''} \
             -f $1 $2
 
+	    bbnote "uboot_mkimage START 1"
     if [ "x${UBOOT_SIGN_ENABLE}" = "x1" ] ; then
         add_key_to_u_boot=""
         if [ -n "${UBOOT_DTB_BINARY}" ]; then
             add_key_to_u_boot="-K ${UBOOT_DTB_BINARY}"
         fi
+	bbnote "uboot_mkimage START 2"
         ${UBOOT_MKIMAGE_SIGN} \
             ${@'-D "${UBOOT_MKIMAGE_DTCOPTS}"' if len('${UBOOT_MKIMAGE_DTCOPTS}') else ''} \
             -F -k "${UBOOT_SIGN_KEYDIR}" \
             $add_key_to_u_boot \
             -r $2 \
             ${UBOOT_MKIMAGE_SIGN_ARGS}
+	    bbnote "uboot_mkimage START 3"
     fi
+bbnote "uboot_mkimage END"
 }
 
 do_assemble_fitimage_initramfs() {
diff --git a/meta-baikal/recipes-kernel/linux/linux-umulti.inc b/meta-baikal/recipes-kernel/linux/linux-umulti.inc
index 096c8d2..96c5055 100644
--- a/meta-baikal/recipes-kernel/linux/linux-umulti.inc
+++ b/meta-baikal/recipes-kernel/linux/linux-umulti.inc
@@ -8,20 +8,24 @@ BAIKAL_INITRAMFS = "initramfs${BAIKAL_COMP_ALG_EXTENSION}"
 BAIKAL_INITRD = "initrd${BAIKAL_COMP_ALG_EXTENSION}"
 
 UBOOT_DTB_BINARY = "${WORKDIR}/baikal.dtb"
-UBOOT_DTS_FILE = "${WORKDIR}/baikal.dts"
+UBOOT_DTS_FILE = "${WORKDIR}/Ibaikal.dts"
 
 baikal_do_uinitramfs () {
+	bbnote "baikal_do_uinitramfs START"
     uboot-mkimage -A ${UBOOT_ARCH} -O linux -T ramdisk -C ${BAIKAL_COMP_ALG} \
             -d "${BAIKAL_IMAGES}/initramfs${BAIKAL_COMP_ALG_EXTENSION}" \
             -n "uInitramfs Image for bfk3 board" \
             ${BAIKAL_IMAGES}/${MACHINE}.uInitramfs
+	    bbnote "baikal_do_uinitramfs END"
 }
 
 baikal_do_uinitrd () {
+	bbnote "baikal_do_uinitrd START"
     uboot-mkimage -A ${UBOOT_ARCH} -O linux -T ramdisk -C ${BAIKAL_COMP_ALG} \
             -d "${BAIKAL_IMAGES}/initrd${BAIKAL_COMP_ALG_EXTENSION}" \
             -n "uInitrd Image for bfk3 board" \
             ${BAIKAL_IMAGES}/${MACHINE}.uInitrd
+	    bbnote "baikal_do_uinitrd END"
 }
 
 baikal_do_ubootdtb () {
@@ -50,8 +54,10 @@ python baikal_entrysymbol () {
 }
 
 baikal_do_umulti () {
+	bbnote "baikal_do_umulti START"
     baikal_do_ubootdtb
     do_assemble_fitimage_initramfs
+    bbnote "baikal_do_umulti END"
 }
 
 do_deploy[postfuncs] += "baikal_entrysymbol"