Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

ramips: Add support for Dlink DIR-878 R1 version #4994

Closed
wants to merge 1 commit into from
Closed

ramips: Add support for Dlink DIR-878 R1 version #4994

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions target/linux/ramips/dts/mt7621_dlink_dir-878-r1.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
// SPDX-License-Identifier: GPL-2.0-or-later OR MIT

#include "mt7621_dlink_dir-8xx-r1.dtsi"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does this compile? It seems we don't have a file of this name?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Before compiling locally I ran the command:
"git checkout v21.02.1"
taken from the instructions of building openwrt:
https://openwrt.org/docs/guide-developer/toolchain/use-buildsystem

It seems like branch 21.02.1 has these files.
interesting why these files are not here on the mirror branch.
any thoughts?

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@lior-pugatch Your PR is against master, right? You need to base it on master.

Master has mt7621_dlink_dir-8xx.dtsi (note: no '-r1' suffix), no mt7621_dlink_dir-8xx-r1.dtsi though as mans0n says.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

When is it expected to have branch 21.02.1 merged to master?
is branch 21.02.1 considered "newer" than master?

Copy link
Contributor

@xabolcs xabolcs Feb 1, 2022 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What is your interest in release 21.02?
Do you want see your DIR-878 R1 device supported by a 21.02 release?

Then do anything what the reviewers ask, and wait it for landing in master.
After that, pick that commit on master and backport to the openwrt-21.02 branch! With git cherry-pick -x and resolve the conflict (like this .dtsi mismatch).

For example see another backporting PR #4630:

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@lior-pugatch Device support PRs are only accepted against master. As @xabolcs explained you can then request a backport to a stable release like 21.02. But only then; it needs to be in master first since that's where development happens.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Your work and test should be based on top of the master branch. Please do not just copy the patch based on the stable branch and say it's done.


/ {
compatible = "dlink,dir-878-r1", "mediatek,mt7621-soc";
model = "D-Link DIR-878 R1";
};
9 changes: 9 additions & 0 deletions target/linux/ramips/image/mt7621.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -375,6 +375,15 @@ define Device/dlink_dir-878-a1
endef
TARGET_DEVICES += dlink_dir-878-a1

define Device/dlink_dir-878-r1
$(Device/dlink_dir-8xx-r1)
DEVICE_MODEL := DIR-878
DEVICE_VARIANT := R1
DEVICE_PACKAGES += kmod-usb3 kmod-usb-ledtrig-usbport
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is there any reason for including USB packages for the DIR-878 R1 considering the device doesn't have working USB ports (at least not without modding the hardware)?

IMAGE/factory.bin := append-kernel | append-rootfs | check-size
endef

TARGET_DEVICES += dlink_dir-878-r1
define Device/dlink_dir-882-a1
$(Device/dlink_dir-8xx-a1)
DEVICE_MODEL := DIR-882
Expand Down