diff --git a/README.md b/README.md index a0b0465..46d720b 100644 --- a/README.md +++ b/README.md @@ -311,6 +311,7 @@ See code for all available configurations. | [NXP iMX8 MQuad Evaluation Kit](nxp/imx8mq-evk) | `` | | [Hardkernel Odroid HC4](hardkernel/odroid-hc4/default.nix) | `` | | [Hardkernel Odroid H3](hardkernel/odroid-h3/default.nix) | `` | +| [Hardkernel Odroid M1](hardkernel/odroid-m1/default.nix) | `` | | [Omen 14-fb0798ng](omen/14-fb0798ng) | `` | | [Omen 15-en0010ca](omen/15-en0010ca) | `` | | [Omen 16-n0005ne](omen/16-n0005ne) | `` | diff --git a/flake.nix b/flake.nix index 44bedb0..225c632 100644 --- a/flake.nix +++ b/flake.nix @@ -261,6 +261,7 @@ nxp-imx8qm-mek = import ./nxp/imx8qm-mek; hardkernel-odroid-hc4 = import ./hardkernel/odroid-hc4; hardkernel-odroid-h3 = import ./hardkernel/odroid-h3; + hardkernel-odroid-m1 = import ./hardkernel/odroid-m1; omen-14-fb0798ng = import ./omen/14-fb0798ng; omen-15-en0010ca = import ./omen/15-en0010ca; omen-16-n0005ne = import ./omen/16-n0005ne; diff --git a/hardkernel/ordoid-m1/default.nix b/hardkernel/ordoid-m1/default.nix new file mode 100644 index 0000000..bc9c73a --- /dev/null +++ b/hardkernel/ordoid-m1/default.nix @@ -0,0 +1,32 @@ +# Based on kboot-conf by original authors povik and sstent. +# I'm just porting things over. the original work can be viewed at: +# https://github.com/sstent/nixos-on-odroid-m1 +# https://github.com/povik/nixos-on-odroid-n2 +{ config, pkgs, lib, ... }: + +{ + imports = [ + ./kboot-conf + ] + + #boot.loader.grub.enable = false; + boot.loader.kboot-conf.enable = true; + # 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); + # Stop ZFS breaking the build + boot.supportedFilesystems = lib.mkForce ["btrfs" "cifs" "f2fs" "jfs" "ntfs" "reiserfs" "vfat" "xfs"]; + + # I'm not completely sure if some of these could be omitted, + # but want to make sure disk access works + boot.initrd.availableKernelModules = [ + "nvme" + "nvme-core" + "phy-rockchip-naneng-combphy" + "phy-rockchip-snps-pcie3" + ]; + # Petitboot uses this port and baud rate on the boards serial port, + # it's probably good to keep the options same for the running + # kernel for serial console access to work well + boot.kernelParams = ["console=ttyS2,1500000"]; + hardware.deviceTree.name = "rockchip/rk3568-odroid-m1.dtb"; +} diff --git a/hardkernel/ordoid-m1/kboot-conf/default.nix b/hardkernel/ordoid-m1/kboot-conf/default.nix new file mode 100644 index 0000000..52f2fcb --- /dev/null +++ b/hardkernel/ordoid-m1/kboot-conf/default.nix @@ -0,0 +1,62 @@ +{ + config, + lib, + pkgs, + ... +}: +with lib; let + cfg = config.boot.loader.kboot-conf; + + # The builder used to write during system activation + builder = pkgs.substituteAll { + src = ./generate-kboot-conf.sh; + isExecutable = true; + path = [pkgs.coreutils pkgs.gnused pkgs.gnugrep]; + inherit (pkgs) bash; + }; + # The builder exposed in populateCmd, which runs on the build architecture + populateBuilder = pkgs.buildPackages.substituteAll { + src = ./generate-kboot-conf.sh; + isExecutable = true; + path = with pkgs.buildPackages; [coreutils gnused gnugrep]; + inherit (pkgs.buildPackages) bash; + }; +in { + options = { + boot.loader.kboot-conf = { + enable = mkOption { + default = false; + type = types.bool; + description = '' + Whether to create petitboot-compatible /kboot.conf + ''; + }; + configurationLimit = mkOption { + default = 10; + example = 5; + type = types.int; + description = '' + Maximum number of configurations in the generated kboot.conf. + ''; + }; + populateCmd = mkOption { + type = types.str; + readOnly = true; + description = '' + Contains the builder command used to populate an image, + honoring all options except the -c <path-to-default-configuration> + argument. + Useful to have for sdImage.populateRootCommands + ''; + }; + }; + }; + config = let + args = "-g ${toString cfg.configurationLimit} -n ${config.hardware.deviceTree.name}"; + in + mkIf cfg.enable { + system.build.installBootLoader = lib.mkForce "${builder} ${args} -c"; + system.boot.loader.id = "kboot-conf"; + boot.loader.kboot-conf.populateCmd = "${populateBuilder} ${args}"; + }; +} diff --git a/hardkernel/ordoid-m1/kboot-conf/generate-kboot-conf.sh b/hardkernel/ordoid-m1/kboot-conf/generate-kboot-conf.sh new file mode 100644 index 0000000..153190c --- /dev/null +++ b/hardkernel/ordoid-m1/kboot-conf/generate-kboot-conf.sh @@ -0,0 +1,77 @@ +#! @bash@/bin/sh -e + +shopt -s nullglob + +export PATH=/empty +for i in @path@; do PATH=$PATH:$i/bin; done + +usage() { + echo "usage: $0 -c -n [-g ] [-d ]" >&2 + exit 1 +} + +target=/kboot.conf +default= # Default configuration +numGenerations=0 # Number of other generations to include in the menu + +while getopts "t:c:d:g:n:" opt; do + case "$opt" in + c) default="$OPTARG" ;; + g) numGenerations="$OPTARG" ;; + d) target="$OPTARG" ;; + n) dtbName="$OPTARG" ;; + \?) usage ;; + esac +done + +[ "$default" = "" -o "$dtbName" = "" ] && usage + +tmp=$target.tmp + +# Echo out an kboot.conf menu entry +addEntry() { + local path=$(readlink -f "$1") + local tag="$2" # Generation number or 'default' + + if ! test -e $path/kernel -a -e $path/initrd; then + return + fi + + timestampEpoch=$(stat -L -c '%Z' $path) + timestamp=$(date "+%Y-%m-%d %H:%M" -d @$timestampEpoch) + nixosLabel="$(cat $path/nixos-version)" + extraParams="$(cat $path/kernel-params)" + + local kernel=$(readlink -f "$path/kernel") + local initrd=$(readlink -f "$path/initrd") + local dtbs=$(readlink -f "$path/dtbs") + + local id="nixos-$tag--$nixosLabel" + + if [ "$tag" = "default" ]; then + echo "default=$id" + fi + + echo -n "$id='" + echo -n "$kernel initrd=$initrd dtb=$dtbs/$dtbName " + echo -n "systemConfig=$path init=$path/init $extraParams" + echo "'" +} + +echo "# Hola!" > $tmp +addEntry $default default >> $tmp + +if [ "$numGenerations" -gt 0 ]; then + # Add up to $numGenerations generations of the system profile to the menu, + # in reverse (most recent to least recent) order. + for generation in $( + (cd /nix/var/nix/profiles && ls -d system-*-link) \ + | sed 's/system-\([0-9]\+\)-link/\1/' \ + | sort -n -r \ + | head -n $numGenerations); do + link=/nix/var/nix/profiles/system-$generation-link + addEntry $link $generation + done >> $tmp +fi + +mv -f $tmp $target