bcm63xx: ad1018: switch to Sercomm WFI

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>

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 3fcf40434f47bf6b1aed982b10a868aadce30b1b..fdb5ddec724786dc3297c96cb5b173f9500b59e7 100644 (file)
--- 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 440c653dcab3832de198a8126a00d3890e2abb9e..421029054a7def42b35c4f8e94bad1d3aa083e92 100644 (file)
--- 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>;