ar71xx: Add support for the Meraki MR12 & MR16

[openwrt/openwrt.git] / target / linux / ar71xx / base-files / lib / ar71xx.sh

diff --git a/target/linux/ar71xx/base-files/lib/ar71xx.sh b/target/linux/ar71xx/base-files/lib/ar71xx.sh
index 52acc6b39edf0a9008248b3f510d6a3673f4a443..d5dd561e3b95153aec6ddddac8eb1c863e9c5c0c 100755 (executable)
--- a/target/linux/ar71xx/base-files/lib/ar71xx.sh
+++ b/target/linux/ar71xx/base-files/lib/ar71xx.sh
@@ -37,16 +37,26 @@ wndr3700_board_detect() {
                machine="NETGEAR WNDR3700"
                ;;
        "33373031")
-               local model
-               model=$(ar71xx_get_mtd_offset_size_format art 56 10 %c)
-               if [ -z "$model" ] || [ "$model" = $'\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff' ]; then
-                       machine="NETGEAR WNDR3700v2"
-               elif [ -z "$model" ] || [ "$model" = $'\xff\xff\xff\xff\xff\xff\xff\xff\xffN' ]; then
-                       machine="NETGEAR WNDRMAC"
-               else
+               # Use awk to remove everything after the first zero byte
+               model="$(ar71xx_get_mtd_offset_size_format art 41 32 %c | awk 'BEGIN{FS="[[:cntrl:]]"} {print $1; exit}')"
+               case $model in
+               $'\xff'*)
+                       if [ "${model:24:1}" = 'N' ]; then
+                               machine="NETGEAR WNDRMAC"
+                       else
+                               machine="NETGEAR WNDR3700v2"
+                       fi
+                       ;;
+               '29763654+16+64'*)
+                       machine="NETGEAR ${model:14}"
+                       ;;
+               '29763654+16+128'*)
+                       machine="NETGEAR ${model:15}"
+                       ;;
+               *)
+                       # Unknown ID
                        machine="NETGEAR $model"
-               fi
-               ;;
+               esac
        esac
 
        AR71XX_BOARD_NAME="$name"
@@ -274,6 +284,19 @@ tplink_pharos_board_detect() {
        [ -n "$model" ] && AR71XX_MODEL="$model v$2"
 }
 
+gl_inet_board_detect() {
+       local size="$(mtd_get_part_size 'firmware')"
+
+       case "$size" in
+       8192000)
+               AR71XX_MODEL='GL-iNet 6408A v1'
+               ;;
+       16580608)
+               AR71XX_MODEL='GL-iNet 6416A v1'
+               ;;
+       esac
+}
+
 ar71xx_board_detect() {
        local machine
        local name
@@ -401,6 +424,7 @@ ar71xx_board_detect() {
                ;;
        *"GL-CONNECT INET v1")
                name="gl-inet"
+               gl_inet_board_detect
                ;;
        *"EnGenius ESR1750")
                name="esr1750"
@@ -447,6 +471,12 @@ ar71xx_board_detect() {
        *"MAC1200R")
                name="mc-mac1200r"
                ;;
+       *MR12)
+               name="mr12"
+               ;;
+       *MR16)
+               name="mr16"
+               ;;
        *MR600v2)
                name="mr600v2"
                ;;
@@ -498,6 +528,9 @@ ar71xx_board_detect() {
        *OM5P)
                name="om5p"
                ;;
+       *"OM5P AN")
+               name="om5p-an"
+               ;;
        *PB42)
                name="pb42"
                ;;
@@ -555,6 +588,9 @@ ar71xx_board_detect() {
        *"RouterBOARD 911G-5HPnD")
                name="rb-911g-5hpnd"
                ;;
+       *"RouterBOARD 911G-5HPacD")
+               name="rb-911g-5hpacd"
+               ;;
        *"RouterBOARD 912UAG-2HPnD")
                name="rb-912uag-2hpnd"
                ;;
@@ -591,6 +627,9 @@ ar71xx_board_detect() {
        *"Rocket M")
                name="rocket-m"
                ;;
+       *"Rocket M XW")
+               name="rocket-m-xw"
+               ;;
        *RouterStation)
                name="routerstation"
                ;;
@@ -738,7 +777,7 @@ ar71xx_board_detect() {
        *"TL-MR12U")
                name="tl-mr12u"
                ;;
-       *"TL-MR13U")
+       *"TL-MR13U v1")
                name="tl-mr13u"
                ;;
        *"Tube2H")
@@ -771,6 +810,12 @@ ar71xx_board_detect() {
        *WPE72)
                name="wpe72"
                ;;
+       *WPJ344)
+               name="wpj344"
+               ;;
+       *WPJ558)
+               name="wpj558"
+               ;;
        *WNDAP360)
                name="wndap360"
                ;;