Merge pull request NixOS#619 from NixOS/nxp-overlay

nxp-imx8: drop kernel overlay
me00001 · May 11, 2023 · fb13179 · fb13179
2 parents 51559e6 + c84a8f2
commit fb13179
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 10 deletions.
diff --git a/nxp/common/modules.nix b/nxp/common/modules.nix
@@ -1,12 +1,8 @@
 { pkgs, lib, ... }: {
-  nixpkgs.overlays = [
-    (import ./overlay.nix)
-  ];
-
   nixpkgs.hostPlatform = "aarch64-linux";
 
   boot = {
-    kernelPackages = pkgs.linuxPackagesFor pkgs.linux_imx8;
+    kernelPackages = pkgs.linuxPackagesFor (pkgs.callPackage ./bsp/linux-imx8.nix { });
     kernelParams = [ "console=ttyLP0,115200n8" ];
     loader.grub.enable = lib.mkDefault true;
     initrd.includeDefaultModules = lib.mkForce false;

diff --git a/nxp/common/overlay.nix b/nxp/common/overlay.nix
diff --git a/nxp/imx8qm-mek/default.nix b/nxp/imx8qm-mek/default.nix
@@ -1,4 +1,4 @@
-{ pkgs, lib, ... }:
+{ pkgs, ... }:
 
 {
   nixpkgs.overlays = [
@@ -10,7 +10,7 @@
   ];
 
   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 = {