Skip to content

kernel: nanopi-r2s: add rk3328-nanopi-r2s-plus device tree (eMMC support) #1589

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

Merged
troglobit merged 3 commits into from
Aug 17, 2026
+31 −1
Merged

kernel: nanopi-r2s: add rk3328-nanopi-r2s-plus device tree (eMMC support) #1589

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e46fd79
kernel: nanopi-r2s: add rk3328-nanopi-r2s-plus device tree (eMMC supp…
pjator Aug 16, 2026
46c6b66
uboot: nanopi-r2s: select kernel DT via ixvariant (eMMC-aware)
pjator Aug 16, 2026
c11e230
doc: ChangeLog: add NanoPi R2S Plus support entry
pjator Aug 16, 2026
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
2 changes: 1 addition & 1 deletion board/aarch64/friendlyarm-nanopi-r2s/dts/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
dtb-y += rockchip/rk3328-nanopi-r2s.dtb
dtb-y += rockchip/rk3328-nanopi-r2s.dtb rockchip/rk3328-nanopi-r2s-plus.dtb
20 changes: 20 additions & 0 deletions board/aarch64/friendlyarm-nanopi-r2s/dts/rockchip/rk3328-nanopi-r2s-plus.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
#include <arm64/rockchip/rk3328-nanopi-r2s-plus.dts>

#include "infix.dtsi"

/ {
compatible = "friendlyarm,nanopi-r2s", "rockchip,rk3328";
};

&rtl8153 {
/*
* Fix port number: device is on port 1, not port 2.
*/
reg = <1>;
};

&{/chosen/infix} {
/* Expose only the external USB 2.0 port for user management */
usb-ports = <&usb_host0_ehci>;
usb-port-names = "USB";
};
5 changes: 5 additions & 0 deletions board/aarch64/friendlyarm-nanopi-r2s/uboot/r2s-env.dtsi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,11 @@
boot_targets = "mmc1";
ethprime = "eth0";

/* The R2S Plus has an on-board eMMC (mmc0); the plain R2S does
* not. Pick the matching kernel DT so the eMMC controller is
* enabled only when the hardware is present. */
ixvariant = "if mmc dev 0; then setenv fdtfile rockchip/rk3328-nanopi-r2s-plus.dtb; else setenv fdtfile rockchip/rk3328-nanopi-r2s.dtb; fi";

/* This is a development platform, hard code developer mode */
ixbtn-devmode = "setenv dev_mode yes; echo Enabled";

Expand Down
5 changes: 5 additions & 0 deletions doc/ChangeLog.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,11 @@ All notable changes to the project are documented in this file.
- Build RPi64 SD card images in release builds
- Include .pkg files in release builds

### Added

- Add NanoPi R2S Plus support (on-board 32 GB eMMC), including U-Boot
device tree selection so the eMMC is enabled when present

### Fixes

- Fix annoying "cannot deselect all services" or reset to YANG default in the
Expand Down