Merge branch 'develop' into rdkbaccl-1197

cpokuru · web-flow · commit acc88556387a · 2025-10-30T14:24:58.000-04:00
diff --git a/conf/distro/include/rdk-bpi-ap-extender.inc b/conf/distro/include/rdk-bpi-ap-extender.inc
@@ -31,3 +31,6 @@ DISTRO_FEATURES_append = " CONFIG_IEEE80211BE"
 DISTRO_FEATURES_append = " generic_mlo"
 #PPP Feature
 #DISTRO_FEATURES_append = "ppp-enabled"
+
+# Kernel 6.6
+#DISTRO_FEATURES_append = " kernel6-6"
diff --git a/conf/machine/bananapi4-rdk-broadband-ap-extender.conf b/conf/machine/bananapi4-rdk-broadband-ap-extender.conf
@@ -6,7 +6,7 @@
 
 RUST_PANIC_STRATEGY="abort"
 
-require conf/machine/filogic880-bpi-r4.conf
+require ${@bb.utils.contains('DISTRO_FEATURES','kernel6-6','conf/machine/filogic880-kernel6-6-bpi-r4.conf','conf/machine/filogic880-bpi-r4.conf',d)}
 DISTRO_FEATURES_append = " em_extender"
 require conf/distro/include/rdk-bpi-ap-extender.inc 
 PREFERRED_PROVIDER_hal-wifi_onewifi = "hal-wifi-generic"
@@ -15,10 +15,13 @@ MACHINE_IMAGE_NAME = "rdk-generic-ap-extender-image"
 #SDCARD supported changes.
 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 = "mediatek/mt7988a-bananapi-bpi-r4-sd.dtb"
+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)}"
-IMAGE_BOOT_FILES = "${@bb.utils.contains('DISTRO_FEATURES','sdmmc','mt7988a-bananapi-bpi-r4-sd.dtb ${KERNEL_IMAGETYPE}','',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
 do_image_wic[depends] += " atf_bootloader_prebuild:do_deploy"
+
+#removing itb-image class for kernel6-6
+KERNEL_CLASSES_remove = "${@bb.utils.contains('DISTRO_FEATURES','kernel6-6','itb-image','',d)}"
diff --git a/meta-rdk-mtk-bpir4/recipes-ccsp/ccsp/ccsp-psm/bbhm_def_cfg_banana.xml b/meta-rdk-mtk-bpir4/recipes-ccsp/ccsp/ccsp-psm/bbhm_def_cfg_banana.xml
@@ -1401,4 +1401,5 @@
   <Record name="eRT.com.cisco.spvtg.ccsp.webpa.WebConfigRfcEnable" type="astr">true</Record>	 
   <!-- Default WPA3 transition start record -->
   <Record name="Device.DeviceInfo.X_RDKCENTRAL-COM_RFC.Feature.WPA3_Personal_Transition.Enable" type="astr">1</Record> 
+  <Record name="dmsb.device.deviceinfo.X_RDKCENTRAL-COM_WHIX.LogInterval" type="astr">3600</Record>	
 </Provision>
diff --git a/meta-rdk-mtk-bpir4/recipes-ccsp/ccsp/files/onewifi_pre_start_em_ctrl.sh b/meta-rdk-mtk-bpir4/recipes-ccsp/ccsp/files/onewifi_pre_start_em_ctrl.sh
@@ -9,17 +9,21 @@ iw phy phy0 interface add wifi1.1 type __ap
 iw phy phy0 interface add wifi1.2 type __ap
 iw phy phy0 interface add wifi1.3 type __ap
 iw phy phy0 interface add wifi2 type __ap
+iw phy phy0 interface add wifi2.1 type __ap
+iw phy phy0 interface add wifi2.2 type __ap
 iw phy phy0 interface add mld0 type __ap radios all
 
 #Obtain the wifi mac address
 wifi0_mac=`cat /nvram/mac_addresses.txt | grep -a wifi0 | cut -d " " -f 2 | head -n1`
 wifi0_1_mac=`cat /nvram/mac_addresses.txt | grep -a wifi0.1 | cut -d " " -f 2 | head -n1`
 wifi0_2_mac=`cat /nvram/mac_addresses.txt | grep -a wifi0.2 | cut -d " " -f 2 | head -n1`
 wifi1_mac=`cat /nvram/mac_addresses.txt | grep -a wifi1 | cut -d " " -f 2 | head -n1`
