Skip to content
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.

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

nixos/hardware.deviceTree: Allow use of dtmerge #67989

Closed
wants to merge 5 commits into from

Conversation

@kwohlfahrt
Copy link
Contributor

kwohlfahrt commented Sep 3, 2019

Some raspberry pi overlays don't build with fdtoverlay (raspberrypi/linux/issues/3198). Also, dtmerge supports 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 overlays option to accept both an overlay path and an optional list of parameters, though the latter must be empty for the dtc builder.

Motivation for this change
Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nix-review --run "nix-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.
Notify maintainers

cc @samueldr

@kwohlfahrt kwohlfahrt force-pushed the kwohlfahrt:device-tree-dtmerge branch from 63b9546 to ac827c9 Sep 3, 2019
@kwohlfahrt kwohlfahrt force-pushed the kwohlfahrt:device-tree-dtmerge branch from ac827c9 to b7a4ede Sep 10, 2019
@lheckemann lheckemann added this to the 20.03 milestone Sep 12, 2019
@kwohlfahrt kwohlfahrt force-pushed the kwohlfahrt:device-tree-dtmerge branch from b7a4ede to 7869074 Sep 25, 2019
@kwohlfahrt kwohlfahrt force-pushed the kwohlfahrt:device-tree-dtmerge branch from 7869074 to 6069e4d Oct 14, 2019
@ofborg ofborg bot added the 8.has: clean-up label Oct 17, 2019
@kwohlfahrt kwohlfahrt force-pushed the kwohlfahrt:device-tree-dtmerge branch from 3c952f7 to f09307f Oct 22, 2019
@kwohlfahrt kwohlfahrt force-pushed the kwohlfahrt:device-tree-dtmerge branch from f09307f to e30dfb0 Nov 4, 2019
@kwohlfahrt kwohlfahrt force-pushed the kwohlfahrt:device-tree-dtmerge branch from e30dfb0 to 18ef96f Nov 12, 2019
@kwohlfahrt kwohlfahrt force-pushed the kwohlfahrt:device-tree-dtmerge branch from 18ef96f to 275d129 Dec 9, 2019
kwohlfahrt added 5 commits Sep 2, 2019
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 kwohlfahrt force-pushed the kwohlfahrt:device-tree-dtmerge branch from 275d129 to 2507748 Dec 19, 2019
device-tree.
'';
example = literalExample "[\"\${pkgs.linuxPackages_rpi.kernel}/dtbs/overlays/w1-gpio.dtbo\"]";
};

This comment has been minimized.

Copy link
@sorki

sorki Feb 3, 2020

Member

Looks like linuxPackages_rpi is no more and you need to say which one e.g. linuxPackages_rpi4

@disassembler disassembler modified the milestones: 20.03, 20.09 Feb 5, 2020
@sorki sorki mentioned this pull request Feb 6, 2020
2 of 10 tasks complete
@kwohlfahrt

This comment has been minimized.

Copy link
Contributor Author

kwohlfahrt commented Apr 1, 2020

Closing this in favour of #79370

@kwohlfahrt kwohlfahrt closed this Apr 1, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

4 participants
You can’t perform that action at this time.