diff --git a/package/firmware/cypress-firmware/Makefile b/package/firmware/cypress-firmware/Makefile index d4ace8509a..0ee3e5aa24 100644 --- a/package/firmware/cypress-firmware/Makefile +++ b/package/firmware/cypress-firmware/Makefile @@ -10,13 +10,13 @@ include $(TOPDIR)/rules.mk UNPACK_CMD=unzip -q -p $(DL_DIR)/$(PKG_SOURCE) $(PKG_SOURCE_UNZIP) | gzip -dc | $(HOST_TAR) -C $(1) $(TAR_OPTIONS) PKG_NAME:=cypress-firmware -PKG_VERSION:=v5.4.18-2020_0402 -PKG_RELEASE:=3 +PKG_VERSION:=v5.4.18-2021_0114 +PKG_RELEASE:=1 PKG_SOURCE_UNZIP:=cypress-firmware-$(PKG_VERSION).tar.gz PKG_SOURCE:=cypress-fmac-$(PKG_VERSION).zip -PKG_SOURCE_URL:=https://community.cypress.com/gfawx74859/attachments/gfawx74859/resourcelibrary/1016/1/ -PKG_HASH:=b12b0570f462c2f3c26dde98b10235a845a7109037def1e7e51af728bcc1a958 +PKG_SOURCE_URL:=https://community.cypress.com/gfawx74859/attachments/gfawx74859/WiFiBluetoothLinux/1738/1/ +PKG_HASH:=a3e914ed8e3b2e5057cdd3c6ab09ff2771a745bd767ba7aada33efe872b57899 PKG_MAINTAINER:=Álvaro Fernández Rojas @@ -41,10 +41,10 @@ endef define Package/cypress-firmware-43012-sdio/install $(INSTALL_DIR) $(1)/lib/firmware/brcm $(INSTALL_DATA) \ - $(PKG_BUILD_DIR)/firmware/brcmfmac43012-sdio.bin \ + $(PKG_BUILD_DIR)/firmware/cyfmac43012-sdio.bin \ $(1)/lib/firmware/brcm/brcmfmac43012-sdio.bin $(INSTALL_DATA) \ - $(PKG_BUILD_DIR)/firmware/brcmfmac43012-sdio.clm_blob \ + $(PKG_BUILD_DIR)/firmware/cyfmac43012-sdio.clm_blob \ $(1)/lib/firmware/brcm/brcmfmac43012-sdio.clm_blob endef @@ -59,7 +59,7 @@ endef define Package/cypress-firmware-43340-sdio/install $(INSTALL_DIR) $(1)/lib/firmware/brcm $(INSTALL_DATA) \ - $(PKG_BUILD_DIR)/firmware/brcmfmac43340-sdio.bin \ + $(PKG_BUILD_DIR)/firmware/cyfmac43340-sdio.bin \ $(1)/lib/firmware/brcm/brcmfmac43340-sdio.bin endef @@ -76,7 +76,7 @@ endef define Package/cypress-firmware-43362-sdio/install $(INSTALL_DIR) $(1)/lib/firmware/brcm $(INSTALL_DATA) \ - $(PKG_BUILD_DIR)/firmware/brcmfmac43362-sdio.bin \ + $(PKG_BUILD_DIR)/firmware/cyfmac43362-sdio.bin \ $(1)/lib/firmware/brcm/brcmfmac43362-sdio.bin endef @@ -91,7 +91,7 @@ endef define Package/cypress-firmware-4339-sdio/install $(INSTALL_DIR) $(1)/lib/firmware/brcm $(INSTALL_DATA) \ - $(PKG_BUILD_DIR)/firmware/brcmfmac4339-sdio.bin \ + $(PKG_BUILD_DIR)/firmware/cyfmac4339-sdio.bin \ $(1)/lib/firmware/brcm/brcmfmac4339-sdio.bin endef @@ -108,10 +108,10 @@ endef define Package/cypress-firmware-43430-sdio/install $(INSTALL_DIR) $(1)/lib/firmware/brcm $(INSTALL_DATA) \ - $(PKG_BUILD_DIR)/firmware/brcmfmac43430-sdio.bin \ + $(PKG_BUILD_DIR)/firmware/cyfmac43430-sdio.bin \ $(1)/lib/firmware/brcm/brcmfmac43430-sdio.bin $(INSTALL_DATA) \ - $(PKG_BUILD_DIR)/firmware/brcmfmac43430-sdio.clm_blob \ + $(PKG_BUILD_DIR)/firmware/cyfmac43430-sdio.clm_blob \ $(1)/lib/firmware/brcm/brcmfmac43430-sdio.clm_blob endef @@ -128,10 +128,10 @@ endef define Package/cypress-firmware-43455-sdio/install $(INSTALL_DIR) $(1)/lib/firmware/brcm $(INSTALL_DATA) \ - $(PKG_BUILD_DIR)/firmware/brcmfmac43455-sdio.bin \ + $(PKG_BUILD_DIR)/firmware/cyfmac43455-sdio.bin \ $(1)/lib/firmware/brcm/brcmfmac43455-sdio.bin $(INSTALL_DATA) \ - $(PKG_BUILD_DIR)/firmware/brcmfmac43455-sdio.clm_blob \ + $(PKG_BUILD_DIR)/firmware/cyfmac43455-sdio.clm_blob \ $(1)/lib/firmware/brcm/brcmfmac43455-sdio.clm_blob endef @@ -146,10 +146,10 @@ endef define Package/cypress-firmware-4354-sdio/install $(INSTALL_DIR) $(1)/lib/firmware/brcm $(INSTALL_DATA) \ - $(PKG_BUILD_DIR)/firmware/brcmfmac4354-sdio.bin \ + $(PKG_BUILD_DIR)/firmware/cyfmac4354-sdio.bin \ $(1)/lib/firmware/brcm/brcmfmac4354-sdio.bin $(INSTALL_DATA) \ - $(PKG_BUILD_DIR)/firmware/brcmfmac4354-sdio.clm_blob \ + $(PKG_BUILD_DIR)/firmware/cyfmac4354-sdio.clm_blob \ $(1)/lib/firmware/brcm/brcmfmac4354-sdio.clm_blob endef @@ -164,10 +164,10 @@ endef define Package/cypress-firmware-4356-pcie/install $(INSTALL_DIR) $(1)/lib/firmware/brcm $(INSTALL_DATA) \ - $(PKG_BUILD_DIR)/firmware/brcmfmac4356-pcie.bin \ + $(PKG_BUILD_DIR)/firmware/cyfmac4356-pcie.bin \ $(1)/lib/firmware/brcm/brcmfmac4356-pcie.bin $(INSTALL_DATA) \ - $(PKG_BUILD_DIR)/firmware/brcmfmac4356-pcie.clm_blob \ + $(PKG_BUILD_DIR)/firmware/cyfmac4356-pcie.clm_blob \ $(1)/lib/firmware/brcm/brcmfmac4356-pcie.clm_blob endef @@ -182,10 +182,10 @@ endef define Package/cypress-firmware-4356-sdio/install $(INSTALL_DIR) $(1)/lib/firmware/brcm $(INSTALL_DATA) \ - $(PKG_BUILD_DIR)/firmware/brcmfmac4356-sdio.bin \ + $(PKG_BUILD_DIR)/firmware/cyfmac4356-sdio.bin \ $(1)/lib/firmware/brcm/brcmfmac4356-sdio.bin $(INSTALL_DATA) \ - $(PKG_BUILD_DIR)/firmware/brcmfmac4356-sdio.clm_blob \ + $(PKG_BUILD_DIR)/firmware/cyfmac4356-sdio.clm_blob \ $(1)/lib/firmware/brcm/brcmfmac4356-sdio.clm_blob endef @@ -200,10 +200,10 @@ endef define Package/cypress-firmware-43570-pcie/install $(INSTALL_DIR) $(1)/lib/firmware/brcm $(INSTALL_DATA) \ - $(PKG_BUILD_DIR)/firmware/brcmfmac43570-pcie.bin \ + $(PKG_BUILD_DIR)/firmware/cyfmac43570-pcie.bin \ $(1)/lib/firmware/brcm/brcmfmac43570-pcie.bin $(INSTALL_DATA) \ - $(PKG_BUILD_DIR)/firmware/brcmfmac43570-pcie.clm_blob \ + $(PKG_BUILD_DIR)/firmware/cyfmac43570-pcie.clm_blob \ $(1)/lib/firmware/brcm/brcmfmac43570-pcie.clm_blob endef @@ -218,10 +218,10 @@ endef define Package/cypress-firmware-4359-pcie/install $(INSTALL_DIR) $(1)/lib/firmware/brcm $(INSTALL_DATA) \ - $(PKG_BUILD_DIR)/firmware/brcmfmac4359-pcie.bin \ + $(PKG_BUILD_DIR)/firmware/cyfmac4359-pcie.bin \ $(1)/lib/firmware/brcm/brcmfmac4359-pcie.bin $(INSTALL_DATA) \ - $(PKG_BUILD_DIR)/firmware/brcmfmac4359-pcie.clm_blob \ + $(PKG_BUILD_DIR)/firmware/cyfmac4359-pcie.clm_blob \ $(1)/lib/firmware/brcm/brcmfmac4359-pcie.clm_blob endef @@ -236,10 +236,10 @@ endef define Package/cypress-firmware-4359-sdio/install $(INSTALL_DIR) $(1)/lib/firmware/brcm $(INSTALL_DATA) \ - $(PKG_BUILD_DIR)/firmware/brcmfmac4359-sdio.bin \ + $(PKG_BUILD_DIR)/firmware/cyfmac4359-sdio.bin \ $(1)/lib/firmware/brcm/brcmfmac4359-sdio.bin $(INSTALL_DATA) \ - $(PKG_BUILD_DIR)/firmware/brcmfmac4359-sdio.clm_blob \ + $(PKG_BUILD_DIR)/firmware/cyfmac4359-sdio.clm_blob \ $(1)/lib/firmware/brcm/brcmfmac4359-sdio.clm_blob endef @@ -254,10 +254,10 @@ endef define Package/cypress-firmware-4373-sdio/install $(INSTALL_DIR) $(1)/lib/firmware/brcm $(INSTALL_DATA) \ - $(PKG_BUILD_DIR)/firmware/brcmfmac4373-sdio.bin \ + $(PKG_BUILD_DIR)/firmware/cyfmac4373-sdio.bin \ $(1)/lib/firmware/brcm/brcmfmac4373-sdio.bin $(INSTALL_DATA) \ - $(PKG_BUILD_DIR)/firmware/brcmfmac4373-sdio.clm_blob \ + $(PKG_BUILD_DIR)/firmware/cyfmac4373-sdio.clm_blob \ $(1)/lib/firmware/brcm/brcmfmac4373-sdio.clm_blob endef @@ -272,10 +272,10 @@ endef define Package/cypress-firmware-4373-usb/install $(INSTALL_DIR) $(1)/lib/firmware/brcm $(INSTALL_DATA) \ - $(PKG_BUILD_DIR)/firmware/brcmfmac4373-usb.bin \ + $(PKG_BUILD_DIR)/firmware/cyfmac4373-usb.bin \ $(1)/lib/firmware/brcm/brcmfmac4373-usb.bin $(INSTALL_DATA) \ - $(PKG_BUILD_DIR)/firmware/brcmfmac4373.clm_blob \ + $(PKG_BUILD_DIR)/firmware/cyfmac4373.clm_blob \ $(1)/lib/firmware/brcm/brcmfmac4373.clm_blob endef @@ -290,10 +290,10 @@ endef define Package/cypress-firmware-54591-pcie/install $(INSTALL_DIR) $(1)/lib/firmware/brcm $(INSTALL_DATA) \ - $(PKG_BUILD_DIR)/firmware/brcmfmac54591-pcie.bin \ + $(PKG_BUILD_DIR)/firmware/cyfmac54591-pcie.bin \ $(1)/lib/firmware/brcm/brcmfmac54591-pcie.bin $(INSTALL_DATA) \ - $(PKG_BUILD_DIR)/firmware/brcmfmac54591-pcie.clm_blob \ + $(PKG_BUILD_DIR)/firmware/cyfmac54591-pcie.clm_blob \ $(1)/lib/firmware/brcm/brcmfmac54591-pcie.clm_blob endef @@ -308,10 +308,10 @@ endef define Package/cypress-firmware-89459-pcie/install $(INSTALL_DIR) $(1)/lib/firmware/brcm $(INSTALL_DATA) \ - $(PKG_BUILD_DIR)/firmware/brcmfmac89459-pcie.bin \ + $(PKG_BUILD_DIR)/firmware/cyfmac89459-pcie.bin \ $(1)/lib/firmware/brcm/brcmfmac89459-pcie.bin $(INSTALL_DATA) \ - $(PKG_BUILD_DIR)/firmware/brcmfmac89459-pcie.clm_blob \ + $(PKG_BUILD_DIR)/firmware/cyfmac89459-pcie.clm_blob \ $(1)/lib/firmware/brcm/brcmfmac89459-pcie.clm_blob endef diff --git a/package/kernel/linux/modules/netsupport.mk b/package/kernel/linux/modules/netsupport.mk index f223e56859..c69522b8e4 100644 --- a/package/kernel/linux/modules/netsupport.mk +++ b/package/kernel/linux/modules/netsupport.mk @@ -721,7 +721,7 @@ $(eval $(call KernelPackage,mppe)) SCHED_MODULES = $(patsubst $(LINUX_DIR)/net/sched/%.ko,%,$(wildcard $(LINUX_DIR)/net/sched/*.ko)) -SCHED_MODULES_CORE = sch_ingress sch_fq_codel sch_hfsc sch_htb sch_tbf cls_basic cls_fw cls_route cls_flow cls_tcindex cls_u32 em_u32 act_mirred act_skbedit cls_matchall +SCHED_MODULES_CORE = sch_ingress sch_fq_codel sch_hfsc sch_htb sch_tbf cls_basic cls_fw cls_route cls_flow cls_tcindex cls_u32 em_u32 act_gact act_mirred act_skbedit cls_matchall SCHED_MODULES_FILTER = $(SCHED_MODULES_CORE) act_connmark act_ctinfo sch_cake sch_netem sch_mqprio em_ipset cls_bpf cls_flower act_bpf act_vlan SCHED_MODULES_EXTRA = $(filter-out $(SCHED_MODULES_FILTER),$(SCHED_MODULES)) SCHED_FILES = $(patsubst %,$(LINUX_DIR)/net/sched/%.ko,$(filter $(SCHED_MODULES_CORE),$(SCHED_MODULES))) @@ -745,6 +745,7 @@ define KernelPackage/sched-core CONFIG_NET_CLS_ROUTE4 \ CONFIG_NET_CLS_TCINDEX \ CONFIG_NET_CLS_U32 \ + CONFIG_NET_ACT_GACT \ CONFIG_NET_ACT_MIRRED \ CONFIG_NET_ACT_SKBEDIT \ CONFIG_NET_CLS_MATCHALL \ @@ -900,7 +901,6 @@ define KernelPackage/sched CONFIG_NET_SCH_FQ \ CONFIG_NET_SCH_PIE \ CONFIG_NET_ACT_POLICE \ - CONFIG_NET_ACT_GACT \ CONFIG_NET_ACT_IPT \ CONFIG_NET_ACT_PEDIT \ CONFIG_NET_ACT_SIMP \ diff --git a/package/lean/autocore/Makefile b/package/lean/autocore/Makefile index 63459f2b11..72a87e9940 100644 --- a/package/lean/autocore/Makefile +++ b/package/lean/autocore/Makefile @@ -12,7 +12,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=autocore PKG_VERSION:=1 -PKG_RELEASE:=39 +PKG_RELEASE:=40 include $(INCLUDE_DIR)/package.mk diff --git a/package/lean/autocore/files/arm/sbin/tempinfo b/package/lean/autocore/files/arm/sbin/tempinfo index bd32b8fb16..812d1750f4 100755 --- a/package/lean/autocore/files/arm/sbin/tempinfo +++ b/package/lean/autocore/files/arm/sbin/tempinfo @@ -1,9 +1,14 @@ #!/bin/sh +mt76_path="/sys/kernel/debug/ieee80211/phy0/mt76/temperature" +if [ -e "${mt76_path}" ]; then + mt76_temp=" $(cat "${mt76_path}" | awk -F ': ' '{print $2}')°C" +fi + sys_temp="$(sensors | grep -Eo '\+[0-9]+.+C' | grep -Ev 'high' | sed ':a;N;$!ba;s/\n/ /g;s/+//g')" if grep -q "ipq40xx" "/etc/openwrt_release"; then - echo -n "WiFi: ${sys_temp}" + echo -n "WiFi:${mt76_temp} ${sys_temp}" else cpu_temp="$(awk "BEGIN{printf (\"%.1f\n\",$(cat /sys/class/thermal/thermal_zone0/temp)/1000) }")°C" echo -n "CPU: ${cpu_temp}, WiFi: ${sys_temp}" diff --git a/package/lean/frp/Makefile b/package/lean/frp/Makefile index d571ae34ff..993b0cd722 100644 --- a/package/lean/frp/Makefile +++ b/package/lean/frp/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=frp -PKG_VERSION:=0.34.2 +PKG_VERSION:=0.36.2 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/fatedier/frp/tar.gz/v$(PKG_VERSION)? -PKG_HASH:=53d8c29ef627e544cf8970b0a05570589d5270398068eb162957bdddb36de9ac +PKG_HASH:=b9dca438385ddbbcc4c7dade3d5e940e1b61b27dd45a012876eaaa41ec2da2a9 PKG_LICENSE:=Apache-2.0 PKG_LICENSE_FILES:=LICENSE diff --git a/package/lean/luci-app-ssr-plus/root/etc/init.d/shadowsocksr b/package/lean/luci-app-ssr-plus/root/etc/init.d/shadowsocksr index 1216ec283a..1c4d0effed 100755 --- a/package/lean/luci-app-ssr-plus/root/etc/init.d/shadowsocksr +++ b/package/lean/luci-app-ssr-plus/root/etc/init.d/shadowsocksr @@ -37,6 +37,7 @@ server_count=0 redir_tcp=0 redir_udp=0 local_enable=0 +ss_protocol= kcp_enable_flag=0 pdnsd_enable_flag=0 switch_server=$1 @@ -273,14 +274,15 @@ gen_config_file() { #server1 type2 code3 local_port4 socks_port5 threads5 config_file=$shunt_config_file ;; 4) + local ss_protocol="socks" config_file=$local_config_file ;; esac case "$2" in ss | ssr) - lua /usr/share/shadowsocksr/gen_config.lua $1 $mode $4 >$config_file + lua /usr/share/shadowsocksr/gen_config.lua $1 $mode $4 ${ss_protocol:-redir} >$config_file if [ "$3" == "3" ]; then - lua /usr/share/shadowsocksr/gen_config.lua $1 $mode $tmp_port >$shunt_dns_config_file + lua /usr/share/shadowsocksr/gen_config.lua $1 $mode $tmp_port socks >$shunt_dns_config_file fi ;; v2ray) @@ -339,8 +341,7 @@ start_udp() { ss | ssr) gen_config_file $UDP_RELAY_SERVER $type 2 $tmp_udp_port ss_program="$(first_type ${type}local ${type}-redir)" - [ "$(printf '%s' "$ss_program" | awk -F '/' '{print $NF}')" = "${type}local" ] && local ss_extra_arg="--protocol redir" - ln_start_bin $ss_program ${type}-redir -c $udp_config_file $ss_extra_arg + ln_start_bin $ss_program ${type}-redir -c $udp_config_file echolog "UDP TPROXY Relay:$(get_name $type) Started!" ;; v2ray) @@ -382,8 +383,7 @@ start_shunt() { ss | ssr) gen_config_file $SHUNT_SERVER $type 3 $tmp_shunt_port ss_program="$(first_type ${type}local ${type}-redir)" - [ "$(printf '%s' "$ss_program" | awk -F '/' '{print $NF}')" = "${type}local" ] && local ss_extra_arg="--protocol redir" - ln_start_bin $ss_program ${type}-redir -c $shunt_config_file $ss_extra_arg + ln_start_bin $ss_program ${type}-redir -c $shunt_config_file if [ -n "$tmp_local_port" ]; then local tmp_port=$tmp_local_port else @@ -530,9 +530,8 @@ Start_Run() { ss | ssr) gen_config_file $GLOBAL_SERVER $type 1 $tcp_port ss_program="$(first_type ${type}local ${type}-redir)" - [ "$(printf '%s' "$ss_program" | awk -F '/' '{print $NF}')" = "${type}local" ] && local ss_extra_arg="--protocol redir" for i in $(seq 1 $threads); do - ln_start_bin "$ss_program" ${type}-redir -c $tcp_config_file $ss_extra_arg + ln_start_bin "$ss_program" ${type}-redir -c $tcp_config_file done echolog "Main node:$(get_name $type) $threads Threads Started!" ;; diff --git a/package/lean/luci-app-ssr-plus/root/usr/share/shadowsocksr/gen_config.lua b/package/lean/luci-app-ssr-plus/root/usr/share/shadowsocksr/gen_config.lua index 05d1401ac1..2ec2b01dfb 100644 --- a/package/lean/luci-app-ssr-plus/root/usr/share/shadowsocksr/gen_config.lua +++ b/package/lean/luci-app-ssr-plus/root/usr/share/shadowsocksr/gen_config.lua @@ -224,6 +224,7 @@ local ss = { local_address = "0.0.0.0", local_port = tonumber(local_port), mode = (proto == "tcp,udp") and "tcp_and_udp" or proto .. "_only", + protocol = socks_port, password = server.password, method = server.encrypt_method_ss, timeout = tonumber(server.timeout), diff --git a/package/lean/v2ray/Makefile b/package/lean/v2ray/Makefile index 879148a4b0..e4c8f56b10 100644 --- a/package/lean/v2ray/Makefile +++ b/package/lean/v2ray/Makefile @@ -9,13 +9,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=v2ray -PKG_VERSION:=4.37.3 +PKG_VERSION:=4.38.0 PKG_RELEASE:=1 PKG_BUILD_DIR:=$(BUILD_DIR)/v2ray-core-$(PKG_VERSION) PKG_SOURCE:=v2ray-core-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/v2fly/v2ray-core/tar.gz/v$(PKG_VERSION)? -PKG_HASH:=b5001622b8a67c4a8e57651ef0f9d23f20604b7a65a18db47e51c1e19c3be08a +PKG_HASH:=36f718389501e03131d6637cfee5e8f2f1efe123f88bd4143f5c6d0d6007bfba PKG_LICENSE:=MIT PKG_LICENSE_FILES:=LICENSE diff --git a/package/network/utils/wireguard-tools/Makefile b/package/network/utils/wireguard-tools/Makefile index 5f8da147c1..77e2fbdc26 100644 --- a/package/network/utils/wireguard-tools/Makefile +++ b/package/network/utils/wireguard-tools/Makefile @@ -11,12 +11,12 @@ include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=wireguard-tools -PKG_VERSION:=1.0.20210223 -PKG_RELEASE:=2 +PKG_VERSION:=1.0.20210315 +PKG_RELEASE:=1 PKG_SOURCE:=wireguard-tools-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=https://git.zx2c4.com/wireguard-tools/snapshot/ -PKG_HASH:=1f72da217044622d79e0bab57779e136a3df795e3761a3fc1dc0941a9055877c +PKG_HASH:=af001d5492be6bf58ef0bebe04b446b6f50eb53e1226fab679cc34af40733a22 PKG_LICENSE:=GPL-2.0 PKG_LICENSE_FILES:=COPYING diff --git a/scripts/download.pl b/scripts/download.pl index be241baa77..a09d1454e5 100755 --- a/scripts/download.pl +++ b/scripts/download.pl @@ -280,7 +280,8 @@ foreach my $mirror (@ARGV) { } } -unshift @mirrors, "https://mirror01.download.immortalwrt.org/openwrt-18.06-k5.4"; +push @mirrors, "https://mirror01.download.immortalwrt.eu.org/openwrt-18.06"; +push @mirrors, "https://mirror02.download.immortalwrt.eu.org/openwrt-18.06"; push @mirrors, "https://openwrt.cc/dl/immortalwrt/openwrt-18.06"; push @mirrors, 'https://sources.cdn.openwrt.org'; push @mirrors, 'https://sources.openwrt.org'; diff --git a/target/linux/ipq40xx/base-files/etc/board.d/02_network b/target/linux/ipq40xx/base-files/etc/board.d/02_network index 2e9e148f10..439787b602 100755 --- a/target/linux/ipq40xx/base-files/etc/board.d/02_network +++ b/target/linux/ipq40xx/base-files/etc/board.d/02_network @@ -76,7 +76,8 @@ ipq40xx_setup_interfaces() ucidef_add_switch "switch0" \ "0t@eth0" "3:lan" "4:lan" "5:wan" ;; - hiwifi,c526a) + hiwifi,c526a|\ + hiwifi,c526a-128m) ucidef_add_switch "switch0" \ "0t@eth0" "2:lan" "3:lan" "4:lan" "5:wan" ;; @@ -154,7 +155,8 @@ ipq40xx_setup_macs() ezviz,cs-w3-wd1200g-eup) label_mac=$(mtd_get_mac_binary "ART" 6) ;; - hiwifi,c526a) + hiwifi,c526a|\ + hiwifi,c526a-128m) lan_mac=$(mtd_get_mac_ascii bdinfo "Vfac_mac ") wan_mac=$(macaddr_add "$lan_mac" 1) ;; diff --git a/target/linux/ipq40xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata b/target/linux/ipq40xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata index c96ca1e893..2ed46243d1 100644 --- a/target/linux/ipq40xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata +++ b/target/linux/ipq40xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata @@ -130,7 +130,8 @@ case "$FIRMWARE" in caldata_extract "ART" 0x1000 0x2f20 ath10k_patch_mac $(macaddr_add $(mtd_get_mac_ascii u-boot-env ethaddr) +2) ;; - hiwifi,c526a) + hiwifi,c526a|\ + hiwifi,c526a-128m) caldata_extract "ART" 0x1000 0x2f20 ath10k_patch_mac $(macaddr_add $(mtd_get_mac_ascii bdinfo "Vfac_mac ") +2) ;; @@ -232,7 +233,8 @@ case "$FIRMWARE" in caldata_extract "ART" 0x5000 0x2f20 ath10k_patch_mac $(macaddr_add $(mtd_get_mac_ascii u-boot-env ethaddr) +3) ;; - hiwifi,c526a) + hiwifi,c526a|\ + hiwifi,c526a-128m) caldata_extract "ART" 0x5000 0x2f20 ath10k_patch_mac $(macaddr_add $(mtd_get_mac_ascii bdinfo "Vfac_mac ") +3) ;; diff --git a/target/linux/ipq40xx/base-files/etc/hotplug.d/ieee80211/10_fix_wifi_mac b/target/linux/ipq40xx/base-files/etc/hotplug.d/ieee80211/10_fix_wifi_mac index 0be00f5ebd..ecef7944ed 100644 --- a/target/linux/ipq40xx/base-files/etc/hotplug.d/ieee80211/10_fix_wifi_mac +++ b/target/linux/ipq40xx/base-files/etc/hotplug.d/ieee80211/10_fix_wifi_mac @@ -12,7 +12,8 @@ PHYNBR=${DEVPATH##*/phy} board=$(board_name) case "$board" in - hiwifi,c526a) + hiwifi,c526a|\ + hiwifi,c526a-128m) [ "$PHYNBR" -eq 0 ] && \ mtd_get_mac_ascii bdinfo "Vfac_mac " > /sys${DEVPATH}/macaddress ;; diff --git a/target/linux/ipq40xx/base-files/etc/init.d/mt7615_reboot b/target/linux/ipq40xx/base-files/etc/init.d/mt7615_reboot new file mode 100755 index 0000000000..b358c5a5bb --- /dev/null +++ b/target/linux/ipq40xx/base-files/etc/init.d/mt7615_reboot @@ -0,0 +1,14 @@ +#!/bin/sh /etc/rc.common + +STOP=60 + +stop() { + . /lib/functions.sh + + case $(board_name) in + hiwifi,c526a|\ + hiwifi,c526a-128m) + rmmod mt7615e + ;; + esac +} diff --git a/target/linux/ipq40xx/base-files/lib/upgrade/platform.sh b/target/linux/ipq40xx/base-files/lib/upgrade/platform.sh index d4bfe23cf7..995a566df0 100644 --- a/target/linux/ipq40xx/base-files/lib/upgrade/platform.sh +++ b/target/linux/ipq40xx/base-files/lib/upgrade/platform.sh @@ -181,6 +181,7 @@ platform_do_upgrade() { century,wr142ac-nand |\ cilab,meshpoint-one |\ hiwifi,c526a |\ + hiwifi,c526a-128m |\ mobipromo,cm520-79f |\ qxwlan,e2600ac-c2) nand_do_upgrade "$ARGV" diff --git a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-c526a-128m.dts b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-c526a-128m.dts new file mode 100644 index 0000000000..a125b1c038 --- /dev/null +++ b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-c526a-128m.dts @@ -0,0 +1,25 @@ +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT + +#include "qcom-ipq4019-c526a.dtsi" + +/ { + model = "HiWiFi C526A 128M"; + compatible = "hiwifi,c526a-128m"; +}; + +&nand { + status = "okay"; + + nand@0 { + partitions { + compatible = "fixed-partitions"; + #address-cells = <1>; + #size-cells = <1>; + + partition@0 { + label = "ubi"; + reg = <0x0 0x8000000>; + }; + }; + }; +}; diff --git a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-c526a.dts b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-c526a.dts index 0d0c19863f..1b1ca4d570 100644 --- a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-c526a.dts +++ b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-c526a.dts @@ -1,228 +1,10 @@ // SPDX-License-Identifier: GPL-2.0-or-later OR MIT -#include "qcom-ipq4019.dtsi" -#include -#include -#include +#include "qcom-ipq4019-c526a.dtsi" / { - model = "HiWiFi C526A"; compatible = "hiwifi,c526a"; - - aliases { - led-boot = &led_boot; - led-failsafe = &led_boot; - led-running = &led_sys; - led-upgrade = &led_sys; - }; - - chosen { - bootargs-append = " ubi.mtd=ubi root=/dev/ubiblock0_1"; - }; - - soc { - rng@22000 { - status = "okay"; - }; - - mdio@90000 { - status = "okay"; - pinctrl-0 = <&mdio_pins>; - pinctrl-names = "default"; - }; - - ess-psgmii@98000 { - status = "okay"; - }; - - tcsr@1949000 { - compatible = "qcom,tcsr"; - reg = <0x1949000 0x100>; - qcom,wifi_glb_cfg = ; - }; - - tcsr@194b000 { - compatible = "qcom,tcsr"; - reg = <0x194b000 0x100>; - qcom,usb-hsphy-mode-select = ; - }; - - ess_tcsr@1953000 { - compatible = "qcom,tcsr"; - reg = <0x1953000 0x1000>; - qcom,ess-interface-select = ; - }; - - tcsr@1957000 { - compatible = "qcom,tcsr"; - reg = <0x1957000 0x100>; - qcom,wifi_noc_memtype_m0_m2 = ; - }; - - usb2@60f8800 { - status = "okay"; - }; - - usb3@8af8800 { - status = "okay"; - }; - - crypto@8e3a000 { - status = "okay"; - }; - - watchdog@b017000 { - status = "okay"; - }; - - ess-switch@c000000 { - status = "okay"; - }; - - edma@c080000 { - status = "okay"; - }; - }; - - leds { - compatible = "gpio-leds"; - - led_sys: blue { - label = "blue:sys"; - gpios = <&tlmm 36 GPIO_ACTIVE_LOW>; - }; - - led_boot: red { - label = "red:sys"; - gpios = <&tlmm 40 GPIO_ACTIVE_LOW>; - panic-indicator; - }; - }; - - keys { - compatible = "gpio-keys"; - - reset { - label = "reset"; - gpios = <&tlmm 18 GPIO_ACTIVE_LOW>; - linux,code = ; - }; - }; -}; - -&blsp_dma { - status = "okay"; -}; - -&blsp1_spi1 { - status = "okay"; - - flash@0 { - reg = <0>; - compatible = "jedec,spi-nor"; - spi-max-frequency = <24000000>; - - partitions { - compatible = "fixed-partitions"; - #address-cells = <1>; - #size-cells = <1>; - - partition@0 { - label = "SBL1"; - reg = <0x0 0x40000>; - read-only; - }; - - partition@40000 { - label = "MIBIB"; - reg = <0x40000 0x20000>; - read-only; - }; - - partition@60000 { - label = "QSEE"; - reg = <0x60000 0x60000>; - read-only; - }; - - partition@c0000 { - label = "CDT"; - reg = <0xc0000 0x10000>; - read-only; - }; - - partition@d0000 { - label = "DDRPARAMS"; - reg = <0xd0000 0x10000>; - read-only; - }; - - partition@e0000 { - label = "APPSBLENV"; - reg = <0xe0000 0x10000>; - read-only; - }; - - partition@f0000 { - label = "APPSBL"; - reg = <0xf0000 0x80000>; - read-only; - }; - - partition@170000 { - label = "ART"; - reg = <0x170000 0x10000>; - read-only; - }; - - partition@180000 { - label = "bdinfo"; - reg = <0x180000 0x10000>; - read-only; - }; - - partition@190000 { - label = "debug"; - reg = <0x190000 0x10000>; - read-only; - }; - - partition@1a0000 { - label = "oem"; - reg = <0x1a0000 0x20000>; - read-only; - }; - - factory: partition@1c0000 { - label = "Factory"; - reg = <0x1c0000 0x10000>; - read-only; - }; - - partition@1d0000 { - label = "hw_panic"; - reg = <0x1d0000 0x10000>; - read-only; - }; - - partition@1e0000 { - label = "upgrade_config"; - reg = <0x1e0000 0x10000>; - read-only; - }; - }; - }; -}; - -&blsp1_uart1 { - pinctrl-0 = <&serial_0_pins>; - pinctrl-names = "default"; - status = "okay"; -}; - -&cryptobam { - status = "okay"; }; &nand { @@ -251,75 +33,3 @@ }; }; }; - -&pcie0 { - status = "okay"; - perst-gpios = <&tlmm 38 GPIO_ACTIVE_LOW>; - wake-gpios = <&tlmm 50 GPIO_ACTIVE_LOW>; - - bridge@0,0 { - reg = <0x00000000 0 0 0 0>; - #address-cells = <3>; - #size-cells = <2>; - ranges; - - wifi@1,0 { - compatible = "mediatek,mt76"; - reg = <0x0000 0 0 0 0>; - mediatek,mtd-eeprom = <&factory 0x0000>; - ieee80211-freq-limit = <2400000 2500000>; - }; - }; -}; - -&qpic_bam { - status = "okay"; -}; - -&tlmm { - mdio_pins: mdio_pinmux { - mux_1 { - pins = "gpio6"; - function = "mdio"; - bias-pull-up; - }; - - mux_2 { - pins = "gpio7"; - function = "mdc"; - bias-pull-up; - }; - }; - - serial_0_pins: serial0-pinmux { - mux { - pins = "gpio16", "gpio17"; - function = "blsp_uart0"; - bias-disable; - }; - }; -}; - -&usb3_ss_phy { - status = "okay"; -}; - -&usb3_hs_phy { - status = "okay"; -}; - -&usb2_hs_phy { - status = "okay"; -}; - -&wifi0 { - status = "okay"; - ieee80211-freq-limit = <5470000 5875000>; - qcom,ath10k-calibration-variant = "C526A"; -}; - -&wifi1 { - status = "okay"; - ieee80211-freq-limit = <5170000 5350000>; - qcom,ath10k-calibration-variant = "C526A"; -}; diff --git a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-c526a.dtsi b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-c526a.dtsi new file mode 100644 index 0000000000..898a239509 --- /dev/null +++ b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-c526a.dtsi @@ -0,0 +1,294 @@ +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT + +#include "qcom-ipq4019.dtsi" +#include +#include +#include + +/ { + aliases { + led-boot = &led_boot; + led-failsafe = &led_boot; + led-running = &led_sys; + led-upgrade = &led_sys; + }; + + chosen { + bootargs-append = " ubi.mtd=ubi root=/dev/ubiblock0_1"; + }; + + soc { + rng@22000 { + status = "okay"; + }; + + mdio@90000 { + status = "okay"; + pinctrl-0 = <&mdio_pins>; + pinctrl-names = "default"; + }; + + ess-psgmii@98000 { + status = "okay"; + }; + + tcsr@1949000 { + compatible = "qcom,tcsr"; + reg = <0x1949000 0x100>; + qcom,wifi_glb_cfg = ; + }; + + tcsr@194b000 { + compatible = "qcom,tcsr"; + reg = <0x194b000 0x100>; + qcom,usb-hsphy-mode-select = ; + }; + + ess_tcsr@1953000 { + compatible = "qcom,tcsr"; + reg = <0x1953000 0x1000>; + qcom,ess-interface-select = ; + }; + + tcsr@1957000 { + compatible = "qcom,tcsr"; + reg = <0x1957000 0x100>; + qcom,wifi_noc_memtype_m0_m2 = ; + }; + + usb2@60f8800 { + status = "okay"; + }; + + usb3@8af8800 { + status = "okay"; + }; + + crypto@8e3a000 { + status = "okay"; + }; + + watchdog@b017000 { + status = "okay"; + }; + + ess-switch@c000000 { + status = "okay"; + }; + + edma@c080000 { + status = "okay"; + }; + }; + + leds { + compatible = "gpio-leds"; + + led_sys: blue { + label = "c526a:blue:sys"; + gpios = <&tlmm 36 GPIO_ACTIVE_LOW>; + }; + + led_boot: red { + label = "c526a:red:sys"; + gpios = <&tlmm 40 GPIO_ACTIVE_LOW>; + panic-indicator; + }; + }; + + keys { + compatible = "gpio-keys"; + + reset { + label = "reset"; + gpios = <&tlmm 18 GPIO_ACTIVE_LOW>; + linux,code = ; + }; + }; +}; + +&blsp_dma { + status = "okay"; +}; + +&blsp1_spi1 { + status = "okay"; + + flash@0 { + reg = <0>; + compatible = "jedec,spi-nor"; + spi-max-frequency = <24000000>; + + partitions { + compatible = "fixed-partitions"; + #address-cells = <1>; + #size-cells = <1>; + + partition@0 { + label = "SBL1"; + reg = <0x0 0x40000>; + read-only; + }; + + partition@40000 { + label = "MIBIB"; + reg = <0x40000 0x20000>; + read-only; + }; + + partition@60000 { + label = "QSEE"; + reg = <0x60000 0x60000>; + read-only; + }; + + partition@c0000 { + label = "CDT"; + reg = <0xc0000 0x10000>; + read-only; + }; + + partition@d0000 { + label = "DDRPARAMS"; + reg = <0xd0000 0x10000>; + read-only; + }; + + partition@e0000 { + label = "APPSBLENV"; + reg = <0xe0000 0x10000>; + read-only; + }; + + partition@f0000 { + label = "APPSBL"; + reg = <0xf0000 0x80000>; + read-only; + }; + + partition@170000 { + label = "ART"; + reg = <0x170000 0x10000>; + read-only; + }; + + partition@180000 { + label = "bdinfo"; + reg = <0x180000 0x10000>; + read-only; + }; + + partition@190000 { + label = "debug"; + reg = <0x190000 0x10000>; + read-only; + }; + + partition@1a0000 { + label = "oem"; + reg = <0x1a0000 0x20000>; + read-only; + }; + + factory: partition@1c0000 { + label = "Factory"; + reg = <0x1c0000 0x10000>; + read-only; + }; + + partition@1d0000 { + label = "hw_panic"; + reg = <0x1d0000 0x10000>; + read-only; + }; + + partition@1e0000 { + label = "upgrade_config"; + reg = <0x1e0000 0x10000>; + read-only; + }; + }; + }; +}; + +&blsp1_uart1 { + pinctrl-0 = <&serial_0_pins>; + pinctrl-names = "default"; + status = "okay"; +}; + +&cryptobam { + status = "okay"; +}; + +&pcie0 { + status = "okay"; + perst-gpios = <&tlmm 38 GPIO_ACTIVE_LOW>; + wake-gpios = <&tlmm 50 GPIO_ACTIVE_LOW>; + + bridge@0,0 { + reg = <0x00000000 0 0 0 0>; + #address-cells = <3>; + #size-cells = <2>; + ranges; + + wifi@1,0 { + compatible = "mediatek,mt76"; + reg = <0x0000 0 0 0 0>; + mediatek,mtd-eeprom = <&factory 0x0000>; + ieee80211-freq-limit = <2400000 2500000>; + }; + }; +}; + +&qpic_bam { + status = "okay"; +}; + +&tlmm { + mdio_pins: mdio_pinmux { + mux_1 { + pins = "gpio6"; + function = "mdio"; + bias-pull-up; + }; + + mux_2 { + pins = "gpio7"; + function = "mdc"; + bias-pull-up; + }; + }; + + serial_0_pins: serial0-pinmux { + mux { + pins = "gpio16", "gpio17"; + function = "blsp_uart0"; + bias-disable; + }; + }; +}; + +&usb3_ss_phy { + status = "okay"; +}; + +&usb3_hs_phy { + status = "okay"; +}; + +&usb2_hs_phy { + status = "okay"; +}; + +&wifi0 { + status = "okay"; + ieee80211-freq-limit = <5470000 5875000>; + qcom,ath10k-calibration-variant = "C526A"; +}; + +&wifi1 { + status = "okay"; + ieee80211-freq-limit = <5170000 5350000>; + qcom,ath10k-calibration-variant = "C526A"; +}; diff --git a/target/linux/ipq40xx/image/Makefile b/target/linux/ipq40xx/image/Makefile index b08d9cdf9f..d51c8c5eac 100644 --- a/target/linux/ipq40xx/image/Makefile +++ b/target/linux/ipq40xx/image/Makefile @@ -523,6 +523,13 @@ define Device/hiwifi_c526a endef TARGET_DEVICES += hiwifi_c526a +define Device/hiwifi_c526a-128m + $(call Device/hiwifi_c526a) + DEVICE_VARIANT := 128M + DEVICE_DTS := qcom-ipq4019-c526a-128m +endef +TARGET_DEVICES += hiwifi_c526a-128m + define Device/hugo_ac1200 $(call Device/FitImage) DEVICE_VENDOR := Hugo diff --git a/target/linux/ipq40xx/patches-5.4/901-arm-boot-add-dts-files.patch b/target/linux/ipq40xx/patches-5.4/901-arm-boot-add-dts-files.patch index b55fedd1b1..5695b81daf 100644 --- a/target/linux/ipq40xx/patches-5.4/901-arm-boot-add-dts-files.patch +++ b/target/linux/ipq40xx/patches-5.4/901-arm-boot-add-dts-files.patch @@ -10,7 +10,7 @@ Signed-off-by: John Crispin --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile -@@ -837,11 +837,57 @@ dtb-$(CONFIG_ARCH_QCOM) += \ +@@ -837,11 +837,58 @@ dtb-$(CONFIG_ARCH_QCOM) += \ qcom-apq8074-dragonboard.dtb \ qcom-apq8084-ifc6540.dtb \ qcom-apq8084-mtp.dtb \ @@ -39,6 +39,7 @@ Signed-off-by: John Crispin qcom-ipq4019-ap.dk07.1-c2.dtb \ + qcom-ipq4019-a62.dtb \ + qcom-ipq4019-c526a.dtb \ ++ qcom-ipq4019-c526a-128m.dtb \ + qcom-ipq4019-cm520-79f.dtb \ + qcom-ipq4019-ea8300.dtb \ + qcom-ipq4019-eap2200.dtb \ diff --git a/toolchain/gdb/Makefile b/toolchain/gdb/Makefile index 3bcc9d1238..05e3c7de3c 100644 --- a/toolchain/gdb/Makefile +++ b/toolchain/gdb/Makefile @@ -22,6 +22,7 @@ HOST_BUILD_PARALLEL:=1 include $(INCLUDE_DIR)/toolchain-build.mk HOST_CONFIGURE_VARS += \ + acx_cv_cc_gcc_supports_ada=false \ gdb_cv_func_sigsetjmp=yes HOST_CONFIGURE_ARGS = \ diff --git a/toolchain/glibc/common.mk b/toolchain/glibc/common.mk index fa6a792f61..549778a440 100644 --- a/toolchain/glibc/common.mk +++ b/toolchain/glibc/common.mk @@ -12,8 +12,8 @@ PKG_RELEASE:=2 PKG_SOURCE_PROTO:=git PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) -PKG_SOURCE_VERSION:=e78ea9bd26199497b9f047e421f16284297629cf -PKG_MIRROR_HASH:=1e08d10f04333cc6cd82c6cfc4c83a37db6b7ce1523b3f6e56673178379a9c2c +PKG_SOURCE_VERSION:=12ff80b312c11b0284df7a1c5cb9be6418f85228 +PKG_MIRROR_HASH:=84b7715886320794f9787976b20c868f5d6967e0ab08e6c821a8d42103c0721b PKG_SOURCE_URL:=https://sourceware.org/git/glibc.git PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.xz