[openwrt/openwrt] ath79: add support for OpenMesh OM2P-HS v2

[LEDE Commits]

adrian pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/f096accce26bc46831e859ccd40b3f88e404cc7e

commit f096accce26bc46831e859ccd40b3f88e404cc7e
Author: Sven Eckelmann <sven at narfation.org>
AuthorDate: Mon Nov 23 13:41:34 2020 +0100

    ath79: add support for OpenMesh OM2P-HS v2
    
    Device specifications:
    ======================
    
    * Qualcomm/Atheros AR9341 rev 1
    * 535/400/200 MHz (CPU/DDR/AHB)
    * 64 MB of RAM
    * 16 MB of SPI NOR flash
      - 2x 7 MB available; but one of the 7 MB regions is the recovery image
    * 2x 10/100 Mbps Ethernet
    * 2T2R 2.4 GHz Wi-Fi
    * 6x GPIO-LEDs (3x wifi, 2x ethernet, 1x power)
    * 1x GPIO-button (reset)
    * external h/w watchdog (enabled by default)
    * TTL pins are on board (arrow points to VCC, then follows: GND, TX, RX)
    * 2x fast ethernet
      - eth0
        + 802.3af POE
        + builtin switch port 1
        + used as LAN interface
      - eth1
        + 18-24V passive POE (mode B)
        + used as WAN interface
    * 12-24V 1A DC
    * internal antennas
    
    Flashing instructions:
    ======================
    
    Various methods can be used to install the actual image on the flash.
    Two easy ones are:
    
    ap51-flash
    ----------
    
    The tool ap51-flash (https://github.com/ap51-flash/ap51-flash) should be
    used to transfer the image to the u-boot when the device boots up.
    
    initramfs from TFTP
    -------------------
    
    The serial console must be used to access the u-boot shell during bootup.
    It can then be used to first boot up the initramfs image from a TFTP server
    (here with the IP 192.168.1.21):
    
       setenv serverip 192.168.1.21
       setenv ipaddr 192.168.1.1
       tftpboot 0c00000 <filename-of-initramfs-kernel>.bin && bootm $fileaddr
    
    The actual sysupgrade image can then be transferred (on the LAN port) to
    the device via
    
      scp <filename-of-squashfs-sysupgrade>.bin root at 192.168.1.1:/tmp/
    
    On the device, the sysupgrade must then be started using
    
      sysupgrade -n /tmp/<filename-of-squashfs-sysupgrade>.bin
    
    Signed-off-by: Sven Eckelmann <sven at narfation.org>
---
 package/boot/uboot-envtools/Makefile                          | 2 +-
 package/boot/uboot-envtools/files/ath79                       | 1 +
 target/linux/ath79/dts/ar9341_openmesh_om2p-hs-v2.dts         | 8 ++++++++
 target/linux/ath79/generic/base-files/etc/board.d/01_leds     | 1 +
 target/linux/ath79/generic/base-files/lib/upgrade/platform.sh | 1 +
 target/linux/ath79/image/generic.mk                           | 9 +++++++++
 6 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/package/boot/uboot-envtools/Makefile b/package/boot/uboot-envtools/Makefile
index 3493332cee..85a67c1ac3 100644
--- a/package/boot/uboot-envtools/Makefile
+++ b/package/boot/uboot-envtools/Makefile
@@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=uboot-envtools
 PKG_DISTNAME:=u-boot
 PKG_VERSION:=2020.04
-PKG_RELEASE:=12
+PKG_RELEASE:=13
 
 PKG_SOURCE:=$(PKG_DISTNAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:= \
diff --git a/package/boot/uboot-envtools/files/ath79 b/package/boot/uboot-envtools/files/ath79
index bc69d35c96..212143f49b 100644
--- a/package/boot/uboot-envtools/files/ath79
+++ b/package/boot/uboot-envtools/files/ath79
@@ -87,6 +87,7 @@ netgear,wndr4300sw)
 	;;
 openmesh,om2p-v4|\
 openmesh,om2p-hs-v1|\
+openmesh,om2p-hs-v2|\
 openmesh,om2p-hs-v4|\
 plasmacloud,pa300|\
 plasmacloud,pa300e)
diff --git a/target/linux/ath79/dts/ar9341_openmesh_om2p-hs-v2.dts b/target/linux/ath79/dts/ar9341_openmesh_om2p-hs-v2.dts
new file mode 100644
index 0000000000..819a6be97f
--- /dev/null
+++ b/target/linux/ath79/dts/ar9341_openmesh_om2p-hs-v2.dts
@@ -0,0 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
+
+#include "ar9341_openmesh_om2p-hs.dtsi"
+
+/ {
+	compatible = "openmesh,om2p-hs-v2", "qca,ar9341";
+	model = "OpenMesh OM2P-HS v2";
+};
diff --git a/target/linux/ath79/generic/base-files/etc/board.d/01_leds b/target/linux/ath79/generic/base-files/etc/board.d/01_leds
index 057bec3bc8..8926ffc0c8 100755
--- a/target/linux/ath79/generic/base-files/etc/board.d/01_leds
+++ b/target/linux/ath79/generic/base-files/etc/board.d/01_leds
@@ -146,6 +146,7 @@ comfast,cf-e560ac)
 	;;
 comfast,cf-ew72|\
 openmesh,om2p-hs-v1|\
+openmesh,om2p-hs-v2|\
 telco,t1)
 	ucidef_set_led_switch "lan" "LAN" "blue:lan" "switch0" "0x02"
 	ucidef_set_led_netdev "wan" "WAN" "blue:wan" "eth1"
diff --git a/target/linux/ath79/generic/base-files/lib/upgrade/platform.sh b/target/linux/ath79/generic/base-files/lib/upgrade/platform.sh
index e3298cfc13..73c328173a 100644
--- a/target/linux/ath79/generic/base-files/lib/upgrade/platform.sh
+++ b/target/linux/ath79/generic/base-files/lib/upgrade/platform.sh
@@ -52,6 +52,7 @@ platform_do_upgrade() {
 		;;
 	openmesh,om2p-v4|\
 	openmesh,om2p-hs-v1|\
+	openmesh,om2p-hs-v2|\
 	openmesh,om2p-hs-v4)
 		PART_NAME="inactive"
 		platform_do_upgrade_openmesh "$1"
diff --git a/target/linux/ath79/image/generic.mk b/target/linux/ath79/image/generic.mk
index 1454c14e44..4e80ac8402 100644
--- a/target/linux/ath79/image/generic.mk
+++ b/target/linux/ath79/image/generic.mk
@@ -1586,6 +1586,15 @@ define Device/openmesh_om2p-hs-v1
 endef
 TARGET_DEVICES += openmesh_om2p-hs-v1
 
+define Device/openmesh_om2p-hs-v2
+  $(Device/openmesh_om2p-common)
+  SOC := ar9341
+  DEVICE_MODEL := OM2P-HS
+  DEVICE_VARIANT := v2
+  SUPPORTED_DEVICES += om2p-hsv2
+endef
+TARGET_DEVICES += openmesh_om2p-hs-v2
+
 define Device/openmesh_om2p-hs-v4
   $(Device/openmesh_om2p-common)
   SOC := qca9533