[openwrt/openwrt] ramips: combine USW-Flex dual firmware-partitions

[LEDE Commits]

blocktrron pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/8036fb8dd01d86a1822efd7bdfac3352d97a7657

commit 8036fb8dd01d86a1822efd7bdfac3352d97a7657
Author: David Bauer <mail at david-bauer.net>
AuthorDate: Thu Nov 17 23:02:13 2022 +0100

    ramips: combine USW-Flex dual firmware-partitions
    
    In order to maximize the available space on USW-Flex boards using a
    dual-image partition layout, combine the two OS partitions into a single
    partition.
    
    This allows users to access more usable space for additional packages.
    
    Don't limit the usable image size to the size of a single OS partition.
    The initial installation has to be done with an older version of OpenWrt
    in case the generated image exceeds the space of a single kernel
    partition in the future.
    
    Signed-off-by: David Bauer <mail at david-bauer.net>
---
 target/linux/ramips/dts/mt7621_ubnt_usw-flex.dts | 8 ++------
 target/linux/ramips/image/mt7621.mk              | 2 +-
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/target/linux/ramips/dts/mt7621_ubnt_usw-flex.dts b/target/linux/ramips/dts/mt7621_ubnt_usw-flex.dts
index e148242387..ff328bd858 100644
--- a/target/linux/ramips/dts/mt7621_ubnt_usw-flex.dts
+++ b/target/linux/ramips/dts/mt7621_ubnt_usw-flex.dts
@@ -164,14 +164,10 @@
 			};
 
 			partition at 1a0000 {
+				/* Combine kernel0 / kernel1 */
 				compatible = "denx,fit";
 				label = "firmware";
-				reg = <0x1a0000 0x730000>;
-			};
-
-			partition at 8d0000 {
-				label = "kernel1";
-				reg = <0x8d0000 0x730000>;
+				reg = <0x1a0000 0xe60000>;
 			};
 		};
 	};
diff --git a/target/linux/ramips/image/mt7621.mk b/target/linux/ramips/image/mt7621.mk
index 2fc193634b..dd49583bf4 100644
--- a/target/linux/ramips/image/mt7621.mk
+++ b/target/linux/ramips/image/mt7621.mk
@@ -2130,7 +2130,7 @@ define Device/ubnt_usw-flex
   DEVICE_DTS_CONFIG := config at 1
   DEVICE_DTS_LOADADDR := 0x87000000
   KERNEL := kernel-bin | lzma | fit lzma $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb
-  IMAGE_SIZE := 7360k
+  IMAGE_SIZE := 14720k
 endef
 TARGET_DEVICES += ubnt_usw-flex