Update QCA Source

2025-12-16 16:57:28 +00:00 · 2025-05-25 17:06:03 +08:00 · 2025-05-25 17:06:03 +08:00 · bc49af5d27
commit bc49af5d27
parent 12da9c6dcb
10 changed files with 40 additions and 55 deletions
--- a/Config.in
+++ b/Config.in
@ -2,7 +2,7 @@
 #
 # Copyright (C) 2006-2013 OpenWrt.org

-mainmenu "ImmortalWrt Configuration"
+mainmenu "LibWRT Configuration"

 config MODULES
 	modules
--- a/config/Config-images.in
+++ b/config/Config-images.in
@ -247,7 +247,7 @@ menu "Target Images"
 	config GRUB_TITLE
 		string "Title for the menu entry in GRUB"
 		depends on GRUB_IMAGES || GRUB_EFI_IMAGES
-		default "ImmortalWrt"
+		default "LibWRT"
 		help
 		  This is the title of the GRUB menu entry.
 		  If unspecified, it defaults to OpenWrt.
--- a/include/version.mk
+++ b/include/version.mk
@ -36,11 +36,11 @@ VERSION_REPO:=$(call qstrip,$(CONFIG_VERSION_REPO))
 VERSION_REPO:=$(if $(VERSION_REPO),$(VERSION_REPO),https://downloads.immortalwrt.org/snapshots)

 VERSION_DIST:=$(call qstrip,$(CONFIG_VERSION_DIST))
-VERSION_DIST:=$(if $(VERSION_DIST),$(VERSION_DIST),LibWrt)
+VERSION_DIST:=$(if $(VERSION_DIST),$(VERSION_DIST),LibWRT)
 VERSION_DIST_SANITIZED:=$(call sanitize,$(VERSION_DIST))

 VERSION_MANUFACTURER:=$(call qstrip,$(CONFIG_VERSION_MANUFACTURER))
-VERSION_MANUFACTURER:=$(if $(VERSION_MANUFACTURER),$(VERSION_MANUFACTURER),LibWrt)
+VERSION_MANUFACTURER:=$(if $(VERSION_MANUFACTURER),$(VERSION_MANUFACTURER),LibWRT)

 VERSION_MANUFACTURER_URL:=$(call qstrip,$(CONFIG_VERSION_MANUFACTURER_URL))
 VERSION_MANUFACTURER_URL:=$(if $(VERSION_MANUFACTURER_URL),$(VERSION_MANUFACTURER_URL),https://immortalwrt.org/)
--- a/package/base-files/files/bin/config_generate
+++ b/package/base-files/files/bin/config_generate
@ -311,7 +311,7 @@ generate_static_system() {
 	uci -q batch <<-EOF
 		delete system.@system[0]
 		add system system
-		set system.@system[-1].hostname='ImmortalWrt'
+		set system.@system[-1].hostname='LibWRT'
 		set system.@system[-1].timezone='CST-8'
 		set system.@system[-1].zonename='Asia/Shanghai'
 		set system.@system[-1].ttylogin='0'
--- a/package/base-files/image-config.in
+++ b/package/base-files/image-config.in
@ -165,10 +165,10 @@ if VERSIONOPT
 	config VERSION_DIST
 		string
 		prompt "Release distribution"
-		default "ImmortalWrt"
+		default "LibWRT"
 		help
 			This is the name of the release distribution.
-			If unspecified, it defaults to ImmortalWrt.
+			If unspecified, it defaults to LibWRT.

 	config VERSION_NUMBER
 		string
--- a/package/network/config/wifi-scripts/files/lib/wifi/mac80211.uc
+++ b/package/network/config/wifi-scripts/files/lib/wifi/mac80211.uc
@ -104,7 +104,7 @@ set ${si}=wifi-iface
 set ${si}.device='${name}'
 set ${si}.network='lan'
 set ${si}.mode='ap'
-set ${si}.ssid='${defaults?.ssid || "ImmortalWrt"}'
+set ${si}.ssid='${defaults?.ssid || "LibWRT"}'
 set ${si}.encryption='${defaults?.encryption || "none"}'
 set ${si}.key='${defaults?.key || ""}'

--- a/target/linux/qualcommax/base-files/etc/uci-defaults/990_set-wireless.sh
+++ b/target/linux/qualcommax/base-files/etc/uci-defaults/990_set-wireless.sh
@ -2,7 +2,7 @@
 . /usr/share/libubox/jshn.sh

 # 默认WIFI设置
-BASE_SSID='OWRT'
+BASE_SSID='LibWRT'
 BASE_WORD='12345678'
 BASE_POWER='auto'

--- a/target/linux/qualcommax/config-6.12
+++ b/target/linux/qualcommax/config-6.12
@ -534,6 +534,10 @@ CONFIG_SERIAL_MSM=y
 CONFIG_SERIAL_MSM_CONSOLE=y
 CONFIG_SGL_ALLOC=y
 CONFIG_SG_POOL=y
+CONFIG_SKB_RECYCLER=y
+# CONFIG_SKB_RECYCLER_MULTI_CPU is not set
+# CONFIG_SKB_RECYCLER_PREALLOC is not set
+CONFIG_SKB_RECYCLE_SIZE=2304
 CONFIG_SMP=y
 # CONFIG_SM_CAMCC_4450 is not set
 # CONFIG_SM_CAMCC_6350 is not set
--- a/target/linux/qualcommax/patches-6.12/0600-1-qca-nss-ecm-support-CORE.patch
+++ b/target/linux/qualcommax/patches-6.12/0600-1-qca-nss-ecm-support-CORE.patch
@ -760,6 +760,33 @@
 	}
 #undef N
 	return "UNKNOWN_NETDEV_EVENT";
+@@ -12049,7 +12050,7 @@ static void __init net_dev_struct_check(
+ #ifdef CONFIG_NET_XGRESS
+ 	CACHELINE_ASSERT_GROUP_MEMBER(struct net_device, net_device_read_tx, tcx_egress);
+ #endif
+-	CACHELINE_ASSERT_GROUP_SIZE(struct net_device, net_device_read_tx, 160);
+	CACHELINE_ASSERT_GROUP_SIZE(struct net_device, net_device_read_tx, 192);
+ 
+ 	/* TXRX read-mostly hotpath */
+ 	CACHELINE_ASSERT_GROUP_MEMBER(struct net_device, net_device_read_txrx, lstats);
+@@ -12058,7 +12059,7 @@ static void __init net_dev_struct_check(
+ 	CACHELINE_ASSERT_GROUP_MEMBER(struct net_device, net_device_read_txrx, hard_header_len);
+ 	CACHELINE_ASSERT_GROUP_MEMBER(struct net_device, net_device_read_txrx, features);
+ 	CACHELINE_ASSERT_GROUP_MEMBER(struct net_device, net_device_read_txrx, ip6_ptr);
+-	CACHELINE_ASSERT_GROUP_SIZE(struct net_device, net_device_read_txrx, 46);
+	CACHELINE_ASSERT_GROUP_SIZE(struct net_device, net_device_read_txrx, 64);
+ 
+ 	/* RX read-mostly hotpath */
+ 	CACHELINE_ASSERT_GROUP_MEMBER(struct net_device, net_device_read_rx, ptype_specific);
+@@ -12078,7 +12079,7 @@ static void __init net_dev_struct_check(
+ #ifdef CONFIG_NET_XGRESS
+ 	CACHELINE_ASSERT_GROUP_MEMBER(struct net_device, net_device_read_rx, tcx_ingress);
+ #endif
+-	CACHELINE_ASSERT_GROUP_SIZE(struct net_device, net_device_read_rx, 104);
+	CACHELINE_ASSERT_GROUP_SIZE(struct net_device, net_device_read_rx, 128);
+ }
+ 
+ /*
 --- a/net/ipv6/addrconf.c
 +++ b/net/ipv6/addrconf.c
@@ -993,6 +993,7 @@ void inet6_ifa_finish_destroy(struct ine
--- a/target/linux/qualcommax/patches-6.6/0401-spi-spi-qpic-snand-default-to-4-bit-ECC.patch
+++ b/target/linux/qualcommax/patches-6.6/0401-spi-spi-qpic-snand-default-to-4-bit-ECC.patch
@ -1,46 +0,0 @@
-From 2e1ab53e8fcf708db51f560f7846802d406ee57d Mon Sep 17 00:00:00 2001
-From: George Moussalem <george.moussalem@outlook.com>
-Date: Thu, 15 May 2025 22:47:43 +0200
-Subject: [PATCH] spi: spi-qpic-snand: default to 4-bit ECC
-
-There are NAND IC-s that define 1-bit ECC as the minimal strength,
-however that is unsupported by QPIC-SNAND as it only supports 4 or 8 bit
-ECC.
-
-Since most of these chips also support 4-bit ECC just fine, instead of
-erroring out if 1-bit ECC is requested lets instead default to 4-bit ECC.
-
-Fixes: 01b72ce61e8f ("qualcommax: ipq50xx: remove ECC user config from board files")
-Signed-off-by: George Moussalem <george.moussalem@outlook.com>
-Signed-off-by: Robert Marko <robimarko@gmail.com>
---
- drivers/spi/spi-qpic-snand.c | 18 ++++++++++++++++++
- 1 file changed, 18 insertions(+)
-
--- a/drivers/spi/spi-qpic-snand.c
-+++ b/drivers/spi/spi-qpic-snand.c
-@@ -296,6 +296,24 @@ static int qcom_spi_ecc_init_ctx_pipelin
- 		ecc_cfg->spare_bytes = 2;
- 		break;
- 
-+	case 1:
-+	case 2:
-+		/*
-+		 * Many chips have set a minimum ECC strength requirement
-+		 * lower than 4-bits but also support higher strength, so
-+		 * check if ecc_cfg was set by chip reqs and try 4-bits.
-+		 */
-+		if (reqs->strength) {
-+			dev_warn(snandc->dev,
-+			         "ECC strength requirement of %u-bit(s) is unsupported, trying 4-bits\n",
-+			         reqs->strength);
-+			ecc_cfg->ecc_mode = ECC_MODE_4BIT;
-+			ecc_cfg->ecc_bytes_hw = 7;
-+			ecc_cfg->spare_bytes = 4;
-+			break;
-+		} else
-+			fallthrough;
-+
- 	default:
- 		dev_err(snandc->dev,
- 			"only 4 or 8 bits ECC strength is supported\n");