ar71xx-generic: Add support for OpenMesh OM2P-HSv3

The new OM2P-HSv3 device support is only available in LEDE master. The
relevant patches have to backported to add support for them in Gluon

Signed-off-by: Sven Eckelmann <sven.eckelmann@open-mesh.com>

docs/index.rst

@@ -137,7 +137,7 @@ ar71xx-generic
   - MR600 (v1, v2)
   - MR900 (v1, v2)
   - OM2P (v1, v2)
-  - OM2P-HS (v1, v2)
+  - OM2P-HS (v1, v2, v3)
   - OM2P-LC
   - OM5P
   - OM5P-AC (v1, v2)

package/gluon-core/files/lib/gluon/upgrade/010-primary-mac

@@ -29,7 +29,7 @@ elseif platform.match('ar71xx', 'generic', {'unifi-outdoor-plus', 'carambola2',
                                             'mr900', 'mr900v2',
                                             'mr1750',
                                             'om2p', 'om2pv2',
-                                            'om2p-hs', 'om2p-hsv2',
+                                            'om2p-hs', 'om2p-hsv2', 'om2p-hsv3',
                                             'om2p-lc',
                                             'om5p', 'om5p-an',
                                             'om5p-ac', 'om5p-acv2'}) then

patches/openwrt/0097-ar71xx-add-kernel-support-for-the-OpenMesh-OM2P-HSv3.patch

@@ -0,0 +1,33 @@
+From: Sven Eckelmann <sven.eckelmann@open-mesh.com>
+Date: Fri, 20 May 2016 18:03:48 +0200
+Subject: ar71xx: add kernel support for the OpenMesh OM2P-HSv3
+
+Signed-off-by: Sven Eckelmann <sven.eckelmann@open-mesh.com>
+
+Forwarded: https://patchwork.ozlabs.org/patch/637052/
+
+diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-om2p.c b/target/linux/ar71xx/files/arch/mips/ath79/mach-om2p.c
+index 6b0bdc3..3b282a3 100644
+--- a/target/linux/ar71xx/files/arch/mips/ath79/mach-om2p.c
++++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-om2p.c
+@@ -223,3 +223,4 @@ static void __init om2p_hs_setup(void)
+ 
+ MIPS_MACHINE(ATH79_MACH_OM2P_HS, "OM2P-HS", "OpenMesh OM2P HS", om2p_hs_setup);
+ MIPS_MACHINE(ATH79_MACH_OM2P_HSv2, "OM2P-HSv2", "OpenMesh OM2P HSv2", om2p_hs_setup);
++MIPS_MACHINE(ATH79_MACH_OM2P_HSv3, "OM2P-HSv3", "OpenMesh OM2P HSv3", om2p_hs_setup);
+diff --git a/target/linux/ar71xx/patches-3.18/817-MIPS-ath79-add-om2phsv3-support.patch b/target/linux/ar71xx/patches-3.18/817-MIPS-ath79-add-om2phsv3-support.patch
+new file mode 100644
+index 0000000..7305b2e
+--- /dev/null
++++ b/target/linux/ar71xx/patches-3.18/817-MIPS-ath79-add-om2phsv3-support.patch
+@@ -0,0 +1,10 @@
++--- a/arch/mips/ath79/machtypes.h
+++++ b/arch/mips/ath79/machtypes.h
++@@ -88,6 +88,7 @@ enum ath79_mach_type {
++ 	ATH79_MACH_NBG460N,		/* Zyxel NBG460N/550N/550NH */
++ 	ATH79_MACH_NBG6716,		/* Zyxel NBG6716 */
++ 	ATH79_MACH_OM2P_HSv2,		/* OpenMesh OM2P-HSv2 */
+++	ATH79_MACH_OM2P_HSv3,		/* OpenMesh OM2P-HSv3 */
++ 	ATH79_MACH_OM2P_HS,		/* OpenMesh OM2P-HS */
++ 	ATH79_MACH_OM2P_LC,		/* OpenMesh OM2P-LC */
++ 	ATH79_MACH_OM2Pv2,		/* OpenMesh OM2Pv2 */

patches/openwrt/0098-ar71xx-add-user-space-support-for-the-OpenMesh-OM2P-HSv3.patch

@@ -0,0 +1,46 @@
+From: Sven Eckelmann <sven.eckelmann@open-mesh.com>
+Date: Fri, 20 May 2016 18:03:49 +0200
+Subject: ar71xx: add user-space support for the OpenMesh OM2P-HSv3
+
+Signed-off-by: Sven Eckelmann <sven.eckelmann@open-mesh.com>
+
+Forwarded: https://patchwork.ozlabs.org/patch/637053/
+
+diff --git a/target/linux/ar71xx/base-files/etc/diag.sh b/target/linux/ar71xx/base-files/etc/diag.sh
+index d4d8b4e..aa02212 100644
+--- a/target/linux/ar71xx/base-files/etc/diag.sh
++++ b/target/linux/ar71xx/base-files/etc/diag.sh
+@@ -171,6 +171,7 @@ get_status_led() {
+ 	om2pv2 | \
+ 	om2p-hs | \
+ 	om2p-hsv2 | \
++	om2p-hsv3 | \
+ 	om2p-lc)
+ 		status_led="om2p:blue:power"
+ 		;;
+diff --git a/target/linux/ar71xx/base-files/etc/uci-defaults/01_leds b/target/linux/ar71xx/base-files/etc/uci-defaults/01_leds
+index dc8b8d6..5767f48 100644
+--- a/target/linux/ar71xx/base-files/etc/uci-defaults/01_leds
++++ b/target/linux/ar71xx/base-files/etc/uci-defaults/01_leds
+@@ -297,6 +297,7 @@ om2p | \
+ om2pv2 | \
+ om2p-hs | \
+ om2p-hsv2 | \
++om2p-hsv3 | \
+ om2p-lc)
+ 	ucidef_set_led_netdev "port1" "port1" "om2p:blue:wan" "eth0"
+ 	ucidef_set_led_netdev "port2" "port2" "om2p:blue:lan" "eth1"
+diff --git a/target/linux/ar71xx/base-files/lib/ar71xx.sh b/target/linux/ar71xx/base-files/lib/ar71xx.sh
+index db908f9..dc51b03 100755
+--- a/target/linux/ar71xx/base-files/lib/ar71xx.sh
++++ b/target/linux/ar71xx/base-files/lib/ar71xx.sh
+@@ -610,6 +610,9 @@ ar71xx_board_detect() {
+ 	*"OM2P HSv2")
+ 		name="om2p-hsv2"
+ 		;;
++	*"OM2P HSv3")
++		name="om2p-hsv3"
++		;;
+ 	*"OM2P LC")
+ 		name="om2p-lc"
+ 		;;

