RDKBACCL-755 : Create SD Flash layout for BPI R4

Reason for change : In BPI, for Firmware Upgrade support, necessary partitions has to be created for flashing the new image after reboot. So, enabled the SD card partitions in RDK-B build, as per Wiki page.
Test Procedure : On boot-up, BPI should have all the partitions required for firmware upgrade and bank switching. Tested using "ls -l /dev/mmcblk0*" and "fdisk /dev/mmcblk0 -l" command
Risks : Low

Signed-off-by: mahanteshchitt <[email protected]>

Author: mahanteshchitt

conf/machine/bananapi4-rdk-broadband.conf

@@ -14,7 +14,9 @@ MACHINEOVERRIDES .="${@bb.utils.contains('DISTRO_FEATURES','sdmmc',':sd','',d)}"
 IMAGE_FSTYPES += "${@bb.utils.contains('DISTRO_FEATURES','sdmmc',' wic.bz2 ext4','',d)}"
 KERNEL_DEVICETREE_mt7988_bpi4_sd = "${@bb.utils.contains('DISTRO_FEATURES','kernel6-6','mediatek/mt7988a-bananapi-bpi-r4.dtb','mediatek/mt7988a-bananapi-bpi-r4-sd.dtb', d)}"
 
-WKS_FILE = " ${@bb.utils.contains('DISTRO_FEATURES','EasyMesh',' sdimage-EM-Bananapi.wks',' sdimage-Bananapi.wks',d)}"
+WKS_FILE = "${@bb.utils.contains('DISTRO_FEATURES', 'kernel6-6', \
+                bb.utils.contains('DISTRO_FEATURES', 'EASYMESH', 'sdimage-EM-Bananapi_6-6.wks', 'sdimage-Bananapi_6-6.wks', d), \
+                bb.utils.contains('DISTRO_FEATURES', 'EASYMESH', 'sdimage-EM-Bananapi.wks', 'sdimage-Bananapi.wks', d), d)}"
 IMAGE_BOOT_FILES = "${@bb.utils.contains('DISTRO_FEATURES','sdmmc', bb.utils.contains('DISTRO_FEATURES','kernel6-6','mt7988a-bananapi-bpi-r4.dtb ${KERNEL_IMAGETYPE}','mt7988a-bananapi-bpi-r4-sd.dtb ${KERNEL_IMAGETYPE}', d),'',d)}"
 do_image_wic[recrdeps] = "do_build"
 #SDCARD supported Pre build bootloader

meta-rdk-mtk-bpir4/recipes-bsp/trusted-firmware-a/bootloader_prebuild.bb

@@ -17,12 +17,30 @@ do_configure[noexec] = "1"
 # since there is no 'main' package generated (empty)
 RDEPENDS_${PN}-dev = ""
 
-SRC_URI_append += " file://bpi-r4_sdmmc_bl2.img \
-                    file://bpi-r4_sdmmc_fip.bin"
+SRC_URI_append = " ${@bb.utils.contains('DISTRO_FEATURES', 'kernel6-6', \
+    ' file://bpi-r4_sdmmc_bl2_6-6.img \
+      file://bpi-r4_sdmmc_fip_6-6.bin \
+      file://bpi-r4_sdmmc_bl2_B_6-6.img \
+      file://bpi-r4_sdmmc_fip_B_6-6.bin', \
+    ' file://bpi-r4_sdmmc_bl2.img \
+      file://bpi-r4_sdmmc_fip.bin \
+      file://bpi-r4_sdmmc_bl2_B.img \
+      file://bpi-r4_sdmmc_fip_B.bin', d)}"
 
 do_deploy() {
         mkdir -p ${DEPLOYDIR}/atf/
+        if ${@bb.utils.contains('DISTRO_FEATURES', 'kernel6-6', 'true', 'false', d)}; then
+        echo "Deploying kernel 6.6 BL2/FIP binaries..."
+        install -m 0644 ${WORKDIR}/bpi-r4_sdmmc_bl2_6-6.img ${DEPLOYDIR}/atf/
+        install -m 0644 ${WORKDIR}/bpi-r4_sdmmc_bl2_B_6-6.img ${DEPLOYDIR}/atf/
+        install -m 0644 ${WORKDIR}/bpi-r4_sdmmc_fip_6-6.bin ${DEPLOYDIR}/atf/
+        install -m 0644 ${WORKDIR}/bpi-r4_sdmmc_fip_B_6-6.bin ${DEPLOYDIR}/atf/
+    else
+        echo "Deploying default BL2/FIP binaries..."
         install -m 0644 ${WORKDIR}/bpi-r4_sdmmc_bl2.img ${DEPLOYDIR}/atf/
+        install -m 0644 ${WORKDIR}/bpi-r4_sdmmc_bl2_B.img ${DEPLOYDIR}/atf/
         install -m 0644 ${WORKDIR}/bpi-r4_sdmmc_fip.bin ${DEPLOYDIR}/atf/
+        install -m 0644 ${WORKDIR}/bpi-r4_sdmmc_fip_B.bin ${DEPLOYDIR}/atf/
+    fi
 }
 addtask do_deploy after do_install

