[openwrt/openwrt] mvebu: venom resize kernel to 6MB

[LEDE Commits]

hauke pushed a commit to openwrt/openwrt.git, branch openwrt-21.02:
https://git.openwrt.org/5a3b1e5b5765208990e45c852c0412f210d63594

commit 5a3b1e5b5765208990e45c852c0412f210d63594
Author: Tad Davanzo <tad at spotco.us>
AuthorDate: Fri Feb 5 22:42:47 2021 -0500

    mvebu: venom resize kernel to 6MB
    
    venom has a 3MB kernel partition as specified by the DTS.
    3MB is not sufficient for building with many kernel modules or newer
    kernel versions.
    
    venom uboot however as set from factory will load up to 6MB.
    This can be observed by looking a uboot log:
            NAND read: device 0 offset 0x900000, size 0x600000
            6291456 bytes read: OK
    and from uboot environment variables:
            $ fw_printenv | grep "priKernSize";
            priKernSize=0x0600000
    
    Resize the root partitions from 120MB to 117MB to let kernel expand
    into it another 3MB.
    And set kernel target size to 6MB.
    
    Lastly set the kernel-size-migration compatibility version on venom to
    prevent sysupgrading without first reinstalling from a factory image.
    
    Signed-off-by: Tad Davanzo <tad at spotco.us>
    (cherry picked from commit 15309f5133d55e92bec3ed91dfb3ac9d124f6a96)
---
 .../cortexa9/base-files/etc/uci-defaults/05_fix-compat-version    | 3 ++-
 .../mvebu/files/arch/arm/boot/dts/armada-385-linksys-venom.dts    | 8 ++++----
 target/linux/mvebu/image/cortexa9.mk                              | 4 ++--
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/target/linux/mvebu/cortexa9/base-files/etc/uci-defaults/05_fix-compat-version b/target/linux/mvebu/cortexa9/base-files/etc/uci-defaults/05_fix-compat-version
index 70e0e9ef95..8856bf23a4 100644
--- a/target/linux/mvebu/cortexa9/base-files/etc/uci-defaults/05_fix-compat-version
+++ b/target/linux/mvebu/cortexa9/base-files/etc/uci-defaults/05_fix-compat-version
@@ -1,7 +1,8 @@
 . /lib/functions.sh
 
 case "$(board_name)" in
-	linksys,wrt1900ac-v1)
+	linksys,wrt1900ac-v1|\
+        linksys,wrt32x)
 		uci set system. at system[0].compat_version="2.0"
 		uci commit system
 		;;
diff --git a/target/linux/mvebu/files/arch/arm/boot/dts/armada-385-linksys-venom.dts b/target/linux/mvebu/files/arch/arm/boot/dts/armada-385-linksys-venom.dts
index de81600a80..a2ca3158cf 100644
--- a/target/linux/mvebu/files/arch/arm/boot/dts/armada-385-linksys-venom.dts
+++ b/target/linux/mvebu/files/arch/arm/boot/dts/armada-385-linksys-venom.dts
@@ -157,9 +157,9 @@
 			reg = <0x900000 0x7b00000>;	/* 123MB */
 		};
 
-		partition at c00000 {
+		partition at f00000 {
 			label = "rootfs1";
-			reg = <0xc00000 0x7800000>;	/* 120MB */
+			reg = <0xf00000 0x7500000>;	/* 117MB */
 		};
 
 		/* kernel2 overlaps with rootfs2 by design */
@@ -168,9 +168,9 @@
 			reg = <0x8400000 0x7b00000>;	/* 123MB */
 		};
 
-		partition at 8700000 {
+		partition at 8a00000 {
 			label = "rootfs2";
-			reg = <0x8700000 0x7800000>;	/* 120MB */
+			reg = <0x8a00000 0x7500000>;	/* 117MB */
 		};
 
 		/* last MB is for the BBT, not writable */
diff --git a/target/linux/mvebu/image/cortexa9.mk b/target/linux/mvebu/image/cortexa9.mk
index 780b1a18c8..3937890116 100644
--- a/target/linux/mvebu/image/cortexa9.mk
+++ b/target/linux/mvebu/image/cortexa9.mk
@@ -154,13 +154,13 @@ TARGET_DEVICES += linksys_wrt3200acm
 
 define Device/linksys_wrt32x
   $(call Device/linksys)
-  $(Device/dsa-migration)
+  $(Device/kernel-size-migration)
   DEVICE_MODEL := WRT32X
   DEVICE_ALT0_VENDOR := Linksys
   DEVICE_ALT0_MODEL := Venom
   DEVICE_DTS := armada-385-linksys-venom
   DEVICE_PACKAGES += kmod-btmrvl kmod-mwifiex-sdio mwlwifi-firmware-88w8964
-  KERNEL_SIZE := 3072k
+  KERNEL_SIZE := 6144k
   KERNEL := kernel-bin | append-dtb
   SUPPORTED_DEVICES += armada-385-linksys-venom linksys,venom
   DEFAULT := n