Merge branch 'immortalwrt:master' into master

package/boot/uboot-rockchip/Makefile

@@ -5,9 +5,9 @@
 include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
-PKG_VERSION:=2024.10
+PKG_VERSION:=2025.01
 PKG_RELEASE:=1
-PKG_HASH:=b28daf4ac17e43156363078bf510297584137f6df50fced9b12df34f61a92fb0
+PKG_HASH:=cdef7d507c93f1bbd9f015ea9bc21fa074268481405501945abc6f854d5b686f
 
 PKG_MAINTAINER:=Sarah Maedel <[email protected]>
 
@@ -442,6 +442,7 @@ UBOOT_CUSTOMIZE_CONFIG := \
 		--disable EFI_CAPSULE_FIRMWARE_RAW \
 		--disable SPL_FIT_SIGNATURE \
 		--disable USB_FUNCTION_FASTBOOT \
+		--disable VIDEO \
 	)
 
 UBOOT_MAKE_FLAGS += \

package/boot/uboot-rockchip/patches/101-rockchip-boot_mode-Allow-rockchip_dnl_key_pressed-in-SPL.patch

@@ -26,7 +26,7 @@ Signed-off-by: Chris Morgan <[email protected]>
 
  obj-spl-$(CONFIG_ROCKCHIP_RK3036) += rk3036-board-spl.o
 
--ifeq ($(CONFIG_SPL_BUILD)$(CONFIG_TPL_BUILD),)
+-ifeq ($(CONFIG_XPL_BUILD)$(CONFIG_TPL_BUILD),)
 -
  # Always include boot_mode.o, as we bypass it (i.e. turn it off)
  # inside of boot_mode.c when CONFIG_ROCKCHIP_BOOT_MODE_REG is 0.  This way,
@@ -101,7 +101,7 @@ Signed-off-by: Chris Morgan <[email protected]>
  #include <asm/arch-rockchip/grf_rk3568.h>
  #include <asm/arch-rockchip/hardware.h>
  #include <dt-bindings/clock/rk3568-cru.h>
-@@ -133,3 +134,26 @@ int arch_cpu_init(void)
+@@ -139,3 +140,26 @@ int arch_cpu_init(void)
  #endif
  	return 0;
  }

package/boot/uboot-rockchip/patches/200-add-photonicat-board-watchdog-support.patch

@@ -1,13 +1,13 @@
 --- a/drivers/watchdog/Makefile
 +++ b/drivers/watchdog/Makefile
-@@ -50,3 +50,4 @@ obj-$(CONFIG_WDT_STM32MP) += stm32mp_wdt
+@@ -52,3 +52,4 @@ obj-$(CONFIG_WDT_STM32MP) += stm32mp_wdt
  obj-$(CONFIG_WDT_SUNXI) += sunxi_wdt.o
  obj-$(CONFIG_WDT_TANGIER) += tangier_wdt.o
  obj-$(CONFIG_WDT_XILINX) += xilinx_wwdt.o
 +obj-$(CONFIG_WDT_PCAT) += pcat_wdt.o
 --- a/drivers/watchdog/Kconfig
 +++ b/drivers/watchdog/Kconfig
-@@ -421,4 +421,10 @@ config WDT_FTWDT010
+@@ -443,4 +443,10 @@ config WDT_FTWDT010
  	help
  	  Faraday Technology ftwdt010 watchdog is an architecture independent
  	  watchdog. It is usually used in SoC chip design.

package/boot/uboot-rockchip/src/arch/arm/dts/rk3568-fastrhino-r66s-u-boot.dtsi

@@ -4,7 +4,6 @@
 
 / {
 	chosen {
-		stdout-path = &uart2;
 		u-boot,spl-boot-order = "same-as-spl", &sdmmc0;
 	};
 };
@@ -16,19 +15,3 @@
 &pcie3x2 {
 	/delete-property/ vpcie3v3-supply;
 };
-
-&uart2 {
-	clock-frequency = <24000000>;
-	bootph-all;
-	status = "okay";
-};
-
-&vcc5v0_usb_host {
-	/delete-property/ regulator-always-on;
-	/delete-property/ regulator-boot-on;
-};
-
-&vcc5v0_usb_otg {
-	/delete-property/ regulator-always-on;
-	/delete-property/ regulator-boot-on;
-};

package/boot/uboot-rockchip/src/arch/arm/dts/rk3568-mrkaio-m68s-u-boot.dtsi

@@ -2,12 +2,6 @@
 
 #include "rk356x-u-boot.dtsi"
 
-/ {
-	chosen {
-		stdout-path = &uart2;
-	};
-};
-
 &sdhci {
 	cap-mmc-highspeed;
 	mmc-ddr-1_8v;
@@ -17,12 +11,6 @@
 	pinctrl-0 = <&emmc_bus8 &emmc_clk &emmc_cmd &emmc_datastrobe>;
 };
 
-&uart2 {
-	clock-frequency = <24000000>;
-	bootph-all;
-	status = "okay";
-};
-
 &vcc5v0_usb_host {
 	/delete-property/ regulator-always-on;
 	/delete-property/ regulator-boot-on;

package/boot/uboot-rockchip/src/arch/arm/dts/rk3568-photonicat-u-boot.dtsi

@@ -3,10 +3,6 @@
 #include "rk356x-u-boot.dtsi"
 
 / {
-	chosen {
-		stdout-path = &uart2;
-	};
-
 	pcat-wdt {
 		compatible = "linux,wdt-pcat";
 		port = <&uart4>;
@@ -26,12 +22,6 @@
 	pinctrl-0 = <&emmc_bus8 &emmc_clk &emmc_cmd &emmc_datastrobe>;
 };
 
-&uart2 {
-	clock-frequency = <24000000>;
-	bootph-all;
-	status = "okay";
-};
-
 &vcc3v3_sd {
 	bootph-pre-ram;
 };

package/boot/uboot-rockchip/src/arch/arm/dts/rk3568-roc-pc-u-boot.dtsi

@@ -2,12 +2,6 @@
 
 #include "rk356x-u-boot.dtsi"
 
-/ {
-	chosen {
-		stdout-path = &uart2;
-	};
-};
-
 &sdhci {
 	cap-mmc-highspeed;
 	mmc-ddr-1_8v;
@@ -17,12 +11,6 @@
 	pinctrl-0 = <&emmc_bus8 &emmc_clk &emmc_cmd &emmc_datastrobe>;
 };
 
-&uart2 {
-	clock-frequency = <24000000>;
-	bootph-all;
-	status = "okay";
-};
-
 &vcc5v0_host {
 	/delete-property/ regulator-always-on;
 };

package/network/config/wifi-scripts/files/lib/netifd/wireless/mac80211.sh

@@ -844,13 +844,19 @@ mac80211_setup_adhoc() {
 
 mac80211_setup_mesh() {
 	json_get_vars ssid mesh_id mcast_rate
+	json_get_values iface_basic_rate_list basic_rate
 
 	mcval=
 	[ -n "$mcast_rate" ] && wpa_supplicant_add_rate mcval "$mcast_rate"
 	[ -n "$mesh_id" ] && ssid="$mesh_id"
 
+	br_list="$basic_rate_list"
+	if [ -n "$iface_basic_rate_list" ]; then
+		br_list="$iface_basic_rate_list"
+	fi
+
 	brstr=
-	for br in $basic_rate_list; do
+	for br in $br_list; do
 		wpa_supplicant_add_rate brstr "$br"
 	done