Merge branch 'rdkcentral:develop' into develop

Author: pratheepa1995

conf/distro/include/rdk-bpi.inc

@@ -13,7 +13,7 @@ DISTRO_FEATURES_append = " halVersion3"
 DISTRO_FEATURES_append = " HOSTAPD_2_10"
 
 # OneWifi feature
-#DISTRO_FEATURES_append = " OneWifi"
+DISTRO_FEATURES_append = " OneWifi"
 
 # MacFilter Feature
 DISTRO_FEATURES_append = " acl_nl_support"
@@ -34,3 +34,9 @@ DISTRO_FEATURES_append = " rdkb_cellular_manager_mm"
 DISTRO_FEATURES_append = " dac"
 
 DISTRO_FEATURES_append = " partner_default_ext"
+
+#Enable SDcard image as default
+DISTRO_FEATURES_append = " sdmmc"
+
+#PPP Feature
+#DISTRO_FEATURES_append = "ppp-enabled"

conf/include/rdk-bpi-bbmasks.inc

@@ -7,3 +7,4 @@ BBMASK .= "${@bb.utils.contains('DISTRO_FEATURES', 'OneWifi', '|meta-cmf-filogic
 BBMASK_append_kirkstone .= "|meta-rdk-opensync/recipes/python3-jinja2/python3-jinja2_2.11.1.bb"
 BBMASK .= "|meta-cmf/recipes-core/images/rdk-ipstb-oss-image.bb"
 BBMASK .= "|meta-cmf/recipes-core/images/rdk-ipstb-oss-tdk-image.bb"
+BBMASK .= "${@bb.utils.contains('DISTRO_FEATURES', 'OneWifi', '|meta-cmf-filogic/recipes-common/mesh-agent/mesh-agent.bbappend', '', d)}"

conf/machine/bananapi4-rdk-broadband.conf

@@ -11,5 +11,11 @@ PREFERRED_PROVIDER_hal-wifi_onewifi = "hal-wifi-generic"
 
 #SDCARD supported changes.
 MACHINEOVERRIDES .="${@bb.utils.contains('DISTRO_FEATURES','sdmmc',':sd','',d)}"
-IMAGE_FSTYPES += "${@bb.utils.contains('DISTRO_FEATURES','sdmmc','ext4','',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"
+
+WKS_FILE = " sdimage-Bananapi.wks"
+IMAGE_BOOT_FILES = "${@bb.utils.contains('DISTRO_FEATURES','sdmmc','mt7988a-bananapi-bpi-r4-sd.dtb ${KERNEL_IMAGETYPE}','',d)}"
+do_image_wic[recrdeps] = "do_build"
+#SDCARD supported Pre build bootloader
+do_image_wic[depends] += " atf_bootloader_prebuild:do_deploy"

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

@@ -17,19 +17,12 @@ do_configure[noexec] = "1"
 # since there is no 'main' package generated (empty)
 RDEPENDS_${PN}-dev = ""
 
-SRC_URI = "https://artifactory.rdkcentral.com/artifactory/RDKB-Platform/BPI-R4/uboot-2024.04/bpi-r4_sdmmc_bl2.img;name=bl2\
-           https://artifactory.rdkcentral.com/artifactory/RDKB-Platform/BPI-R4/uboot-2024.04/bpi-r4_sdmmc_fip.bin;name=fip\
-           https://artifactory.rdkcentral.com/artifactory/RDKB-Platform/BPI-R4/uboot-2024.04/bpir4_sd_image_creater.sh;name=sdimg\
-          "
-
-SRC_URI[bl2.sha256sum]= "7af8092bc993241f44013c28894739ceb9bdb93bab593d15cc10e2e68e57a349"
-SRC_URI[fip.sha256sum] = "e32aa5b1d5aca78765703f8544386fb6c294385ae120c272a863d46a599339e3"
-SRC_URI[sdimg.sha256sum] = "d6747c81c8330b4f37bae34fdff1480c548f3bbe5f3fa41536907d97df89bc83"
+SRC_URI_append += " file://bpi-r4_sdmmc_bl2.img \
+                    file://bpi-r4_sdmmc_fip.bin"
 
 do_deploy() {
         mkdir -p ${DEPLOYDIR}/atf/
         install -m 0644 ${WORKDIR}/bpi-r4_sdmmc_bl2.img ${DEPLOYDIR}/atf/
         install -m 0644 ${WORKDIR}/bpi-r4_sdmmc_fip.bin ${DEPLOYDIR}/atf/
-        install -m 0777 ${WORKDIR}/bpir4_sd_image_creater.sh ${DEPLOYDIR}/
 }
 addtask do_deploy after do_install

