Skip to content

hack: support 'devicetree' with systemd-boot + hardware.device-tree #331003

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

Closed
colemickens wants to merge 2 commits into from
Closed

hack: support 'devicetree' with systemd-boot + hardware.device-tree #331003

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
29506a3
system/kernel.nix: toplevel: add dtb link
colemickens Jul 9, 2024
4f07523
systemd-boot-builder.py: add devicetree if dtb exists
colemickens Jul 16, 2024
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
8 changes: 8 additions & 0 deletions nixos/modules/system/boot/kernel.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -353,6 +353,14 @@ in
ln -s ${config.system.build.initialRamdiskSecretAppender}/bin/append-initrd-secrets $out

ln -s ${config.hardware.firmware}/lib/firmware $out/firmware

${lib.optionalString (
config.hardware.deviceTree.enable
&& config.hardware.deviceTree.package != null
&& config.hardware.deviceTree.name != null)
# "ln -s ${config.boot.kernelPackages.package}/dtbs/${config.hardware.deviceTree.name} $out/dtb"
"ln -s ${config.hardware.deviceTree.package}/${config.hardware.deviceTree.name} $out/dtb"
}
'';

# Implement consoleLogLevel both in early boot and using sysctl
Expand Down
23 changes: 23 additions & 0 deletions nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -305,6 +305,29 @@ def write_entry(profile: str | None,
sort_key=bootspec.sortKey,
default=current
).write(sorted_first)

devicetree = None
dtb_link = f"{system_dir(profile, generation, specialisation)}/dtb"
if os.path.exists(dtb_link):
dtb_path = os.path.realpath(dtb_link)
if os.path.exists(dtb_path):
devicetree = copy_from_file(dtb_path)

with open(tmp_path, 'w') as f:
f.write(BOOT_ENTRY.format(title=title,
sort_key=bootspec.sortKey,
generation=generation,
kernel=kernel,
initrd=initrd,
kernel_params=kernel_params,
description=f"{bootspec.label}, built on {build_date}"))
if machine_id is not None:
f.write("machine-id %s\n" % machine_id)
if devicetree is not None:
f.write("devicetree %s\n" % devicetree)
f.flush()
os.fsync(f.fileno())
os.rename(tmp_path, entry_file)

def get_generations(profile: str | None = None) -> list[SystemIdentifier]:
gen_list = run(
Expand Down