[bot] AutoMerging: merge all upstream's changes:

* https://github.com/coolsnowwolf/lede: mediatek: expand kernel size to 6MiB for Xiaomi AX6S
zesming · Dec 13, 2024 · 53f3344 · 53f3344
2 parents a8e9e8e + 21eb7bf
commit 53f3344
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/target/linux/mediatek/dts/mt7622-xiaomi-redmi-router-ax6s.dts b/target/linux/mediatek/dts/mt7622-xiaomi-redmi-router-ax6s.dts
@@ -298,7 +298,7 @@
 			 */
 			partition@2c0000 {
 				label = "kernel";
-				reg = <0x2c0000 0x400000>;
+				reg = <0x2c0000 0x600000>;
 			};
 
 			/* ubi partition is the result of squashing
@@ -308,9 +308,9 @@
 			 * - overlay
 			 * - obr
 			 */
-			partition@6c0000 {
+			partition@8c0000 {
 				label = "ubi";
-				reg = <0x6C0000 0x6f00000>;
+				reg = <0x8c0000 0x6d00000>;
 			};
 		};
 	};

diff --git a/target/linux/mediatek/image/mt7622.mk b/target/linux/mediatek/image/mt7622.mk
@@ -345,7 +345,7 @@ define Device/xiaomi_redmi-router-ax6s
   IMAGES += factory.bin
   BLOCKSIZE := 128k
   PAGESIZE := 2048
-  KERNEL_SIZE := 4096k
+  KERNEL_SIZE := 6144k
   KERNEL_INITRAMFS_SUFFIX := -recovery.itb
   IMAGE/factory.bin := append-kernel | pad-to $$(KERNEL_SIZE) | append-ubi
   IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata