Merge pull request #66 from coolsnowwolf/master

20250106 日常更新
xayane · Jan 6, 2025 · 1e2c3c0 · 1e2c3c0
2 parents 9ef2860 + f404679
commit 1e2c3c0
Show file tree

Hide file tree

Showing 46 changed files with 699 additions and 335 deletions.
diff --git a/README.md b/README.md
@@ -37,12 +37,12 @@ ArmSoM-Sige 系列：软路由、单板计算机、小型服务器与智能家
    sudo apt update -y
    sudo apt full-upgrade -y
    sudo apt install -y ack antlr3 asciidoc autoconf automake autopoint binutils bison build-essential \
-   bzip2 ccache clang cmake cpio curl device-tree-compiler flex gawk gettext gcc-multilib g++-multilib \
-   git gperf haveged help2man intltool libc6-dev-i386 libelf-dev libfuse-dev libglib2.0-dev libgmp3-dev \
-   libltdl-dev libmpc-dev libmpfr-dev libncurses-dev libncurses-dev libpython3-dev libreadline-dev \
-   libssl-dev libtool llvm lrzsz genisoimage msmtp ninja-build p7zip p7zip-full patch pkgconf python3 \
-   python3-pyelftools python3-setuptools qemu-utils rsync scons squashfs-tools subversion swig texinfo \
-   uglifyjs upx-ucl unzip vim wget xmlto xxd zlib1g-dev
+   bzip2 ccache clang cmake cpio curl device-tree-compiler flex gawk gcc-multilib g++-multilib gettext \
+   genisoimage git gperf haveged help2man intltool libc6-dev-i386 libelf-dev libfuse-dev libglib2.0-dev \
+   libgmp3-dev libltdl-dev libmpc-dev libmpfr-dev libncurses5-dev libncursesw5-dev libpython3-dev \
+   libreadline-dev libssl-dev libtool llvm lrzsz msmtp ninja-build p7zip p7zip-full patch pkgconf \
+   python3 python3-pyelftools python3-setuptools qemu-utils rsync scons squashfs-tools subversion \
+   swig texinfo uglifyjs upx-ucl unzip vim wget xmlto xxd zlib1g-dev
    ```
 
 3. 下载源代码，更新 feeds 并选择配置

diff --git a/README_EN.md b/README_EN.md
@@ -38,12 +38,12 @@ Buy Link ：
    sudo apt update -y
    sudo apt full-upgrade -y
    sudo apt install -y ack antlr3 asciidoc autoconf automake autopoint binutils bison build-essential \
-   bzip2 ccache cmake cpio curl device-tree-compiler fastjar flex gawk gettext gcc-multilib g++-multilib \
-   git gperf haveged help2man intltool libc6-dev-i386 libelf-dev libglib2.0-dev libgmp3-dev libltdl-dev \
-   libmpc-dev libmpfr-dev libncurses5-dev libncursesw5-dev libreadline-dev libssl-dev libtool lrzsz \
-   mkisofs msmtp nano ninja-build p7zip p7zip-full patch pkgconf python2.7 python3 python3-pyelftools \
-   libpython3-dev qemu-utils rsync scons squashfs-tools subversion swig texinfo uglifyjs upx-ucl unzip \
-   vim wget xmlto xxd zlib1g-dev python3-setuptools
+   bzip2 ccache clang cmake cpio curl device-tree-compiler flex gawk gcc-multilib g++-multilib gettext \
+   git gperf haveged help2man intltool libc6-dev-i386 libelf-dev libfuse-dev libglib2.0-dev libgmp3-dev \
+   libltdl-dev libmpc-dev libmpfr-dev libncurses5-dev libncursesw5-dev libpython3-dev libreadline-dev \
+   libssl-dev libtool llvm lrzsz mkisofs msmtp nano ninja-build p7zip p7zip-full patch pkgconf python3 \
+   python3-pyelftools python3-setuptools qemu-utils rsync scons squashfs-tools subversion swig texinfo \
+   uglifyjs upx-ucl unzip vim wget xmlto xxd zlib1g-dev
    ```
 
 3. Clone the source code, update `feeds` and configure:
