diff --git a/conf/machine/bananapi4-rdk-broadband.conf b/conf/machine/bananapi4-rdk-broadband.conf index 7be507ee..f2aebbd2 100644 --- a/conf/machine/bananapi4-rdk-broadband.conf +++ b/conf/machine/bananapi4-rdk-broadband.conf @@ -7,7 +7,7 @@ require ${@bb.utils.contains('DISTRO_FEATURES','kernel6-6','conf/machine/filogic880-kernel6-6-bpi-r4.conf','conf/machine/filogic880-bpi-r4.conf',d)} require conf/distro/include/rdk-bpi.inc -PREFERRED_PROVIDER_hal-wifi_onewifi = "hal-wifi-generic" +PREFERRED_PROVIDER_hal-wifi_onewifi = "rdk-wifi-hal" MACHINEOVERRIDES .= ":mt7988" diff --git a/meta-rdk-mtk-bpir4/recipes-ccsp/ccsp/ccsp-one-wifi.bbappend b/meta-rdk-mtk-bpir4/recipes-ccsp/ccsp/ccsp-one-wifi.bbappend index 2d1b7199..2f3d7e60 100644 --- a/meta-rdk-mtk-bpir4/recipes-ccsp/ccsp/ccsp-one-wifi.bbappend +++ b/meta-rdk-mtk-bpir4/recipes-ccsp/ccsp/ccsp-one-wifi.bbappend @@ -9,6 +9,7 @@ DEPENDS_append = " mesh-agent " DEPENDS_remove = " opensync " DEPENDS += " ${@bb.utils.contains('DISTRO_FEATURES', 'EasyMesh', ' rdk-wifi-libhostap ', '', d)}" +DEPENDS += " rdk-wifi-hal" CFLAGS_append = " -DWIFI_HAL_VERSION_3 -Wno-unused-function " LDFLAGS_append = " -ldl" CFLAGS_append_aarch64 = " -Wno-error " diff --git a/meta-rdk-mtk-bpir4/recipes-ccsp/hal/hal-wifi-generic_git.bbappend b/meta-rdk-mtk-bpir4/recipes-ccsp/hal/hal-wifi-generic_git.bbappend index c0f63ac3..4d361ae4 100644 --- a/meta-rdk-mtk-bpir4/recipes-ccsp/hal/hal-wifi-generic_git.bbappend +++ b/meta-rdk-mtk-bpir4/recipes-ccsp/hal/hal-wifi-generic_git.bbappend @@ -11,26 +11,6 @@ LDFLAGS_append = " -lev -lwpa_client -lpthread" do_configure_prepend(){ rm ${S}/wifi_hal.c rm ${S}/Makefile.am - ln -sf ${S}/devices_bpi/source/wifi/wifi_hal.c ${S}/wifi_hal.c - ln -sf ${S}/devices_bpi/source/wifi/client_wifi_hal.c ${S}/client_wifi_hal.c - ln -sf ${S}/devices_bpi/source/wifi/wifi_hostapd_interface.c ${S}/wifi_hostapd_interface.c - ln -sf ${S}/devices_bpi/source/wifi/rpi_wifi_hal_assoc_devices_details.c ${S}/rpi_wifi_hal_assoc_devices_details.c - ln -sf ${S}/devices_bpi/source/wifi/rpi_wifi_hal_version_3.c ${S}/rpi_wifi_hal_version_3.c - ln -sf ${S}/devices_bpi/source/wifi/wifi_hal_rpi.h ${S}/wifi_hal_rpi.h - ln -sf ${S}/devices_bpi/source/wifi/Makefile.am ${S}/Makefile.am - sed -i "s/wlan0/wifi0/g" ${S}/wifi_hal.c - sed -i "s/wlan0/wifi0/g" ${S}/rpi_wifi_hal_assoc_devices_details.c - sed -i "s/wlan1/wifi1/g" ${S}/wifi_hal.c - sed -i "s/wlan1/wifi1/g" ${S}/rpi_wifi_hal_assoc_devices_details.c - sed -i "s/wlan%d/wifi%d/g" ${S}/wifi_hal.c - sed -i "s/wlan%d/wifi%d/g" ${S}/rpi_wifi_hal_assoc_devices_details.c - sed -i '5063i # if 0' ${S}/devices_rpi/source/wifi/wifi_hal.c - sed -i '5096i #endif' ${S}/devices_rpi/source/wifi/wifi_hal.c -} - -do_install_append(){ - install -d ${D}/usr/bin - install -m 777 ${B}/wifihal ${D}/usr/bin/ } CFLAGS_append = " -DWIFI_HAL_VERSION_3 "