aires/nixos-hardware
aires/nixos-hardware
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Merge pull request #619 from NixOS/nxp-overlay

Browse source 
nxp-imx8: drop kernel overlay
This commit is contained in:
Jörg Thalheim 2023-05-11 21:28:21 +01:00 committed by GitHub
parent 51559e691f c84a8f2423
commit fb13179483
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
nxp/common/modules.nix
View file

@ -1,12 +1,8 @@
{ pkgs, lib, ... }: { { pkgs, lib, ... }: {
nixpkgs.overlays = [
(import ./overlay.nix)
];
nixpkgs.hostPlatform = "aarch64-linux"; nixpkgs.hostPlatform = "aarch64-linux";
boot = { boot = {
kernelPackages = pkgs.linuxPackagesFor pkgs.linux_imx8; kernelPackages = pkgs.linuxPackagesFor (pkgs.callPackage ./bsp/linux-imx8.nix { });
kernelParams = [ "console=ttyLP0,115200n8" ]; kernelParams = [ "console=ttyLP0,115200n8" ];
loader.grub.enable = lib.mkDefault true; loader.grub.enable = lib.mkDefault true;
initrd.includeDefaultModules = lib.mkForce false; initrd.includeDefaultModules = lib.mkForce false;

3
nxp/common/overlay.nix
View file

@ -1,3 +0,0 @@
final: prev: {
linux_imx8 = final.callPackage ./bsp/linux-imx8.nix { pkgs = final; };
}

4
nxp/imx8qm-mek/default.nix
View file

@ -1,4 +1,4 @@
{ pkgs, lib, ... }: { pkgs, ... }:
{ {
nixpkgs.overlays = [ nixpkgs.overlays = [
@ -10,7 +10,7 @@
]; ];
boot.loader.grub.extraFiles = { boot.loader.grub.extraFiles = {
"imx8qm-mek.dtb" = "${pkgs.linux_imx8}/dtbs/freescale/imx8qm-mek.dtb"; "imx8qm-mek.dtb" = "${pkgs.callPackage ../common/bsp/linux-imx8.nix { }}/dtbs/freescale/imx8qm-mek.dtb";
}; };
hardware.deviceTree = { hardware.deviceTree = {