Merge branch 'develop' into RDKBACCL-1103_ipv6_regression

Author: cpokuru

meta-rdk-mtk-bpir4/recipes-ccsp/ccsp/ccsp-one-wifi-libwebconfig.bbappend

@@ -1,7 +1,7 @@
 SRC_URI_remove = "${CMF_GIT_ROOT}/rdkb/components/opensource/ccsp/OneWifi;protocol=${CMF_GIT_PROTOCOL};branch=${CMF_GIT_BRANCH};name=libwebconfig"
 
 SRC_URI = "git://github.com/rdkcentral/OneWifi.git;protocol=https;branch=develop;name=libwebconfig"
-SRCREV_libwebconfig = "4639020050aeb074af3ca1f61999e834f1faf282"
+SRCREV_libwebconfig = "8e08be25456e28de996fcdef077d826463180395"
 
 DEPENDS += " ${@bb.utils.contains('DISTRO_FEATURES', 'EasyMesh', ' rdk-wifi-libhostap unified-wifi-mesh-header ', '', d)}"
 EXTRA_OECONF_append = " ${@bb.utils.contains('DISTRO_FEATURES', 'EasyMesh', ' --enable-easymesh ', '', d)}"

meta-rdk-mtk-bpir4/recipes-ccsp/ccsp/ccsp-one-wifi.bbappend

@@ -4,7 +4,7 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
 
 SRC_URI_remove = "${CMF_GIT_ROOT}/rdkb/components/opensource/ccsp/OneWifi;protocol=${CMF_GIT_PROTOCOL};branch=${CMF_GIT_BRANCH};name=OneWifi"
 SRC_URI = "git://github.com/rdkcentral/OneWifi.git;protocol=https;branch=develop;name=OneWifi"
-SRCREV_OneWifi = "4639020050aeb074af3ca1f61999e834f1faf282"
+SRCREV_OneWifi = "8e08be25456e28de996fcdef077d826463180395"
 DEPENDS_append = " mesh-agent "
 DEPENDS_remove = " opensync "
 DEPENDS += " ${@bb.utils.contains('DISTRO_FEATURES', 'EasyMesh', ' rdk-wifi-libhostap ', '', d)}"

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

@@ -1,16 +1,9 @@
 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 \
+SRC_URI_append = " \
            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
@@ -20,5 +13,4 @@ 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-ccsp/hal/rdk-wifi-hal.bbappend

@@ -1,11 +1,12 @@
 SRC_URI_remove = "git://github.com/rdkcentral/rdk-wifi-hal.git;protocol=https;branch=main;name=rdk-wifi-hal"
 
 SRC_URI += "git://github.com/rdkcentral/rdk-wifi-hal.git;protocol=https;branch=develop;name=rdk-wifi-hal"
-SRCREV_rdk-wifi-hal = "044b39b511a0b4b65eeca3685283e91e4d9a90e5"
+SRCREV_rdk-wifi-hal = "2be1439ea39a54d444f6591465afb6fed51e2c36"
 
 CFLAGS_append = " -D_PLATFORM_BANANAPI_R4_  -DBANANA_PI_PORT  -DFEATURE_SINGLE_PHY -DCONFIG_HW_CAPABILITIES "
 
-CFLAGS_append = " ${@bb.utils.contains('DISTRO_FEATURES', 'generic_mlo', ' -DCONFIG_GENERIC_MLO ', '', d)}"
+CFLAGS_append = " ${@bb.utils.contains('DISTRO_FEATURES', 'generic_mlo', ' -DCONFIG_GENERIC_MLO -DCONFIG_MLO ', '', d)}"
+CFLAGS_append = "${@bb.utils.contains('DISTRO_FEATURES', 'kernel6-6' , ' -DKERNEL_6_6 ','', d)}"
 
 CFLAGS_append_kirkstone = " -fcommon"
 CFLAGS_remove = "-DCONFIG_MBO"

meta-rdk-mtk-bpir4/recipes-ccsp/hal/rdk-wifi-halif.bbappend

@@ -2,7 +2,7 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
 
 SRC_URI_remove_onewifi = "git://github.com/rdkcentral/rdkb-halif-wifi.git;protocol=https;branch=main"
 SRC_URI_onewifi = "git://github.com/rdkcentral/rdkb-halif-wifi.git;protocol=https;branch=develop"
-SRCREV_onewifi = "863289342d4ca4f3b3053f8b7f36866d2b20a569"
+SRCREV_onewifi = "c6d9055da7f15c9c0763745b681a8134453ed01d"
 
 SRC_URI += "${@bb.utils.contains('DISTRO_FEATURES', 'OneWifi', ' ', ' file://sta-network-wifiagent.patch', d)}"
 SRC_URI += "${@bb.utils.contains('DISTRO_FEATURES', 'OneWifi', ' ', ' file://0002-Add-EHT-support.patch', d)}"

meta-rdk-mtk-bpir4/recipes-ccsp/hal/rdk-wifi-util.bbappend

@@ -1,4 +1,4 @@
 SRC_URI_remove = "git://github.com/rdkcentral/rdk-wifi-hal.git;protocol=https;branch=main;name=rdk-wifi-util"
 
 SRC_URI = "git://github.com/rdkcentral/rdk-wifi-hal.git;protocol=https;branch=develop;name=rdk-wifi-util"
-SRCREV_rdk-wifi-util = "044b39b511a0b4b65eeca3685283e91e4d9a90e5"
+SRCREV_rdk-wifi-util = "2be1439ea39a54d444f6591465afb6fed51e2c36"

meta-rdk-mtk-bpir4/recipes-ccsp/rdk-wifi-libhostap/files/2.11/0001-mtk-hostapd-patch-all-in-one.patch renamed to meta-rdk-mtk-bpir4/recipes-ccsp/rdk-wifi-libhostap/files/2.11/kernel_5_4/0001-mtk-hostapd-patch-all-in-one.patch

@@ -1,3 +1,5 @@
+Source : RDKM
+
 --- git/source/hostap-2.11/src/ap/drv_callbacks.c	2023-06-08 11:27:27.645895606 +0000
 +++ git/source/hostap-2.11/src/ap/drv_callbacks.c	2023-06-08 11:26:49.786465276 +0000
 @@ -772,6 +772,9 @@