diff --git a/boards/ekh-filogic/target_diffconfig b/boards/ekh-filogic/target_diffconfig index 8c8ddcd714..72efd2b3b0 100644 --- a/boards/ekh-filogic/target_diffconfig +++ b/boards/ekh-filogic/target_diffconfig @@ -1,7 +1,7 @@ CONFIG_TARGET_MULTI_PROFILE=y CONFIG_TARGET_mediatek=y CONFIG_TARGET_mediatek_filogic=y -CONFIG_TARGET_DEVICE_mediatek_filogic_DEVICE_glinet_gl-mt3000=y +CONFIG_TARGET_DEVICE_mediatek_filogic_DEVICE_morse_ekh19=y CONFIG_TARGET_DEVICE_mediatek_filogic_DEVICE_asus_rt-ax59u=y CONFIG_TARGET_PREINIT_IP="192.168.8.1" diff --git a/package/boot/uboot-envtools/files/mediatek_filogic b/package/boot/uboot-envtools/files/mediatek_filogic index 85114ec938..c67ffaf281 100644 --- a/package/boot/uboot-envtools/files/mediatek_filogic +++ b/package/boot/uboot-envtools/files/mediatek_filogic @@ -86,7 +86,8 @@ xiaomi,redmi-router-ax6000-ubootmod) ubootenv_add_uci_config "$envdev" "0x0" "0x1f000" "0x20000" "1" ubootenv_add_uci_config "$envdev2" "0x0" "0x1f000" "0x20000" "1" ;; -glinet,gl-mt3000) +glinet,gl-mt3000|\ +morse,*ekh19*) ubootenv_add_uci_config "/dev/mtd1" "0x0" "0x80000" "0x20000" ;; glinet,gl-mt6000) diff --git a/target/linux/mediatek/base-files/lib/preinit/05_set_preinit_iface b/target/linux/mediatek/base-files/lib/preinit/05_set_preinit_iface index 6dfa52c291..4a369bc76d 100644 --- a/target/linux/mediatek/base-files/lib/preinit/05_set_preinit_iface +++ b/target/linux/mediatek/base-files/lib/preinit/05_set_preinit_iface @@ -2,7 +2,8 @@ set_preinit_iface() { case $(board_name) in cudy,m3000-v1|\ cudy,tr3000-v1|\ - glinet,gl-mt3000) + glinet,gl-mt3000|\ + morse,*ekh19*) ip link set eth1 up ifname=eth1 ;; diff --git a/target/linux/mediatek/dts/mt7981b-glinet-gl-mt3000.dts b/target/linux/mediatek/dts/mt7981b-glinet-gl-mt3000.dts index f9b8c16652..4a02b36a6e 100644 --- a/target/linux/mediatek/dts/mt7981b-glinet-gl-mt3000.dts +++ b/target/linux/mediatek/dts/mt7981b-glinet-gl-mt3000.dts @@ -4,7 +4,7 @@ / { model = "GL.iNet GL-MT3000"; - compatible = "glinet,gl-mt3000", "mediatek,mt7981"; + compatible = "morse,ekh19", "glinet,gl-mt3000", "mediatek,mt7981"; aliases { label-mac-device = &gmac0; diff --git a/target/linux/mediatek/filogic/base-files/etc/board.d/02_network b/target/linux/mediatek/filogic/base-files/etc/board.d/02_network index e8ce84dd4b..e0afbf72fa 100644 --- a/target/linux/mediatek/filogic/base-files/etc/board.d/02_network +++ b/target/linux/mediatek/filogic/base-files/etc/board.d/02_network @@ -47,7 +47,8 @@ mediatek_setup_interfaces() ;; cudy,m3000-v1|\ cudy,tr3000-v1|\ - glinet,gl-mt3000) + glinet,gl-mt3000|\ + morse,*ekh19*) ucidef_set_interfaces_lan_wan eth1 eth0 ;; dlink,aquila-pro-ai-m30-a1) diff --git a/target/linux/mediatek/image/filogic.mk b/target/linux/mediatek/image/filogic.mk index e069671c47..3ea6265239 100644 --- a/target/linux/mediatek/image/filogic.mk +++ b/target/linux/mediatek/image/filogic.mk @@ -458,15 +458,6 @@ define Device/glinet_gl-mt3000 DEVICE_DTS := mt7981b-glinet-gl-mt3000 DEVICE_DTS_DIR := ../dts SUPPORTED_DEVICES += glinet,mt3000-snand - - # Just rename the image name for now. - __MM_DEVICE_VENDOR := MorseMicro - __MM_DEVICE_MODEL := MM8108-EKH19 - __MM_DEVICE_VARIANT := 01 - __MM_DEVICE_TITLE = $$(__MM_DEVICE_VENDOR) $$(__MM_DEVICE_MODEL) $$(__MM_DEVICE_VARIANT) - IMAGE_PREFIX = $$(VERSION_DIST_SANITIZED)-$$(IMG_PREFIX_VERCODE)$$(IMG_PREFIX_EXTRA)$$(call sanitize,$$(__MM_DEVICE_TITLE)) - DEVICE_IMG_NAME = $$(IMAGE_PREFIX)-$$(1)-$$(2) - DEVICE_PACKAGES := kmod-mt7981-firmware mt7981-wo-firmware kmod-hwmon-pwmfan kmod-usb3 UBINIZE_OPTS := -E 5 BLOCKSIZE := 128k @@ -477,6 +468,17 @@ define Device/glinet_gl-mt3000 endef TARGET_DEVICES += glinet_gl-mt3000 +define Device/morse_ekh19 + $(Device/glinet_gl-mt3000) + DEVICE_VENDOR := MorseMicro + DEVICE_MODEL := MM8108-EKH19 + SUPPORTED_DEVICES += glinet,mt3000 + # Image name format : ----squashfs-sysupgrade.bin + IMAGE_PREFIX = $$(VERSION_DIST_SANITIZED)-$$(IMG_PREFIX_VERCODE)$$(IMG_PREFIX_EXTRA)$$(call sanitize,$$(DEVICE_TITLE)) + DEVICE_IMG_NAME = $$(IMAGE_PREFIX)-$$(1)-$$(2) +endef +TARGET_DEVICES += morse_ekh19 + define Device/glinet_gl-mt6000 DEVICE_VENDOR := GL.iNet DEVICE_MODEL := GL-MT6000