detect arch in kernel and uimage

also move kernel builder to pkgs/

FIXME we need to straighten out the mess in calling
dtb.nix/uimage.nix
This commit is contained in:
Daniel Barlow
2023-09-20 17:57:17 +01:00
parent f1c04c7979
commit 4f29bdd3ed
6 changed files with 28 additions and 9 deletions

View File

@@ -24,7 +24,7 @@ in {
extraPatchPhase = mkOption {
default = "true";
type = types.lines;
} ;
};
config = mkOption {
description = ''
Kernel config options, as listed in Kconfig* files in the

View File

@@ -62,14 +62,14 @@ in
kernel = liminix.builders.kernel.override {
inherit (config.kernel) config src extraPatchPhase;
};
dtb = (callPackage ../kernel/dtb.nix {}) {
dtb = liminix.builders.dtb {
inherit (config.boot) commandLine;
dts = config.hardware.dts.src;
includes = config.hardware.dts.includes ++ [
"${kernel.headers}/include"
];
};
uimage = (callPackage ../kernel/uimage.nix {}) {
uimage = liminix.builders.uimage {
commandLine = concatStringsSep " " config.boot.commandLine;
inherit (config.hardware) loadAddress entryPoint;
inherit kernel;