meta-rdk-mtk-bpir4/recipes-ccsp/ccsp/ccsp-common-library.bbappend

@@ -75,6 +75,7 @@ do_install_append_class-target() {
    sed -i '$a [Install]\nWantedBy=multi-user.target' ${D}${systemd_unitdir}/system/onewifi.service
    fi
    sed -i '/IsErouterRunningStatus/,/fi/ s/^/#/' ${D}/usr/ccsp/ccspPAMCPCheck.sh
+   sed -i '/ExecStart=/i ExecStartPre=/usr/bin/start_cron' ${D}/lib/systemd/system/RdkFwUpgradeManager.service
 }
 
 

meta-rdk-mtk-bpir4/recipes-ccsp/hal/files/start_cron.sh

@@ -0,0 +1,20 @@
+#!/bin/sh
+
+
+CRON_JOB="*/15 * * * * /usr/bin/fwupgrade >> /var/log/fwupgrade_cron.log 2>&1"
+
+
+crontab -l 2>/dev/null | grep -qF "/usr/bin/fwupgrade" || (
+    crontab -l 2>/dev/null; echo "$CRON_JOB"
+) | crontab -
+partitions=(9 10 11 12 13)
+
+for part_num in "${partitions[@]}"; do
+    part="/dev/mmcblk0p${part_num}"
+blkid_output=$(blkid "$part")
+    if echo "$blkid_output" | grep -q 'TYPE="'; then
+        echo "Partition $part is already formatted. Skipping."
+    else
+          mkfs.ext4 -F "$part"
+    fi
+done

meta-rdk-mtk-bpir4/recipes-ccsp/hal/hal-fwupgrade.bbappend

@@ -1 +1,24 @@
+DESCRIPTION = "HAL Firmware Upgrade for BPI"
+FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
+SRC_URI_remove = "git://git01.mediatek.com/filogic/rdk-b/rdkb_hal;branch=master;protocol=https;name=fwupgradehal \
+           file://LICENSE;subdir=git \
+          "
+SRC_URI_append = "git://github.com/rdkcentral/rdkb-hal-bpi;branch=develop;protocol=https;name=fwupgradehal \
+           file://start_cron.sh \
+                "
+LIC_FILES_CHKSUM = "file://../../LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
+#LIC_FILES_CHKSUM = "file://${THISDIR}/files/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
+
+
+SRCREV = "0c1948d6fd6598b0290a54c21265642faa8124da"
+do_install_append () {
+         install -d ${D}${bindir}
+        install -v -m 0755 ${WORKDIR}/start_cron.sh ${D}${bindir}/start_cron
+}
+FILES:${PN} += "${bindir}/start_cron"
+DEPENDS_append += " cjson "
+RDEPENDS_${PN}_append = " cjson "
+CFLAGS_append = "-I${STAGING_INCDIR}/cjson "
+LDFLAGS += "-lcjson"
+S = "${WORKDIR}/git/source/fwupgrade"
 DEPENDS += " rdkb-halif-fwupgrade"

meta-rdk-mtk-bpir4/recipes-core/busybox/busybox/rdkb.cfg

@@ -1,2 +1,3 @@
 CONFIG_ARP=y
 CONFIG_CRONTAB=y
+CONFIG_CROND=y

meta-rdk-mtk-bpir4/recipes-core/images/rdk-generic-broadband-image.bbappend

@@ -9,7 +9,7 @@ IMAGE_INSTALL_append = " bpi-macaddress"
 
 IMAGE_INSTALL_append = " rdk-speedtest-cli"
 #Enable required linux utils for Fwupgrade
-IMAGE_INSTALL_append = " gptfdisk e2fsprogs-mke2fs"
+IMAGE_INSTALL_append = " gptfdisk e2fsprogs-mke2fs util-linux util-linux-losetup coreutils"
 
 ROOTFS_POSTPROCESS_COMMAND_append = "add_busybox_fixes; "
 

setup-environment-refboard-rdkb

@@ -120,13 +120,26 @@ if [ "X$BPI_IMG_TYPE" == "Xnand" ]; then
     sed -i '/sdmmc/s/^/#/' ${_TOPDIR}/meta-cmf-bananapi/conf/distro/include/rdk-bpi.inc
 else # SD card image is default
     mkdir -p ${_TOPDIR}/downloads
