diff --git a/lichee/buildroot/target/dragonboard/src/testcases/wifitester/fw_bcm43438a0.bin b/lichee/buildroot/target/dragonboard/src/testcases/wifitester/fw_bcm43438a0.bin index 59972d5612..7f8210a41b 100644 Binary files a/lichee/buildroot/target/dragonboard/src/testcases/wifitester/fw_bcm43438a0.bin and b/lichee/buildroot/target/dragonboard/src/testcases/wifitester/fw_bcm43438a0.bin differ diff --git a/lichee/buildroot/target/dragonboard/src/testcases/wifitester/fw_bcm43438a0_apsta.bin b/lichee/buildroot/target/dragonboard/src/testcases/wifitester/fw_bcm43438a0_apsta.bin index 93e3107977..7f8210a41b 100644 Binary files a/lichee/buildroot/target/dragonboard/src/testcases/wifitester/fw_bcm43438a0_apsta.bin and b/lichee/buildroot/target/dragonboard/src/testcases/wifitester/fw_bcm43438a0_apsta.bin differ diff --git a/lichee/buildroot/target/dragonboard/src/testcases/wifitester/fw_bcm43438a1.bin b/lichee/buildroot/target/dragonboard/src/testcases/wifitester/fw_bcm43438a1.bin new file mode 100755 index 0000000000..8ee72cfc7d Binary files /dev/null and b/lichee/buildroot/target/dragonboard/src/testcases/wifitester/fw_bcm43438a1.bin differ diff --git a/lichee/buildroot/target/dragonboard/src/testcases/wifitester/fw_bcm43438a1_apsta.bin b/lichee/buildroot/target/dragonboard/src/testcases/wifitester/fw_bcm43438a1_apsta.bin new file mode 100755 index 0000000000..8ee72cfc7d Binary files /dev/null and b/lichee/buildroot/target/dragonboard/src/testcases/wifitester/fw_bcm43438a1_apsta.bin differ diff --git a/lichee/linux-4.9/arch/arm64/configs/sun50iw1p1smp_dragonboard_defconfig b/lichee/linux-4.9/arch/arm64/configs/sun50iw1p1smp_dragonboard_defconfig index e847775801..8db8b627aa 100644 --- a/lichee/linux-4.9/arch/arm64/configs/sun50iw1p1smp_dragonboard_defconfig +++ b/lichee/linux-4.9/arch/arm64/configs/sun50iw1p1smp_dragonboard_defconfig @@ -1536,7 +1536,12 @@ CONFIG_WLAN_VENDOR_TI=y CONFIG_WLAN_VENDOR_ZYDAS=y # CONFIG_USB_ZD1201 is not set # CONFIG_USB_NET_RNDIS_WLAN is not set -# CONFIG_BCMDHD is not set +CONFIG_BCMDHD=m +CONFIG_BCMDHD_FW_PATH="/system/vendor/modules/fw_bcmdhd.bin" +CONFIG_BCMDHD_NVRAM_PATH="/system/vendor/modules/nvram.txt" +CONFIG_BCMDHD_SDIO=y +CONFIG_BCMDHD_OOB=y +# CONFIG_BCMDHD_SDIO_IRQ is not set CONFIG_RTL8723CS=m CONFIG_RTL8723BS_VQ0=m diff --git a/lichee/linux-4.9/drivers/net/wireless/bcmdhd/wl_cfg80211.c b/lichee/linux-4.9/drivers/net/wireless/bcmdhd/wl_cfg80211.c old mode 100644 new mode 100755 index 14e55d3456..f203cf5c07 --- a/lichee/linux-4.9/drivers/net/wireless/bcmdhd/wl_cfg80211.c +++ b/lichee/linux-4.9/drivers/net/wireless/bcmdhd/wl_cfg80211.c @@ -5062,7 +5062,7 @@ wl_cfg80211_get_key(struct wiphy *wiphy, struct net_device *dev, swap_key_to_BE(&key); memset(¶ms, 0, sizeof(params)); params.key_len = (u8) min_t(u8, DOT11_MAX_KEY_SIZE, key.len); - memcpy(params.key, key.data, params.key_len); + memcpy((void *)params.key, key.data, params.key_len); err = wldev_iovar_getint_bsscfg(dev, "wsec", &wsec, bssidx); if (unlikely(err)) { @@ -12946,13 +12946,15 @@ static s32 __wl_cfg80211_down(struct bcm_cfg80211 *cfg) defined(WL_NEWCFG_PRIVCMD_SUPPORT)) struct net_device *p2p_net = cfg->p2p_net; #endif /* WL_CFG80211 && (WL_ENABLE_P2P_IF || WL_NEWCFG_PRIVCMD_SUPPORT) */ - u32 bssidx = 0; #ifdef PROP_TXSTATUS_VSDB #if defined(BCMSDIO) dhd_pub_t *dhd = (dhd_pub_t *)(cfg->pub); #endif #endif /* PROP_TXSTATUS_VSDB */ WL_DBG(("In\n")); + + u32 bssidx = 0; + /* Delete pm_enable_work */ wl_add_remove_pm_enable_work(cfg, FALSE, WL_HANDLER_DEL); diff --git a/lichee/tools/pack/chips/sun50iw1p1/configs/m64/sys_config_linux-4.9.fex b/lichee/tools/pack/chips/sun50iw1p1/configs/m64/sys_config_linux-4.9.fex index 68d3f61b6e..9bb71b5d38 100755 --- a/lichee/tools/pack/chips/sun50iw1p1/configs/m64/sys_config_linux-4.9.fex +++ b/lichee/tools/pack/chips/sun50iw1p1/configs/m64/sys_config_linux-4.9.fex @@ -977,9 +977,9 @@ mir3da = 1 ;-------------------------------------------------------------------------------- [wlan] compatible = "allwinner,sunxi-wlan" -wlan_used = 0 +wlan_used = 1 wlan_busnum = 1 -clocks = +;clocks = wlan_power = "vcc-wifi" wlan_io_regulator = "vcc-wifi-io" wlan_regon = port:PL02<1><0> @@ -1442,7 +1442,7 @@ pmu_powkey_on_time = 1000 [regulator0] compatible = "axp803-regulator" regulator_count = 23 -regulator1 = "axp803_dcdc1 none vcc-nand vcc-emmc vcc-sdc vcc-usb-30 vcc-io vcc-emmcv vcc-emmcvq33 vcc-sdcvq33 vcc-sdcv vcc-sdcvd vcc-wifi" +regulator1 = "axp803_dcdc1 none vcc-nand vcc-emmc vcc-sdc vcc-usb-30 vcc-io vcc-emmcv vcc-emmcvq33 vcc-sdcvq33 vcc-sdcv vcc-sdcvd" regulator2 = "axp803_dcdc2 none vdd-cpua" regulator3 = "axp803_dcdc3 none" regulator4 = "axp803_dcdc4 none" @@ -1454,7 +1454,7 @@ regulator9 = "axp803_aldo1 none vdd-csi-led afvcc-csi iovdd-csi " regulator10 = "axp803_aldo2 none vcc-pl" regulator11 = "axp803_aldo3 none vcc-avcc vcc-pll" regulator12 = "axp803_dldo1 none vcc-hdmi-33 vcc-dsi-33 vcc-io2" -regulator13 = "axp803_dldo2 none vcc-lcd" +regulator13 = "axp803_dldo2 none vcc-wifi" regulator14 = "axp803_dldo3 none avdd-csi" regulator15 = "axp803_dldo4 none vcc-wifi-io vcc-pg" regulator16 = "axp803_eldo1 none vcc-cpvdd vcc-pc vcc-emmcvq18" diff --git a/lichee/tools/pack/chips/sun50iw1p1/configs/m64/test_config.fex b/lichee/tools/pack/chips/sun50iw1p1/configs/m64/test_config.fex index faaadfa644..f8c0ee3a01 100644 --- a/lichee/tools/pack/chips/sun50iw1p1/configs/m64/test_config.fex +++ b/lichee/tools/pack/chips/sun50iw1p1/configs/m64/test_config.fex @@ -59,13 +59,13 @@ run_type = 1 ;------------------------------------------------------------------------------- [wifi] display_name= "网络" -activated = 0 +activated = 1 program = "wifitester.sh" category = 0 run_type = 1 module_count= 1 -module_path = "/system/vendor/modules/8723cs.ko" -module_args = +module_path = "/system/vendor/modules/bcmdhd.ko" +module_args = "nvram_path=/system/vendor/modules/nvram_ap6212.txt" [ethernet] display_name= "乙太網"