Merge Official Source

Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>

include/bpf.mk

@@ -1,4 +1,4 @@
-BPF_DEPENDS := @HAS_BPF_TOOLCHAIN
+BPF_DEPENDS := @HAS_BPF_TOOLCHAIN +@NEED_BPF_TOOLCHAIN
 LLVM_VER:=
 
 CLANG_MIN_VER:=12

package/firmware/ipq-wifi/Makefile

@@ -6,9 +6,9 @@ PKG_RELEASE:=1
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL=$(PROJECT_GIT)/project/firmware/qca-wireless.git
-PKG_SOURCE_DATE:=2025-01-15
+PKG_SOURCE_DATE:=2025-02-06
-PKG_SOURCE_VERSION:=6e1801a4992fe72a98a2219f2dcd038194785971
+PKG_SOURCE_VERSION:=38b0e9ee0f3c55cda5b66736a47a68a663b220b9
-PKG_MIRROR_HASH:=569cf6894e21712ed6a5553b4fad0bbdeed14e0cc4b9292f5f86343f7897fc7e
+PKG_MIRROR_HASH:=be073d4afd116560d689ccb96beb0339195a939c9eb8d13d3bdb03ec6f1bcd7b
 PKG_FLAGS:=nonshared
 
 include $(INCLUDE_DIR)/package.mk

package/network/services/unetd/Makefile

@@ -40,6 +40,7 @@ define Package/unetd/config
 		bool "VXLAN support"
 		depends on PACKAGE_unetd
 		depends on HAS_BPF_TOOLCHAIN
+		select NEED_BPF_TOOLCHAIN
 		default y
 
 endef

package/network/utils/iwinfo/Makefile

@@ -11,9 +11,9 @@ PKG_RELEASE:=1
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL=$(PROJECT_GIT)/project/iwinfo.git
-PKG_SOURCE_DATE:=2024-10-20
+PKG_SOURCE_DATE:=2025-02-06
-PKG_SOURCE_VERSION:=b94f066e3f5839b8509483cdd8f4f582a45fa233
+PKG_SOURCE_VERSION:=9cec6b4dd2df80d4c02bad322a5db14203a92cba
-PKG_MIRROR_HASH:=ee0bce167707fe78f68a951b7ee1e0e61a92cae281e0e24eb709857ae849777e
+PKG_MIRROR_HASH:=cf85caf5f343bf607dd8fbb412e1ea9f1b4474607a6d18f61e333f068124a966
 PKG_MAINTAINER:=Jo-Philipp Wich <jo@mein.io>
 PKG_LICENSE:=GPL-2.0
 

target/linux/generic/files/drivers/mtd/nand/mtk_bmt.c

