mvebu: split interface configuration for clearfog pro and base

Handle both variants separately. This removes the need for calling
swconfig to detect the switch, and simplifies future changes.

Signed-off-by: Josua Mayer <josua.mayer@jm0.eu>

diff --git a/target/linux/mvebu/base-files/etc/board.d/02_network b/target/linux/mvebu/base-files/etc/board.d/02_network
index 69c63e3791688c4f40f7efb2d88f68153e615353..283a8562582d6f8e08b212372bfaf27829a438cb 100755 (executable)
--- a/target/linux/mvebu/base-files/etc/board.d/02_network
+++ b/target/linux/mvebu/base-files/etc/board.d/02_network
@@ -52,17 +52,21 @@ marvell,axp-gp)
 methode,udpu)
        ucidef_set_interfaces_lan_wan "eth1" "eth0"
        ;;
-solidrun,clearfog*a1)
+solidrun,clearfog-a1|solidrun,clearfog-pro-a1)
        # eth0 is standalone ethernet
-       # eth1 is switch (-pro) or standalone ethernet (-base)
+       # eth1 is switch
        # eth2 is SFP
        ucidef_set_interfaces_lan_wan "eth1" "eth0 eth2"
 
-       # if switch exists (clearfog-pro)
        # switch port 5 is connected to eth1
-       swconfig list 2>&1 | grep -q switch0 && \
-               ucidef_add_switch "switch0" \
-                       "0:lan:5" "1:lan:4" "2:lan:3" "3:lan:2" "4:lan:1" "5u@eth1" "6:lan:6"
+       ucidef_add_switch "switch0" \
+               "0:lan:5" "1:lan:4" "2:lan:3" "3:lan:2" "4:lan:1" "5u@eth1" "6:lan:6"
+       ;;
+solidrun,clearfog-base-a1)
+       # eth0 is standalone ethernet
+       # eth1 is standalone ethernet
+       # eth2 is SFP
+       ucidef_set_interfaces_lan_wan "eth1" "eth0 eth2"
        ;;
 *)
        ucidef_set_interface_lan "eth0"