From 0b12f9cb8011a2def0962d9fdc9ca96129eaa204 Mon Sep 17 00:00:00 2001 From: Jan-Niklas Burfeind Date: Sat, 26 Nov 2022 22:52:10 +0100 Subject: [PATCH 1/2] generic: try to not attempt to build kmod-usbip targets without usb-support fail to build without this change Co-authored-by: David Bauer (cherry picked from commit e53308b61e81c629aef4d560e41bd13abf770830) --- targets/generic | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/targets/generic b/targets/generic index 1cb8b5e4..806e39d2 100644 --- a/targets/generic +++ b/targets/generic @@ -38,7 +38,7 @@ config('TARGET_ROOTFS_INITRAMFS', false) config('DEVEL', true) config('ALL_NONSHARED', true) -config('PACKAGE_usbip', false) -- fails to build +try_config('PACKAGE_usbip', false) -- fails to build try_config('PACKAGE_ATH_DEBUG', true) From 0b516a7e61821fbb6a85efbb68fb2b60797eebc9 Mon Sep 17 00:00:00 2001 From: Jan-Niklas Burfeind Date: Sat, 26 Nov 2022 03:09:26 +0100 Subject: [PATCH 2/2] realtek-rtl838x: add support for D-Link DGS-1210-10P as well as the target itself (cherry picked from commit a8dc234550a547a6ffdb9a089a0c900ccfbbc09b) --- .github/filters.yml | 9 +++++++++ docs/user/supported_devices.rst | 7 +++++++ .../gluon-core/luasrc/lib/gluon/upgrade/020-interfaces | 4 ++++ targets/realtek-rtl838x | 5 +++++ targets/targets.mk | 1 + 5 files changed, 26 insertions(+) create mode 100644 targets/realtek-rtl838x diff --git a/.github/filters.yml b/.github/filters.yml index eaf928a6..6e7badaa 100644 --- a/.github/filters.yml +++ b/.github/filters.yml @@ -147,6 +147,15 @@ "targets/generic", "targets/targets.mk" ], + "realtek-rtl838x": [ + "targets/realtek-rtl838x", + "modules", + "Makefile", + "patches/**", + "scripts/**", + "targets/generic", + "targets/targets.mk" + ], "rockchip-armv8": [ "targets/rockchip-armv8", "modules", diff --git a/docs/user/supported_devices.rst b/docs/user/supported_devices.rst index 67f66b5b..bf40bd0d 100644 --- a/docs/user/supported_devices.rst +++ b/docs/user/supported_devices.rst @@ -434,6 +434,13 @@ ramips-mt76x8 - Xiaomi Mi Router 4A (100M International Edition) - Xiaomi Mi Router 4C +realtek-rtl838x +--------------- + +* D-Link + + - DGS-1210-10P (F1) + rockchip-armv8 -------------- diff --git a/package/gluon-core/luasrc/lib/gluon/upgrade/020-interfaces b/package/gluon-core/luasrc/lib/gluon/upgrade/020-interfaces index cf21e907..997c1159 100755 --- a/package/gluon-core/luasrc/lib/gluon/upgrade/020-interfaces +++ b/package/gluon-core/luasrc/lib/gluon/upgrade/020-interfaces @@ -67,6 +67,10 @@ elseif platform.match('ramips', 'mt7621', { 'netgear,wac104', }) then lan_ifname, wan_ifname = 'lan2 lan3 lan4', 'lan1' +elseif platform.match('realtek', 'rtl838x', { + 'd-link,dgs-1210-10p', +}) then + lan_ifname, wan_ifname = 'lan2 lan3 lan4 lan5 lan6 lan7 lan8 lan9 lan10', 'lan1' end if wan_ifname and lan_ifname then diff --git a/targets/realtek-rtl838x b/targets/realtek-rtl838x new file mode 100644 index 00000000..f78c9ed2 --- /dev/null +++ b/targets/realtek-rtl838x @@ -0,0 +1,5 @@ +-- D-Link + +device('d-link_dgs-1210-10p', 'd-link_dgs-1210-10p', { + factory = '-squashfs-factory_image1', +}) diff --git a/targets/targets.mk b/targets/targets.mk index b405adae..346377ea 100644 --- a/targets/targets.mk +++ b/targets/targets.mk @@ -14,6 +14,7 @@ $(eval $(call GluonTarget,mpc85xx,p1020)) $(eval $(call GluonTarget,ramips,mt7620)) $(eval $(call GluonTarget,ramips,mt7621)) $(eval $(call GluonTarget,ramips,mt76x8)) +$(eval $(call GluonTarget,realtek,rtl838x)) $(eval $(call GluonTarget,rockchip,armv8)) $(eval $(call GluonTarget,sunxi,cortexa7)) $(eval $(call GluonTarget,x86,generic))