[meta-rockchip][PATCH 1/2] nanopi-r4s: remove 2nd eth work-around

[meta-rockchip][PATCH 1/2] nanopi-r4s: remove 2nd eth work-around

[Trevor Woerner]

Pre-6.16.y linux kernels needed a kludge in order for the second ethernet the
work out of the box. With the update to the 6.16.y kernel the kludge no longer
applies. Fixing up the kludge so that it does apply does not seem to bring up
the second interface. However with the kludge removed altogether, the second
interface comes up without issue.

    # lspci
    00:00.0 PCI bridge: Rockchip Electronics Co., Ltd RK3399 PCI Express Root Port
    01:00.0 Ethernet controller: Realtek Semiconductor Co., Ltd. RTL8111/8168/8211/8411 PCI Express Gigabit Ethernet Controller (rev 15)

Signed-off-by: Trevor Woerner <twoerner@gmail.com>
---
 .../linux/linux-yocto/nanopi-r4s.scc          |  6 ---
 ...anopi-r4s.dts-enable-second-ethernet.patch | 41 -------------------
 recipes-kernel/linux/linux-yocto_%.bbappend   |  1 -
 3 files changed, 48 deletions(-)
 delete mode 100644 recipes-kernel/linux/linux-yocto/nanopi-r4s.scc
 delete mode 100644 recipes-kernel/linux/linux-yocto/rockchip-kmeta/bsp/rockchip/0001-rk3399-nanopi-r4s.dts-enable-second-ethernet.patch