patches/openwrt/0099-ar71xx-enable-sysupgrade-for-the-OpenMesh-OM2P-HSv3.patch

@@ -0,0 +1,40 @@
+From: Sven Eckelmann <sven.eckelmann@open-mesh.com>
+Date: Fri, 20 May 2016 18:03:50 +0200
+Subject: ar71xx: enable sysupgrade for the OpenMesh OM2P-HSv3
+
+Signed-off-by: Sven Eckelmann <sven.eckelmann@open-mesh.com>
+
+Forwarded: https://patchwork.ozlabs.org/patch/637054/
+
+diff --git a/target/linux/ar71xx/base-files/lib/upgrade/openmesh.sh b/target/linux/ar71xx/base-files/lib/upgrade/openmesh.sh
+index 209cdaa..0e8ea27 100644
+--- a/target/linux/ar71xx/base-files/lib/upgrade/openmesh.sh
++++ b/target/linux/ar71xx/base-files/lib/upgrade/openmesh.sh
+@@ -63,6 +63,7 @@ platform_check_image_openmesh()
+ 			[ "$board" = "om2p-lc" ] && break
+ 			[ "$board" = "om2p-hs" ] && break
+ 			[ "$board" = "om2p-hsv2" ] && break
++			[ "$board" = "om2p-hsv3" ] && break
+ 			echo "Invalid image board target ($img_board_target) for this platform: $board. Use the correct image for this platform"
+ 			return 1
+ 			;;
+diff --git a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
+index aeb4577..9b26e73 100755
+--- a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
++++ b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
+@@ -306,6 +306,7 @@ platform_check_image() {
+ 	om2pv2 | \
+ 	om2p-hs | \
+ 	om2p-hsv2 | \
++	om2p-hsv3 | \
+ 	om2p-lc | \
+ 	om5p | \
+ 	om5p-an | \
+@@ -541,6 +542,7 @@ platform_do_upgrade() {
+ 	om2pv2 | \
+ 	om2p-hs | \
+ 	om2p-hsv2 | \
++	om2p-hsv3 | \
+ 	om2p-lc | \
+ 	om5p | \
+ 	om5p-an | \

patches/openwrt/0100-package-om-watchdog-add-OpenMesh-OM2P-HSv3-support.patch

@@ -0,0 +1,21 @@
+From: Sven Eckelmann <sven.eckelmann@open-mesh.com>
+Date: Fri, 20 May 2016 18:03:51 +0200
+Subject: package/om-watchdog: add OpenMesh OM2P-HSv3 support
+
+Signed-off-by: Sven Eckelmann <sven.eckelmann@open-mesh.com>
+
+Forwarded: https://patchwork.ozlabs.org/patch/637055/
+
+diff --git a/package/kernel/om-watchdog/files/om-watchdog.init b/package/kernel/om-watchdog/files/om-watchdog.init
+index 6b96966..bf8a124 100644
+--- a/package/kernel/om-watchdog/files/om-watchdog.init
++++ b/package/kernel/om-watchdog/files/om-watchdog.init
+@@ -13,7 +13,7 @@ boot() {
+ 		local board=$(ar71xx_board_name)
+ 
+ 		case "$board" in
+-			"om2p"|"om2p-hs"|"om2p-hsv2"|"om5p-acv2")
++			"om2p"|"om2p-hs"|"om2p-hsv2"|"om2p-hsv3"|"om5p-acv2")
+ 				service_start /sbin/om-watchdog 12
+ 				;;
+ 			"om2pv2"|"om2p-lc")

