| Message ID | BLU436-SMTP2160FA91842424D7AC75217D0180@phx.gbl |
|---|---|
| State | Changes Requested |
| Headers | show |
On 22/11/2015 15:58, YounJae Rho wrote: > netis WF-2881 is an MT7621AT based router with MT7602EN, MT7612EN. > It has 128MB DDR3, 128MB SLC NAND FLASH, 5-port Gbps switch and 1x USB 3.0. > The following patch adds support for this device. > > Tested and working: > * ethernet > * both WiFi radios > * USB 3.0 > * buttons (reset button) > * ethernet switch and USB diag LEDs > * UART > * GPIOs > > tested not working > * jffs2 oob erase marker error > * openwrt setting(luci) reset after reboot > > Signed-off-by: YounJae Rho <luxflow@live.com> Hi, you are doing something wrong Applying: mt7621: add support for netis WF-2881 Using index info to reconstruct a base tree... <stdin>:605: new blank line at EOF. + warning: 1 line adds whitespace errors. Falling back to patching base and 3-way merge... error: The following untracked working tree files would be overwritten by merge: target/linux/ramips/dts/WF-2881.dts target/linux/ramips/mt7621/profiles/netis.mk Please move or remove them before you can merge. Aborting Failed to merge in the changes. Patch failed at 0001 mt7621: add support for netis WF-2881 When you have resolved this problem run "git am --resolved". If you would prefer to skip this patch, instead run "git am --skip". To restore the original branch and stop patching run "git am --abort". applying 547334 FAILED John > > --- > I tested it in trunk commit 2c868ebd6f1132e19f120774e98253136b1fcc88 > MTK_NAND should be patched to compile > > > target/linux/ramips/base-files/etc/board.d/01_leds | 3 +- > .../linux/ramips/base-files/etc/board.d/02_network | 1 + > target/linux/ramips/base-files/etc/diag.sh | 1 + > target/linux/ramips/base-files/lib/ramips.sh | 3 + > .../ramips/base-files/lib/upgrade/platform.sh | 1 + > target/linux/ramips/dts/WF-2881.dts | 123 +++++++++++++++++++++ > target/linux/ramips/image/Makefile | 6 +- > target/linux/ramips/mt7621/config-3.18 | 4 +- > target/linux/ramips/mt7621/profiles/netis.mk | 20 ++++ > 9 files changed, 159 insertions(+), 3 deletions(-) > create mode 100644 target/linux/ramips/dts/WF-2881.dts > create mode 100644 target/linux/ramips/mt7621/profiles/netis.mk > > diff --git a/target/linux/ramips/base-files/etc/board.d/01_leds b/target/linux/ramips/base-files/etc/board.d/01_leds > index 5627c8c..a365c61 100755 > --- a/target/linux/ramips/base-files/etc/board.d/01_leds > +++ b/target/linux/ramips/base-files/etc/board.d/01_leds > @@ -44,7 +44,8 @@ air3gii) > all0239-3g|\ > hw550-3g|\ > mofi3500-3gn|\ > -sap-g3200u3) > +sap-g3200u3|\ > +wf-2881) > set_usb_led "$board:green:usb" > ;; > all0256n) > diff --git a/target/linux/ramips/base-files/etc/board.d/02_network b/target/linux/ramips/base-files/etc/board.d/02_network > index 3821742..45778f3 100755 > --- a/target/linux/ramips/base-files/etc/board.d/02_network > +++ b/target/linux/ramips/base-files/etc/board.d/02_network > @@ -78,6 +78,7 @@ ramips_setup_interfaces() > oy-0001|\ > pbr-m1|\ > sap-g3200u3|\ > + wf-2881|\ > whr-300hp2|\ > whr-600d|\ > wsr-1166|\ > diff --git a/target/linux/ramips/base-files/etc/diag.sh b/target/linux/ramips/base-files/etc/diag.sh > index 3013d24..ff5fbf2 100644 > --- a/target/linux/ramips/base-files/etc/diag.sh > +++ b/target/linux/ramips/base-files/etc/diag.sh > @@ -155,6 +155,7 @@ get_status_led() { > tew-692gr|\ > ur-326n4g|\ > ur-336un|\ > + wf-2881|\ > wr512-3gn) > status_led="$board:green:wps" > ;; > diff --git a/target/linux/ramips/base-files/lib/ramips.sh b/target/linux/ramips/base-files/lib/ramips.sh > index a1bcb72..eb2f194 100755 > --- a/target/linux/ramips/base-files/lib/ramips.sh > +++ b/target/linux/ramips/base-files/lib/ramips.sh > @@ -376,6 +376,9 @@ ramips_board_detect() { > *"WCR-150GN") > name="wcr-150gn" > ;; > + *"WF-2881") > + name="wf-2881" > + ;; > *"WHR-1166D") > name="whr-1166d" > ;; > diff --git a/target/linux/ramips/base-files/lib/upgrade/platform.sh b/target/linux/ramips/base-files/lib/upgrade/platform.sh > index 0e8d619..19ab5a2 100755 > --- a/target/linux/ramips/base-files/lib/upgrade/platform.sh > +++ b/target/linux/ramips/base-files/lib/upgrade/platform.sh > @@ -108,6 +108,7 @@ platform_check_image() { > w150m|\ > w306r-v20|\ > w502u|\ > + wf-2881|\ > whr-1166d|\ > whr-300hp2|\ > whr-600d|\ > diff --git a/target/linux/ramips/dts/WF-2881.dts b/target/linux/ramips/dts/WF-2881.dts > new file mode 100644 > index 0000000..52d04e7 > --- /dev/null > +++ b/target/linux/ramips/dts/WF-2881.dts > @@ -0,0 +1,123 @@ > +/dts-v1/; > + > +/include/ "mt7621.dtsi" > + > +/ { > + compatible = "mediatek,mt7621-eval-board", "mediatek,mt7621-soc"; > + model = "NETIS WF-2881"; > + > + memory@0 { > + device_type = "memory"; > + reg = <0x0 0x8000000>; > + }; > + > + palmbus@1E000000 { > + spi@b00 { > + status="disabled"; > + }; > + }; > + > + chosen { > + bootargs = "console=ttyS0,57600"; > + }; > + > + nand@1e003000 { > + compatible = "mtk,mt7621-nand"; > + bank-width = <2>; > + reg = <0x1e003000 0x800 > + 0x1e003800 0x800>; > + #address-cells = <1>; > + #size-cells = <1>; > + > + partition@0 { > + label = "u-boot"; > + reg = <0x0 0x30000>; > + read-only; > + }; > + > + partition@30000 { > + label = "u-boot-env"; > + reg = <0x30000 0x1000>; > + read-only; > + }; > + > + partition@80000 { > + label = "config"; > + reg = <0x80000 0x80000>; > + read-only; > + }; > + > + factory: partition@100000 { > + label = "factory"; > + reg = <0x100000 0x40000>; > + read-only; > + }; > + > + partition@140000 { > + label = "firmware"; > + reg = <0x140000 0x7E00000>; > + }; > + }; > + > + pcie@1e140000 { > + status = "okay"; > + > + pcie0 { > + mt76@0,0 { > + reg = <0x0000 0 0 0 0>; > + device_type = "pci"; > + mediatek,mtd-eeprom = <&factory 0x8000>; > + mediatek,2ghz = <0>; > + }; > + }; > + > + pcie1 { > + mt76@1,0 { > + reg = <0x0000 0 0 0 0>; > + device_type = "pci"; > + mediatek,mtd-eeprom = <&factory 0x0000>; > + mediatek,5ghz = <0>; > + }; > + }; > + }; > + > + ethernet@1e100000 { > + mtd-mac-address = <&factory 0xe006>; > + }; > + > + gpio-leds { > + compatible = "gpio-leds"; > + > + usb { > + label = "wf-2881:green:usb"; > + gpios = <&gpio0 6 1>; > + }; > + > + wps { > + label = "wf-2881:green:wps"; > + gpios = <&gpio0 0 1>; > + }; > + }; > + > + gpio-keys-polled { > + compatible = "gpio-keys-polled"; > + #address-cells = <1>; > + #size-cells = <0>; > + poll-interval = <20>; > + > + reset { > + label = "reset"; > + gpios = <&gpio0 12 1>; > + linux,code = <0x198>; > + }; > + }; > + > + pinctrl { > + state_default: pinctrl0 { > + gpio { > + ralink,group = "uart3", "jtag"; > + ralink,function = "gpio"; > + }; > + }; > + }; > +}; > diff --git a/target/linux/ramips/image/Makefile b/target/linux/ramips/image/Makefile > index 5e19c3f..be0347c 100644 > --- a/target/linux/ramips/image/Makefile > +++ b/target/linux/ramips/image/Makefile > @@ -952,7 +952,7 @@ endif > # > > ifeq ($(SUBTARGET),mt7621) > - TARGET_DEVICES += mt7621 wsr-600 wsr-1166 dir-860l-b1 firewrt pbr-m1 re6500 sap-g3200u3 zbt-wg2626 > + TARGET_DEVICES += mt7621 wsr-600 wsr-1166 dir-860l-b1 firewrt pbr-m1 re6500 sap-g3200u3 zbt-wg2626 wf-2881 > endif > > define Device/mt7621 > @@ -1007,6 +1007,10 @@ define Device/zbt-wg2626 > IMAGE_SIZE := $(ralink_default_fw_size_16M) > endef > > +define Device/wf-2881 > + DTS := WF-2881 > +endef > + > # > # MT7628 Profiles > # > diff --git a/target/linux/ramips/mt7621/config-3.18 b/target/linux/ramips/mt7621/config-3.18 > index fb05d1e..bf1b3f9 100644 > --- a/target/linux/ramips/mt7621/config-3.18 > +++ b/target/linux/ramips/mt7621/config-3.18 > @@ -117,18 +117,20 @@ CONFIG_MIPS_MT_FPAFF=y > CONFIG_MIPS_MT_SMP=y > CONFIG_MIPS_PERF_SHARED_TC_COUNTERS=y > # CONFIG_MIPS_VPE_LOADER is not set > -# CONFIG_MTK_MTD_NAND is not set > CONFIG_MODULES_USE_ELF_REL=y > CONFIG_MT7621_WDT=y > # CONFIG_MTD_CFI_INTELEXT is not set > CONFIG_MTD_CMDLINE_PARTS=y > CONFIG_MTD_M25P80=y > +CONFIG_MTD_NAND=y > +CONFIG_MTD_NAND_ECC=y > CONFIG_MTD_PHYSMAP=y > CONFIG_MTD_SPI_NOR=y > CONFIG_MTD_SPLIT_FIRMWARE=y > CONFIG_MTD_SPLIT_SEAMA_FW=y > CONFIG_MTD_SPLIT_TRX_FW=y > CONFIG_MTD_SPLIT_UIMAGE_FW=y > +CONFIG_MTK_MTD_NAND=y > CONFIG_NEED_DMA_MAP_STATE=y > CONFIG_NET_FLOW_LIMIT=y > CONFIG_NET_RALINK=y > diff --git a/target/linux/ramips/mt7621/profiles/netis.mk b/target/linux/ramips/mt7621/profiles/netis.mk > new file mode 100644 > index 0000000..a46fc4f > --- /dev/null > +++ b/target/linux/ramips/mt7621/profiles/netis.mk > @@ -0,0 +1,20 @@ > +# > +# Copyright (C) 2015 OpenWrt.org > +# > +# This is free software, licensed under the GNU General Public License v2. > +# See /LICENSE for more information. > +# > + > +define Profile/WF-2881 > + NAME:=NETIS WF-2881 > + PACKAGES:=\ > + kmod-usb-core kmod-usb3 kmod-usb-hid \ > + kmod-ledtrig-usbdev > +endef > + > +define Profile/WF-2881/Description > + Package set compatible with the NETIS WF-2881 board. > +endef > + > +$(eval $(call Profile,WF-2881)) > + > > > 2015-11-22 오전 3:12에 John Crispin 이(가) 쓴 글: >> Hi, >> >> the patch does not apply. is this against trunk or CC ? >> >> John >> >> On 14/11/2015 15:32, YounJaeRho wrote: >>> netis WF-2881 is an MT7621AT based router with MT7602EN, MT7612EN. >>> It has 128MB DDR3, 128MB SLC NAND FLASH, 5-port Gbps switch and 1x USB 3.0. >>> The following patch adds support for this device. >>> >>> Tested and working: >>> * ethernet >>> * both WiFi radios >>> * USB 3.0 >>> * buttons (reset button) >>> * ethernet switch and USB diag LEDs >>> * UART >>> * GPIOs >>> >>> >>> Signed-off-by: YounJae Rho <luxflow@live.com> >>> --- >>> Violation of alphabet ordering, indentation, naming, etc from previous version are resolved. >>> Thanks Piotr Dymacz. >>> >>> >>> target/linux/ramips/base-files/etc/board.d/01_leds | 3 +- >>> .../linux/ramips/base-files/etc/board.d/02_network | 1 + >>> target/linux/ramips/base-files/etc/diag.sh | 1 + >>> target/linux/ramips/base-files/lib/ramips.sh | 3 + >>> .../ramips/base-files/lib/upgrade/platform.sh | 1 + >>> target/linux/ramips/dts/WF-2881.dts | 123 +++++++++++++++++++++ >>> target/linux/ramips/image/Makefile | 6 +- >>> target/linux/ramips/mt7621/config-3.18 | 4 +- >>> target/linux/ramips/mt7621/profiles/netis.mk | 18 +++ >>> 9 files changed, 157 insertions(+), 3 deletions(-) >>> create mode 100644 target/linux/ramips/dts/WF-2881.dts >>> create mode 100644 target/linux/ramips/mt7621/profiles/netis.mk >>> >>> diff --git a/target/linux/ramips/base-files/etc/board.d/01_leds b/target/linux/ramips/base-files/etc/board.d/01_leds >>> index c75a993..f9f8e3e 100755 >>> --- a/target/linux/ramips/base-files/etc/board.d/01_leds >>> +++ b/target/linux/ramips/base-files/etc/board.d/01_leds >>> @@ -44,7 +44,8 @@ air3gii) >>> all0239-3g|\ >>> hw550-3g|\ >>> mofi3500-3gn|\ >>> -sap-g3200u3) >>> +sap-g3200u3|\ >>> +wf-2881) >>> set_usb_led "$board:green:usb" >>> ;; >>> all0256n) >>> diff --git a/target/linux/ramips/base-files/etc/board.d/02_network b/target/linux/ramips/base-files/etc/board.d/02_network >>> index 0732796..d3f8121 100755 >>> --- a/target/linux/ramips/base-files/etc/board.d/02_network >>> +++ b/target/linux/ramips/base-files/etc/board.d/02_network >>> @@ -78,6 +78,7 @@ ramips_setup_interfaces() >>> oy-0001|\ >>> pbr-m1|\ >>> sap-g3200u3|\ >>> + wf-2881|\ >>> whr-300hp2|\ >>> whr-600d|\ >>> wsr-1166|\ >>> diff --git a/target/linux/ramips/base-files/etc/diag.sh b/target/linux/ramips/base-files/etc/diag.sh >>> index 5376759..7d16f2c 100644 >>> --- a/target/linux/ramips/base-files/etc/diag.sh >>> +++ b/target/linux/ramips/base-files/etc/diag.sh >>> @@ -150,6 +150,7 @@ get_status_led() { >>> tew-692gr|\ >>> ur-326n4g|\ >>> ur-336un|\ >>> + wf-2881|\ >>> wr512-3gn) >>> status_led="$board:green:wps" >>> ;; >>> diff --git a/target/linux/ramips/base-files/lib/ramips.sh b/target/linux/ramips/base-files/lib/ramips.sh >>> index 340bc4c..5ee494e 100755 >>> --- a/target/linux/ramips/base-files/lib/ramips.sh >>> +++ b/target/linux/ramips/base-files/lib/ramips.sh >>> @@ -373,6 +373,9 @@ ramips_board_detect() { >>> *"WCR-150GN") >>> name="wcr-150gn" >>> ;; >>> + *"WF-2881") >>> + name="wf-2881" >>> + ;; >>> *"WHR-1166D") >>> name="whr-1166d" >>> ;; >>> diff --git a/target/linux/ramips/base-files/lib/upgrade/platform.sh b/target/linux/ramips/base-files/lib/upgrade/platform.sh >>> index d3d9df3..687642f 100755 >>> --- a/target/linux/ramips/base-files/lib/upgrade/platform.sh >>> +++ b/target/linux/ramips/base-files/lib/upgrade/platform.sh >>> @@ -107,6 +107,7 @@ platform_check_image() { >>> w150m|\ >>> w306r-v20|\ >>> w502u|\ >>> + wf-2881|\ >>> whr-1166d|\ >>> whr-300hp2|\ >>> whr-600d|\ >>> diff --git a/target/linux/ramips/dts/WF-2881.dts b/target/linux/ramips/dts/WF-2881.dts >>> new file mode 100644 >>> index 0000000..ba4a29b >>> --- /dev/null >>> +++ b/target/linux/ramips/dts/WF-2881.dts >>> @@ -0,0 +1,123 @@ >>> +/dts-v1/; >>> + >>> +/include/ "mt7621.dtsi" >>> + >>> +/ { >>> + compatible = "mediatek,mt7621-eval-board", "mediatek,mt7621-soc"; >>> + model = "NETIS WF-2881"; >>> + >>> + memory@0 { >>> + device_type = "memory"; >>> + reg = <0x0 0x8000000>; >>> + }; >>> + >>> + palmbus@1E000000 { >>> + spi@b00 { >>> + status="disabled"; >>> + }; >>> + }; >>> + >>> + chosen { >>> + bootargs = "console=ttyS0,57600"; >>> + }; >>> + >>> + nand@1e003000 { >>> + compatible = "mtk,mt7621-nand"; >>> + bank-width = <2>; >>> + reg = <0x1e003000 0x800 >>> + 0x1e003800 0x800>; >>> + #address-cells = <1>; >>> + #size-cells = <1>; >>> + >>> + partition@0 { >>> + label = "u-boot"; >>> + reg = <0x0 0x30000>; >>> + read-only; >>> + }; >>> + >>> + partition@30000 { >>> + label = "u-boot-env"; >>> + reg = <0x30000 0x1000>; >>> + read-only; >>> + }; >>> + >>> + partition@80000 { >>> + label = "config"; >>> + reg = <0x80000 0x20000>; >>> + read-only; >>> + }; >>> + >>> + factory: partition@100000 { >>> + label = "factory"; >>> + reg = <0x100000 0x40000>; >>> + read-only; >>> + }; >>> + >>> + partition@140000 { >>> + label = "firmware"; >>> + reg = <0x140000 0x6EC0000>; >>> + }; >>> + }; >>> + >>> + pcie@1e140000 { >>> + status = "okay"; >>> + >>> + pcie0 { >>> + mt76@0,0 { >>> + reg = <0x0000 0 0 0 0>; >>> + device_type = "pci"; >>> + mediatek,mtd-eeprom = <&factory 0x8000>; >>> + mediatek,2ghz = <0>; >>> + }; >>> + }; >>> + >>> + pcie1 { >>> + mt76@1,0 { >>> + reg = <0x0000 0 0 0 0>; >>> + device_type = "pci"; >>> + mediatek,mtd-eeprom = <&factory 0x0000>; >>> + mediatek,5ghz = <0>; >>> + }; >>> + }; >>> + }; >>> + >>> + ethernet@1e100000 { >>> + mtd-mac-address = <&factory 0xe006>; >>> + }; >>> + >>> + gpio-leds { >>> + compatible = "gpio-leds"; >>> + >>> + usb { >>> + label = "wf-2881:green:usb"; >>> + gpios = <&gpio0 6 1>; >>> + }; >>> + >>> + wps { >>> + label = "wf-2881:green:wps"; >>> + gpios = <&gpio0 0 1>; >>> + }; >>> + }; >>> + >>> + gpio-keys-polled { >>> + compatible = "gpio-keys-polled"; >>> + #address-cells = <1>; >>> + #size-cells = <0>; >>> + poll-interval = <20>; >>> + >>> + reset { >>> + label = "reset"; >>> + gpios = <&gpio0 12 1>; >>> + linux,code = <0x198>; >>> + }; >>> + }; >>> + >>> + pinctrl { >>> + state_default: pinctrl0 { >>> + gpio { >>> + ralink,group = "uart3", "jtag"; >>> + ralink,function = "gpio"; >>> + }; >>> + }; >>> + }; >>> +}; >>> diff --git a/target/linux/ramips/image/Makefile b/target/linux/ramips/image/Makefile >>> index c66409d..060a2a4 100644 >>> --- a/target/linux/ramips/image/Makefile >>> +++ b/target/linux/ramips/image/Makefile >>> @@ -950,7 +950,7 @@ endif >>> # >>> >>> ifeq ($(SUBTARGET),mt7621) >>> - TARGET_DEVICES += mt7621 wsr-600 wsr-1166 dir-860l-b1 firewrt pbr-m1 re6500 sap-g3200u3 >>> + TARGET_DEVICES += mt7621 wsr-600 wsr-1166 dir-860l-b1 firewrt pbr-m1 re6500 sap-g3200u3 wf-2881 >>> endif >>> >>> define Device/mt7621 >>> @@ -1000,6 +1000,10 @@ define Device/sap-g3200u3 >>> DTS := SAP-G3200U3 >>> endef >>> >>> +define Device/wf-2881 >>> + DTS := WF-2881 >>> +endef >>> + >>> # >>> # MT7628 Profiles >>> # >>> diff --git a/target/linux/ramips/mt7621/config-3.18 b/target/linux/ramips/mt7621/config-3.18 >>> index fb05d1e..bf1b3f9 100644 >>> --- a/target/linux/ramips/mt7621/config-3.18 >>> +++ b/target/linux/ramips/mt7621/config-3.18 >>> @@ -117,18 +117,20 @@ CONFIG_MIPS_MT_FPAFF=y >>> CONFIG_MIPS_MT_SMP=y >>> CONFIG_MIPS_PERF_SHARED_TC_COUNTERS=y >>> # CONFIG_MIPS_VPE_LOADER is not set >>> -# CONFIG_MTK_MTD_NAND is not set >>> CONFIG_MODULES_USE_ELF_REL=y >>> CONFIG_MT7621_WDT=y >>> # CONFIG_MTD_CFI_INTELEXT is not set >>> CONFIG_MTD_CMDLINE_PARTS=y >>> CONFIG_MTD_M25P80=y >>> +CONFIG_MTD_NAND=y >>> +CONFIG_MTD_NAND_ECC=y >>> CONFIG_MTD_PHYSMAP=y >>> CONFIG_MTD_SPI_NOR=y >>> CONFIG_MTD_SPLIT_FIRMWARE=y >>> CONFIG_MTD_SPLIT_SEAMA_FW=y >>> CONFIG_MTD_SPLIT_TRX_FW=y >>> CONFIG_MTD_SPLIT_UIMAGE_FW=y >>> +CONFIG_MTK_MTD_NAND=y >>> CONFIG_NEED_DMA_MAP_STATE=y >>> CONFIG_NET_FLOW_LIMIT=y >>> CONFIG_NET_RALINK=y >>> diff --git a/target/linux/ramips/mt7621/profiles/netis.mk b/target/linux/ramips/mt7621/profiles/netis.mk >>> new file mode 100644 >>> index 0000000..6de40af >>> --- /dev/null >>> +++ b/target/linux/ramips/mt7621/profiles/netis.mk >>> @@ -0,0 +1,18 @@ >>> +# >>> +# Copyright (C) 2015 OpenWrt.org >>> +# >>> +# This is free software, licensed under the GNU General Public License v2. >>> +# See /LICENSE for more information. >>> +# >>> + >>> +define Profile/WF-2881 >>> + NAME:=NETIS WF-2881 >>> + PACKAGES:=\ >>> + kmod-usb-core kmod-usb3 kmod-usb-hid \ >>> + kmod-ledtrig-usbdev >>> +endef >>> + >>> +define Profile/WF-2881/Description >>> + Package set compatible with the NETIS WF-2881 board. >>> +endef >>> +$(eval $(call Profile,WF-2881)) >>> >>> >>> _______________________________________________ >>> openwrt-devel mailing list >>> openwrt-devel@lists.openwrt.org >>> https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel >>> > _______________________________________________ > openwrt-devel mailing list > openwrt-devel@lists.openwrt.org > https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel >
diff --git a/target/linux/ramips/base-files/etc/board.d/01_leds b/target/linux/ramips/base-files/etc/board.d/01_leds index 5627c8c..a365c61 100755 --- a/target/linux/ramips/base-files/etc/board.d/01_leds +++ b/target/linux/ramips/base-files/etc/board.d/01_leds @@ -44,7 +44,8 @@ air3gii) all0239-3g|\ hw550-3g|\ mofi3500-3gn|\ -sap-g3200u3) +sap-g3200u3|\ +wf-2881) set_usb_led "$board:green:usb" ;; all0256n) diff --git a/target/linux/ramips/base-files/etc/board.d/02_network b/target/linux/ramips/base-files/etc/board.d/02_network index 3821742..45778f3 100755 --- a/target/linux/ramips/base-files/etc/board.d/02_network +++ b/target/linux/ramips/base-files/etc/board.d/02_network @@ -78,6 +78,7 @@ ramips_setup_interfaces() oy-0001|\ pbr-m1|\ sap-g3200u3|\ + wf-2881|\ whr-300hp2|\ whr-600d|\ wsr-1166|\ diff --git a/target/linux/ramips/base-files/etc/diag.sh b/target/linux/ramips/base-files/etc/diag.sh index 3013d24..ff5fbf2 100644 --- a/target/linux/ramips/base-files/etc/diag.sh +++ b/target/linux/ramips/base-files/etc/diag.sh @@ -155,6 +155,7 @@ get_status_led() { tew-692gr|\ ur-326n4g|\ ur-336un|\ + wf-2881|\ wr512-3gn) status_led="$board:green:wps" ;; diff --git a/target/linux/ramips/base-files/lib/ramips.sh b/target/linux/ramips/base-files/lib/ramips.sh index a1bcb72..eb2f194 100755 --- a/target/linux/ramips/base-files/lib/ramips.sh +++ b/target/linux/ramips/base-files/lib/ramips.sh @@ -376,6 +376,9 @@ ramips_board_detect() { *"WCR-150GN") name="wcr-150gn" ;; + *"WF-2881") + name="wf-2881" + ;; *"WHR-1166D") name="whr-1166d" ;; diff --git a/target/linux/ramips/base-files/lib/upgrade/platform.sh b/target/linux/ramips/base-files/lib/upgrade/platform.sh index 0e8d619..19ab5a2 100755 --- a/target/linux/ramips/base-files/lib/upgrade/platform.sh +++ b/target/linux/ramips/base-files/lib/upgrade/platform.sh @@ -108,6 +108,7 @@ platform_check_image() { w150m|\ w306r-v20|\ w502u|\ + wf-2881|\ whr-1166d|\ whr-300hp2|\ whr-600d|\ diff --git a/target/linux/ramips/dts/WF-2881.dts b/target/linux/ramips/dts/WF-2881.dts new file mode 100644 index 0000000..52d04e7 --- /dev/null +++ b/target/linux/ramips/dts/WF-2881.dts @@ -0,0 +1,123 @@ +/dts-v1/; + +/include/ "mt7621.dtsi" + +/ { + compatible = "mediatek,mt7621-eval-board", "mediatek,mt7621-soc"; + model = "NETIS WF-2881"; + + memory@0 { + device_type = "memory"; + reg = <0x0 0x8000000>; + }; + + palmbus@1E000000 { + spi@b00 { + status="disabled"; + }; + }; + + chosen { + bootargs = "console=ttyS0,57600"; + }; + + nand@1e003000 { + compatible = "mtk,mt7621-nand"; + bank-width = <2>; + reg = <0x1e003000 0x800 + 0x1e003800 0x800>; + #address-cells = <1>; + #size-cells = <1>; + + partition@0 { + label = "u-boot"; + reg = <0x0 0x30000>; + read-only; + }; + + partition@30000 { + label = "u-boot-env"; + reg = <0x30000 0x1000>; + read-only; + }; + + partition@80000 { + label = "config"; + reg = <0x80000 0x80000>; + read-only; + }; + + factory: partition@100000 { + label = "factory"; + reg = <0x100000 0x40000>; + read-only; + }; + + partition@140000 { + label = "firmware"; + reg = <0x140000 0x7E00000>; + }; + }; + + pcie@1e140000 { + status = "okay"; + + pcie0 { + mt76@0,0 { + reg = <0x0000 0 0 0 0>; + device_type = "pci"; + mediatek,mtd-eeprom = <&factory 0x8000>; + mediatek,2ghz = <0>; + }; + }; + + pcie1 { + mt76@1,0 { + reg = <0x0000 0 0 0 0>; + device_type = "pci"; + mediatek,mtd-eeprom = <&factory 0x0000>; + mediatek,5ghz = <0>; + }; + }; + }; + + ethernet@1e100000 { + mtd-mac-address = <&factory 0xe006>; + }; + + gpio-leds { + compatible = "gpio-leds"; + + usb { + label = "wf-2881:green:usb"; + gpios = <&gpio0 6 1>; + }; + + wps { + label = "wf-2881:green:wps"; + gpios = <&gpio0 0 1>; + }; + }; + + gpio-keys-polled { + compatible = "gpio-keys-polled"; + #address-cells = <1>; + #size-cells = <0>; + poll-interval = <20>; + + reset { + label = "reset"; + gpios = <&gpio0 12 1>; + linux,code = <0x198>; + }; + }; + + pinctrl { + state_default: pinctrl0 { + gpio { + ralink,group = "uart3", "jtag"; + ralink,function = "gpio"; + }; + }; + }; +}; diff --git a/target/linux/ramips/image/Makefile b/target/linux/ramips/image/Makefile index 5e19c3f..be0347c 100644 --- a/target/linux/ramips/image/Makefile +++ b/target/linux/ramips/image/Makefile @@ -952,7 +952,7 @@ endif # ifeq ($(SUBTARGET),mt7621) - TARGET_DEVICES += mt7621 wsr-600 wsr-1166 dir-860l-b1 firewrt pbr-m1 re6500 sap-g3200u3 zbt-wg2626 + TARGET_DEVICES += mt7621 wsr-600 wsr-1166 dir-860l-b1 firewrt pbr-m1 re6500 sap-g3200u3 zbt-wg2626 wf-2881 endif define Device/mt7621 @@ -1007,6 +1007,10 @@ define Device/zbt-wg2626 IMAGE_SIZE := $(ralink_default_fw_size_16M) endef +define Device/wf-2881 + DTS := WF-2881 +endef + # # MT7628 Profiles # diff --git a/target/linux/ramips/mt7621/config-3.18 b/target/linux/ramips/mt7621/config-3.18 index fb05d1e..bf1b3f9 100644 --- a/target/linux/ramips/mt7621/config-3.18 +++ b/target/linux/ramips/mt7621/config-3.18 @@ -117,18 +117,20 @@ CONFIG_MIPS_MT_FPAFF=y CONFIG_MIPS_MT_SMP=y CONFIG_MIPS_PERF_SHARED_TC_COUNTERS=y # CONFIG_MIPS_VPE_LOADER is not set -# CONFIG_MTK_MTD_NAND is not set CONFIG_MODULES_USE_ELF_REL=y CONFIG_MT7621_WDT=y # CONFIG_MTD_CFI_INTELEXT is not set CONFIG_MTD_CMDLINE_PARTS=y CONFIG_MTD_M25P80=y +CONFIG_MTD_NAND=y +CONFIG_MTD_NAND_ECC=y CONFIG_MTD_PHYSMAP=y CONFIG_MTD_SPI_NOR=y CONFIG_MTD_SPLIT_FIRMWARE=y CONFIG_MTD_SPLIT_SEAMA_FW=y CONFIG_MTD_SPLIT_TRX_FW=y CONFIG_MTD_SPLIT_UIMAGE_FW=y +CONFIG_MTK_MTD_NAND=y CONFIG_NEED_DMA_MAP_STATE=y CONFIG_NET_FLOW_LIMIT=y CONFIG_NET_RALINK=y diff --git a/target/linux/ramips/mt7621/profiles/netis.mk b/target/linux/ramips/mt7621/profiles/netis.mk new file mode 100644 index 0000000..a46fc4f --- /dev/null +++ b/target/linux/ramips/mt7621/profiles/netis.mk @@ -0,0 +1,20 @@ +# +# Copyright (C) 2015 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +define Profile/WF-2881 + NAME:=NETIS WF-2881 + PACKAGES:=\ + kmod-usb-core kmod-usb3 kmod-usb-hid \ + kmod-ledtrig-usbdev +endef + +define Profile/WF-2881/Description + Package set compatible with the NETIS WF-2881 board. +endef + +$(eval $(call Profile,WF-2881)) +