-wifi2_mac=`cat /nvram/mac_addresses.txt | grep -a wifi2 | cut -d " " -f 2`
+wifi2_mac=`cat /nvram/mac_addresses.txt | grep -a wifi2 | cut -d " " -f 2 | head -n1`
 wifi1_1_mac=`cat /nvram/mac_addresses.txt | grep -a wifi1.1 | cut -d " " -f 2 | head -n1`
 wifi1_2_mac=`cat /nvram/mac_addresses.txt | grep -a wifi1.2 | cut -d " " -f 2 | head -n1`
 wifi1_3_mac=`cat /nvram/mac_addresses.txt | grep -a wifi1.3 | cut -d " " -f 2 | head -n1`
+wifi2_1_mac=`cat /nvram/mac_addresses.txt | grep -a wifi2.1 | cut -d " " -f 2 | head -n1`
+wifi2_2_mac=`cat /nvram/mac_addresses.txt | grep -a wifi2.2 | cut -d " " -f 2 | head -n1`
 
 #Update the mac address using ip link command
 ifconfig wifi0 down
@@ -30,6 +34,8 @@ ifconfig wifi1.1 down
 ifconfig wifi1.2 down
 ifconfig wifi1.3 down
 ifconfig wifi2 down
+ifconfig wifi2.1 down
+ifconfig wifi2.2 down
 
 ip link set dev wifi0 address $wifi0_mac
 ip link set dev wifi0.1 address $wifi0_1_mac
@@ -39,6 +45,8 @@ ip link set dev wifi1.1 address $wifi1_1_mac
 ip link set dev wifi1.2 address $wifi1_2_mac
 ip link set dev wifi1.3 address $wifi1_3_mac
 ip link set dev wifi2 address $wifi2_mac
+ip link set dev wifi2.1 address $wifi2_1_mac
+ip link set dev wifi2.2 address $wifi2_2_mac
 
 ifconfig wifi0 up
 ifconfig wifi0.1 up
@@ -48,6 +56,8 @@ ifconfig wifi1.1 up
 ifconfig wifi1.2 up
 ifconfig wifi1.3 up
 ifconfig wifi2 up
+ifconfig wifi2.1 up
+ifconfig wifi2.2 up
 
 # Set MLD interface address as wifi2 MAC address + 1
 prefix="${wifi2_mac%:*}"
diff --git a/meta-rdk-mtk-bpir4/recipes-ccsp/ccsp/files/onewifi_pre_start_em_ext.sh b/meta-rdk-mtk-bpir4/recipes-ccsp/ccsp/files/onewifi_pre_start_em_ext.sh
@@ -9,17 +9,21 @@ iw phy phy0 interface add wifi1.1 type __ap
 iw phy phy0 interface add wifi1.2 type __ap
 iw phy phy0 interface add wifi1.3 type __ap
 iw phy phy0 interface add wifi2 type __ap
+iw phy phy0 interface add wifi2.1 type __ap
+iw phy phy0 interface add wifi2.2 type __ap
 iw phy phy0 interface add mld0 type __ap radios all
 
 #Obtain the wifi mac address
 wifi0_mac=`cat /nvram/mac_addresses.txt | grep -a wifi0 | cut -d " " -f 2 | head -n1`
 wifi0_1_mac=`cat /nvram/mac_addresses.txt | grep -a wifi0.1 | cut -d " " -f 2 | head -n1`
 wifi0_2_mac=`cat /nvram/mac_addresses.txt | grep -a wifi0.2 | cut -d " " -f 2 | head -n1`
 wifi1_mac=`cat /nvram/mac_addresses.txt | grep -a wifi1 | cut -d " " -f 2 | head -n1`