-    if [ -f ${_TOPDIR}/downloads/bpi-r4_sdmmc_bl2.img ] && [ -f ${_TOPDIR}/downloads/bpi-r4_sdmmc_fip.bin ]; then
-        echo "Both bl2 and fip binaries are present in local workspace."
+    if [ "X$KERNEL_TYPE" == "Xkernel6-6" ]; then
+	    if [ -f ${_TOPDIR}/downloads/bpi-r4_sdmmc_bl2_6-6.img ] && [ -f ${_TOPDIR}/downloads/bpi-r4_sdmmc_fip_6-6.bin ] && [ -f ${_TOPDIR}/downloads/bpi-r4_sdmmc_bl2_B_6-6.img ] && [ -f ${_TOPDIR}/downloads/bpi-r4_sdmmc_fip_B_6-6.bin ]; then
+		    echo "Both bl2 and fip binaries are present in local workspace for 6.6 kernel."
+	    else
+		    echo "**********************************************************************"
+        	    echo "> Missing files are preventing the build from starting:"
+        	    echo "> The BL2 and FIP binaries for kernel-6.6 aren't in the downloads directory. Copy these binaries into the directory and then restart the build. You can find instructions for creating the necessary binaries on the RDK-B Code Releases page: (https://wiki.rdkcentral.com/display/CMF/RDK-B+Code+Releases)"
+        	    echo "**********************************************************************"
+        	    return 1
+	     fi
     else
-        echo "**********************************************************************"
-        echo "> Missing files are preventing the build from starting:"
-        echo "> The BL2 and FIP binaries aren't in the downloads directory. Copy these binaries into the directory and then restart the build. You can find instructions for creating the necessary binaries on the RDK-B Code Releases page: (https://wiki.rdkcentral.com/display/CMF/RDK-B+Code+Releases)"
-        echo "**********************************************************************"
-        return 1
+	   if [ -f ${_TOPDIR}/downloads/bpi-r4_sdmmc_bl2.img ] && [ -f ${_TOPDIR}/downloads/bpi-r4_sdmmc_fip.bin ] && [ -f ${_TOPDIR}/downloads/bpi-r4_sdmmc_bl2_B.img ] && [ -f ${_TOPDIR}/downloads/bpi-r4_sdmmc_fip_B.bin ]; then
+		   echo "Both bl2 and fip binaries are present in local workspace for 5.4 kernel."
+      	   else
+		   echo "**********************************************************************"
+                   echo "> Missing files are preventing the build from starting:"
+                   echo "> The BL2 and FIP binaries for kernel-5.4 aren't in the downloads directory. Copy these binaries into the directory and then restart the build. You can find instructions for creating the necessary binaries on the RDK-B Code Releases page: (https://wiki.rdkcentral.com/display/CMF/RDK-B+Code+Releases)"
+                   echo "**********************************************************************"
+                   return 1
+             fi		   
+
     fi
 fi

wic/sdimage-Bananapi.wks

@@ -1,12 +1,44 @@
-# short-description: Create Bananapi Pi SD card image
-# long-description: Creates a partitioned SD card image for use with Bananapi R4.
-
+# short-description: Custom Bananapi R4 SD card image
+# long-description: Creates a partitioned SD card image with dual-bank layout and additional RDK-B partitions.
+#
 bootloader --ptable gpt --timeout=0
 
+# 1. BL2 (aligned at 17 sectors, 4079KB)
 part --source rawcopy --sourceparams="file=atf/bpi-r4_sdmmc_bl2.img" --part-name bl2 --align 17 --fixed-size 4079K --active --part-type=0FC63DAF-8483-4772-8E79-3D69D8477DE4
 
+
+# 2. FIP (aligned at 6656 sectors, 2048KB)
 part --source rawcopy --sourceparams="file=atf/bpi-r4_sdmmc_fip.bin" --part-name fip --align 6656 --fixed-size 2M --part-type=0FC63DAF-8483-4772-8E79-3D69D8477DE4
 
