diff --git a/defconfig/nx60pro-ipailna-high-power.config b/defconfig/nx60pro-ipailna-high-power.config new file mode 100644 index 0000000000..54828a861d --- /dev/null +++ b/defconfig/nx60pro-ipailna-high-power.config @@ -0,0 +1,311 @@ +CONFIG_TARGET_mediatek=y +CONFIG_TARGET_mediatek_mt7986=y +CONFIG_TARGET_MULTI_PROFILE=y +CONFIG_TARGET_DEVICE_mediatek_mt7986_DEVICE_glinet_gl-mt6000=y +CONFIG_TARGET_DEVICE_PACKAGES_mediatek_mt7986_DEVICE_glinet_gl-mt6000="" +CONFIG_TARGET_DEVICE_mediatek_mt7986_DEVICE_tplink_tl-xdr6086=y +CONFIG_TARGET_DEVICE_PACKAGES_mediatek_mt7986_DEVICE_tplink_tl-xdr6086="" +CONFIG_TARGET_DEVICE_mediatek_mt7986_DEVICE_tplink_tl-xdr6088=y +CONFIG_TARGET_DEVICE_PACKAGES_mediatek_mt7986_DEVICE_tplink_tl-xdr6088="" +CONFIG_TARGET_DEVICE_mediatek_mt7986_DEVICE_xiaomi_redmi-router-ax6000=y +CONFIG_TARGET_DEVICE_PACKAGES_mediatek_mt7986_DEVICE_xiaomi_redmi-router-ax6000="" +CONFIG_TARGET_DEVICE_mediatek_mt7986_DEVICE_xiaomi_redmi-router-ax6000-stock=y +CONFIG_TARGET_DEVICE_PACKAGES_mediatek_mt7986_DEVICE_xiaomi_redmi-router-ax6000-stock="" +CONFIG_DEVEL=y +CONFIG_TOOLCHAINOPTS=y +CONFIG_BUSYBOX_CUSTOM=y +CONFIG_TARGET_PER_DEVICE_ROOTFS=y +CONFIG_AFALG_UPDATE_CTR_IV=y +CONFIG_BUSYBOX_CONFIG_BLKID=y +CONFIG_BUSYBOX_CONFIG_FEATURE_BLKID_TYPE=y +CONFIG_BUSYBOX_CONFIG_VOLUMEID=y +CONFIG_CONNINFRA_AUTO_UP=y +CONFIG_CONNINFRA_EMI_SUPPORT=y +# CONFIG_GDB is not set +CONFIG_INCLUDE_CONFIG=y +CONFIG_JSON_OVERVIEW_IMAGE_INFO=y +# CONFIG_KERNEL_BLK_DEV_THROTTLING is not set +# CONFIG_KERNEL_CFS_BANDWIDTH is not set +CONFIG_KERNEL_CGROUP_DEVICE=y +CONFIG_KERNEL_CGROUP_FREEZER=y +CONFIG_KERNEL_DEVMEM=y +# CONFIG_KERNEL_KEYS is not set +# CONFIG_KERNEL_MEMCG_SWAP is not set +CONFIG_KERNEL_NET_CLS_CGROUP=y +CONFIG_MTK_ACK_CTS_TIMEOUT_SUPPORT=y +CONFIG_MTK_AIR_MONITOR=y +CONFIG_MTK_AMPDU_CONF_SUPPORT=y +CONFIG_MTK_ANTENNA_CONTROL_SUPPORT=y +CONFIG_MTK_APCLI_SUPPORT=y +CONFIG_MTK_ATE_SUPPORT=y +CONFIG_MTK_BACKGROUND_SCAN_SUPPORT=y +CONFIG_MTK_CAL_BIN_FILE_SUPPORT=y +CONFIG_MTK_CFG_SUPPORT_FALCON_MURU=y +CONFIG_MTK_CFG_SUPPORT_FALCON_PP=y +CONFIG_MTK_CFG_SUPPORT_FALCON_SR=y +CONFIG_MTK_CFG_SUPPORT_FALCON_TXCMD_DBG=y +CONFIG_MTK_CHIP_MT7986=y +CONFIG_MTK_CONNINFRA_APSOC=y +CONFIG_MTK_CONNINFRA_APSOC_MT7986=y +CONFIG_MTK_CON_WPS_SUPPORT=y +CONFIG_MTK_DBDC_MODE=y +CONFIG_MTK_DOT11K_RRM_SUPPORT=y +CONFIG_MTK_DOT11R_FT_SUPPORT=y +CONFIG_MTK_DOT11W_PMF_SUPPORT=y +CONFIG_MTK_DOT11_HE_AX=y +CONFIG_MTK_DOT11_N_SUPPORT=y +CONFIG_MTK_DOT11_VHT_AC=y +CONFIG_MTK_FAST_NAT_SUPPORT=y +CONFIG_MTK_FIRST_IF_EEPROM_FLASH=y +CONFIG_MTK_FIRST_IF_IPAILNA=y +CONFIG_MTK_FIRST_IF_MT7986=y +CONFIG_MTK_GREENAP_SUPPORT=y +CONFIG_MTK_G_BAND_256QAM_SUPPORT=y +CONFIG_MTK_HDR_TRANS_RX_SUPPORT=y +CONFIG_MTK_HDR_TRANS_TX_SUPPORT=y +CONFIG_MTK_ICAP_SUPPORT=y +CONFIG_MTK_IGMP_SNOOP_SUPPORT=y +CONFIG_MTK_INTERWORKING=y +CONFIG_MTK_BAND_STEERING=y +CONFIG_MTK_MAP_SUPPORT=y +CONFIG_MTK_MAP_R2_VER_SUPPORT=y +CONFIG_MTK_MAP_R3_VER_SUPPORT=y +CONFIG_MTK_MAP_R2_6E_SUPPORT=y +CONFIG_MTK_MAP_R3_6E_SUPPORT=y +CONFIG_MTK_MBO_SUPPORT=y +CONFIG_MTK_MBSS_DTIM_SUPPORT=y +CONFIG_MTK_MBSS_SUPPORT=y +CONFIG_MTK_MCAST_RATE_SPECIFIC=y +CONFIG_MTK_MGMT_TXPWR_CTRL=y +CONFIG_MTK_MLME_MULTI_QUEUE_SUPPORT=y +# CONFIG_MTK_MT7986_NEW_FW is not set +CONFIG_MTK_MT_AP_SUPPORT=m +CONFIG_MTK_MT_DFS_SUPPORT=y +CONFIG_MTK_MT_MAC=y +CONFIG_MTK_MT_WIFI=m +CONFIG_MTK_MT_WIFI_PATH="mt_wifi" +CONFIG_MTK_MUMIMO_SUPPORT=y +CONFIG_MTK_MU_RA_SUPPORT=y +CONFIG_MTK_OFFCHANNEL_SCAN_FEATURE=y +CONFIG_MTK_OWE_SUPPORT=y +CONFIG_MTK_PHY_ICS_SUPPORT=y +CONFIG_MTK_QOS_R1_SUPPORT=y +CONFIG_MTK_RA_PHY_RATE_SUPPORT=y +CONFIG_MTK_RED_SUPPORT=y +CONFIG_MTK_RTMP_FLASH_SUPPORT=y +CONFIG_MTK_RT_FIRST_CARD_EEPROM="flash" +CONFIG_MTK_RT_FIRST_IF_RF_OFFSET=0xc0000 +CONFIG_MTK_SCS_FW_OFFLOAD=y +CONFIG_MTK_SECOND_IF_NONE=y +CONFIG_MTK_SMART_CARRIER_SENSE_SUPPORT=y +CONFIG_MTK_SPECTRUM_SUPPORT=y +CONFIG_MTK_SUPPORT_OPENWRT=y +CONFIG_MTK_THERMAL_PROTECT_SUPPORT=y +CONFIG_MTK_THIRD_IF_NONE=y +CONFIG_MTK_TPC_SUPPORT=y +CONFIG_MTK_TXBF_SUPPORT=y +CONFIG_MTK_UAPSD=y +CONFIG_MTK_VLAN_SUPPORT=y +CONFIG_MTK_VOW_SUPPORT=y +CONFIG_MTK_WARP_V2=y +CONFIG_MTK_WDS_SUPPORT=y +CONFIG_MTK_WHNAT_SUPPORT=m +CONFIG_MTK_WIFI_ADIE_TYPE="mt7976" +CONFIG_MTK_WIFI_BASIC_FUNC=y +CONFIG_MTK_WIFI_DRIVER=y +CONFIG_MTK_WIFI_EAP_FEATURE=y +CONFIG_MTK_WIFI_FW_BIN_LOAD=y +CONFIG_MTK_WIFI_MODE_AP=m +CONFIG_MTK_WIFI_MT_MAC=y +CONFIG_MTK_WIFI_SKU_TYPE="AX6000" +CONFIG_MTK_WIFI_TWT_SUPPORT=y +CONFIG_MTK_WLAN_HOOK=y +CONFIG_MTK_WLAN_SERVICE=y +CONFIG_MTK_WNM_SUPPORT=y +CONFIG_MTK_WPA3_SUPPORT=y +CONFIG_MTK_WSC_INCLUDED=y +CONFIG_MTK_WSC_V2_SUPPORT=y +# CONFIG_OPENSSL_ENGINE_BUILTIN is not set +# CONFIG_OPENSSL_PREFER_CHACHA_OVER_GCM is not set +CONFIG_OPENSSL_WITH_NPN=y +# CONFIG_PACKAGE_TURBOACC_INCLUDE_FLOW_OFFLOADING is not set +CONFIG_PACKAGE_TURBOACC_INCLUDE_NO_FASTPATH=y +CONFIG_PACKAGE_blockd=y +CONFIG_PACKAGE_ca-certificates=y +CONFIG_PACKAGE_datconf=y +CONFIG_PACKAGE_datconf-lua=y +CONFIG_PACKAGE_ethtool=y +CONFIG_PACKAGE_ebtables=y +CONFIG_PACKAGE_htop=y +CONFIG_PACKAGE_ip-bridge=y +CONFIG_PACKAGE_ip6tables-extra=y +CONFIG_PACKAGE_ipset=y +CONFIG_PACKAGE_iptables-mod-conntrack-extra=y +CONFIG_PACKAGE_iptables-mod-extra=y +CONFIG_PACKAGE_iptables-mod-filter=y +CONFIG_PACKAGE_iptables-mod-hashlimit=y +CONFIG_PACKAGE_iptables-mod-iface=y +CONFIG_PACKAGE_iptables-mod-ipmark=y +CONFIG_PACKAGE_iptables-mod-ipopt=y +CONFIG_PACKAGE_iptables-mod-iprange=y +CONFIG_PACKAGE_iptables-mod-ipv4options=y +CONFIG_PACKAGE_iptables-mod-nat-extra=y +CONFIG_PACKAGE_iptables-mod-proto=y +CONFIG_PACKAGE_iptables-mod-tee=y +CONFIG_PACKAGE_iptables-mod-tproxy=y +CONFIG_PACKAGE_iptables-mod-u32=y +CONFIG_PACKAGE_iw=y +CONFIG_PACKAGE_iwinfo=y +CONFIG_PACKAGE_kmod-ata-core=y +CONFIG_PACKAGE_kmod-conninfra=y +CONFIG_PACKAGE_kmod-crypto-acompress=y +CONFIG_PACKAGE_kmod-crypto-ccm=y +CONFIG_PACKAGE_kmod-crypto-cmac=y +CONFIG_PACKAGE_kmod-crypto-crc32c=y +CONFIG_PACKAGE_kmod-crypto-ctr=y +CONFIG_PACKAGE_kmod-crypto-des=y +CONFIG_PACKAGE_kmod-crypto-gcm=y +CONFIG_PACKAGE_kmod-crypto-gf128=y +CONFIG_PACKAGE_kmod-crypto-ghash=y +CONFIG_PACKAGE_kmod-crypto-hmac=y +CONFIG_PACKAGE_kmod-crypto-md4=y +CONFIG_PACKAGE_kmod-crypto-md5=y +CONFIG_PACKAGE_kmod-crypto-rng=y +CONFIG_PACKAGE_kmod-crypto-seqiv=y +CONFIG_PACKAGE_kmod-crypto-sha256=y +CONFIG_PACKAGE_kmod-crypto-sha512=y +CONFIG_PACKAGE_kmod-ebtables=y +CONFIG_PACKAGE_kmod-ebtables-ipv4=y +CONFIG_PACKAGE_kmod-ebtables-ipv6=y +CONFIG_PACKAGE_kmod-fs-autofs4=y +CONFIG_PACKAGE_kmod-fs-vfat=y +CONFIG_PACKAGE_kmod-inet-diag=y +CONFIG_PACKAGE_kmod-ip6tables-extra=y +CONFIG_PACKAGE_kmod-ipt-compat-xtables=y +CONFIG_PACKAGE_kmod-ipt-conntrack-extra=y +CONFIG_PACKAGE_kmod-ipt-extra=y +CONFIG_PACKAGE_kmod-ipt-filter=y +CONFIG_PACKAGE_kmod-ipt-hashlimit=y +CONFIG_PACKAGE_kmod-ipt-iface=y +CONFIG_PACKAGE_kmod-ipt-ipmark=y +CONFIG_PACKAGE_kmod-ipt-ipopt=y +CONFIG_PACKAGE_kmod-ipt-iprange=y +CONFIG_PACKAGE_kmod-ipt-ipv4options=y +CONFIG_PACKAGE_kmod-ipt-nat-extra=y +CONFIG_PACKAGE_kmod-ipt-offload=y +CONFIG_PACKAGE_kmod-ipt-proto=y +CONFIG_PACKAGE_kmod-ipt-raw6=y +CONFIG_PACKAGE_kmod-ipt-tee=y +CONFIG_PACKAGE_kmod-ipt-tproxy=y +CONFIG_PACKAGE_kmod-ipt-u32=y +CONFIG_PACKAGE_kmod-leds-ws2812b=y +CONFIG_PACKAGE_kmod-lib-crc32c=y +CONFIG_PACKAGE_kmod-lib-lzo=y +CONFIG_PACKAGE_kmod-mediatek_hnat=y +CONFIG_PACKAGE_kmod-mt_wifi=y +CONFIG_PACKAGE_kmod-nf-flow=y +CONFIG_PACKAGE_kmod-nls-base=y +CONFIG_PACKAGE_kmod-nls-cp437=y +CONFIG_PACKAGE_kmod-nls-iso8859-1=y +CONFIG_PACKAGE_kmod-nls-utf8=y +CONFIG_PACKAGE_kmod-scsi-core=y +CONFIG_PACKAGE_kmod-tcp-bbr=y +CONFIG_PACKAGE_kmod-tun=y +CONFIG_PACKAGE_kmod-warp=y +CONFIG_PACKAGE_kmod-zram=y +CONFIG_PACKAGE_kvcedit=y +CONFIG_PACKAGE_libatomic=y +CONFIG_PACKAGE_libblkid=y +CONFIG_PACKAGE_libcap-ng=y +CONFIG_PACKAGE_libcbor=y +CONFIG_PACKAGE_libevdev=y +CONFIG_PACKAGE_libfido2=y +CONFIG_PACKAGE_libipset=y +CONFIG_PACKAGE_libkvcutil=y +CONFIG_PACKAGE_libncurses=y +CONFIG_PACKAGE_libnl=y +CONFIG_PACKAGE_libnl-core=y +CONFIG_PACKAGE_libnl-genl=y +CONFIG_PACKAGE_libnl-nf=y +CONFIG_PACKAGE_libnl-route=y +CONFIG_PACKAGE_libopenssl-afalg_sync=y +CONFIG_PACKAGE_libopenssl-devcrypto=y +CONFIG_PACKAGE_libpcap=y +CONFIG_PACKAGE_libstdcpp=y +CONFIG_PACKAGE_libudev-zero=y +CONFIG_PACKAGE_libuuid=y +CONFIG_PACKAGE_luci-app-eqos-mtk=y +CONFIG_PACKAGE_luci-app-mtwifi-cfg=y +CONFIG_PACKAGE_lua-cjson=y +# CONFIG_PACKAGE_luci-app-passwall_INCLUDE_Haproxy is not set +# CONFIG_PACKAGE_luci-app-passwall_INCLUDE_ShadowsocksR_Libev_Client is not set +# CONFIG_PACKAGE_luci-app-passwall_INCLUDE_Shadowsocks_Libev_Client is not set +# CONFIG_PACKAGE_luci-app-passwall_INCLUDE_Shadowsocks_Libev_Server is not set +# CONFIG_PACKAGE_luci-app-passwall_INCLUDE_Shadowsocks_Rust_Client is not set +# CONFIG_PACKAGE_luci-app-passwall_INCLUDE_Simple_Obfs is not set +# CONFIG_PACKAGE_luci-app-passwall_INCLUDE_Trojan_Plus is not set +# CONFIG_PACKAGE_luci-app-passwall_INCLUDE_V2ray is not set +# CONFIG_PACKAGE_luci-app-passwall_INCLUDE_V2ray_Plugin is not set +# CONFIG_PACKAGE_luci-app-passwall_INCLUDE_Xray is not set +# CONFIG_PACKAGE_luci-app-rclone_INCLUDE_rclone-ng is not set +# CONFIG_PACKAGE_luci-app-rclone_INCLUDE_rclone-webui is not set +# CONFIG_PACKAGE_luci-app-ssr-plus_INCLUDE_ChinaDNS_NG is not set +CONFIG_PACKAGE_luci-app-ssr-plus_INCLUDE_NONE_V2RAY=y +CONFIG_PACKAGE_wifi-scripts=y +# CONFIG_PACKAGE_luci-app-ssr-plus_INCLUDE_ShadowsocksR_Libev_Client is not set +CONFIG_PACKAGE_luci-app-ssr-plus_INCLUDE_Shadowsocks_NONE_Client=y +CONFIG_PACKAGE_luci-app-ssr-plus_INCLUDE_Shadowsocks_NONE_Server=y +# CONFIG_PACKAGE_luci-app-ssr-plus_INCLUDE_Shadowsocks_Rust_Client is not set +# CONFIG_PACKAGE_luci-app-ssr-plus_INCLUDE_Shadowsocks_Rust_Server is not set +# CONFIG_PACKAGE_luci-app-ssr-plus_INCLUDE_Shadowsocks_Simple_Obfs is not set +# CONFIG_PACKAGE_luci-app-ssr-plus_INCLUDE_Xray is not set +CONFIG_PACKAGE_luci-app-turboacc-mtk=y +CONFIG_PACKAGE_luci-app-upnp-mtk-adjust=y +# CONFIG_PACKAGE_luci-app-vssr_INCLUDE_ShadowsocksR_Libev_Server is not set +# CONFIG_PACKAGE_luci-app-vssr_INCLUDE_Trojan is not set +# CONFIG_PACKAGE_luci-app-vssr_INCLUDE_Xray is not set +# CONFIG_PACKAGE_luci-app-vssr_INCLUDE_Xray_plugin is not set +CONFIG_PACKAGE_luci-i18n-mtwifi-cfg-zh-cn=y +CONFIG_PACKAGE_luci-i18n-turboacc-mtk-zh-cn=y +CONFIG_PACKAGE_luci-theme-argon=y +CONFIG_PACKAGE_luci-theme-bootstrap-mod=y +CONFIG_PACKAGE_mii_mgr=y +CONFIG_PACKAGE_mtkhqos_util=y +CONFIG_PACKAGE_mtk-smp=y +CONFIG_PACKAGE_nano=y +CONFIG_PACKAGE_openssh-keygen=y +CONFIG_PACKAGE_openssh-sftp-server=y +CONFIG_PACKAGE_openssl-util=y +CONFIG_PACKAGE_regs=y +CONFIG_PACKAGE_resolveip=y +# CONFIG_PACKAGE_swconfig is not set +CONFIG_PACKAGE_switch=y +CONFIG_PACKAGE_tcpdump=y +CONFIG_PACKAGE_terminfo=y +CONFIG_PACKAGE_wifi-dats=y +CONFIG_PACKAGE_mtwifi-cfg=y +CONFIG_PACKAGE_wireless-regdb=y +CONFIG_PACKAGE_wireless-tools=y +CONFIG_PACKAGE_zram-swap=y +# CONFIG_PKG_CHECK_FORMAT_SECURITY is not set +# CONFIG_PKG_FORTIFY_SOURCE_1 is not set +CONFIG_PKG_FORTIFY_SOURCE_2=y +CONFIG_WARP_CHIPSET="mt7986" +CONFIG_WARP_DBG_SUPPORT=y +CONFIG_WARP_MEMORY_LEAK_DBG=y +CONFIG_WARP_NEW_FW=y +CONFIG_WARP_VERSION=2 +CONFIG_WED_HW_RRO_SUPPORT=y +# CONFIG_WOLFSSL_HAS_ECC25519 is not set +CONFIG_first_card=y +CONFIG_first_card_name="MT7986" +# CONFIG_AFALG_FALLBACK is not set +# CONFIG_MTK_BAND_STEERING is not set +# CONFIG_MTK_DEFAULT_5G_PROFILE is not set +# CONFIG_MTK_MAC_REPEATER_SUPPORT is not set +# CONFIG_MTK_MULTI_PROFILE_SUPPORT is not set +# CONFIG_MTK_PCIE_ASPM_DYM_CTRL_SUPPORT is not set +# CONFIG_MTK_PRE_CAL_TRX_SET1_SUPPORT is not set +# CONFIG_MTK_PRE_CAL_TRX_SET2_SUPPORT is not set +# CONFIG_MTK_RLM_CAL_CACHE_SUPPORT is not set +# CONFIG_MTK_SNIFFER_RADIOTAP_SUPPORT is not set diff --git a/package/mtk/applications/mtk-smp/files/smp.sh b/package/mtk/applications/mtk-smp/files/smp.sh index cb76d7e5dd..8cd8fd3dd9 100755 --- a/package/mtk/applications/mtk-smp/files/smp.sh +++ b/package/mtk/applications/mtk-smp/files/smp.sh @@ -736,10 +736,11 @@ setup_model() case $board in xiaomi,redmi-router-ax6000* |\ bananapi,bpi-r3mini* |\ - netcore,n60 |\ + netcore,n60* |\ glinet,gl-mt6000|\ jdcloud,re-cp-03 |\ tplink,tl-xdr608* |\ + zyxel,ex5700 |\ *7986*) MT7986_whnat $num_of_wifi $usbnet ;; diff --git a/package/mtk/drivers/mt_wifi/Makefile b/package/mtk/drivers/mt_wifi/Makefile index cedcb4d3db..40f15adc44 100644 --- a/package/mtk/drivers/mt_wifi/Makefile +++ b/package/mtk/drivers/mt_wifi/Makefile @@ -300,10 +300,8 @@ define KernelPackage/mt_wifi/config endef define FIXUP_NEW_MCU_FW_API - @if [ "$$(CONFIG_MTK_MT7981_NEW_FW)" = "y" ] || [ "$$(CONFIG_MTK_MT7986_NEW_FW)" = "y" ]; then \ echo "Fixup new mcu fw API"; \ - patch -p1 -d $(PKG_BUILD_DIR) < ./files/fix-new-mcu-fw-api.patch; \ - fi + patch -p1 -d $(PKG_BUILD_DIR) < ./files/fix-new-mcu-fw-api.patch @if [ "$$(CONFIG_MTK_MT7986_NEW_FW)" = "y" ]; then \ echo "Fixup eeprom reading API"; \ patch -p1 -d $(PKG_BUILD_DIR) < ./files/eeprom-flash-api.patch; \ @@ -326,21 +324,13 @@ if [ "$$(CONFIG_MTK_WIFI_FW_BIN_LOAD)" = "y" ]; then \ rm -rf $(1)/lib/firmware/; \ $(INSTALL_DIR) $(1)/lib/firmware/; \ if [ "$$(CONFIG_MTK_CHIP_MT7986)" = "y" ] ; then \ - if [ "$$(CONFIG_MTK_MT7986_NEW_FW)" = "y" ]; then \ - $(INSTALL_BIN) ./files/$$(MT7986_FW_DIR)/WIFI_RAM_CODE_MT7986.bin \ - ./files/$$(MT7986_FW_DIR)/WIFI_RAM_CODE_MT7986_MT7975.bin \ - ./files/$$(MT7986_FW_DIR)/mt7986_patch_e1_hdr.bin \ - ./files/$$(MT7986_FW_DIR)/mt7986_patch_e1_hdr_mt7975.bin \ - ./files/$$(MT7986_FW_DIR)/7986_WACPU_RAM_CODE_release.bin $(1)/lib/firmware/; \ - else \ - $(INSTALL_BIN) $(PKG_BUILD_DIR)/bin/mt7986/rebb/WIFI_RAM_CODE_MT7986.bin \ - $(PKG_BUILD_DIR)/bin/mt7986/rebb/WIFI_RAM_CODE_MT7986_MT7975.bin \ - $(PKG_BUILD_DIR)/bin/mt7986/rebb/mt7986_patch_e1_hdr.bin \ - $(PKG_BUILD_DIR)/bin/mt7986/rebb/mt7986_patch_e1_hdr_mt7975.bin \ - $(PKG_BUILD_DIR)/bin/mt7986/rebb/7986_WACPU_RAM_CODE_release.bin $(1)/lib/firmware/; \ - fi ; \ + $(INSTALL_BIN) ./files/$$(MT7986_FW_DIR)/WIFI_RAM_CODE_MT7986.bin \ + ./files/$$(MT7986_FW_DIR)/WIFI_RAM_CODE_MT7986_MT7975.bin \ + ./files/$$(MT7986_FW_DIR)/mt7986_patch_e1_hdr.bin \ + ./files/$$(MT7986_FW_DIR)/mt7986_patch_e1_hdr_mt7975.bin \ + ./files/$$(MT7986_FW_DIR)/7986_WACPU_RAM_CODE_release.bin $(1)/lib/firmware/; \ if [ "$$(CONFIG_MTK_WIFI_SKU_TYPE)" = "AX6000" -o "$$(CONFIG_MTK_WIFI_SKU_TYPE)" = "AX8400" ] ; then \ - $(INSTALL_BIN) $(PKG_BUILD_DIR)/bin/mt7986/rebb/MT7986_iPAiLNA_EEPROM_AX6000.bin $(PKG_BUILD_DIR)/bin/mt7986/rebb/MT7986_ePAeLNA_EEPROM_AX6000.bin \ + $(INSTALL_BIN) ./files/mt7986-default-eeprom/MT7986_iPAiLNA_EEPROM_AX6000.bin ./files/mt7986-default-eeprom/MT7986_ePAeLNA_EEPROM_AX6000.bin \ $(1)/lib/firmware/; \ fi; \ if [ "$$(CONFIG_MTK_WIFI_SKU_TYPE)" = "AX4200" ] ; then \ diff --git a/package/mtk/drivers/mt_wifi/files/mt7986-asus-ax6000/MT7986_ePAeLNA_EEPROM_ONEADIE_DBDC.bin b/package/mtk/drivers/mt_wifi/files/mt7986-asus-ax6000/MT7986_ePAeLNA_EEPROM_ONEADIE_DBDC.bin index aea4d689fe..1021dbaa35 100644 Binary files a/package/mtk/drivers/mt_wifi/files/mt7986-asus-ax6000/MT7986_ePAeLNA_EEPROM_ONEADIE_DBDC.bin and b/package/mtk/drivers/mt_wifi/files/mt7986-asus-ax6000/MT7986_ePAeLNA_EEPROM_ONEADIE_DBDC.bin differ diff --git a/package/mtk/drivers/mt_wifi/files/mt7986-asus-ax6000/MT7986_ePAeLNA_EEPROM_ONEADIE_DBDC_TEST.bin b/package/mtk/drivers/mt_wifi/files/mt7986-asus-ax6000/MT7986_ePAeLNA_EEPROM_ONEADIE_DBDC_TEST.bin index 5e304f84a2..1021dbaa35 100644 Binary files a/package/mtk/drivers/mt_wifi/files/mt7986-asus-ax6000/MT7986_ePAeLNA_EEPROM_ONEADIE_DBDC_TEST.bin and b/package/mtk/drivers/mt_wifi/files/mt7986-asus-ax6000/MT7986_ePAeLNA_EEPROM_ONEADIE_DBDC_TEST.bin differ diff --git a/package/mtk/drivers/mt_wifi/files/mt7986-default-eeprom/MT7986_ePAeLNA_EEPROM_AX6000 (Copy).bin b/package/mtk/drivers/mt_wifi/files/mt7986-default-eeprom/MT7986_ePAeLNA_EEPROM_AX6000 (Copy).bin new file mode 100644 index 0000000000..1021dbaa35 Binary files /dev/null and b/package/mtk/drivers/mt_wifi/files/mt7986-default-eeprom/MT7986_ePAeLNA_EEPROM_AX6000 (Copy).bin differ diff --git a/package/mtk/drivers/mt_wifi/files/mt7986-default-eeprom/MT7986_iPAiLNA_EEPROM_AX6000.bin b/package/mtk/drivers/mt_wifi/files/mt7986-default-eeprom/MT7986_iPAiLNA_EEPROM_AX6000.bin new file mode 100644 index 0000000000..1021dbaa35 Binary files /dev/null and b/package/mtk/drivers/mt_wifi/files/mt7986-default-eeprom/MT7986_iPAiLNA_EEPROM_AX6000.bin differ diff --git a/package/network/utils/ethtool/Makefile b/package/network/utils/ethtool/Makefile index 5da65273ca..44df2e7209 100644 --- a/package/network/utils/ethtool/Makefile +++ b/package/network/utils/ethtool/Makefile @@ -5,6 +5,7 @@ # See /LICENSE for more information. # + include $(TOPDIR)/rules.mk PKG_NAME:=ethtool diff --git a/package/network/utils/ethtool/patches/0001-ethtool-make-building-for-RSS-input-xfrm-optional.patch b/package/network/utils/ethtool/patches/0001-ethtool-make-building-for-RSS-input-xfrm-optional.patch deleted file mode 100644 index 4c8403dcbc..0000000000 --- a/package/network/utils/ethtool/patches/0001-ethtool-make-building-for-RSS-input-xfrm-optional.patch +++ /dev/null @@ -1,67 +0,0 @@ -From c88eb6f4e9b2d8f71f3391db2bf0ec82ecccae81 Mon Sep 17 00:00:00 2001 -From: Daniel Golle -Date: Wed, 12 Feb 2025 04:12:42 +0000 -Subject: [PATCH] ethtool: make building for RSS input xfrm optional - -Unfortunately there is no way to detect at runtime if the kernel the -support for RSS input transformation, and the default value -RXH_XFRM_NO_CHANGE (0xff) used by newer ethtool results in breakage -with older kernels. -As a stop-gap solution simply don't compile with support for input -xfrm by default. - -Signed-off-by: Daniel Golle ---- - configure.ac | 10 ++++++++++ - ethtool.c | 10 ++++++++++ - 2 files changed, 20 insertions(+) - ---- a/configure.ac -+++ b/configure.ac -@@ -45,6 +45,16 @@ if test x$enable_pretty_dump = xyes; the - fi - AM_CONDITIONAL([ETHTOOL_ENABLE_PRETTY_DUMP], [test x$enable_pretty_dump = xyes]) - -+AC_ARG_ENABLE(rss-input-xfrm, -+ [ --enable-rss-input-xfrm build with support for RSS input transformation (disabled by default)], -+ , -+ enable_rss_input_xfrm=no) -+if test x$enable_rss_input_xfrm = xyes; then -+ AC_DEFINE(ETHTOOL_ENABLE_RSS_INPUT_XFRM, 1, -+ [Define this to enable building with support for RSS input transformation.]) -+fi -+AM_CONDITIONAL([ETHTOOL_ENABLE_RSS_INPUT_XFRM], [test x$enable_rss_input_xfrm = xyes]) -+ - AC_ARG_WITH([bash-completion-dir], - AS_HELP_STRING([--with-bash-completion-dir[=PATH]], - [Install the bash-completion script in this directory. @<:@default=yes@:>@]), ---- a/ethtool.c -+++ b/ethtool.c -@@ -4109,9 +4109,11 @@ static int do_grxfh(struct cmd_context * - (const char *)hfuncs->data + i * ETH_GSTRING_LEN, - (rss->hfunc & (1 << i)) ? "on" : "off"); - -+#ifdef ETHTOOL_ENABLE_RSS_INPUT_XFRM - printf("RSS input transformation:\n"); - printf(" symmetric-xor: %s\n", - (rss->input_xfrm & RXH_XFRM_SYM_XOR) ? "on" : "off"); -+#endif - - out: - free(hfuncs); -@@ -4431,7 +4433,15 @@ static int do_srxfh(struct cmd_context * - rss->cmd = ETHTOOL_SRSSH; - rss->rss_context = rss_context; - rss->hfunc = req_hfunc; -+#ifdef ETHTOOL_ENABLE_RSS_INPUT_XFRM - rss->input_xfrm = req_input_xfrm; -+#else -+ if (req_input_xfrm != 0xff) { -+ perror("Compiled for kernel without support for input transformation"); -+ err = 1; -+ goto free; -+ } -+#endif - if (delete) { - rss->indir_size = rss->key_size = 0; - } else { diff --git a/target/linux/mediatek/files-5.4/arch/arm64/boot/dts/mediatek/mt7986a-netcore-n60-pro.dts b/target/linux/mediatek/files-5.4/arch/arm64/boot/dts/mediatek/mt7986a-netcore-n60-pro.dts new file mode 100644 index 0000000000..4569466d96 --- /dev/null +++ b/target/linux/mediatek/files-5.4/arch/arm64/boot/dts/mediatek/mt7986a-netcore-n60-pro.dts @@ -0,0 +1,353 @@ +// SPDX-License-Identifier: (GPL-2.0-only OR MIT) +/dts-v1/; + +#include +#include +#include + +#include "mt7986a.dtsi" +#include "mt7986a-pinctrl.dtsi" +/ { + model = "Netcore N60 PRO"; + compatible = "netcore,n60-pro", "mediatek,mt7986a"; + chosen { + bootargs = "console=ttyS0,115200n1 loglevel=8 \ + earlycon=uart8250,mmio32,0x11002000"; + }; + + aliases { + led-boot = &led_status_red; + led-failsafe = &led_status_red; + led-running = &led_status_blue; + led-upgrade = &led_status_blue; + }; + + memory { + reg = <0 0x40000000 0 0x20000000>; + }; + + gpio-keys { + compatible = "gpio-keys"; + + button-reset { + label = "reset"; + linux,code = ; + gpios = <&pio 9 GPIO_ACTIVE_LOW>; + }; + + button-wps { + label = "wps"; + linux,code = ; + gpios = <&pio 10 GPIO_ACTIVE_LOW>; + }; + }; + + leds { + compatible = "gpio-leds"; + + led_status_red: status_red { + label = "red:status"; + gpios = <&pio 29 GPIO_ACTIVE_LOW>; + }; + + led_status_blue: status_blue { + label = "blue:status"; + gpios = <&pio 32 GPIO_ACTIVE_LOW>; + }; + }; + + nmbm_spim_nand { + compatible = "generic,nmbm"; + + #address-cells = <1>; + #size-cells = <1>; + + lower-mtd-device = <&spi_nand>; + forced-create; + + partitions { + compatible = "fixed-partitions"; + #address-cells = <1>; + #size-cells = <1>; + + partition@0 { + label = "BL2"; + reg = <0x00000 0x0100000>; + read-only; + }; + + partition@100000 { + label = "u-boot-env"; + reg = <0x0100000 0x0080000>; + }; + + Factory: partition@180000 { + label = "Factory"; + reg = <0x180000 0x0200000>; + }; + + partition@380000 { + label = "FIP"; + reg = <0x380000 0x0200000>; + }; + + partition@580000 { + label = "ubi"; + reg = <0x580000 0x7280000>; + }; + }; + }; + + reg_3p3v: regulator-3p3v { + compatible = "regulator-fixed"; + regulator-name = "fixed-3.3V"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + regulator-boot-on; + regulator-always-on; + }; + + usb_vbus: regulator-usb-vbus { + compatible = "regulator-fixed"; + regulator-name = "usb_vbus"; + regulator-min-microvolt = <5000000>; + regulator-max-microvolt = <5000000>; + gpios = <&pio 24 GPIO_ACTIVE_HIGH>; + enable-active-high; + regulator-boot-on; + }; +}; + + +&crypto { + status = "okay"; +}; + +ð { + status = "okay"; + + gmac0: mac@0 { + compatible = "mediatek,eth-mac"; + reg = <0>; + phy-mode = "2500base-x"; + fixed-link { + speed = <2500>; + full-duplex; + pause; + }; + }; + + gmac1: mac@1 { + compatible = "mediatek,eth-mac"; + reg = <1>; + label = "wan"; + phy-mode = "2500base-x"; + + fixed-link { + speed = <2500>; + full-duplex; + pause; + }; + }; + + mdio: mdio-bus { + #address-cells = <1>; + #size-cells = <0>; + }; +}; + +&mdio { + phy5: phy@5 { + compatible = "ethernet-phy-id67c9.de0a"; + reg = <5>; + reset-gpios = <&pio 6 GPIO_ACTIVE_LOW>; + reset-assert-us = <50000>; + reset-deassert-us = <20000>; + mxl,led-config = <0x0 0x0 0x0 0x3f0>; + }; + + phy6: phy@6 { + compatible = "ethernet-phy-id67c9.de0a"; + reg = <6>; + mxl,led-config = <0x0 0x0 0x0 0x3f0>; + }; + + switch: switch@0 { + compatible = "mediatek,mt7531"; + reg = <31>; + reset-gpios = <&pio 5 GPIO_ACTIVE_HIGH>; + interrupt-controller; + #interrupt-cells = <1>; + interrupt-parent = <&pio>; + interrupts = <66 IRQ_TYPE_LEVEL_HIGH>; + }; +}; + +&switch { + ports { + #address-cells = <1>; + #size-cells = <0>; + + port@1 { + reg = <0>; + label = "lan2"; + }; + + port@3 { + reg = <3>; + label = "lan3"; + }; + + port@4 { + reg = <4>; + label = "lan4"; + }; + + port@5 { + reg = <5>; + label = "lan1"; + phy-mode = "2500base-x"; + fixed-link { + speed = <2500>; + full-duplex; + pause; + }; + }; + + port@6 { + reg = <6>; + label = "cpu"; + ethernet = <&gmac0>; + phy-mode = "2500base-x"; + + fixed-link { + speed = <2500>; + full-duplex; + pause; + }; + }; + }; +}; + +&xhci { + vusb33-supply = <®_3p3v>; + vbus-supply = <&usb_vbus>; + status = "okay"; +}; + +&hnat { + mtketh-wan = "eth1"; + mtketh-lan = "lan"; + mtketh-max-gmac = <2>; + status = "okay"; +}; + +&pio { + spi_flash_pins: spi-flash-pins-33-to-38 { + mux { + function = "flash"; + groups = "spi0", "spi0_wp_hold"; + }; + conf-pu { + pins = "SPI2_CS", "SPI2_HOLD", "SPI2_WP"; + drive-strength = <8>; + mediatek,pull-up-adv = <0>; + }; + conf-pd { + pins = "SPI2_CLK", "SPI2_MOSI", "SPI2_MISO"; + drive-strength = <8>; + mediatek,pull-down-adv = <0>; + }; + }; + + wf_2g_5g_pins: wf_2g_5g-pins { + mux { + function = "wifi"; + groups = "wf_2g", "wf_5g"; + }; + conf { + pins = "WF0_HB1", "WF0_HB2", "WF0_HB3", "WF0_HB4", + "WF0_HB0", "WF0_HB0_B", "WF0_HB5", "WF0_HB6", + "WF0_HB7", "WF0_HB8", "WF0_HB9", "WF0_HB10", + "WF0_TOP_CLK", "WF0_TOP_DATA", "WF1_HB1", + "WF1_HB2", "WF1_HB3", "WF1_HB4", "WF1_HB0", + "WF1_HB5", "WF1_HB6", "WF1_HB7", "WF1_HB8", + "WF1_TOP_CLK", "WF1_TOP_DATA"; + drive-strength = ; + }; + }; + + wf_dbdc_pins: wf_dbdc-pins { + mux { + function = "wifi"; + groups = "wf_dbdc"; + }; + conf { + pins = "WF0_HB1", "WF0_HB2", "WF0_HB3", "WF0_HB4", + "WF0_HB0", "WF0_HB0_B", "WF0_HB5", "WF0_HB6", + "WF0_HB7", "WF0_HB8", "WF0_HB9", "WF0_HB10", + "WF0_TOP_CLK", "WF0_TOP_DATA", "WF1_HB1", + "WF1_HB2", "WF1_HB3", "WF1_HB4", "WF1_HB0", + "WF1_HB5", "WF1_HB6", "WF1_HB7", "WF1_HB8", + "WF1_TOP_CLK", "WF1_TOP_DATA"; + drive-strength = ; + }; + }; +}; + +&pcie0 { + pinctrl-names = "default"; + pinctrl-0 = <&pcie0_pins>; + status = "okay"; +}; + +&uart0 { + status = "okay"; +}; + +&spi0 { + pinctrl-names = "default"; + pinctrl-0 = <&spi_flash_pins>; + status = "okay"; + cs-gpios = <0>, <0>; + spi_nand: spi_nand@0 { + #address-cells = <1>; + #size-cells = <1>; + compatible = "spi-nand"; + reg = <1>; + spi-max-frequency = <20000000>; + spi-tx-buswidth = <4>; + spi-rx-buswidth = <4>; + }; +}; + +&wbsys { + status = "okay"; + mediatek,mtd-eeprom = <&Factory 0x0000>; +}; + +&spi1 { + pinctrl-names = "default"; + pinctrl-0 = <&spic_pins_g1>; + status = "okay"; +}; + + +&watchdog { + status = "okay"; +}; + +&i2c0 { + pinctrl-names = "default"; + pinctrl-0 = <&i2c_pins>; + status = "okay"; + + wm8960: wm8960@1a { + compatible = "wlf,wm8960"; + reg = <0x1a>; + }; +}; + +&auxadc { + status = "okay"; +}; diff --git a/target/linux/mediatek/files-5.4/arch/arm64/boot/dts/mediatek/mt7986a-netcore-n60.dts b/target/linux/mediatek/files-5.4/arch/arm64/boot/dts/mediatek/mt7986a-netcore-n60.dts index 7653ab62cd..cbb4fb0655 100644 --- a/target/linux/mediatek/files-5.4/arch/arm64/boot/dts/mediatek/mt7986a-netcore-n60.dts +++ b/target/linux/mediatek/files-5.4/arch/arm64/boot/dts/mediatek/mt7986a-netcore-n60.dts @@ -168,13 +168,13 @@ }; port@3 { - reg = <2>; + reg = <3>; label = "lan2"; }; port@4 { - reg = <3>; + reg = <4>; label = "lan3"; }; diff --git a/target/linux/mediatek/files-5.4/arch/arm64/boot/dts/mediatek/mt7986a-zyxel-ex5700.dts b/target/linux/mediatek/files-5.4/arch/arm64/boot/dts/mediatek/mt7986a-zyxel-ex5700.dts new file mode 100644 index 0000000000..183473d622 --- /dev/null +++ b/target/linux/mediatek/files-5.4/arch/arm64/boot/dts/mediatek/mt7986a-zyxel-ex5700.dts @@ -0,0 +1,358 @@ +/dts-v1/; +#include "mt7986a.dtsi" +#include "mt7986a-pinctrl.dtsi" +#include +#include +#include + +/ { + model = "Zyxel EX5700"; + compatible = "zyxel,ex5700", "mediatek,mt7986a"; + + chosen { + bootargs = "console=ttyS0,115200n1 loglevel=8 \ + earlycon=uart8250,mmio32,0x11002000"; + }; + + aliases { + led-boot = &led_status_green; + led-failsafe = &led_status_green; + led-running = &led_status_green; + led-upgrade = &led_status_amber; + }; + + memory { + reg = <0 0x40000000 0 0x40000000>; + }; + + + + gpio-keys { + compatible = "gpio-keys"; + poll-interval = <20>; + + reset-button { + label = "reset"; + gpios = <&pio 9 GPIO_ACTIVE_LOW>; + linux,code = ; + }; + + wps-button { + label = "wps"; + gpios = <&pio 10 GPIO_ACTIVE_LOW>; + linux,code = ; + }; + }; + + leds { + compatible = "gpio-leds"; + + red1 { + label = "red:net"; + gpios = <&pio 23 GPIO_ACTIVE_HIGH>; + }; + + green1 { + label = "green:net"; + gpios = <&pio 25 GPIO_ACTIVE_HIGH>; + }; + + amber1 { + label = "amber:net"; + gpios = <&pio 29 GPIO_ACTIVE_HIGH>; + }; + + white2 { + label = "white:status"; + gpios = <&pio 16 GPIO_ACTIVE_HIGH>; + }; + + red2 { + label = "red:status"; + gpios = <&pio 17 GPIO_ACTIVE_HIGH>; + }; + + led_status_green: green2 { + label = "green:status"; + gpios = <&pio 31 GPIO_ACTIVE_HIGH>; + }; + + led_status_amber: amber2 { + label = "amber:status"; + gpios = <&pio 18 GPIO_ACTIVE_HIGH>; + }; + }; + + nmbm_spim_nand { + compatible = "generic,nmbm"; + #address-cells = <1>; + #size-cells = <1>; + + lower-mtd-device = <&spi_nand>; + forced-create; + + partitions { + compatible = "fixed-partitions"; + #address-cells = <1>; + #size-cells = <1>; + + partition@0 { + label = "BL2"; + reg = <0x00 0x100000>; + }; + + partition@100000 { + label = "u-boot-env"; + reg = <0x100000 0x80000>; + }; + + partition@180000 { + label = "Factory"; + reg = <0x180000 0x200000>; + }; + + partition@380000 { + label = "FIP"; + reg = <0x380000 0x200000>; + }; + + partition@580000 { + label = "ubi"; + reg = <0x00580000 0x1da80000>; + }; + }; + }; + + reg_3p3v: regulator-3p3v { + compatible = "regulator-fixed"; + regulator-name = "fixed-3.3V"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + regulator-boot-on; + regulator-always-on; + }; + + usb_vbus: regulator-usb-vbus { + compatible = "regulator-fixed"; + regulator-name = "usb_vbus"; + regulator-min-microvolt = <5000000>; + regulator-max-microvolt = <5000000>; + enable-active-high; + regulator-boot-on; + }; +}; + +&uart0 { + status = "okay"; +}; + +&watchdog { + status = "okay"; +}; + +ð { + status = "okay"; + + gmac0: mac@0 { + compatible = "mediatek,eth-mac"; + reg = <0>; + phy-mode = "2500base-x"; + + fixed-link { + speed = <2500>; + full-duplex; + pause; + }; + }; + + gmac1: mac@1 { + label = "wan"; + compatible = "mediatek,eth-mac"; + reg = <1>; + phy-mode = "2500base-x"; + + fixed-link { + speed = <2500>; + full-duplex; + pause; + }; + + }; + + mdio: mdio-bus { + #address-cells = <1>; + #size-cells = <0>; + + phy5: phy@5 { + compatible = "ethernet-phy-id67c9.de0a"; + phy-mode = "2500base-x"; + reset-gpios = <&pio 6 GPIO_ACTIVE_LOW>; + reset-assert-us = <50000>; + reset-deassert-us = <20000>; + maxlinear,led-reg = <0x3c0 0x330 0x0 0x0>; + reg = <5>; + }; + + phy6: phy@6 { + compatible = "ethernet-phy-id67c9.de0a"; + phy-mode = "2500base-x"; + maxlinear,led-reg = <0x3c0 0x330 0x0 0x0>; + reg = <6>; + }; + + switch@0 { + compatible = "mediatek,mt7531"; + reg = <31>; + reset-gpios = <&pio 5 0>; + + ports { + #address-cells = <1>; + #size-cells = <0>; + + port@0 { + reg = <0>; + label = "lan3"; + }; + + port@1 { + reg = <1>; + label = "lan2"; + }; + + port@2 { + reg = <2>; + label = "lan1"; + }; + + + port@5 { + reg = <5>; + label = "lan4"; + phy-mode = "2500base-x"; + fixed-link { + speed = <2500>; + full-duplex; + pause; + }; + }; + + port@6 { + reg = <6>; + label = "cpu"; + ethernet = <&gmac0>; + phy-mode = "2500base-x"; + + fixed-link { + speed = <2500>; + full-duplex; + pause; + }; + }; + }; + }; + + }; +}; + + +&xhci { + vusb33-supply = <®_3p3v>; + vbus-supply = <&usb_vbus>; + status = "okay"; +}; + +&hnat { + mtketh-wan = "eth1"; + mtketh-lan = "eth0"; + mtketh-max-gmac = <2>; + status = "okay"; +}; + +&pcie0 { + pinctrl-names = "default"; + pinctrl-0 = <&pcie0_pins>; + status = "okay"; +}; + +&wbsys { + status = "okay"; + pinctrl-names = "default", "dbdc"; + pinctrl-0 = <&wf_2g_5g_pins>; + pinctrl-1 = <&wf_dbdc_pins>; +}; + +&spi0 { + pinctrl-names = "default"; + pinctrl-0 = <&spi_flash_pins>; + status = "okay"; + cs-gpios = <0>, <0>; + + spi_nand: spi_nand@0 { + #address-cells = <1>; + #size-cells = <1>; + compatible = "spi-nand"; + reg = <1>; + spi-max-frequency = <52000000>; + spi-tx-bus-width = <4>; + spi-rx-bus-width = <4>; + spi-cal-enable; + spi-cal-mode = "read-data"; + spi-cal-datalen = <7>; + spi-cal-data = /bits/ 8 <0x53 0x50 0x49 0x4E 0x41 0x4E 0x44>; /* 'SPINAND' */ + spi-cal-addrlen = <5>; + spi-cal-addr = /bits/ 32 <0x0 0x0 0x0 0x0 0x0>; + }; +}; + +&pio { + spi_flash_pins: spi-flash-pins-33-to-38 { + mux { + function = "flash"; + groups = "spi0", "spi0_wp_hold"; + }; + conf-pu { + pins = "SPI2_CS", "SPI2_HOLD", "SPI2_WP"; + drive-strength = <8>; + mediatek,pull-up-adv = <0>; + }; + conf-pd { + pins = "SPI2_CLK", "SPI2_MOSI", "SPI2_MISO"; + drive-strength = <8>; + mediatek,pull-down-adv = <0>; + }; + }; + + wf_2g_5g_pins: wf_2g_5g-pins { + mux { + function = "wifi"; + groups = "wf_2g", "wf_5g"; + }; + conf { + pins = "WF0_HB1", "WF0_HB2", "WF0_HB3", "WF0_HB4", + "WF0_HB0", "WF0_HB0_B", "WF0_HB5", "WF0_HB6", + "WF0_HB7", "WF0_HB8", "WF0_HB9", "WF0_HB10", + "WF0_TOP_CLK", "WF0_TOP_DATA", "WF1_HB1", + "WF1_HB2", "WF1_HB3", "WF1_HB4", "WF1_HB0", + "WF1_HB5", "WF1_HB6", "WF1_HB7", "WF1_HB8", + "WF1_TOP_CLK", "WF1_TOP_DATA"; + drive-strength = ; + }; + }; + + wf_dbdc_pins: wf_dbdc-pins { + mux { + function = "wifi"; + groups = "wf_dbdc"; + }; + conf { + pins = "WF0_HB1", "WF0_HB2", "WF0_HB3", "WF0_HB4", + "WF0_HB0", "WF0_HB0_B", "WF0_HB5", "WF0_HB6", + "WF0_HB7", "WF0_HB8", "WF0_HB9", "WF0_HB10", + "WF0_TOP_CLK", "WF0_TOP_DATA", "WF1_HB1", + "WF1_HB2", "WF1_HB3", "WF1_HB4", "WF1_HB0", + "WF1_HB5", "WF1_HB6", "WF1_HB7", "WF1_HB8", + "WF1_TOP_CLK", "WF1_TOP_DATA"; + drive-strength = ; + }; + }; +}; diff --git a/target/linux/mediatek/image/mt7986.mk b/target/linux/mediatek/image/mt7986.mk index 1018a9339c..7da2874f0f 100644 --- a/target/linux/mediatek/image/mt7986.mk +++ b/target/linux/mediatek/image/mt7986.mk @@ -511,6 +511,23 @@ define Device/netcore_n60 endef TARGET_DEVICES += netcore_n60 +define Device/netcore_n60-pro + DEVICE_VENDOR := Netcore + DEVICE_MODEL := N60 PRO + DEVICE_DTS := mt7986a-netcore-n60-pro + DEVICE_DTS_DIR := $(DTS_DIR)/mediatek + SUPPORTED_DEVICES := netcore,n60-pro + DEVICE_PACKAGES := kmod-usb3 kmod-mt7986-firmware mt7986-wo-firmware + UBINIZE_OPTS := -E 5 + BLOCKSIZE := 128k + PAGESIZE := 2048 + KERNEL_IN_UBI := 1 + IMAGES += factory.bin + IMAGE/factory.bin := append-ubi | check-size $$$$(IMAGE_SIZE) + IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata +endef +TARGET_DEVICES += netcore_n60-pro + define Device/glinet_gl-mt6000 DEVICE_VENDOR := GL.iNet DEVICE_MODEL := GL-MT6000 @@ -547,3 +564,21 @@ define Device/tplink_tl-xdr6088 $(call Device/tplink_tl-common) endef TARGET_DEVICES += tplink_tl-xdr6088 + +define Device/zyxel_ex5700 + DEVICE_VENDOR := Zyxel + DEVICE_MODEL := EX5700 + DEVICE_DTS := mt7986a-zyxel-ex5700 + SUPPORTED_DEVICES := zyxel,ex5700 + DEVICE_DTS_DIR := $(DTS_DIR)/mediatek + DEVICE_PACKAGES := $(MT7986_USB_PKGS) + UBINIZE_OPTS := -E 5 + BLOCKSIZE := 256k + PAGESIZE := 4096 + IMAGE_SIZE := 65536k + KERNEL_IN_UBI := 1 + IMAGES += factory.bin + IMAGE/factory.bin := append-ubi | check-size $$$$(IMAGE_SIZE) + IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata + endef + TARGET_DEVICES += zyxel_ex5700 diff --git a/target/linux/mediatek/mt7986/base-files/etc/board.d/02_network b/target/linux/mediatek/mt7986/base-files/etc/board.d/02_network index 113a5d09a0..61ae52bf2e 100755 --- a/target/linux/mediatek/mt7986/base-files/etc/board.d/02_network +++ b/target/linux/mediatek/mt7986/base-files/etc/board.d/02_network @@ -29,9 +29,13 @@ mediatek_setup_interfaces() ruijie,rg-x60-pro*) ucidef_set_interfaces_lan_wan "lan0 lan1 lan2 lan3" wan ;; + netcore,n60-pro) + ucidef_set_interfaces_lan_wan "lan1 lan2 lan3 lan4" wan + ;; glinet,gl-mt6000) ucidef_set_interfaces_lan_wan "lan1 lan2 lan3 lan4 lan5" wan ;; + zyxel,ex5700|\ jdcloud,re-cp-03) ucidef_set_interfaces_lan_wan "lan1 lan2 lan3 lan4" wan ;; @@ -56,9 +60,15 @@ mediatek_setup_macs() case $board in *netcore,n60*) - wifi_mac=$(mtd_get_mac_binary $part_name 4) + wifi_mac=$(mtd_get_mac_binary $part_name 0x1fef20) lan_mac="$(macaddr_add $wifi_mac -1)" wan_mac="$(macaddr_add $wifi_mac -2)" + sed -i '/MacAddress=$wifi_mac/d' /etc/wireless/mediatek/mt7986.dbdc.b0.dat + echo "MacAddress=$wifi_mac" >> /etc/wireless/mediatek/mt7986.dbdc.b0.dat + wifi_mac="$(macaddr_add $wifi_mac 1)" + sed -i '/MacAddress=$wifi_mac/d' /etc/wireless/mediatek/mt7986.dbdc.b1.dat + echo "MacAddress=$wifi_mac" >> /etc/wireless/mediatek/mt7986.dbdc.b1.dat + ;; glinet,gl-mt6000) label_mac=$(mmc_get_mac_binary factory 0x0a) diff --git a/target/linux/mediatek/mt7986/base-files/lib/upgrade/platform.sh b/target/linux/mediatek/mt7986/base-files/lib/upgrade/platform.sh index 5becb19850..de695ed286 100755 --- a/target/linux/mediatek/mt7986/base-files/lib/upgrade/platform.sh +++ b/target/linux/mediatek/mt7986/base-files/lib/upgrade/platform.sh @@ -148,8 +148,10 @@ platform_do_upgrade() { xiaomi,redmi-router-ax6000 |\ bananapi,bpi-r3mini |\ netcore,n60|\ + netcore,n60-pro |\ tplink,tl-xdr608*|\ ruijie,rg-x60-pro*|\ + zyxel,ex5700 |\ *snand*) nand_do_upgrade "$1" ;; @@ -179,11 +181,13 @@ platform_check_image() { xiaomi,redmi-router-ax6000* |\ bananapi,bpi-r3mini* |\ netcore,n60|\ + netcore,n60-pro |\ ruijie,rg-x60-pro*|\ *snand* |\ glinet,gl-mt6000|\ jdcloud,re-cp-03|\ tplink,tl-xdr608*|\ + zyxel,ex5700 |\ *emmc*) # tar magic `ustar` magic="$(dd if="$1" bs=1 skip=257 count=5 2>/dev/null)"