From d2907ab4462ee840ac2ddd070f40c48555c2dc2f Mon Sep 17 00:00:00 2001 From: Josh Buker Date: Thu, 29 Jan 2026 00:06:32 -0800 Subject: [PATCH] Remove unnecessary configuration for odroid-m1 --- hardkernel/odroid-m1/default.nix | 36 ++++++++++---------------------- 1 file changed, 11 insertions(+), 25 deletions(-) diff --git a/hardkernel/odroid-m1/default.nix b/hardkernel/odroid-m1/default.nix index e055b93..e3db31e 100644 --- a/hardkernel/odroid-m1/default.nix +++ b/hardkernel/odroid-m1/default.nix @@ -1,40 +1,23 @@ -{ config, pkgs, lib, ... }: +{ + config, + pkgs, + lib, + ... +}: { imports = [ ./petitboot ]; + # Enable petitboot support. boot.loader.petitboot.enable = lib.mkForce true; - # Fails to rebuild unless grub is explicitly disabled + # `nixos-rebuild` fails unless grub is explicitly disabled. boot.loader.grub.enable = lib.mkForce false; - # TODO: Can this be removed? Presumably anything built with 25.11 / unstable - # or later will be on a kernel >6.6 - # Use kernel >6.6 The devicetree is missing from kernel versions older than this. - # boot.kernelPackages = lib.mkIf (lib.versionOlder pkgs.linux.version "6.6") (lib.mkDefault pkgs.linuxPackages_latest); - - # TODO: Debug why removing this breaks booting from petitboot - # boot.supportedFilesystems = lib.mkForce [ - # "btrfs" - # "cifs" - # "f2fs" - # "jfs" - # "ntfs" - # "reiserfs" - # "vfat" - # "xfs" - # ]; - - # TODO: Some of these could potentially be omitted, check which ones are - # actually necessary for disk access to function boot.initrd.availableKernelModules = [ - # Only nvme emitted when using nixos-generate-config on my odroid-m1 "nvme" - # "nvme-core" - # "phy-rockchip-naneng-combphy" - # "phy-rockchip-snps-pcie3" ]; # Petitboot uses this port and baud rate on the board's serial port. It's @@ -42,4 +25,7 @@ # console access to work well. boot.kernelParams = [ "console=ttyS2,1500000" ]; hardware.deviceTree.name = "rockchip/rk3568-odroid-m1.dtb"; + # FIXME: The serial terminal does seem to throw random errors still, but that + # doesn't appear to crash anything. May need adjusted if you're + # actually using the GPIO. }