meta-rdk-mtk-bpir4/recipes-bsp/trusted-firmware-a/files/PLACEHOLDER

@@ -0,0 +1,4 @@
+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 = "7d4697bc74017e0ec57c3ba903a70dfe56809cb4"

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

@@ -2,6 +2,9 @@ require ccsp_common_bananapi.inc
 
 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 = "7d4697bc74017e0ec57c3ba903a70dfe56809cb4"
 DEPENDS_append = " mesh-agent "
 
 CFLAGS_append = " -DWIFI_HAL_VERSION_3 -Wno-unused-function "

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

@@ -4,6 +4,7 @@ do_install_append () {
                 if ${@bb.utils.contains('DISTRO_FEATURES', 'OneWifi', 'true', 'false', d)}; then
                    install -m 0755 ${S}/../xb6/jst/wireless_network_configuration_onewifi.jst ${D}/usr/www2/wireless_network_configuration.jst
                    install -m 0755 ${S}/../xb6/jst/wireless_network_configuration_edit_onewifi.jst ${D}/usr/www2/wireless_network_configuration_edit.jst
+                   install -m 0755 ${S}/../xb6/jst/at_a_glance.jst ${D}/usr/www2/at_a_glance.jst
                    install -m 0755 ${S}/../xb6/jst/actionHandler/ajaxSet_wireless_network_configuration_onewifi.jst ${D}/usr/www2/actionHandler/ajaxSet_wireless_network_configuration.jst
                    install -m 0755 ${S}/../xb6/jst/actionHandler/ajaxSet_wireless_network_configuration_edit_onewifi.jst ${D}/usr/www2/actionHandler/ajaxSet_wireless_network_configuration_edit.jst
                    install -m 0755 ${S}/jst/actionHandler/ajaxSet_wireless_network_configuration_redirection_onewifi.jst ${D}/usr/www2/actionHandler/ajaxSet_wireless_network_configuration_redirection.jst

meta-rdk-mtk-bpir4/recipes-ccsp/ccsp/ccsp-webui-jst.bbappend

@@ -1,8 +1,8 @@
 #!/bin/sh
-sleep 5
+sleep 20
 iw phy phy0 interface add wifi0 type __ap
 iw phy phy0 interface add wifi1 type __ap
-#iw phy phy0 interface add wifi2 type __ap
+iw phy phy0 interface add wifi2 type __ap
 
 #Obtain the wifi0 mac address
 wifi0_mac="$(cat /sys/class/ieee80211/phy0/macaddress)"
@@ -16,17 +16,17 @@ wifi2_mac=$(printf "%012x" $mac_incr | sed 's/../&:/g;s/:$//')
 #print the mac address
 echo $wifi0_mac
 echo $wifi1_mac
-#echo $wifi2_mac
+echo $wifi2_mac
 
 #Update the mac address using ip link command
 ifconfig wifi0 down
 ifconfig wifi1 down
-#ifconfig wifi2 down
+ifconfig wifi2 down
 ip link set dev wifi0 address $wifi0_mac
 ip link set dev wifi1 address $wifi1_mac
-#ip link set dev wifi2 address $wifi2_mac
+ip link set dev wifi2 address $wifi2_mac
 ifconfig wifi0 up
 ifconfig wifi1 up
-#ifconfig wifi2 up
+ifconfig wifi2 up
 
 exit 0

meta-rdk-mtk-bpir4/recipes-ccsp/ccsp/files/onewifi_pre_start.sh

@@ -0,0 +1,12 @@
+diff --git a/platform/banana-pi/platform.c b/platform/banana-pi/platform.c
+index 37f3eec..5304565 100644
+--- a/platform/banana-pi/platform.c
++++ b/platform/banana-pi/platform.c
+@@ -81,6 +81,7 @@ int platform_post_init(wifi_vap_info_map_t *vap_map)
+     wifi_hal_dbg_print("%s:%d \n",__func__,__LINE__);    
+     system("brctl addif brlan0 wifi0");
+     system("brctl addif brlan0 wifi1");
++    system("brctl addif brlan0 wifi2");
+     return 0;
+ }
+