move dts config from kernel to boot
The kernel does not need to know about the DTS. I am prepared to be very slightly injured on this hill.
This commit is contained in:
@@ -29,13 +29,6 @@ in {
|
||||
default = "true";
|
||||
type = types.lines;
|
||||
} ;
|
||||
dts = {
|
||||
src = mkOption { type = types.path; };
|
||||
includes = mkOption {
|
||||
default = [];
|
||||
type = types.listOf types.path;
|
||||
};
|
||||
};
|
||||
config = mkOption {
|
||||
# mostly the values are y n or m, but sometimes
|
||||
# other strings are also used
|
||||
@@ -48,9 +41,18 @@ in {
|
||||
users = mkOption {
|
||||
type = types.attrsOf types.anything;
|
||||
};
|
||||
boot.commandLine = mkOption {
|
||||
type = types.listOf types.nonEmptyStr;
|
||||
default = [];
|
||||
boot = {
|
||||
dts = {
|
||||
src = mkOption { type = types.path; };
|
||||
includes = mkOption {
|
||||
default = [];
|
||||
type = types.listOf types.path;
|
||||
};
|
||||
};
|
||||
commandLine = mkOption {
|
||||
type = types.listOf types.nonEmptyStr;
|
||||
default = [];
|
||||
};
|
||||
};
|
||||
device.defaultOutput = mkOption {
|
||||
type = types.nonEmptyStr;
|
||||
|
@@ -23,8 +23,8 @@ in
|
||||
inherit (config.kernel) config src extraPatchPhase;
|
||||
};
|
||||
dtb = (callPackage ../kernel/dtb.nix {}) {
|
||||
dts = config.kernel.dts.src;
|
||||
includes = config.kernel.dts.includes ++ [
|
||||
dts = config.boot.dts.src;
|
||||
includes = config.boot.dts.includes ++ [
|
||||
"${kernel.headers}/include"
|
||||
];
|
||||
};
|
||||
|
Reference in New Issue
Block a user