-wifi2_mac=`cat /nvram/mac_addresses.txt | grep -a wifi2 | cut -d " " -f 2`
+wifi2_mac=`cat /nvram/mac_addresses.txt | grep -a wifi2 | cut -d " " -f 2 | head -n1`
 wifi1_1_mac=`cat /nvram/mac_addresses.txt | grep -a wifi1.1 | cut -d " " -f 2 | head -n1`
 wifi1_2_mac=`cat /nvram/mac_addresses.txt | grep -a wifi1.2 | cut -d " " -f 2 | head -n1`
 wifi1_3_mac=`cat /nvram/mac_addresses.txt | grep -a wifi1.3 | cut -d " " -f 2 | head -n1`
+wifi2_1_mac=`cat /nvram/mac_addresses.txt | grep -a wifi2.1 | cut -d " " -f 2 | head -n1`
+wifi2_2_mac=`cat /nvram/mac_addresses.txt | grep -a wifi2.2 | cut -d " " -f 2 | head -n1`
 
 #Update the mac address using ip link command
 ifconfig wifi0 down
@@ -30,6 +34,8 @@ ifconfig wifi1.1 down
 ifconfig wifi1.2 down
 ifconfig wifi1.3 down
 ifconfig wifi2 down
+ifconfig wifi2.1 down
+ifconfig wifi2.2 down
 
 ip link set dev wifi0 address $wifi0_mac
 ip link set dev wifi0.1 address $wifi0_1_mac
@@ -39,6 +45,8 @@ ip link set dev wifi1.1 address $wifi1_1_mac
 ip link set dev wifi1.2 address $wifi1_2_mac
 ip link set dev wifi1.3 address $wifi1_3_mac
 ip link set dev wifi2 address $wifi2_mac
+ip link set dev wifi2.1 address $wifi2_1_mac
+ip link set dev wifi2.2 address $wifi2_2_mac
 
 ifconfig wifi0 up
 ifconfig wifi0.1 up
@@ -48,6 +56,8 @@ ifconfig wifi1.1 up
 ifconfig wifi1.2 up
 ifconfig wifi1.3 up
 ifconfig wifi2 up
+ifconfig wifi2.1 up
+ifconfig wifi2.2 up
 
 # Set MLD interface address as wifi2 MAC address + 1
 prefix="${wifi2_mac%:*}"