@@ -407,6 +407,7 @@ int mtk_bmt_attach(struct mtd_info *mtd)
 {
 	struct device_node *np;
 	int ret = 0;
+	u32 overridden_oobsize = 0;
 
 	if (bmtd.mtd)
 		return -ENOSPC;
@@ -431,6 +432,14 @@ int mtk_bmt_attach(struct mtd_info *mtd)
 	bmtd.mtd = mtd;
 	mtk_bmt_replace_ops(mtd);
 
+	if (!of_property_read_u32(np, "mediatek,bmt-mtd-overridden-oobsize",
+				  &overridden_oobsize))
+		if (overridden_oobsize < bmtd.mtd->oobsize) {
+			bmtd.mtd->oobsize = overridden_oobsize;
+			pr_info("NMBM: mtd OOB size has been overridden to %luB\n",
+				(long unsigned int)bmtd.mtd->oobsize);
+		}
+
 	bmtd.blk_size = mtd->erasesize;
 	bmtd.blk_shift = ffs(bmtd.blk_size) - 1;
 	bmtd.pg_size = mtd->writesize;

target/linux/mediatek/dts/mt7981b-xiaomi-mi-router-ax3000t.dts

@@ -12,6 +12,7 @@
 	mediatek,nmbm;
 	mediatek,bmt-max-ratio = <1>;
 	mediatek,bmt-max-reserved-blocks = <64>;
+	mediatek,bmt-mtd-overridden-oobsize = <64>;
 };
 
 &partitions {

target/linux/qualcommax/config-6.6

@@ -197,8 +197,10 @@ CONFIG_I2C_QUP=y
 CONFIG_IIO=y
 CONFIG_ILLEGAL_POINTER_VALUE=0xdead000000000000
 CONFIG_INITRAMFS_SOURCE=""
+# CONFIG_IPQ5018_PHY is not set
 CONFIG_IPQ_APSS_6018=y
 CONFIG_IPQ_APSS_PLL=y
+# CONFIG_IPQ_CMN_PLL is not set
 # CONFIG_IPQ_GCC_4019 is not set
 # CONFIG_IPQ_GCC_5018 is not set
 # CONFIG_IPQ_GCC_5332 is not set
@@ -333,6 +335,7 @@ CONFIG_PHY_QCOM_QMP_USB=y
 CONFIG_PHY_QCOM_QUSB2=y
 # CONFIG_PHY_QCOM_SGMII_ETH is not set
 # CONFIG_PHY_QCOM_SNPS_EUSB2 is not set
+# CONFIG_PHY_QCOM_UNIPHY_PCIE_28LP is not set
 # CONFIG_PHY_QCOM_USB_HS_28NM is not set
 # CONFIG_PHY_QCOM_USB_SNPS_FEMTO_V2 is not set
 # CONFIG_PHY_QCOM_USB_SS is not set
@@ -406,6 +409,7 @@ CONFIG_QCOM_NET_PHYLIB=y
 CONFIG_QCOM_PIL_INFO=y
 # CONFIG_QCOM_Q6V5_ADSP is not set
 CONFIG_QCOM_Q6V5_COMMON=y
+# CONFIG_QCOM_Q6V5_MPD is not set
 # CONFIG_QCOM_Q6V5_MSS is not set
 # CONFIG_QCOM_Q6V5_PAS is not set
 CONFIG_QCOM_Q6V5_WCSS=y
@@ -536,6 +540,7 @@ CONFIG_SPARSE_IRQ=y
 CONFIG_SPI=y
 CONFIG_SPI_MASTER=y
 CONFIG_SPI_MEM=y
+# CONFIG_SPI_QPIC_SNAND is not set
 CONFIG_SPI_QUP=y
 CONFIG_SQUASHFS_DECOMP_MULTI_PERCPU=y
 CONFIG_SWIOTLB=y

target/linux/qualcommax/ipq50xx/config-default

@@ -1,26 +1,21 @@
-CONFIG_QCOM_APM=y
+CONFIG_GRO_CELLS=y
-CONFIG_IPQ_GCC_5018=y
-CONFIG_PINCTRL_IPQ5018=y
-
-CONFIG_MTD_SPI_NAND=y
-CONFIG_SPI_QPIC_SNAND=y
-
-CONFIG_IPQ_CMN_PLL=y
 CONFIG_IPQ5018_PHY=y
+CONFIG_IPQ_CMN_PLL=y
+CONFIG_IPQ_GCC_5018=y
+CONFIG_LEDS_PWM=y
+CONFIG_MTD_SPI_NAND=y
+CONFIG_NET_DEVLINK=y
 CONFIG_NET_DSA=y
 CONFIG_NET_DSA_QCA8K=y
 CONFIG_NET_DSA_TAG_QCA=y
-CONFIG_QCA83XX_PHY=y
+CONFIG_PHYLINK=y
-
+CONFIG_PHY_QCOM_M31_USB=y
-CONFIG_QCOM_Q6V5_MPD=y
-CONFIG_QCOM_QMI_HELPERS=y
-
 CONFIG_PHY_QCOM_UNIPHY_PCIE_28LP=y
-CONFIG_PCIE_QCOM=y
+CONFIG_PINCTRL_IPQ5018=y
-
 CONFIG_PWM=y
 CONFIG_PWM_IPQ=y
-CONFIG_LEDS_PWM=y
+CONFIG_PWM_SYSFS=y
-
+CONFIG_QCA83XX_PHY=y
-CONFIG_PHY_QCOM_M31_USB=y
+CONFIG_QCOM_APM=y
-CONFIG_USB_DWC3_QCOM=y
+CONFIG_QCOM_Q6V5_MPD=y
+CONFIG_SPI_QPIC_SNAND=y

toolchain/Config.in

@@ -40,9 +40,8 @@ menuconfig TARGET_OPTIONS
 
 	choice BPF_TOOLCHAIN
 		prompt "BPF toolchain" if DEVEL
-		default BPF_TOOLCHAIN_BUILD_LLVM if BUILDBOT
 		default BPF_TOOLCHAIN_PREBUILT if HAS_PREBUILT_LLVM_TOOLCHAIN
-		default BPF_TOOLCHAIN_NONE
+		default BPF_TOOLCHAIN_BUILD_LLVM
 
 		config BPF_TOOLCHAIN_NONE
 			bool "None"
@@ -57,7 +56,7 @@ menuconfig TARGET_OPTIONS
 			bool "Use host LLVM toolchain"
 
 		config BPF_TOOLCHAIN_BUILD_LLVM
-			select USE_LLVM_BUILD
+			select USE_LLVM_BUILD if NEED_BPF_TOOLCHAIN
 			bool "Build LLVM toolchain for eBPF"
 			help
 			  If enabled, a LLVM toolchain for building eBPF binaries will be built.
@@ -320,23 +319,24 @@ config GDB_PYTHON
 	  Enable the python bindings for GDB to allow using python in the gdb shell.
 
 config HAS_BPF_TOOLCHAIN
+	default y if !BPF_TOOLCHAIN_NONE
+	bool
+
+config NEED_BPF_TOOLCHAIN
 	bool
 
 config HAS_PREBUILT_LLVM_TOOLCHAIN
 	def_bool $(shell, [ -f llvm-bpf/.llvm-version ] && echo y || echo n)
 
 config USE_LLVM_HOST
-	select HAS_BPF_TOOLCHAIN
 	bool
 
 config USE_LLVM_PREBUILT
-	select HAS_BPF_TOOLCHAIN
 	default y if !DEVEL && !BUILDBOT && HAS_PREBUILT_LLVM_TOOLCHAIN
 	bool
 
 config USE_LLVM_BUILD
-	default y if !DEVEL && BUILDBOT
+	default y if !DEVEL && NEED_BPF_TOOLCHAIN && (BUILDBOT || !HAS_PREBUILT_LLVM_TOOLCHAIN)
-	select HAS_BPF_TOOLCHAIN
 	bool
 
 config USE_GLIBC

tools/Makefile

@@ -148,8 +148,9 @@ endif
 
 ifneq ($(CONFIG_CCACHE)$(CONFIG_SDK),)
 $(foreach tool, $(filter-out zstd zlib xz pkgconf patch ninja meson libressl expat cmake,$(tools-y)), $(eval $(curdir)/$(tool)/compile += $(curdir)/ccache/compile))
-tools-y += ccache
+tools-y += ccache xxhash
-$(curdir)/ccache/compile := $(curdir)/cmake/compile
+$(curdir)/xxhash/compile := $(curdir)/cmake/compile
+$(curdir)/ccache/compile := $(curdir)/xxhash/compile
 endif
 
 # in case there is no patch tool on the host we need to make patch tool a

tools/ccache/Makefile

@@ -22,6 +22,7 @@ CMAKE_HOST_OPTIONS += \
 	-DCMAKE_SKIP_RPATH=FALSE \
 	-DCMAKE_INSTALL_RPATH="${STAGING_DIR_HOST}/lib" \
 	-DENABLE_DOCUMENTATION=OFF \
-	-DREDIS_STORAGE_BACKEND=OFF
+	-DREDIS_STORAGE_BACKEND=OFF \
+	-DENABLE_TESTING=OFF
 
 $(eval $(call HostBuild))

tools/xxhash/Makefile

@@ -0,0 +1,25 @@
+# SPDX-License-Identifier: GPL-2.0-only
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=xxHash
+PKG_VERSION:=0.8.3
+
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_URL=https://github.com/Cyan4973/xxHash
+PKG_SOURCE_VERSION:=e626a72bc2321cd320e953a0ccf1584cad60f363
+PKG_MIRROR_HASH:=234cfc24004c1b97d3ec9c48e976347b31a513a68de40f57a765667eb89dbbb0
+
+PKG_LICENSE:=BSD-2-Clause
+PKG_LICENSE_FILES:=LICENSE
+
+include $(INCLUDE_DIR)/host-build.mk
+include $(INCLUDE_DIR)/cmake.mk
+
+CMAKE_C_COMPILER_LAUNCHER :=
+CMAKE_CXX_COMPILER_LAUNCHER :=
+
+CMAKE_BINARY_SUBDIR := build
+CMAKE_SOURCE_SUBDIR := cmake_unofficial
+
+$(eval $(call HostBuild))