diff --git a/nxp/common/modules.nix b/nxp/common/modules.nix index 4bc9df4..16bf0ca 100644 --- 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 deleted file mode 100644 index 61c0853..0000000 --- a/nxp/common/overlay.nix +++ /dev/null @@ -1,3 +0,0 @@ -final: prev: { - linux_imx8 = final.callPackage ./bsp/linux-imx8.nix { pkgs = final; }; -} diff --git a/nxp/imx8qm-mek/default.nix b/nxp/imx8qm-mek/default.nix index 05f243c..4974455 100644 --- 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 = {