[openwrt/openwrt] ath79: airtight c-75: use second flash chip

[LEDE Commits]

adrian pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/13581a5fa7ed09aa04393d496f44d0bf068e3024

commit 13581a5fa7ed09aa04393d496f44d0bf068e3024
Author: Tomasz Maciej Nowak <tmn505 at gmail.com>
AuthorDate: Thu Dec 17 17:24:27 2020 +0100

    ath79: airtight c-75: use second flash chip
    
    The flash capacity is divided in two flash chips and currently only
    first is used. Increase available space for OpenWrt by additional 16 MiB
    using mtd-concat driver. Because U-Boot might not be able to load kernel
    image spanned through two flash chips, the size of kernel is limited
    to space available on first first chip.
    
    Cc: Vladimir Georgievsky <vladimir.georgievsky at yahoo.com>
    Signed-off-by: Tomasz Maciej Nowak <tmn505 at gmail.com>
---
 target/linux/ath79/dts/qca9550_airtight_c-75.dts | 26 +++++++++++++++++++-----
 target/linux/ath79/image/generic.mk              |  3 ++-
 2 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/target/linux/ath79/dts/qca9550_airtight_c-75.dts b/target/linux/ath79/dts/qca9550_airtight_c-75.dts
index 566aa6aef6..1bdbc86156 100644
--- a/target/linux/ath79/dts/qca9550_airtight_c-75.dts
+++ b/target/linux/ath79/dts/qca9550_airtight_c-75.dts
@@ -41,6 +41,23 @@
 			linux,default-trigger = "phy1tpt";
 		};
 	};
+
+	virtual_flash {
+		compatible = "mtd-concat";
+		devices = <&concat0 &concat1>;
+
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition at 0 {
+				label = "firmware";
+				reg = <0x0 0x1f90000>;
+				compatible = "denx,uimage";
+			};
+		};
+	};
 };
 
 &eth0 {
@@ -118,10 +135,9 @@
 				read-only;
 			};
 
-			partition at 60000 {
-				label = "firmware";
+			concat0: partition at 60000 {
+				label = "reserved1";
 				reg = <0x060000 0xf90000>;
-				compatible = "denx,uimage";
 			};
 
 			art: partition at ff0000 {
@@ -142,8 +158,8 @@
 			#address-cells = <1>;
 			#size-cells = <1>;
 
-			partition at 0 {
-				label = "opt";
+			concat1: partition at 0 {
+				label = "reserved2";
 				reg = <0x0 0x1000000>;
 			};
 		};
diff --git a/target/linux/ath79/image/generic.mk b/target/linux/ath79/image/generic.mk
index baaea00c30..4d181245a6 100644
--- a/target/linux/ath79/image/generic.mk
+++ b/target/linux/ath79/image/generic.mk
@@ -246,7 +246,8 @@ define Device/airtight_c-75
   DEVICE_ALT1_VENDOR := WatchGuard
   DEVICE_ALT1_MODEL := AP320
   DEVICE_PACKAGES := ath10k-firmware-qca988x-ct kmod-ath10k-ct kmod-usb2
-  IMAGE_SIZE := 15936k
+  IMAGE_SIZE := 32320k
+  KERNEL_SIZE := 15936k
 endef
 TARGET_DEVICES += airtight_c-75