diff --git a/recipes-kernel/linux/linux-yocto/nanopi-r4s.scc b/recipes-kernel/linux/linux-yocto/nanopi-r4s.scc
deleted file mode 100644
index 266b77c63fe5..000000000000
--- a/recipes-kernel/linux/linux-yocto/nanopi-r4s.scc
+++ /dev/null
@@ -1,6 +0,0 @@
-define KFEATURE_DESCRIPTION "tweaks for the nanopi-r4s"
-define KMACHINE nanopi-r4s
-define KTYPE standard
-define KARCH arm64
-
-include bsp/rockchip/0001-rk3399-nanopi-r4s.dts-enable-second-ethernet.patch
diff --git a/recipes-kernel/linux/linux-yocto/rockchip-kmeta/bsp/rockchip/0001-rk3399-nanopi-r4s.dts-enable-second-ethernet.patch b/recipes-kernel/linux/linux-yocto/rockchip-kmeta/bsp/rockchip/0001-rk3399-nanopi-r4s.dts-enable-second-ethernet.patch
deleted file mode 100644
index e1f2b92665dd..000000000000
--- a/recipes-kernel/linux/linux-yocto/rockchip-kmeta/bsp/rockchip/0001-rk3399-nanopi-r4s.dts-enable-second-ethernet.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 4c867907b68b417da0711cabdde30a969e368596 Mon Sep 17 00:00:00 2001
-From: Trevor Woerner <twoerner@gmail.com>
-Date: Sun, 17 Sep 2023 17:30:43 -0400
-Subject: [PATCH] rk3399-nanopi-r4s.dts: enable second ethernet
-
-# lspci
-00:00.0 PCI bridge: Rockchip Electronics Co., Ltd RK3399 PCI Express Root Port
-01:00.0 Ethernet controller: Realtek Semiconductor Co., Ltd. RTL8111/8168/8411 PCI Express Gigabit Ether)
-
-Link: https://github.com/armbian/build/pull/2415
-Upstream-Status: Submitted [by someone else]
-Signed-off-by: Trevor Woerner <twoerner@gmail.com>
----
- arch/arm64/boot/dts/rockchip/rk3399-nanopi-r4s.dts | 11 +++++++++++
- 1 file changed, 11 insertions(+)
-
-diff --git a/arch/arm64/boot/dts/rockchip/rk3399-nanopi-r4s.dts b/arch/arm64/boot/dts/rockchip/rk3399-nanopi-r4s.dts
-index fe5b52610010..771615722358 100644
---- a/arch/arm64/boot/dts/rockchip/rk3399-nanopi-r4s.dts
-+++ b/arch/arm64/boot/dts/rockchip/rk3399-nanopi-r4s.dts
-@@ -76,6 +76,17 @@ &pcie0 {
- 	max-link-speed = <1>;
- 	num-lanes = <1>;
- 	vpcie3v3-supply = <&vcc3v3_sys>;
-+
-+	pcie@0 {
-+		reg = <0x00000000 0 0 0 0>;
-+		#address-cells = <3>;
-+		#size-cells = <2>;
-+
-+		r8169: pcie@0,0 {
-+			reg = <0x000000 0 0 0 0>;
-+			local-mac-address = [ 00 00 00 00 00 00 ];
-+		};
-+	};
- };
- 
- &pinctrl {
--- 
-2.41.0.327.gaa9166bcc0ba
-
diff --git a/recipes-kernel/linux/linux-yocto_%.bbappend b/recipes-kernel/linux/linux-yocto_%.bbappend
index 75de6110c228..5d68c7d56e2b 100644
--- a/recipes-kernel/linux/linux-yocto_%.bbappend
+++ b/recipes-kernel/linux/linux-yocto_%.bbappend
@@ -31,4 +31,3 @@ COMPATIBLE_MACHINE:rock64 = "rock64"
 COMPATIBLE_MACHINE:soquartz = "soquartz"
 
 SRC_URI:append:rockchip = " file://rockchip-kmeta;type=kmeta;name=rockchip-kmeta;destsuffix=rockchip-kmeta"
-SRC_URI:append:nanopi-r4s = " file://nanopi-r4s.scc"
-- 
2.44.0.501.g19981daefd7c

[meta-rockchip][PATCH 2/2] nanopi-r4s: enable r8169 built-in

[Trevor Woerner]

Since the Realtek RTL8169 is part of this board, enable it unconditionally in
the kernel.

Signed-off-by: Trevor Woerner <twoerner@gmail.com>
---
 recipes-kernel/linux/linux-yocto/realtek-r8169.cfg | 1 +
 recipes-kernel/linux/linux-yocto_%.bbappend        | 1 +
 2 files changed, 2 insertions(+)
 create mode 100644 recipes-kernel/linux/linux-yocto/realtek-r8169.cfg

diff --git a/recipes-kernel/linux/linux-yocto/realtek-r8169.cfg b/recipes-kernel/linux/linux-yocto/realtek-r8169.cfg
new file mode 100644
index 000000000000..811d42a79bf3
--- /dev/null
+++ b/recipes-kernel/linux/linux-yocto/realtek-r8169.cfg
@@ -0,0 +1 @@
+CONFIG_R8169=y
diff --git a/recipes-kernel/linux/linux-yocto_%.bbappend b/recipes-kernel/linux/linux-yocto_%.bbappend
index 5d68c7d56e2b..da1b172294e7 100644
--- a/recipes-kernel/linux/linux-yocto_%.bbappend
+++ b/recipes-kernel/linux/linux-yocto_%.bbappend
@@ -31,3 +31,4 @@ COMPATIBLE_MACHINE:rock64 = "rock64"
 COMPATIBLE_MACHINE:soquartz = "soquartz"
 
 SRC_URI:append:rockchip = " file://rockchip-kmeta;type=kmeta;name=rockchip-kmeta;destsuffix=rockchip-kmeta"
+SRC_URI:append:nanopi-r4s = " file://realtek-r8169.cfg"
-- 
2.44.0.501.g19981daefd7c

Re: [yocto-patches] [meta-rockchip][PATCH 2/2] nanopi-r4s: enable r8169 built-in

[Quentin Schulz]

Hi Trevor,

On 9/4/25 9:45 PM, Trevor Woerner via lists.yoctoproject.org wrote:
> Since the Realtek RTL8169 is part of this board, enable it unconditionally in

The FriendlyElec wiki and product page doesn't mention this part number, 
weird (but armbian and openwrt forums do).

FYI, it seems the default value when using "defconfig" defconfig from 
upstream is R8169 driver built as a module, so you could simply install 
the kernel module instead of marking it as Y. (But then you hit some 
corner cases when you want to use NFS for rootfs for example).

While many devices supported by this driver seem to require (?) a 
firmware, the R8169 seemingly doesn't seem to require one, so I guess 
this is fine :)

> the kernel.
> 
> Signed-off-by: Trevor Woerner <twoerner@gmail.com>

Acked-by: Quentin Schulz <quentin.schulz@cherry.de>

Thanks!
Quentin

Re: [yocto-patches] [meta-rockchip][PATCH 1/2] nanopi-r4s: remove 2nd eth work-around

[Quentin Schulz]

Hi Trevor,

On 9/4/25 9:45 PM, Trevor Woerner via lists.yoctoproject.org wrote:
> Pre-6.16.y linux kernels needed a kludge in order for the second ethernet the
> work out of the box. With the update to the 6.16.y kernel the kludge no longer
> applies. Fixing up the kludge so that it does apply does not seem to bring up
> the second interface. However with the kludge removed altogether, the second
> interface comes up without issue.
> 
>      # lspci
>      00:00.0 PCI bridge: Rockchip Electronics Co., Ltd RK3399 PCI Express Root Port
>      01:00.0 Ethernet controller: Realtek Semiconductor Co., Ltd. RTL8111/8168/8211/8411 PCI Express Gigabit Ethernet Controller (rev 15)
> 
> Signed-off-by: Trevor Woerner <twoerner@gmail.com>