@@ -193,11 +193,6 @@ Yingku R2 - N95/N300 Mini Four-Network HomeLab Server
 
 ## Donation
 
-<!--
-如果你觉得此项目对你有帮助，可以捐助我们，以鼓励项目能持续发展，更加完善
-
- ![star](doc/star.png)
--->
 If this project did helped you, please consider donating to support the development of this project.
 
 <div align="left">

diff --git a/README_JA.md b/README_JA.md
@@ -28,12 +28,12 @@ I18N: [English](README_EN.md) | [简体中文](README.md) | [日本語](README_J
    sudo apt update -y
    sudo apt full-upgrade -y
    sudo apt install -y ack antlr3 asciidoc autoconf automake autopoint binutils bison build-essential \
-   bzip2 ccache cmake cpio curl device-tree-compiler fastjar flex gawk gettext gcc-multilib g++-multilib \
-   git gperf haveged help2man intltool libc6-dev-i386 libelf-dev libglib2.0-dev libgmp3-dev libltdl-dev \
-   libmpc-dev libmpfr-dev libncurses5-dev libncursesw5-dev libreadline-dev libssl-dev libtool lrzsz \
-   mkisofs msmtp nano ninja-build p7zip p7zip-full patch pkgconf python2.7 python3 python3-pyelftools \
-   libpython3-dev qemu-utils rsync scons squashfs-tools subversion swig texinfo uglifyjs upx-ucl unzip \
-   vim wget xmlto xxd zlib1g-dev python3-setuptools
+   bzip2 ccache clang cmake cpio curl device-tree-compiler flex gawk gcc-multilib g++-multilib gettext \
+   git gperf haveged help2man intltool libc6-dev-i386 libelf-dev libfuse-dev libglib2.0-dev libgmp3-dev \
+   libltdl-dev libmpc-dev libmpfr-dev libncurses5-dev libncursesw5-dev libpython3-dev libreadline-dev \
+   libssl-dev libtool llvm lrzsz mkisofs msmtp nano ninja-build p7zip p7zip-full patch pkgconf python3 \
+   python3-pyelftools python3-setuptools qemu-utils rsync scons squashfs-tools subversion swig texinfo \
+   uglifyjs upx-ucl unzip vim wget xmlto xxd zlib1g-dev
    ```
 
 3. ソースコードをクローンし、`feeds` を更新し、設定する:

diff --git a/include/kernel-5.10 b/include/kernel-5.10
@@ -1,2 +1,2 @@
-LINUX_VERSION-5.10 = .231
-LINUX_KERNEL_HASH-5.10.231 = 565a4883cc460af9f338966fca51a84bcba13dc7e47a563e32639115cba79675
+LINUX_VERSION-5.10 = .232
+LINUX_KERNEL_HASH-5.10.232 = fda44589a438dff8c718082e9a48843b15e5eb82f6cc2f98d48f48226063bef0
diff --git a/include/kernel-5.15 b/include/kernel-5.15
@@ -1,2 +1,2 @@
-LINUX_VERSION-5.15 = .174
-LINUX_KERNEL_HASH-5.15.174 = c3e63cb864a05b6bbc886613c9e91714106b7a9ab40c31c101da0ca5b64d760a
+LINUX_VERSION-5.15 = .175
+LINUX_KERNEL_HASH-5.15.175 = 8fd8bbc80e7aae30aaca3b40576b283010b5e84e70f6fea1573589155ce8a9d0
diff --git a/include/kernel-5.4 b/include/kernel-5.4
@@ -1,2 +1,2 @@
-LINUX_VERSION-5.4 = .287
-LINUX_KERNEL_HASH-5.4.287 = 0d0ffae5bf0e6f9c6a1ce42da2bc2a8696ca55721c103497eb1245be8cc04b20
+LINUX_VERSION-5.4 = .288
+LINUX_KERNEL_HASH-5.4.288 = 876fbae303723bcf9e01ab57b1a0a7d38045aacd481ff865dccc2cc89f591afe
diff --git a/include/kernel-6.1 b/include/kernel-6.1
@@ -1,2 +1,2 @@
-LINUX_VERSION-6.1 = .120
-LINUX_KERNEL_HASH-6.1.120 = 61c997b8acbbb8ab184565e96f476ecbb7e773cb35b98a1a4c832d809b2bf719
+LINUX_VERSION-6.1 = .121
+LINUX_KERNEL_HASH-6.1.121 = ddbc16da602f731585038fa4d12a777a78d4b74cb2a3cc9981107b52054d3b43
diff --git a/include/kernel-6.12 b/include/kernel-6.12
@@ -1,2 +1,2 @@
-LINUX_VERSION-6.12 = .5
-LINUX_KERNEL_HASH-6.12.5 = 39207fce1ce42838e085261bae0af5ce4a0843aa777cfc0f5c49bc7729602bcd
+LINUX_VERSION-6.12 = .8
+LINUX_KERNEL_HASH-6.12.8 = 2291da065ca04b715c89ee50362aec3f021a7414bc963f1b56736682c8122979
diff --git a/include/kernel-6.6 b/include/kernel-6.6
@@ -1,2 +1,2 @@
-LINUX_VERSION-6.6 = .66
-LINUX_KERNEL_HASH-6.6.66 = 9d757937c4661c2f512c62641b74ef74eff9bb13dc5dbcbaaa108c21152f1e52
+LINUX_VERSION-6.6 = .69
+LINUX_KERNEL_HASH-6.6.69 = 9c6305567b75d99514cde6eb9de39973f3d5c857a75bd9dcdfca57041f8d4f34
diff --git a/...age/boot/uboot-rockchip/patches/302-rockchip-rk3399-Add-support-for-rumu3f-fine3399.patch b/...age/boot/uboot-rockchip/patches/302-rockchip-rk3399-Add-support-for-rumu3f-fine3399.patch
@@ -1,4 +1,21 @@
 --- /dev/null
++++ b/arch/arm/dts/rk3399-fine-3399-u-boot.dtsi
+@@ -0,0 +1,14 @@
++// SPDX-License-Identifier: GPL-2.0+
++
++#include "rk3399-u-boot.dtsi"
++#include "rk3399-sdram-lpddr4-100.dtsi"
++
++/ {
++	chosen {
++		u-boot,spl-boot-order = "same-as-spl", &sdhci, &sdmmc;
++	};
++};
++
++&vdd_log {
++	regulator-init-microvolt = <950000>;
++};
+--- /dev/null
 +++ b/arch/arm/dts/rk3399-fine-3399.dts
 @@ -0,0 +1,789 @@
 +// SPDX-License-Identifier: (GPL-2.0+ OR MIT)

diff --git a/package/firmware/linux-firmware/mediatek.mk b/package/firmware/linux-firmware/mediatek.mk
@@ -69,6 +69,15 @@ define Package/mt7922bt-firmware/install
 endef
 $(eval $(call BuildPackage,mt7922bt-firmware))
 
+Package/mt7925bt-firmware = $(call Package/firmware-default,mt7925bt firmware)
+define Package/mt7925bt-firmware/install
+	$(INSTALL_DIR) $(1)/lib/firmware/mediatek/mt7925
+	$(INSTALL_DATA) \
+		$(PKG_BUILD_DIR)/mediatek/mt7925/BT_RAM_CODE_MT7925_1_1_hdr.bin \
+		$(1)/lib/firmware/mediatek/mt7925
+endef
+$(eval $(call BuildPackage,mt7925bt-firmware))
+
 Package/mt7981-wo-firmware = $(call Package/firmware-default,MT7981 offload firmware)
 define Package/mt7981-wo-firmware/install
 	$(INSTALL_DIR) $(1)/lib/firmware/mediatek

diff --git a/package/kernel/linux/modules/netdevices.mk b/package/kernel/linux/modules/netdevices.mk
@@ -1506,20 +1506,22 @@ $(eval $(call KernelPackage,bnx2x))
 
 define KernelPackage/bnxt-en
   SUBMENU:=$(NETWORK_DEVICES_MENU)
-  TITLE:=BCM 574xx/575xx 10/25/50-Gigabit ethernet adapter driver
-  DEPENDS:=@PCI_SUPPORT  +kmod-lib-crc32c +kmod-mdio +kmod-ptp +kmod-lib-zlib-inflate +kmod-hwmon-core
+  TITLE:=Broadcom NetXtreme-C/E network driver
+  DEPENDS:=@PCI_SUPPORT +kmod-hwmon-core +kmod-lib-crc32c +kmod-mdio +kmod-ptp
   FILES:=$(LINUX_DIR)/drivers/net/ethernet/broadcom/bnxt/bnxt_en.ko
   KCONFIG:= \
-	CONFIG_BNXT \
-	CONFIG_BNXT_SRIOV=y \
-  	CONFIG_BNXT_FLOWER_OFFLOAD=y \
-  	CONFIG_BNXT_DCB=n \
-  	CONFIG_BNXT_HWMON=y
+	  CONFIG_BNXT \
+	  CONFIG_BNXT_SRIOV=y \
+	  CONFIG_BNXT_FLOWER_OFFLOAD=y \
+	  CONFIG_BNXT_DCB=n \
+	  CONFIG_BNXT_HWMON=y
   AUTOLOAD:=$(call AutoProbe,bnxt_en)
 endef
 
 define KernelPackage/bnxt-en/description
-  Broadcom 573xx/574xx/575xx 10/25/40/50-Gigabit ethernet adapter Driver
+  Supports Broadcom NetXtreme-C/E based Ethernet NICs including:
+  * BCM573xx
+  * BCM574xx
 endef
 
 $(eval $(call KernelPackage,bnxt-en))

diff --git a/package/lean/aic8800/Makefile b/package/lean/aic8800/Makefile
@@ -9,10 +9,10 @@ PKG_NAME:=aic8800
 PKG_RELEASE:=1
 
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_DATE:=2024-03-04
+PKG_SOURCE_DATE:=2024-06-20
 PKG_SOURCE_URL:=https://github.com/radxa-pkg/aic8800.git
-PKG_SOURCE_VERSION:=6a7ec8536a1688a785740d98ca96a4d00b274c56
-PKG_MIRROR_HASH:=75bbd6f410089d8301663aebdeeb79027420ec45dd054b5851c408dfeef23776
+PKG_SOURCE_VERSION:=8ad987876a6220fffb40a755e0454250ce2c5fdd
+PKG_MIRROR_HASH:=4a22e28a4341eb7516f03ea7e6c1c0523013e1aaf72c17428eb3749c8f553856
 
 MAKE_PATH:=src/SDIO/driver_fw/driver/aic8800
 PKG_EXTMOD_SUBDIRS:=$(MAKE_PATH)

diff --git a/package/lean/aic8800/patches/010-fixes-build.patch b/package/lean/aic8800/patches/010-fixes-build.patch
@@ -1,6 +1,6 @@
 --- a/src/SDIO/driver_fw/driver/aic8800/aic8800_fdrv/rwnx_main.c
 +++ b/src/SDIO/driver_fw/driver/aic8800/aic8800_fdrv/rwnx_main.c
-@@ -2932,7 +2932,7 @@ static struct rwnx_vif *rwnx_interface_a
+@@ -2997,7 +2997,7 @@ static struct rwnx_vif *rwnx_interface_a
  		vif->ap.generation = 0;
  		vif->ap.mesh_pm = NL80211_MESH_POWER_ACTIVE;
  		vif->ap.next_mesh_pm = NL80211_MESH_POWER_ACTIVE;
@@ -9,7 +9,7 @@
  	case NL80211_IFTYPE_AP:
  		INIT_LIST_HEAD(&vif->ap.sta_list);
  		memset(&vif->ap.bcn, 0, sizeof(vif->ap.bcn));
-@@ -3349,7 +3349,7 @@ static int rwnx_cfg80211_change_iface(st
+@@ -3414,7 +3414,7 @@ static int rwnx_cfg80211_change_iface(st
  		INIT_LIST_HEAD(&vif->ap.proxy_list);
  		vif->ap.create_path = false;
  		vif->ap.generation = 0;
@@ -18,15 +18,15 @@
  	case NL80211_IFTYPE_AP:
  	case NL80211_IFTYPE_P2P_GO:
  		INIT_LIST_HEAD(&vif->ap.sta_list);
-@@ -5257,6 +5257,7 @@ static int rwnx_cfg80211_mgmt_tx(struct
+@@ -5333,6 +5333,7 @@ static int rwnx_cfg80211_mgmt_tx(struct
  	switch (RWNX_VIF_TYPE(rwnx_vif)) {
  	case NL80211_IFTYPE_AP_VLAN:
  		rwnx_vif = rwnx_vif->ap_vlan.master;
 +		fallthrough;
  	case NL80211_IFTYPE_AP:
  	case NL80211_IFTYPE_P2P_GO:
  	case NL80211_IFTYPE_MESH_POINT:
-@@ -5569,7 +5570,7 @@ rwnx_cfg80211_tdls_mgmt(struct wiphy *wi
+@@ -5645,7 +5646,7 @@ rwnx_cfg80211_tdls_mgmt(struct wiphy *wi
  			printk("%s: only one TDLS link is supported!\n", __func__);
  			status_code = WLAN_STATUS_REQUEST_DECLINED;
  		}
@@ -35,7 +35,7 @@
  	case WLAN_TDLS_SETUP_REQUEST:
  	case WLAN_TDLS_TEARDOWN:
  	case WLAN_TDLS_DISCOVERY_REQUEST:
-@@ -5889,6 +5890,7 @@ static int rwnx_fill_station_info(struct
+@@ -5965,6 +5966,7 @@ static int rwnx_fill_station_info(struct
  #if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 19, 0)
  	case FORMATMOD_HE_MU:
  		sinfo->rxrate.he_ru_alloc = rx_vect1->he.ru_size;
@@ -104,7 +104,7 @@
  	{
 --- a/src/SDIO/driver_fw/driver/aic8800/aic8800_fdrv/rwnx_txq.c
 +++ b/src/SDIO/driver_fw/driver/aic8800/aic8800_fdrv/rwnx_txq.c
-@@ -635,6 +635,7 @@ static inline void rwnx_txq_vif_for_each
+@@ -640,6 +640,7 @@ static inline void rwnx_txq_vif_for_each
  	}
  	case NL80211_IFTYPE_AP_VLAN:
  		rwnx_vif = rwnx_vif->ap_vlan.master;

diff --git a/package/lean/aic8800/patches/030-wireless-5.15.patch b/package/lean/aic8800/patches/030-wireless-5.15.patch
@@ -11,7 +11,7 @@
  #define IEEE80211_HE_PHY_CAP6_TRIG_SU_BEAMFORMER_FB         IEEE80211_HE_PHY_CAP6_TRIG_SU_BEAMFORMING_FB
 --- a/src/SDIO/driver_fw/driver/aic8800/aic8800_fdrv/rwnx_main.c
 +++ b/src/SDIO/driver_fw/driver/aic8800/aic8800_fdrv/rwnx_main.c
-@@ -2998,7 +2998,7 @@ static struct rwnx_vif *rwnx_interface_a
+@@ -3063,7 +3063,7 @@ static struct rwnx_vif *rwnx_interface_a
  	} else
  		vif->use_4addr = false;
 
@@ -20,7 +20,7 @@
          if (cfg80211_register_netdevice(ndev))
  #else
          if (register_netdevice(ndev))
-@@ -3271,7 +3271,7 @@ static int rwnx_cfg80211_del_iface(struc
+@@ -3336,7 +3336,7 @@ static int rwnx_cfg80211_del_iface(struc
 
  	if (dev->reg_state == NETREG_REGISTERED) {
          /* Will call rwnx_close if interface is UP */