From patchwork Sun Feb  5 18:13:43 2017
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: [v2,11/15] lede: some images are renamed
From: Tim Niemeyer <tim@tn-x.org>
X-Patchwork-Id: 287
Message-Id: <1486318428-7226-12-git-send-email-tim@tn-x.org>
To: franken-dev@freifunk.net
Cc: Tim Niemeyer <tim@tn-x.org>
Date: Sun,  5 Feb 2017 19:13:43 +0100

Signed-off-by: Tim Niemeyer <tim@tn-x.org>
---

Changes in v2:
- added network.cpe510 (as it is now a separate image)
- remove cpe210/cpe510 from boardname detection
- sysupgrade: changes due to new image file names

 bsp/board_ar71xx.bsp                               | 13 ++++++-----
 .../files/etc/uci-defaults/50-fff-boardname        |  3 ---
 src/packages/fff/fff-network/ar71xx/network.cpe510 | 27 ++++++++++++++++++++++
 .../fff/fff-sysupgrade/files/etc/sysupgrade.sh     | 14 ++++++++++-
 4 files changed, 47 insertions(+), 10 deletions(-)
 create mode 100644 src/packages/fff/fff-network/ar71xx/network.cpe510

diff --git a/bsp/board_ar71xx.bsp b/bsp/board_ar71xx.bsp
index 58f6fb2..bd7c033 100644
--- a/bsp/board_ar71xx.bsp
+++ b/bsp/board_ar71xx.bsp
@@ -1,17 +1,18 @@
 machine=ar71xx
 chipset=ar71xx
 target=$builddir/$machine
-images=("lede-ar71xx-generic-cpe210-220-510-520-squashfs-sysupgrade.bin"
+images=("lede-ar71xx-generic-cpe210-220-squashfs-sysupgrade.bin"
+        "lede-ar71xx-generic-cpe510-520-squashfs-sysupgrade.bin"
         "lede-ar71xx-generic-ubnt-nano-m-squashfs-sysupgrade.bin"
         "lede-ar71xx-generic-ubnt-loco-m-xw-squashfs-sysupgrade.bin"
         "lede-ar71xx-generic-tl-wr740n-v4-squashfs-sysupgrade.bin"
         "lede-ar71xx-generic-tl-wr741nd-v2-squashfs-sysupgrade.bin"
         "lede-ar71xx-generic-tl-wr741nd-v4-squashfs-sysupgrade.bin"
-        "lede-ar71xx-generic-tl-wr841nd-v7-squashfs-sysupgrade.bin"
-        "lede-ar71xx-generic-tl-wr841n-v8-squashfs-sysupgrade.bin"
-        "lede-ar71xx-generic-tl-wr841n-v9-squashfs-sysupgrade.bin"
-        "lede-ar71xx-generic-tl-wr841n-v10-squashfs-sysupgrade.bin"
-        "lede-ar71xx-generic-tl-wr841n-v11-squashfs-sysupgrade.bin"
+        "lede-ar71xx-generic-tl-wr841-v7-squashfs-sysupgrade.bin"
+        "lede-ar71xx-generic-tl-wr841-v8-squashfs-sysupgrade.bin"
+        "lede-ar71xx-generic-tl-wr841-v9-squashfs-sysupgrade.bin"
+        "lede-ar71xx-generic-tl-wr841-v10-squashfs-sysupgrade.bin"
+        "lede-ar71xx-generic-tl-wr841-v11-squashfs-sysupgrade.bin"
         "lede-ar71xx-generic-tl-wr842n-v2-squashfs-sysupgrade.bin"
         "lede-ar71xx-generic-tl-wr1043nd-v1-squashfs-sysupgrade.bin"
         "lede-ar71xx-generic-tl-wr1043nd-v2-squashfs-sysupgrade.bin"
diff --git a/src/packages/fff/fff-boardname/files/etc/uci-defaults/50-fff-boardname b/src/packages/fff/fff-boardname/files/etc/uci-defaults/50-fff-boardname
index 6ad34bd..94b9884 100755
--- a/src/packages/fff/fff-boardname/files/etc/uci-defaults/50-fff-boardname
+++ b/src/packages/fff/fff-boardname/files/etc/uci-defaults/50-fff-boardname
@@ -51,9 +51,6 @@ case "$BOARD" in
     tl-mr3020)
         BOARD=tl-mr3020-v1
         ;;
-    cpe510)
-        grep "CPE210" /var/sysinfo/model && BOARD=cpe210
-        ;;
     archer-c7)
         BOARD=archer-c7-v2
         ;;
diff --git a/src/packages/fff/fff-network/ar71xx/network.cpe510 b/src/packages/fff/fff-network/ar71xx/network.cpe510
new file mode 100644
index 0000000..8180789
--- /dev/null
+++ b/src/packages/fff/fff-network/ar71xx/network.cpe510
@@ -0,0 +1,27 @@
+WANDEV=eth0
+SWITCHDEV=eth0
+CLIENT_PORTS="0t"
+WAN_PORTS="0t"
+BATMAN_PORTS="0t"
+
+ETHMESHMAC="w2ap"
+
+. /etc/network.mode
+
+#LAN0: default: BATMAN
+if [ "${LAN0MODE}" = "BATMAN" ] ; then
+  BATMAN_PORTS="${BATMAN_PORTS} 5"
+elif [ "${LAN0MODE}" = "CLIENT" ] ; then
+  CLIENT_PORTS="${CLIENT_PORTS} 5"
+else
+  WAN_PORTS="${WAN_PORTS} 5"
+fi
+
+#LAN1: default: BATMAN
+if [ "${LAN1MODE}" = "WAN" ] ; then
+  WAN_PORTS="${WAN_PORTS} 4"
+elif [ "${LAN1MODE}" = "CLIENT" ] ; then
+  CLIENT_PORTS="${CLIENT_PORTS} 4"
+else
+  BATMAN_PORTS="${BATMAN_PORTS} 4"
+fi
diff --git a/src/packages/fff/fff-sysupgrade/files/etc/sysupgrade.sh b/src/packages/fff/fff-sysupgrade/files/etc/sysupgrade.sh
index 317d0a6..942573c 100755
--- a/src/packages/fff/fff-sysupgrade/files/etc/sysupgrade.sh
+++ b/src/packages/fff/fff-sysupgrade/files/etc/sysupgrade.sh
@@ -19,7 +19,19 @@ echo -ne "\nHardware: $BOARD\n"
 #rewrite BOARD
 case $BOARD in
     cpe210 )
-        BOARD="cpe210-220-510-520" ;;
+        BOARD="cpe210-220" ;;
+    cpe510 )
+        BOARD="cpe510-520" ;;
+    wr841nd-v7 )
+        BOARD="wr841-v7" ;;
+    wr841n-v8 )
+        BOARD="wr841-v8" ;;
+    wr841n-v9 )
+        BOARD="wr841-v9" ;;
+    wr841n-v10 )
+        BOARD="wr841-v10" ;;
+    wr841n-v11 )
+        BOARD="wr841-v11" ;;
 esac
 
 wget "${UPGRADE_PATH}/release.nfo"