diff --git a/meta-rdk-mtk-bpir4/recipes-ccsp/hal/files/InterfaceMap_em.json b/meta-rdk-mtk-bpir4/recipes-ccsp/hal/files/InterfaceMap_em.json
@@ -7,6 +7,20 @@
                     "Index": 2,
                     "RadioName": "wifi2",
                     "InterfaceList": [
+                        {
+                            "InterfaceName": "wifi2.2",
+                            "Bridge": "brlan0",
+                            "vlanId": 0,
+                            "vapIndex": 17,
+                            "vapName": "iot_ssid_6g"
+                        },
+                        {
+                            "InterfaceName": "wifi2.1",
+                            "Bridge": "brlan0",
+                            "vlanId": 0,
+                            "vapIndex": 22,
+                            "vapName": "mesh_backhaul_6g"
+                        },
                         {
                             "InterfaceName": "wifi2",
                             "Bridge": "brlan0",
diff --git a/meta-rdk-mtk-bpir4/recipes-core/images/rdk-generic-ap-extender-image.bbappend b/meta-rdk-mtk-bpir4/recipes-core/images/rdk-generic-ap-extender-image.bbappend
@@ -27,7 +27,7 @@ SYSTEMD_TOOLS = "systemd-analyze systemd-bootchart"
 # systemd-bootchart doesn't currently build with musl libc
 SYSTEMD_TOOLS_remove_libc-musl = "systemd-bootchart"
 
-DEPENDS += "cryptsetup-native"
+DEPENDS += "cryptsetup-native fit-rootfs-hash-tool-native"
 
 IMAGE_INSTALL += " \
     ${SYSTEMD_TOOLS} \
@@ -59,7 +59,8 @@ IMAGE_INSTALL += " \
     strongswan \
     libpcap \
     tcpdump \
-    perf \
+    ${@bb.utils.contains('DISTRO_FEATURES','kernel6-6','linux-firmware-mt7988  fitblk','',d)} \
+    ${@bb.utils.contains('DISTRO_FEATURES','kernel6-6','','perf',d)} \
     ${@bb.utils.contains('DISTRO_FEATURES','mt76','packagegroup-filogic-mt76','',d)} \
     ${@bb.utils.contains('DISTRO_FEATURES','em_extender','packagegroup-ap-extender','',d)} \
     ${@bb.utils.contains('DISTRO_FEATURES','logan','packagegroup-filogic-logan','',d)} \
@@ -113,6 +114,9 @@ do_filogic_gen_image(){
             cp ${DEPLOY_DIR_IMAGE}/fitImage ${IMGDEPLOYDIR}/sysupgrade-${PN}-${MACHINE}/kernel
             cp ${IMGDEPLOYDIR}/${PN}-${MACHINE}.squashfs-xz ${IMGDEPLOYDIR}/sysupgrade-${PN}-${MACHINE}/root
 
+            if ${@bb.utils.contains('DISTRO_FEATURES','kernel6-6','true','false',d)}; then
+                fit-rootfs-hash-tool ${IMGDEPLOYDIR}/sysupgrade-${PN}-${MACHINE}/kernel ${IMGDEPLOYDIR}/sysupgrade-${PN}-${MACHINE}/root
+            fi
             cd ${IMGDEPLOYDIR}
             tar cvf ${PN}-${MACHINE}-sysupgrade.bin sysupgrade-${PN}-${MACHINE}
             mv ${PN}-${MACHINE}-sysupgrade.bin ${DEPLOY_DIR_IMAGE}/
@@ -128,6 +132,9 @@ do_filogic_gen_image(){
 
             cp ${IMGDEPLOYDIR}/${PN}-${MACHINE}.squashfs-xz ${IMGDEPLOYDIR}/sysupgrade-${PN}-${MACHINE}-sb/root
 
+            if ${@bb.utils.contains('DISTRO_FEATURES','kernel6-6','true','false',d)}; then
+                fit-rootfs-hash-tool ${IMGDEPLOYDIR}/sysupgrade-${PN}-${MACHINE}-sb/kernel ${IMGDEPLOYDIR}/sysupgrade-${PN}-${MACHINE}-sb/root
+            fi
             cd ${IMGDEPLOYDIR}
 
             tar cvf ${PN}-${MACHINE}-sb-sysupgrade.bin sysupgrade-${PN}-${MACHINE}-sb
diff --git a/meta-rdk-mtk-bpir4/recipes-extended/macaddress/bpi-macaddress.bb b/meta-rdk-mtk-bpir4/recipes-extended/macaddress/bpi-macaddress.bb
@@ -9,7 +9,7 @@ SRC_URI = "${CMF_GITHUB_ROOT}/broadband-utils;protocol=https;branch=develop"
 
 S = "${WORKDIR}/git"
 PV = "1.0.0"
-SRCREV = "e2060a77127aff5c2a49cb4b5957597acb642db2"
+SRCREV = "55d70f1560fc9092c037d869aae450524b5c6ae8"
 
 CXXFLAGS_append = "  -DAARCH64_BUILD"
 CXXFLAGS_append = "  ${@bb.utils.contains('DISTRO_FEATURES', 'EasyMesh', bb.utils.contains('DISTRO_FEATURES', 'em_extender', ' -D_EM_EXT_BUILD_ -D_EM_BUILD_ ',' -D_EM_BUILD_ ', d), ' ', d)}"
diff --git a/setup-environment-refboard-rdkb b/setup-environment-refboard-rdkb
@@ -112,6 +112,7 @@ fi
 
 if [ "X$KERNEL_TYPE" == "Xkernel6-6" ]; then
     sed -i '/kernel6-6/s/^#//' ${_TOPDIR}/meta-cmf-bananapi/conf/distro/include/rdk-bpi.inc
+    sed -i '/kernel6-6/s/^#//' ${_TOPDIR}/meta-cmf-bananapi/conf/distro/include/rdk-bpi-ap-extender.inc
     echo 'RDEPENDS:${PN}-dev = ""' >> ${_TOPDIR}/meta-filogic/recipes-kernel/linux6-6-libc-headers/linux-libc-headers.inc
 fi
 
