aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--target/linux/ramips/dts/mt7621_ubiquiti_edgerouterx-sfp.dts17
-rw-r--r--target/linux/ramips/dts/mt7621_ubiquiti_edgerouterx.dts8
-rw-r--r--target/linux/ramips/dts/mt7621_ubnt_edgerouter-x-sfp.dts17
-rw-r--r--target/linux/ramips/dts/mt7621_ubnt_edgerouter-x.dts8
-rw-r--r--target/linux/ramips/dts/mt7621_ubnt_edgerouter-x.dtsi (renamed from target/linux/ramips/dts/mt7621_ubiquiti_edgerouterx.dtsi)0
-rw-r--r--target/linux/ramips/image/mt7621.mk23
-rwxr-xr-xtarget/linux/ramips/mt7621/base-files/etc/board.d/02_network4
-rwxr-xr-xtarget/linux/ramips/mt7621/base-files/etc/board.d/03_gpio_switches4
-rw-r--r--target/linux/ramips/mt7621/base-files/lib/preinit/07_mt7621_bringup_dsa_master4
-rwxr-xr-xtarget/linux/ramips/mt7621/base-files/lib/upgrade/platform.sh4
10 files changed, 46 insertions, 43 deletions
diff --git a/target/linux/ramips/dts/mt7621_ubiquiti_edgerouterx-sfp.dts b/target/linux/ramips/dts/mt7621_ubiquiti_edgerouterx-sfp.dts
deleted file mode 100644
index b4deb490ed..0000000000
--- a/target/linux/ramips/dts/mt7621_ubiquiti_edgerouterx-sfp.dts
+++ /dev/null
@@ -1,17 +0,0 @@
-/dts-v1/;
-
-#include "mt7621_ubiquiti_edgerouterx.dtsi"
-
-/ {
- model = "UBNT-ERX-SFP";
- compatible = "ubiquiti,edgerouterx-sfp", "mediatek,mt7621-soc";
-};
-
-&i2c {
- status = "okay";
-
- pca9555@25 {
- compatible = "nxp,pca9555";
- reg = <0x25>;
- };
-};
diff --git a/target/linux/ramips/dts/mt7621_ubiquiti_edgerouterx.dts b/target/linux/ramips/dts/mt7621_ubiquiti_edgerouterx.dts
deleted file mode 100644
index 5c1d9ec887..0000000000
--- a/target/linux/ramips/dts/mt7621_ubiquiti_edgerouterx.dts
+++ /dev/null
@@ -1,8 +0,0 @@
-/dts-v1/;
-
-#include "mt7621_ubiquiti_edgerouterx.dtsi"
-
-/ {
- model = "UBNT-ERX";
- compatible = "ubiquiti,edgerouterx", "mediatek,mt7621-soc";
-};
diff --git a/target/linux/ramips/dts/mt7621_ubnt_edgerouter-x-sfp.dts b/target/linux/ramips/dts/mt7621_ubnt_edgerouter-x-sfp.dts
new file mode 100644
index 0000000000..9515f1d8b5
--- /dev/null
+++ b/target/linux/ramips/dts/mt7621_ubnt_edgerouter-x-sfp.dts
@@ -0,0 +1,17 @@
+/dts-v1/;
+
+#include "mt7621_ubnt_edgerouter-x.dtsi"
+
+/ {
+ model = "Ubiquiti EdgeRouter X SFP";
+ compatible = "ubnt,edgerouter-x-sfp", "mediatek,mt7621-soc";
+};
+
+&i2c {
+ status = "okay";
+
+ pca9555@25 {
+ compatible = "nxp,pca9555";
+ reg = <0x25>;
+ };
+};
diff --git a/target/linux/ramips/dts/mt7621_ubnt_edgerouter-x.dts b/target/linux/ramips/dts/mt7621_ubnt_edgerouter-x.dts
new file mode 100644
index 0000000000..260baf9cf9
--- /dev/null
+++ b/target/linux/ramips/dts/mt7621_ubnt_edgerouter-x.dts
@@ -0,0 +1,8 @@
+/dts-v1/;
+
+#include "mt7621_ubnt_edgerouter-x.dtsi"
+
+/ {
+ model = "Ubiquiti EdgeRouter X";
+ compatible = "ubnt,edgerouter-x", "mediatek,mt7621-soc";
+};
diff --git a/target/linux/ramips/dts/mt7621_ubiquiti_edgerouterx.dtsi b/target/linux/ramips/dts/mt7621_ubnt_edgerouter-x.dtsi
index 4503f67a64..4503f67a64 100644
--- a/target/linux/ramips/dts/mt7621_ubiquiti_edgerouterx.dtsi
+++ b/target/linux/ramips/dts/mt7621_ubnt_edgerouter-x.dtsi
diff --git a/target/linux/ramips/image/mt7621.mk b/target/linux/ramips/image/mt7621.mk
index 6b2e68b03b..806286b0bb 100644
--- a/target/linux/ramips/image/mt7621.mk
+++ b/target/linux/ramips/image/mt7621.mk
@@ -794,27 +794,30 @@ define Device/tplink_re650-v1
endef
TARGET_DEVICES += tplink_re650-v1
-define Device/ubiquiti_edgerouterx
+define Device/ubnt_edgerouter_common
+ DEVICE_VENDOR := Ubiquiti
IMAGE_SIZE := 256768k
FILESYSTEMS := squashfs
KERNEL_SIZE := 3145728
KERNEL_INITRAMFS := $$(KERNEL) | \
ubnt-erx-factory-image $(KDIR)/tmp/$$(KERNEL_INITRAMFS_PREFIX)-factory.tar
IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata
- DEVICE_VENDOR := Ubiquiti
+endef
+
+define Device/ubnt_edgerouter-x
+ $(Device/ubnt_edgerouter_common)
DEVICE_MODEL := EdgeRouter X
- SUPPORTED_DEVICES += ubnt-erx
+ SUPPORTED_DEVICES += ubnt-erx ubiquiti,edgerouterx
endef
-TARGET_DEVICES += ubiquiti_edgerouterx
+TARGET_DEVICES += ubnt_edgerouter-x
-define Device/ubiquiti_edgerouterx-sfp
- $(Device/ubiquiti_edgerouterx)
- DEVICE_VENDOR := Ubiquiti
- DEVICE_MODEL := EdgeRouter X-SFP
+define Device/ubnt_edgerouter-x-sfp
+ $(Device/ubnt_edgerouter_common)
+ DEVICE_MODEL := EdgeRouter X SFP
DEVICE_PACKAGES += kmod-i2c-algo-pca kmod-gpio-pca953x
- SUPPORTED_DEVICES += ubnt-erx-sfp
+ SUPPORTED_DEVICES += ubnt-erx-sfp ubiquiti,edgerouterx-sfp
endef
-TARGET_DEVICES += ubiquiti_edgerouterx-sfp
+TARGET_DEVICES += ubnt_edgerouter-x-sfp
define Device/ubnt_unifi-nanohd
DEVICE_VENDOR := Ubiquiti
diff --git a/target/linux/ramips/mt7621/base-files/etc/board.d/02_network b/target/linux/ramips/mt7621/base-files/etc/board.d/02_network
index f573a049ce..252f9f1dda 100755
--- a/target/linux/ramips/mt7621/base-files/etc/board.d/02_network
+++ b/target/linux/ramips/mt7621/base-files/etc/board.d/02_network
@@ -42,8 +42,8 @@ ramips_setup_interfaces()
mikrotik,routerboard-750gr3)
ucidef_set_interfaces_lan_wan "lan2 lan3 lan4 lan5" "wan"
;;
- ubiquiti,edgerouterx|\
- ubiquiti,edgerouterx-sfp)
+ ubnt,edgerouter-x|\
+ ubnt,edgerouter-x-sfp)
ucidef_set_interface_lan "eth0 eth1 eth2 eth3 eth4"
;;
*)
diff --git a/target/linux/ramips/mt7621/base-files/etc/board.d/03_gpio_switches b/target/linux/ramips/mt7621/base-files/etc/board.d/03_gpio_switches
index 511d9deed8..91a9459d8c 100755
--- a/target/linux/ramips/mt7621/base-files/etc/board.d/03_gpio_switches
+++ b/target/linux/ramips/mt7621/base-files/etc/board.d/03_gpio_switches
@@ -13,10 +13,10 @@ mikrotik,routerboard-750gr3)
telco-electronics,x1)
ucidef_add_gpio_switch "modem_reset" "Modem Reset" "16"
;;
-ubiquiti,edgerouterx)
+ubnt,edgerouter-x)
ucidef_add_gpio_switch "poe_passthrough" "PoE Passthrough" "0"
;;
-ubiquiti,edgerouterx-sfp)
+ubnt,edgerouter-x-sfp)
ucidef_add_gpio_switch "poe_power_port0" "PoE Power Port0" "496"
ucidef_add_gpio_switch "poe_power_port1" "PoE Power Port1" "497"
ucidef_add_gpio_switch "poe_power_port2" "PoE Power Port2" "498"
diff --git a/target/linux/ramips/mt7621/base-files/lib/preinit/07_mt7621_bringup_dsa_master b/target/linux/ramips/mt7621/base-files/lib/preinit/07_mt7621_bringup_dsa_master
index 7a11252168..b8ebcc3f41 100644
--- a/target/linux/ramips/mt7621/base-files/lib/preinit/07_mt7621_bringup_dsa_master
+++ b/target/linux/ramips/mt7621/base-files/lib/preinit/07_mt7621_bringup_dsa_master
@@ -7,8 +7,8 @@ mt7621_bringup_dsa_master() {
local masterif
case "$board" in
- ubiquiti,edgerouterx|\
- ubiquiti,edgerouterx-sfp)
+ ubnt,edgerouter-x|\
+ ubnt,edgerouter-x-sfp)
masterif="dsa"
;;
*)
diff --git a/target/linux/ramips/mt7621/base-files/lib/upgrade/platform.sh b/target/linux/ramips/mt7621/base-files/lib/upgrade/platform.sh
index 3f292a5dac..864c59c8e5 100755
--- a/target/linux/ramips/mt7621/base-files/lib/upgrade/platform.sh
+++ b/target/linux/ramips/mt7621/base-files/lib/upgrade/platform.sh
@@ -62,8 +62,8 @@ platform_do_upgrade() {
iodata_mstc_upgrade_prepare
nand_do_upgrade "$1"
;;
- ubiquiti,edgerouterx|\
- ubiquiti,edgerouterx-sfp)
+ ubnt,edgerouter-x|\
+ ubnt,edgerouter-x-sfp)
platform_upgrade_ubnt_erx "$1"
;;
*)