patches/openwrt/0101-package-uboot-envtools-add-OpenMesh-OM2P-HSv3-support.patch

@@ -0,0 +1,20 @@
+From: Sven Eckelmann <sven.eckelmann@open-mesh.com>
+Date: Fri, 20 May 2016 18:03:52 +0200
+Subject: package/uboot-envtools: add OpenMesh OM2P-HSv3 support
+
+Signed-off-by: Sven Eckelmann <sven.eckelmann@open-mesh.com>
+
+Forwarded: https://patchwork.ozlabs.org/patch/637056/
+
+diff --git a/package/boot/uboot-envtools/files/ar71xx b/package/boot/uboot-envtools/files/ar71xx
+index 9071c11..81c6481 100644
+--- a/package/boot/uboot-envtools/files/ar71xx
++++ b/package/boot/uboot-envtools/files/ar71xx
+@@ -41,6 +41,7 @@ om2p | \
+ om2pv2 | \
+ om2p-hs | \
+ om2p-hsv2 | \
++om2p-hsv3 | \
+ om2p-lc)
+ 	ubootenv_add_uci_config "/dev/mtd1" "0x0" "0x40000" "0x40000"
+ 	;;

patches/openwrt/0102-ar71xx-add-OM2P-HSv3-to-the-OM2P-profile.patch

@@ -0,0 +1,27 @@
+From: Sven Eckelmann <sven.eckelmann@open-mesh.com>
+Date: Fri, 20 May 2016 18:03:53 +0200
+Subject: ar71xx: add OM2P-HSv3 to the OM2P profile
+
+Signed-off-by: Sven Eckelmann <sven.eckelmann@open-mesh.com>
+
+Forwarded: https://patchwork.ozlabs.org/patch/637057/
+
+diff --git a/target/linux/ar71xx/generic/profiles/openmesh.mk b/target/linux/ar71xx/generic/profiles/openmesh.mk
+index c0919ed..ddd3f8d 100644
+--- a/target/linux/ar71xx/generic/profiles/openmesh.mk
++++ b/target/linux/ar71xx/generic/profiles/openmesh.mk
+@@ -6,12 +6,12 @@
+ #
+ 
+ define Profile/OM2P
+-	NAME:=OpenMesh OM2P/OM2Pv2/OM2P-HS/OM2P-HSv2/OM2P-LC
++	NAME:=OpenMesh OM2P/OM2Pv2/OM2P-HS/OM2P-HSv2/OM2P-HSv3/OM2P-LC
+ 	PACKAGES:=kmod-ath9k om-watchdog
+ endef
+ 
+ define Profile/OM2P/Description
+-	Package set optimized for the OpenMesh OM2P/OM2Pv2/OM2P-HS/OM2P-HSv2/OM2P-LC.
++	Package set optimized for the OpenMesh OM2P/OM2Pv2/OM2P-HS/OM2P-HSv2/OM2P-HSv3/OM2P-LC.
+ endef
+ 
+ $(eval $(call Profile,OM2P))

targets/ar71xx-generic/profiles.mk

@@ -330,6 +330,7 @@ $(eval $(call GluonModel,OM2P,om2p,openmesh-om2p))
 $(eval $(call GluonModelAlias,OM2P,openmesh-om2p,openmesh-om2pv2))
 $(eval $(call GluonModelAlias,OM2P,openmesh-om2p,openmesh-om2p-hs))
 $(eval $(call GluonModelAlias,OM2P,openmesh-om2p,openmesh-om2p-hsv2))
+$(eval $(call GluonModelAlias,OM2P,openmesh-om2p,openmesh-om2p-hsv3))
 $(eval $(call GluonModelAlias,OM2P,openmesh-om2p,openmesh-om2p-lc))
 
 # OM5P