From: Felix Fietkau Date: Tue, 12 Jan 2021 13:20:05 +0000 (+0100) Subject: ramips: add work-in-progress support for D-Link DIR-X1860 X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=9eec4e8488ec12fb108d3a931f7463e459b337f4;p=openwrt%2Fstaging%2Fnbd.git ramips: add work-in-progress support for D-Link DIR-X1860 Signed-off-by: Felix Fietkau --- diff --git a/package/boot/uboot-envtools/files/ramips b/package/boot/uboot-envtools/files/ramips index 341687625c..3b894a9494 100644 --- a/package/boot/uboot-envtools/files/ramips +++ b/package/boot/uboot-envtools/files/ramips @@ -88,6 +88,9 @@ sim,simax1800t) ubootenv_add_uci_config "/dev/mtd1" "0x0" "0x20000" "0x20000" ubootenv_add_uci_sys_config "/dev/mtd1" "0x40000" "0x40000" "0x20000" ;; +dlink,dir-x1860) + ubootenv_add_uci_config "/dev/mtd1" "0x0" "0x2000" "0x20000" + ;; hootoo,ht-tm05|\ ravpower,rp-wd03) idx="$(find_mtd_index u-boot-env)" diff --git a/target/linux/ramips/dts/mt7621_dlink_dir-x1860.dts b/target/linux/ramips/dts/mt7621_dlink_dir-x1860.dts new file mode 100644 index 0000000000..f481c94f81 --- /dev/null +++ b/target/linux/ramips/dts/mt7621_dlink_dir-x1860.dts @@ -0,0 +1,165 @@ +/dts-v1/; + +#include "mt7621.dtsi" +#include + +/ { + compatible = "dlink,dir-x1860", "mediatek,mt7621-soc"; + model = "DLink DIR-X1860"; + + chosen { + bootargs-override = "console=ttyS0,115200"; + }; + + aliases { + label-mac-device = &gmac0; + led-boot = &led_power_orange; + led-failsafe = &led_power_white; + led-running = &led_power_white; + led-upgrade = &led_net_orange; + }; + + gpio-leds { + compatible = "gpio-leds"; + + led_power_white: power_white { + label = "white:power"; + gpios = <&gpio 13 GPIO_ACTIVE_LOW>; + }; + + led_net_orange: net_orange { + label = "orange:net"; + gpios = <&gpio 14 GPIO_ACTIVE_LOW>; + }; + + led_power_orange: power_orange { + label = "orange:power"; + gpios = <&gpio 15 GPIO_ACTIVE_LOW>; + }; + + led_net_white { + label = "white:net"; + gpios = <&gpio 16 GPIO_ACTIVE_LOW>; + }; + }; + + keys { + compatible = "gpio-keys"; + + reset { + label = "reset"; + gpios = <&gpio 6 GPIO_ACTIVE_LOW>; + linux,code = ; + }; + + wps { + label = "wps"; + linux,code = ; + gpios = <&gpio 18 GPIO_ACTIVE_LOW>; + }; + }; +}; + +&mdio { + phy4: ethernet-phy@4 { + reg = <4>; + }; +}; + +&gmac1 { + status = "okay"; + phy-handle = <&phy4>; +}; + +&switch0 { + ports { + port@0 { + status = "okay"; + label = "lan4"; + }; + + port@1 { + status = "okay"; + label = "lan3"; + }; + + port@2 { + status = "okay"; + label = "lan2"; + }; + + port@3 { + status = "okay"; + label = "lan1"; + }; + }; +}; + +&nand { + status = "okay"; + + partitions { + compatible = "fixed-partitions"; + #address-cells = <1>; + #size-cells = <1>; + + partition@0 { + label = "u-boot"; + reg = <0x00000 0x80000>; + read-only; + }; + + partition@80000 { + label = "u-boot-env"; + reg = <0x80000 0x80000>; + }; + + factory: partition@100000 { + label = "factory"; + reg = <0x100000 0x80000>; + }; + + partition@180000 { + label = "kernel"; + reg = <0x180000 0x400000>; + }; + + partition@580000 { + label = "ubi"; + reg = <0x580000 0x2b00000>; + }; + + partition@2c80000 { + label = "firmware2"; + reg = <0x2c80000 0x2b00000>; + }; + + partition@5780000 { + label = "Devdata"; + reg = <0x5780000 0x800000>; + }; + + partition@5f80000 { + label = "User_data"; + reg = <0x5f80000 0x2000000>; + }; + }; +}; + +&state_default { + gpio { + groups = "i2c", "uart3", "jtag", "wdt"; + function = "gpio"; + }; +}; + +&pcie { + status = "okay"; +}; + +&pcie1 { + mt76@0,0 { + reg = <0x0000 0 0 0 0>; + mediatek,mtd-eeprom = <&factory 0x0000>; + }; +}; diff --git a/target/linux/ramips/image/mt7621.mk b/target/linux/ramips/image/mt7621.mk index eb7dacefef..1b36e990f2 100644 --- a/target/linux/ramips/image/mt7621.mk +++ b/target/linux/ramips/image/mt7621.mk @@ -15,6 +15,23 @@ define Image/Prepare echo -ne '\xde\xad\xc0\xde' > $(KDIR)/ubi_mark endef +RELOCATE_LOADADDR = 0x81000000 + +define Build/uImage-relocate + mkimage \ + -A $(LINUX_KARCH) \ + -O linux \ + -T kernel \ + -C $(word 1,$(1)) \ + -a $(RELOCATE_LOADADDR) \ + -e $(RELOCATE_LOADADDR) \ + -n '$(if $(UIMAGE_NAME),$(UIMAGE_NAME),$(call toupper,$(LINUX_KARCH)) $(VERSION_DIST) Linux-$(LINUX_VERSION))' \ + $(if $(UIMAGE_MAGIC),-M $(UIMAGE_MAGIC)) \ + $(wordlist 2,$(words $(1)),$(1)) \ + -d $@ $@.new + mv $@.new $@ +endef + define Build/append-dlink-covr-metadata echo -ne '{"supported_devices": "$(1)", "firmware": "' > $@metadata.tmp $(MKHASH) md5 "$@" | head -c32 >> $@metadata.tmp @@ -1005,6 +1022,24 @@ define Device/dlink_dir-882-r1 endef TARGET_DEVICES += dlink_dir-882-r1 +define Device/dlink_dir-x1860 + $(Device/dsa-migration) + DEVICE_VENDOR := D-Link + DEVICE_MODEL := DIR-X1860 + DEVICE_PACKAGES += kmod-mt7915e uboot-envtools + BLOCKSIZE := 128k + PAGESIZE := 2048 + KERNEL_SIZE := 4096k + UBINIZE_OPTS := -E 5 + KERNEL := kernel-bin | append-dtb | relocate-kernel | lzma | uImage-relocate lzma + IMAGES += factory.bin + IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata + IMAGE/factory.bin := append-kernel | pad-to $$(KERNEL_SIZE) | append-ubi | \ + check-size + IMAGE_SIZE := 40960k +endef +TARGET_DEVICES += dlink_dir-x1860 + define Device/dlink_dra-1360-a1 $(Device/dlink_dxx-1xx0-x1) DEVICE_MODEL := DRA-1360 diff --git a/target/linux/ramips/mt7621/base-files/etc/board.d/01_leds b/target/linux/ramips/mt7621/base-files/etc/board.d/01_leds index 9a77b1b1bc..7a88f30a46 100644 --- a/target/linux/ramips/mt7621/base-files/etc/board.d/01_leds +++ b/target/linux/ramips/mt7621/base-files/etc/board.d/01_leds @@ -119,6 +119,10 @@ dlink,dir-882-a1|\ dlink,dir-882-r1) ucidef_set_led_netdev "wan" "wan" "green:net" "wan" ;; +dlink,dir-x1860) + ucidef_set_led_netdev "lan" "LAN Link" "orange:net" "eth0" + ucidef_set_led_netdev "wan" "WAN Link" "white:net" "eth1" + ;; gnubee,gb-pc2) ucidef_set_led_netdev "ethyellow" "ethyellow" "orange:ethyellow" "ethyellow" "link tx rx" ;; 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 c780443c1c..f7c92be960 100644 --- a/target/linux/ramips/mt7621/base-files/etc/board.d/02_network +++ b/target/linux/ramips/mt7621/base-files/etc/board.d/02_network @@ -112,6 +112,9 @@ ramips_setup_interfaces() dlink,covr-x1860-a1) ucidef_set_interfaces_lan_wan "ethernet" "internet" ;; + dlink,dir-x1860) + ucidef_set_interfaces_lan_wan "lan1 lan2 lan3 lan4" "eth1" + ;; elecom,wmc-s1267gs2|\ linksys,re6500|\ netgear,wac104|\ @@ -251,6 +254,11 @@ ramips_setup_macs() lan_mac=$(mtd_get_mac_ascii factory lanmac) wan_mac=$(mtd_get_mac_ascii factory wanmac) ;; + dlink,dir-x1860) + lan_mac=$(mtd_get_mac_ascii u-boot-env lanmac) + label_mac=$lan_mac + wan_mac=$(macaddr_add "$lan_mac" 1) + ;; edimax,ra21s|\ edimax,rg21s) lan_mac=$(mtd_get_mac_ascii u-boot-env ethaddr) 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 17532f795b..64b8b28b9b 100755 --- a/target/linux/ramips/mt7621/base-files/lib/upgrade/platform.sh +++ b/target/linux/ramips/mt7621/base-files/lib/upgrade/platform.sh @@ -94,6 +94,7 @@ platform_do_upgrade() { elecom,wmc-x1800gst|\ elecom,wsc-x1800gs|\ etisalat,s3|\ + dlink,dir-x1860|\ h3c,tx1800-plus|\ h3c,tx1801-plus|\ h3c,tx1806|\