nixos/hardware.deviceTree: Allow use of dtmerge #67989
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
kwohlfahrt
force-pushed
the
device-tree-dtmerge
branch
from
63b9546
to
ac827c9
Compare
kwohlfahrt
force-pushed
the
device-tree-dtmerge
branch
from
ac827c9
to
b7a4ede
Compare
kwohlfahrt
force-pushed
the
device-tree-dtmerge
branch
from
b7a4ede
to
7869074
Compare
kwohlfahrt
force-pushed
the
device-tree-dtmerge
branch
from
7869074
to
6069e4d
Compare
kwohlfahrt
force-pushed
the
device-tree-dtmerge
branch
from
3c952f7
to
f09307f
Compare
kwohlfahrt
force-pushed
the
device-tree-dtmerge
branch
from
f09307f
to
e30dfb0
Compare
kwohlfahrt
force-pushed
the
device-tree-dtmerge
branch
from
e30dfb0
to
18ef96f
Compare
kwohlfahrt
force-pushed
the
device-tree-dtmerge
branch
from
18ef96f
to
275d129
Compare
Some raspberry pi overlays don't build with fdtoverlay (github.com/raspberrypi/linux/issues/3198). Also, dtmerge supports setting overlay parameters. However, dtmerge is only available on ARM, so we can't use it everywhere.
These device trees are incompatible with the mainline kernel, as well as linux_rpi. linux_rpi now bundles its own device-tree files and overlays, so there is no use for these anymore.
kwohlfahrt
force-pushed
the
device-tree-dtmerge
branch
from
275d129
to
2507748
Compare
sorki
reviewed
Feb 3, 2020
| device-tree. | ||
| ''; | ||
| example = literalExample "[\"\${pkgs.linuxPackages_rpi.kernel}/dtbs/overlays/w1-gpio.dtbo\"]"; | ||
| }; |
There was a problem hiding this comment.
Looks like linuxPackages_rpi is no more and you need to say which one e.g. linuxPackages_rpi4
10 tasks
|
Closing this in favour of #79370 |
|
This pull request has been mentioned on NixOS Discourse. There might be relevant details there: https://discourse.nixos.org/t/cross-compiling-problem-with-devicetree-on-armv6/9254/5 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Some raspberry pi overlays don't build with
fdtoverlay(raspberrypi/linux/issues/3198). Also,dtmergesupports setting overlay parameters. However, dtmerge is only available on ARM, so we can't use it everywhere, hence adding the option to select which tool to use for combining device trees.This also modifies the format of the
overlaysoption to accept both an overlay path and an optional list of parameters, though the latter must be empty for thedtcbuilder.Motivation for this change
Things done
sandboxinnix.confon non-NixOS)nix-shell -p nix-review --run "nix-review wip"./result/bin/)nix path-info -Sbefore and after)Notify maintainers
cc @samueldr