Skip to content

Move NanoPC‑T6 back to nabam kernel path and adopt latest Rockchip variant #5

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

Draft
Copilot wants to merge 11 commits into
base: copilot/debug-kernel-console-access
Choose a base branch
from
Draft

Move NanoPC‑T6 back to nabam kernel path and adopt latest Rockchip variant #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
cc8c1b9
Initial plan
Copilot Feb 13, 2026
9ad3693
Prefer USB-C serial console on NanoPC-T6
Copilot Feb 13, 2026
58065fb
Handle ttyS0/ttyS2 USB-C console aliasing on NanoPC-T6
Copilot Feb 13, 2026
83b2683
Switch NanoPC-T6 to nixpkgs latest kernel packages
Copilot Feb 17, 2026
652d6ea
Remove nabam nixos-rockchip flake input entirely
Copilot Feb 17, 2026
2e51482
Use non-nabam Rockchip kernel source for NanoPC-T6
Copilot Feb 17, 2026
95a6d2c
Align NanoPC-T6 with nixos-25.11 kernel packages
Copilot Feb 19, 2026
4636c3a
Fix NanoPC-T6 kernel patch option for NixOS 25.11
Copilot Feb 19, 2026
7cbbe10
Restore Rockchip kernel input for NanoPC-T6 board support
Copilot Feb 19, 2026
bf946e5
Switch NanoPC-T6 to FriendlyARM kernel fork source
Copilot Feb 19, 2026
ad6d0cb
Use nabam rockchip unstable kernel for NanoPC-T6
Copilot Feb 19, 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
1 change: 1 addition & 0 deletions flake.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ rec {
rockchip = {
url = "github:nabam/nixos-rockchip";
};

};
outputs =
{
Expand Down
16 changes: 11 additions & 5 deletions nix/builders/nanopc-t6/base.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,8 @@
];

# Enable both video and serial console output.
# The rk3588 debug UART (UART2) is accessible via the USB-C debug port
# and appears as ttyS2 via the mainline 8250/DW serial driver.
# The rk3588 debug UART (UART2) is accessible via the USB-C debug port.
# Depending on kernel/device-tree aliasing it may appear as ttyS2 or ttyS0.
# earlycon provides serial output during early boot before the full
# UART driver loads; keep_bootcon keeps earlycon active alongside the
# real console so no output is lost during the transition.
Expand All @@ -56,8 +56,9 @@
"keep_bootcon"
"clk_ignore_unused"
"pd_ignore_unused"
"console=ttyS2,1500000"
"console=tty1"
"console=ttyS2,1500000"
"console=ttyS0,1500000"
];

# Use the extlinux boot loader. (NixOS wants to enable GRUB by default)
Expand All @@ -67,7 +68,7 @@
boot.loader.timeout = 1;

boot.kernelPackages =
inputs.rockchip.legacyPackages.aarch64-linux.kernel_linux_latest_rockchip_stable;
inputs.rockchip.legacyPackages.aarch64-linux.kernel_linux_latest_rockchip_unstable;

boot.kernelPatches = [
{
Expand All @@ -80,7 +81,7 @@
# available immediately during boot, not after module loading.
name = "serial-console-builtin";
patch = null;
extraStructuredConfig = with lib.kernel; {
structuredExtraConfig = with lib.kernel; {
SERIAL_8250 = yes;
SERIAL_8250_CONSOLE = yes;
SERIAL_8250_DW = yes;
Expand Down Expand Up @@ -197,6 +198,11 @@
wantedBy = [ "getty.target" ];
serviceConfig.Restart = "always";
};
systemd.services."serial-getty@ttyS0" = {
enable = true;
wantedBy = [ "getty.target" ];
serviceConfig.Restart = "always";
};

system.activationScripts.rk3588-firmware = ''
mkdir -p /etc/firmware
Expand Down
Loading