-part /boot --source bootimg-partition --ondisk mmcblk0 --fstype=vfat --label boot --active --align 8704 --fixed-size 100M --part-type=0FC63DAF-8483-4772-8E79-3D69D8477DE4
+# 3. Boot A
+part /boot --source bootimg-partition --ondisk mmcblk0 --fstype=vfat --label boot_a --active --align 8704 --fixed-size 16M --part-type=0FC63DAF-8483-4772-8E79-3D69D8477DE4
+
+# 4. rootfs A
+part / --source rootfs --ondisk mmcblk0 --fstype=ext4 --label rootfs_a --fixed-size 1024M
+
+# 5. BL2 B (copy of BL2)
+part --source rawcopy --sourceparams="file=atf/bpi-r4_sdmmc_bl2_B.img" --part-name bl2_b --fixed-size 4079K --part-type=0FC63DAF-8483-4772-8E79-3D69D8477DE4
+
+# 6. FIP B (copy of FIP)
+part --source rawcopy --sourceparams="file=atf/bpi-r4_sdmmc_fip_B.bin" --part-name fip_b --fixed-size 2M --part-type=0FC63DAF-8483-4772-8E79-3D69D8477DE4
+
+# 7. Boot B
+part --source bootimg-partition --ondisk mmcblk0 --fstype=vfat --label boot_b --active --fixed-size 16M --part-type=0FC63DAF-8483-4772-8E79-3D69D8477DE4
+
+# 8. rootfs B
+part / --source rootfs --ondisk mmcblk0 --fstype=ext4 --label rootfs_b --fixed-size 1024M
+
+# 9. NVRAM (2MB)
+part --source=empty --fstype=ext4 --label=nvram --fixed-size=2M
+
+# 10. Crash_a Debug (8MB)
+part --source=empty --fstype=ext4 --label=crash_a --fixed-size=8M
+
+# 11. Crash_b Debug (8MB)
+part --source=empty --fstype=ext4 --label=crash_b --fixed-size=8M
+
+# 12. Reserved (16MB)
+part --source=empty --fstype=ext4 --label=reserved --fixed-size=16M
 
-part / --source rootfs --ondisk mmcblk0 --fstype=ext4 --label root --align 111104
+# 13. DAC 
+part --source=empty --fstype=ext4 --label=dac --fixed-size=32M

wic/sdimage-Bananapi_6-6.wks

@@ -0,0 +1,44 @@
+# short-description: Custom Bananapi R4 SD card image
+# long-description: Creates a partitioned SD card image with dual-bank layout and additional RDK-B partitions.
+#
+bootloader --ptable gpt --timeout=0
+
+# 1. BL2 (aligned at 17 sectors, 4079KB)
+part --source rawcopy --sourceparams="file=atf/bpi-r4_sdmmc_bl2_6-6.img" --part-name bl2 --align 17 --fixed-size 4079K --active --part-type=0FC63DAF-8483-4772-8E79-3D69D8477DE4
+
+
+# 2. FIP (aligned at 6656 sectors, 2048KB)
+part --source rawcopy --sourceparams="file=atf/bpi-r4_sdmmc_fip_6-6.bin" --part-name fip --align 6656 --fixed-size 2M --part-type=0FC63DAF-8483-4772-8E79-3D69D8477DE4
+
+# 3. Boot A
+part /boot --source bootimg-partition --ondisk mmcblk0 --fstype=vfat --label boot_a --active --align 8704 --fixed-size 16M --part-type=0FC63DAF-8483-4772-8E79-3D69D8477DE4
+
+# 4. rootfs A
+part / --source rootfs --ondisk mmcblk0 --fstype=ext4 --label rootfs_a --fixed-size 1024M
+
+# 5. BL2 B (copy of BL2)
+part --source rawcopy --sourceparams="file=atf/bpi-r4_sdmmc_bl2_B_6-6.img" --part-name bl2_b --fixed-size 4079K --part-type=0FC63DAF-8483-4772-8E79-3D69D8477DE4
+
+# 6. FIP B (copy of FIP)
+part --source rawcopy --sourceparams="file=atf/bpi-r4_sdmmc_fip_B_6-6.bin" --part-name fip_b --fixed-size 2M --part-type=0FC63DAF-8483-4772-8E79-3D69D8477DE4
+
+# 7. Boot B
+part --source bootimg-partition --ondisk mmcblk0 --fstype=vfat --label boot_b --active --fixed-size 16M --part-type=0FC63DAF-8483-4772-8E79-3D69D8477DE4
+
+# 8. rootfs B
+part / --source rootfs --ondisk mmcblk0 --fstype=ext4 --label rootfs_b --fixed-size 1024M
+
+# 9. NVRAM (2MB)
+part --source=empty --fstype=ext4 --label=nvram --fixed-size=2M
+
+# 10. Crash_a Debug (8MB)
+part --source=empty --fstype=ext4 --label=crash_a --fixed-size=8M
+
+# 11. Crash_b Debug (8MB)
+part --source=empty --fstype=ext4 --label=crash_b --fixed-size=8M
+
+# 12. Reserved (16MB)
+part --source=empty --fstype=ext4 --label=reserved --fixed-size=16M
+
+# 13. DAC 
+part --source=empty --fstype=ext4 --label=dac --fixed-size=32M