Acked-by: Quentin Schulz <quentin.schulz@cherry.de>

Thanks!
Quentin

Re: [meta-rockchip][PATCH 1/2] nanopi-r4s: remove 2nd eth work-around

[Trevor Woerner]

On Thu 2025-09-04 @ 03:45:28 PM, Trevor Woerner wrote:
> Pre-6.16.y linux kernels needed a kludge in order for the second ethernet the
> work out of the box. With the update to the 6.16.y kernel the kludge no longer
> applies. Fixing up the kludge so that it does apply does not seem to bring up
> the second interface. However with the kludge removed altogether, the second
> interface comes up without issue.
> 
>     # lspci
>     00:00.0 PCI bridge: Rockchip Electronics Co., Ltd RK3399 PCI Express Root Port
>     01:00.0 Ethernet controller: Realtek Semiconductor Co., Ltd. RTL8111/8168/8211/8411 PCI Express Gigabit Ethernet Controller (rev 15)
> 
> Signed-off-by: Trevor Woerner <twoerner@gmail.com>
> ---
>  .../linux/linux-yocto/nanopi-r4s.scc          |  6 ---
>  ...anopi-r4s.dts-enable-second-ethernet.patch | 41 -------------------
>  recipes-kernel/linux/linux-yocto_%.bbappend   |  1 -
>  3 files changed, 48 deletions(-)
>  delete mode 100644 recipes-kernel/linux/linux-yocto/nanopi-r4s.scc
>  delete mode 100644 recipes-kernel/linux/linux-yocto/rockchip-kmeta/bsp/rockchip/0001-rk3399-nanopi-r4s.dts-enable-second-ethernet.patch

Applied to meta-rockchip, master branch.

Re: [yocto-patches] [meta-rockchip][PATCH 2/2] nanopi-r4s: enable r8169 built-in

[Trevor Woerner]

On Fri 2025-09-05 @ 11:10:45 AM, Quentin Schulz via lists.yoctoproject.org wrote:
> Hi Trevor,
> 
> On 9/4/25 9:45 PM, Trevor Woerner via lists.yoctoproject.org wrote:
> > Since the Realtek RTL8169 is part of this board, enable it unconditionally in
> 
> The FriendlyElec wiki and product page doesn't mention this part number,
> weird (but armbian and openwrt forums do).

...and so does the output of lspci.

> FYI, it seems the default value when using "defconfig" defconfig from
> upstream is R8169 driver built as a module, so you could simply install the
> kernel module instead of marking it as Y. (But then you hit some corner
> cases when you want to use NFS for rootfs for example).

Exactly. If it is a device that is built into the board, I think it should be
built into the kernel rather than a module.

I didn't provide this in the commit message, but while testing with it enabled
as a module, it is the driver that is installed automatically by the system,
that's how/why I chose this driver to convert to =y.

> While many devices supported by this driver seem to require (?) a firmware,
> the R8169 seemingly doesn't seem to require one, so I guess this is fine :)
> 
> > the kernel.
> > 
> > Signed-off-by: Trevor Woerner <twoerner@gmail.com>
> 
> Acked-by: Quentin Schulz <quentin.schulz@cherry.de>
> 
> Thanks!
> Quentin
> 
> 
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#2138): https://lists.yoctoproject.org/g/yocto-patches/message/2138
> Mute This Topic: https://lists.yoctoproject.org/mt/115070708/900817
> Group Owner: yocto-patches+owner@lists.yoctoproject.org
> Unsubscribe: https://lists.yoctoproject.org/g/yocto-patches/leave/13168745/900817/63955952/xyzzy [twoerner@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
> 
> 

Re: [meta-rockchip][PATCH 2/2] nanopi-r4s: enable r8169 built-in

[Trevor Woerner]

On Thu 2025-09-04 @ 03:45:29 PM, Trevor Woerner wrote:
> Since the Realtek RTL8169 is part of this board, enable it unconditionally in
> the kernel.
> 
> Signed-off-by: Trevor Woerner <twoerner@gmail.com>
> ---
>  recipes-kernel/linux/linux-yocto/realtek-r8169.cfg | 1 +
>  recipes-kernel/linux/linux-yocto_%.bbappend        | 1 +
>  2 files changed, 2 insertions(+)
>  create mode 100644 recipes-kernel/linux/linux-yocto/realtek-r8169.cfg

Applied to meta-rockchip, master branch.