CVS commit: [netbsd-11] src

["Martin Husemann" <martin%netbsd.org@localhost>]

Module Name:    src
Committed By:   martin
Date:           Thu Apr  2 19:04:53 UTC 2026

Modified Files:
        src/share/installboot/evbarm [netbsd-11]: boards.plist
        src/sys/dev/ic [netbsd-11]: rtl8169.c
        src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/rockchip [netbsd-11]:
            rk3399-nanopi-r4s.dts

Log Message:
Pull up following revision(s) (requested by gutteridge in ticket #228):

        sys/external/gpl2/dts/dist/arch/arm64/boot/dts/rockchip/rk3399-nanopi-r4s.dts: revision 1.2
        share/installboot/evbarm/boards.plist: revision 1.17
        sys/dev/ic/rtl8169.c: revision 1.182

evbarm/boards.plist: add nanopi-r4s

rk3399-nanopi-r4s.dts: apply upstream USB fix

This gives us the addition of:
[   1.0000040] rkusbphy2 at rkusb1: USB2 host port

This is taken from the following commit (applied to a different file
in the current Linux tree; it should be included in the DTS update
skrll@ is planning, but could be simpler to pull up to netbsd-11 in
this form):
>From 38f4aa34a5f737ea8588dac320d884cc2e762c03 Mon Sep 17 00:00:00 2001
From: Justin Klaassen <justin%tidylabs.net@localhost>
Date: Tue, 25 Feb 2025 17:03:58 +0000
Subject: arm64: dts: rockchip: fix u2phy1_host status for NanoPi R4S
The u2phy1_host should always have the same status as usb_host1_ehci
and usb_host1_ohci, otherwise the EHCI and OHCI drivers may be
initialized for a disabled usb port.
Per the NanoPi R4S schematic, the phy-supply for u2phy1_host is set to
the vdd_5v regulator.
Fixes: db792e9adbf8 ("rockchip: rk3399: Add support for FriendlyARM NanoPi R4S")
Cc: stable%vger.kernel.org@localhost
Signed-off-by: Justin Klaassen <justin%tidylabs.net@localhost>
Reviewed-by: Dragan Simic <dsimic%manjaro.org@localhost>
Link: https://lore.kernel.org/r/20250225170420.3898-1-justin%tidylabs.net@localhost
Signed-off-by: Heiko Stuebner <heiko%sntech.de@localhost>

rtl8169.c: generate MAC address for hardware without an EEPROM

Borrow the equivalent change from if_ure.c (r. 1.33). These re(4)
devices otherwise end up with an all zero MAC. Found (at least) on the
NanoPi R4S (non-"Enterprise" version, the other being distinguished by
including an EEPROM to set a consistent MAC address).
(Given this code is in two places now, it may make more sense to
centralize this if it grows any further.)


To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.15.2.1 src/share/installboot/evbarm/boards.plist
cvs rdiff -u -r1.179 -r1.179.2.1 src/sys/dev/ic/rtl8169.c
cvs rdiff -u -r1.1.1.1 -r1.1.1.1.12.1 \
    src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/rockchip/rk3399-nanopi-r4s.dts

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.