From 80d811480256bda63b0f0d087b55a9e35b59e91e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=81lvaro=20Fern=C3=A1ndez=20Rojas?= <noltari@gmail.com>
Date: Tue, 2 Jun 2020 08:59:58 +0200
Subject: [PATCH] bcm63xx: ad1018: switch to Sercomm WFI
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Support Sercomm firmware partition split.
WFI partition must be defined after bootflag partitions in order for the
parser to properly find bootflag1 and bootflag2 partitions.

Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
---
 .../bcm63xx/base-files/etc/uci-defaults/09_fix_crc   |  3 ---
 target/linux/bcm63xx/dts/bcm6328-sercomm-ad1018.dts  | 12 ++++++------
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/target/linux/bcm63xx/base-files/etc/uci-defaults/09_fix_crc b/target/linux/bcm63xx/base-files/etc/uci-defaults/09_fix_crc
index 3fcf40434f..fdb5ddec72 100644
--- a/target/linux/bcm63xx/base-files/etc/uci-defaults/09_fix_crc
+++ b/target/linux/bcm63xx/base-files/etc/uci-defaults/09_fix_crc
@@ -41,7 +41,4 @@ case "$(board_name)" in
 	zyxel,p870hw-51a-v2)
 		do_fixcrc
 		;;
-	sercomm,ad1018)
-		mtd erase bootflag2
-		;;
 esac
diff --git a/target/linux/bcm63xx/dts/bcm6328-sercomm-ad1018.dts b/target/linux/bcm63xx/dts/bcm6328-sercomm-ad1018.dts
index 440c653dca..421029054a 100644
--- a/target/linux/bcm63xx/dts/bcm6328-sercomm-ad1018.dts
+++ b/target/linux/bcm63xx/dts/bcm6328-sercomm-ad1018.dts
@@ -167,12 +167,6 @@
 				read-only;
 			};
 
-			partition@520000 {
-				compatible = "brcm,wfi-sercomm";
-				label = "wfi";
-				reg = <0x0520000 0x6400000>;
-			};
-
 			partition@6920000 {
 				label = "bootflag1";
 				reg = <0x6920000 0x0140000>;
@@ -183,6 +177,12 @@
 				reg = <0x6a60000 0x0140000>;
 			};
 
+			partition@520000 {
+				compatible = "sercomm,wfi";
+				label = "wfi";
+				reg = <0x0520000 0x6400000>;
+			};
+
 			partition@6ba0000 {
 				label = "xml_cfg";
 				reg = <0x6ba0000 0x0280000>;