diff --git a/br-ext-chip-allwinner/configs/v83x_lite_defconfig b/br-ext-chip-allwinner/configs/v83x_lite_defconfig index f5296785..eaf9eeac 100644 --- a/br-ext-chip-allwinner/configs/v83x_lite_defconfig +++ b/br-ext-chip-allwinner/configs/v83x_lite_defconfig @@ -104,7 +104,7 @@ BR2_PACKAGE_WPA_SUPPLICANT_PASSPHRASE=y BR2_PACKAGE_LINUX_FIRMWARE_OPENIPC=y BR2_PACKAGE_LINUX_FIRMWARE_OPENIPC_MEDIATEK_MT7601U=y # BR2_PACKAGE_RTL8188EU is not set -BR2_PACKAGE_ATBM603X=y +BR2_PACKAGE_ATBM60XX=y # WIREGUARD # BR2_PACKAGE_WIREGUARD_LINUX_COMPAT is not set diff --git a/br-ext-chip-allwinner/configs/v83x_ultimate_defconfig b/br-ext-chip-allwinner/configs/v83x_ultimate_defconfig index 8b13c1bc..53946fd4 100644 --- a/br-ext-chip-allwinner/configs/v83x_ultimate_defconfig +++ b/br-ext-chip-allwinner/configs/v83x_ultimate_defconfig @@ -104,7 +104,7 @@ BR2_PACKAGE_WPA_SUPPLICANT_PASSPHRASE=y BR2_PACKAGE_LINUX_FIRMWARE_OPENIPC=y BR2_PACKAGE_LINUX_FIRMWARE_OPENIPC_MEDIATEK_MT7601U=y # BR2_PACKAGE_RTL8188EU is not set -BR2_PACKAGE_ATBM603X=y +BR2_PACKAGE_ATBM60XX=y # WIREGUARD # BR2_PACKAGE_WIREGUARD_LINUX_COMPAT is not set diff --git a/br-ext-chip-ingenic/configs/t31_ultimate_defconfig b/br-ext-chip-ingenic/configs/t31_ultimate_defconfig index 2eb62766..3c1afcf0 100644 --- a/br-ext-chip-ingenic/configs/t31_ultimate_defconfig +++ b/br-ext-chip-ingenic/configs/t31_ultimate_defconfig @@ -104,9 +104,7 @@ BR2_PACKAGE_WPA_SUPPLICANT_NL80211=y BR2_PACKAGE_WPA_SUPPLICANT_PASSPHRASE=y BR2_PACKAGE_LINUX_FIRMWARE_OPENIPC=y BR2_PACKAGE_LINUX_FIRMWARE_OPENIPC_MEDIATEK_MT7601U=y -BR2_PACKAGE_INGENIC_ATBM603X_SDIO_T31=y -BR2_PACKAGE_INGENIC_ATBM603X_SDIO_T31_MMC0=y -BR2_PACKAGE_INGENIC_ATBM603X_SDIO_T31_MMC1=y +BR2_PACKAGE_ATBM60XX=y BR2_PACKAGE_RTL8189FS_OPENIPC=y # BR2_PACKAGE_RTL8188EU is not set diff --git a/general/overlay/etc/wireless/sdio b/general/overlay/etc/wireless/sdio index 21ad5e19..c5d7350c 100755 --- a/general/overlay/etc/wireless/sdio +++ b/general/overlay/etc/wireless/sdio @@ -23,9 +23,9 @@ if [ "$1" = "atbm603x-t31-mmc0" ]; then devmem 0x10011134 32 0x20000 set_mmc 0 - cp /usr/share/atbm603x_conf/atbm_txpwer_dcxo_cfg.txt /tmp - cp /usr/share/atbm603x_conf/set_rate_power.txt /tmp - modprobe atbm603x_wifi_sdi0 atbm_printk_mask=0 + cp /usr/share/atbm60xx_conf/atbm_txpwer_dcxo_cfg.txt /tmp + cp /usr/share/atbm60xx_conf/set_rate_power.txt /tmp + modprobe atbm603x_wifi_sdio atbm_printk_mask=0 exit 0 fi @@ -35,9 +35,9 @@ if [ "$1" = "atbm603x-t31-mmc1" ]; then devmem 0x10011110 32 0x6e094800 set_mmc 1 - cp /usr/share/atbm603x_conf/atbm_txpwer_dcxo_cfg.txt /tmp - cp /usr/share/atbm603x_conf/set_rate_power.txt /tmp - modprobe atbm603x_wifi_sdi1 atbm_printk_mask=0 + cp /usr/share/atbm60xx_conf/atbm_txpwer_dcxo_cfg.txt /tmp + cp /usr/share/atbm60xx_conf/set_rate_power.txt /tmp + modprobe atbm603x_wifi_sdio atbm_printk_mask=0 exit 0 fi @@ -46,9 +46,9 @@ if [ "$1" = "atbm603x-t31-wyze-v3" ]; then set_gpio 57 0;set_gpio 57 1 set_mmc 1 - cp /usr/share/atbm603x_conf/atbm_txpwer_dcxo_cfg.txt /tmp - cp /usr/share/atbm603x_conf/set_rate_power.txt /tmp - modprobe atbm603x_wifi_sdi1 atbm_printk_mask=0 + cp /usr/share/atbm60xx_conf/atbm_txpwer_dcxo_cfg.txt /tmp + cp /usr/share/atbm60xx_conf/set_rate_power.txt /tmp + modprobe atbm603x_wifi_sdio atbm_printk_mask=0 exit 0 fi diff --git a/general/package/Config.in b/general/package/Config.in index 49cf67ed..a30cab10 100644 --- a/general/package/Config.in +++ b/general/package/Config.in @@ -1,7 +1,7 @@ source "$BR2_EXTERNAL_GENERAL_PATH/package/aic8800-openipc/Config.in" source "$BR2_EXTERNAL_GENERAL_PATH/package/allwinner-osdrv-v83x/Config.in" source "$BR2_EXTERNAL_GENERAL_PATH/package/ambarella-osdrv-s3l/Config.in" -source "$BR2_EXTERNAL_GENERAL_PATH/package/atbm603x/Config.in" +source "$BR2_EXTERNAL_GENERAL_PATH/package/atbm60xx/Config.in" source "$BR2_EXTERNAL_GENERAL_PATH/package/atbm6441/Config.in" source "$BR2_EXTERNAL_GENERAL_PATH/package/aura-httpd/Config.in" source "$BR2_EXTERNAL_GENERAL_PATH/package/autonight/Config.in" diff --git a/general/package/atbm603x/Config.in b/general/package/atbm603x/Config.in deleted file mode 100644 index d1804654..00000000 --- a/general/package/atbm603x/Config.in +++ /dev/null @@ -1,10 +0,0 @@ -config BR2_PACKAGE_ATBM603X - bool "atbm603x" - depends on BR2_LINUX_KERNEL - help - Wireless driver atbm603x. - - Allwinner atbm603x WiFi driver - -comment "ATBM603X needs a Linux kernel to be built" - depends on !BR2_LINUX_KERNEL diff --git a/general/package/atbm603x/atbm603x.mk b/general/package/atbm603x/atbm603x.mk deleted file mode 100644 index b420ba0a..00000000 --- a/general/package/atbm603x/atbm603x.mk +++ /dev/null @@ -1,21 +0,0 @@ -################################################################################ -# -# atbm603x -# -################################################################################ - -ifeq ($(LOCAL_DOWNLOAD),y) -ATBM603X_SITE_METHOD = git -ATBM603X_SITE = https://github.com/openipc/atbm_60xx -ATBM603X_VERSION = $(shell git ls-remote $(ATBM603X_SITE) HEAD | head -1 | cut -f1) -else -ATBM603X_SITE = https://github.com/openipc/atbm_60xx/archive -ATBM603X_SOURCE = master.tar.gz -endif - -ATBM603X_LICENSE = GPL-2.0 -ATBM603X_MODULE_MAKE_OPTS = \ - KSRC=$(LINUX_DIR) - -$(eval $(kernel-module)) -$(eval $(generic-package)) diff --git a/general/package/atbm60xx/Config.in b/general/package/atbm60xx/Config.in new file mode 100644 index 00000000..9a649f8f --- /dev/null +++ b/general/package/atbm60xx/Config.in @@ -0,0 +1,10 @@ +config BR2_PACKAGE_ATBM60XX + bool "atbm60xx" + depends on BR2_LINUX_KERNEL + help + Wireless driver atbm60xx. + + Allwinner atbm60xx WiFi driver + +comment "ATBM60xX needs a Linux kernel to be built" + depends on !BR2_LINUX_KERNEL diff --git a/general/package/atbm60xx/atbm60xx.mk b/general/package/atbm60xx/atbm60xx.mk new file mode 100644 index 00000000..22e462b9 --- /dev/null +++ b/general/package/atbm60xx/atbm60xx.mk @@ -0,0 +1,26 @@ +################################################################################ +# +# altobeam atbm60xx wifi driver +# +################################################################################ + +ifeq ($(LOCAL_DOWNLOAD),y) +ATBM60XX_SITE_METHOD = git +ATBM60XX_SITE = https://github.com/openipc/atbm_60xx +ATBM60XX_VERSION = $(shell git ls-remote $(ATBM60XX_SITE) HEAD | head -1 | cut -f1) +else +ATBM60XX_SITE = https://github.com/openipc/atbm_60xx/archive +ATBM60XX_SOURCE = master.tar.gz +endif + +define ATBM60XX_INSTALL_TARGET_CMDS + $(INSTALL) -m 755 -d $(TARGET_DIR)/usr/share/atbm60xx_conf + $(INSTALL) -m 644 -t $(TARGET_DIR)/usr/share/atbm60xx_conf $(ATBM60XX_PKGDIR)/files/*.txt +endef + +ATBM60XX_LICENSE = GPL-2.0 +ATBM60XX_MODULE_MAKE_OPTS = \ + KSRC=$(LINUX_DIR) + +$(eval $(kernel-module)) +$(eval $(generic-package)) diff --git a/general/package/atbm60xx/files/atbm_txpwer_dcxo_cfg.txt b/general/package/atbm60xx/files/atbm_txpwer_dcxo_cfg.txt new file mode 100644 index 00000000..a92b4657 --- /dev/null +++ b/general/package/atbm60xx/files/atbm_txpwer_dcxo_cfg.txt @@ -0,0 +1,3 @@ +delta_gain1:-1 delta_gain2:-1 delta_gain3:-1 dcxo:-1 +b_delta_gain1:10 b_delta_gain2:12 b_delta_gain3:15 +gn_delta_gain1:10 gn_delta_gain2:8 gn_delta_gain3:12 \ No newline at end of file diff --git a/general/package/atbm60xx/files/set_rate_power.txt b/general/package/atbm60xx/files/set_rate_power.txt new file mode 100644 index 00000000..28fc5cbe --- /dev/null +++ b/general/package/atbm60xx/files/set_rate_power.txt @@ -0,0 +1,11 @@ +b_1M_2M=0 +b_5_5M_11M=0 +g_6M_n_6_5M=0 +g_9M=0 +g_12M_n_13M=0 +g_18M_n_19_5M=0 +g_24M_n_26M=0 +g_36M_n_39M=0 +g_48M_n_52M=0 +g_54M_n_58_5M=0 +n_65M=2 \ No newline at end of file