diff options
8 files changed, 87 insertions, 2 deletions
diff --git a/package/boot/uboot-envtools/Makefile b/package/boot/uboot-envtools/Makefile index 8bc2c00ba5..4847653f3f 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:=17 +PKG_RELEASE:=18 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 3cdb71a69e..028b00ac43 100644 --- a/package/boot/uboot-envtools/files/ath79 +++ b/package/boot/uboot-envtools/files/ath79 @@ -49,6 +49,7 @@ netgear,wnr612-v2|\ ocedo,koala|\ ocedo,raccoon|\ openmesh,mr600-v1|\ +openmesh,mr600-v2|\ openmesh,om5p|\ openmesh,om5p-ac-v2|\ samsung,wam250|\ diff --git a/target/linux/ath79/dts/ar9344_openmesh_mr600-v2.dts b/target/linux/ath79/dts/ar9344_openmesh_mr600-v2.dts new file mode 100644 index 0000000000..988066798f --- /dev/null +++ b/target/linux/ath79/dts/ar9344_openmesh_mr600-v2.dts @@ -0,0 +1,71 @@ +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT + +#include "ar9344_openmesh_mr600.dtsi" + +/ { + compatible = "openmesh,mr600-v2", "qca,ar9344"; + model = "OpenMesh MR600 v2"; + + aliases { + led-boot = &led_power_blue; + led-failsafe = &led_power_blue; + led-running = &led_power_blue; + led-upgrade = &led_power_blue; + }; + + leds { + compatible = "gpio-leds"; + + wifi5g_red { + label = "red:wifi5g"; + gpios = <&gpio 12 GPIO_ACTIVE_LOW>; + }; + + wps_blue { + label = "blue:wps"; + gpios = <&gpio 13 GPIO_ACTIVE_LOW>; + }; + + led_power_blue: power_blue { + label = "blue:power"; + gpios = <&gpio 14 GPIO_ACTIVE_LOW>; + default-state = "on"; + }; + + wifi2g_green { + label = "green:wifi2g"; + gpios = <&gpio 18 GPIO_ACTIVE_LOW>; + linux,default-trigger = "phy1tpt"; + }; + + wifi2g_yellow { + label = "yellow:wifi2g"; + gpios = <&gpio 19 GPIO_ACTIVE_LOW>; + }; + + wifi2g_red { + label = "red:wifi2g"; + gpios = <&gpio 20 GPIO_ACTIVE_LOW>; + }; + + wifi5g_green { + label = "green:wifi5g"; + gpios = <&gpio 21 GPIO_ACTIVE_LOW>; + linux,default-trigger = "phy0tpt"; + }; + + wifi5g_yellow { + label = "yellow:wifi5g"; + gpios = <&gpio 22 GPIO_ACTIVE_LOW>; + }; + }; + + watchdog { + compatible = "linux,wdt-gpio"; + gpios = <&gpio 15 GPIO_ACTIVE_LOW>; + hw_algo = "toggle"; + /* hw_margin_ms is actually 300s but driver limits it to 60s */ + hw_margin_ms = <60000>; + always-running; + }; +}; diff --git a/target/linux/ath79/generic/base-files/etc/board.d/02_network b/target/linux/ath79/generic/base-files/etc/board.d/02_network index df0842fc63..3c37781c0e 100755 --- a/target/linux/ath79/generic/base-files/etc/board.d/02_network +++ b/target/linux/ath79/generic/base-files/etc/board.d/02_network @@ -47,6 +47,7 @@ ath79_setup_interfaces() ocedo,koala|\ ocedo,raccoon|\ openmesh,mr600-v1|\ + openmesh,mr600-v2|\ pcs,cap324|\ pisen,ts-d084|\ pisen,wmb001n|\ diff --git a/target/linux/ath79/generic/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom b/target/linux/ath79/generic/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom index 150c70d68b..d50d8d9f82 100644 --- a/target/linux/ath79/generic/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom +++ b/target/linux/ath79/generic/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom @@ -120,7 +120,8 @@ case "$FIRMWARE" in ubnt,rocket-m) caldata_extract "art" 0x1000 0x1000 ;; - openmesh,mr600-v1) + openmesh,mr600-v1|\ + openmesh,mr600-v2) caldata_extract "ART" 0x5000 0x440 ;; wd,mynet-n750) diff --git a/target/linux/ath79/generic/base-files/etc/uci-defaults/04_led_migration b/target/linux/ath79/generic/base-files/etc/uci-defaults/04_led_migration index 871d84ed63..88c4f527b7 100644 --- a/target/linux/ath79/generic/base-files/etc/uci-defaults/04_led_migration +++ b/target/linux/ath79/generic/base-files/etc/uci-defaults/04_led_migration @@ -20,6 +20,9 @@ glinet,gl-mifi) openmesh,mr600-v1) migrate_leds ":wlan58=:wifi5g" ;; +openmesh,mr600-v2) + migrate_leds ":wlan24=:wifi2g" ":wlan58=:wifi5g" + ;; pcs,cap324) migrate_leds "lan:amber=amber:lan" "lan:green=green:lan" ;; 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 81dd911564..e14adb38fa 100644 --- a/target/linux/ath79/generic/base-files/lib/upgrade/platform.sh +++ b/target/linux/ath79/generic/base-files/lib/upgrade/platform.sh @@ -51,6 +51,7 @@ platform_do_upgrade() { redboot_fis_do_upgrade "$1" linux ;; openmesh,mr600-v1|\ + openmesh,mr600-v2|\ openmesh,om2p-v2|\ openmesh,om2p-v4|\ openmesh,om2p-hs-v1|\ diff --git a/target/linux/ath79/image/generic.mk b/target/linux/ath79/image/generic.mk index 14546f6ade..9a182cab79 100644 --- a/target/linux/ath79/image/generic.mk +++ b/target/linux/ath79/image/generic.mk @@ -1545,6 +1545,13 @@ define Device/openmesh_mr600-v1 endef TARGET_DEVICES += openmesh_mr600-v1 +define Device/openmesh_mr600-v2 + $(Device/openmesh_mr600-common) + DEVICE_VARIANT := v2 + SUPPORTED_DEVICES += mr600v2 +endef +TARGET_DEVICES += openmesh_mr600-v2 + define Device/openmesh_om2p-common DEVICE_VENDOR := OpenMesh DEVICE_PACKAGES := uboot-envtools |