From 0d9f2f0bb497020af31c93706cdf970a3db4bdfc Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Sun, 5 Nov 2017 16:58:14 +0200 Subject: platforms.nix: Clean up more 'uboot' legacy For a while now, the only thing the 'uboot' attribute does is to tell whether to add ubootTools to kernel/initrd builds. That can be determined with platform.kernelTarget == "uImage" just as well. --- pkgs/os-specific/linux/kernel/manual-config.nix | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) (limited to 'pkgs/os-specific/linux/kernel/manual-config.nix') diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix index 61349175c78f..28ad5aeca35f 100644 --- a/pkgs/os-specific/linux/kernel/manual-config.nix +++ b/pkgs/os-specific/linux/kernel/manual-config.nix @@ -224,8 +224,8 @@ stdenv.mkDerivation ((drvAttrs config stdenv.platform (kernelPatches ++ nativeKe enableParallelBuilding = true; - nativeBuildInputs = [ perl bc nettools openssl gmp libmpc mpfr ] ++ optional (stdenv.platform.uboot != null) - ubootTools; + nativeBuildInputs = [ perl bc nettools openssl gmp libmpc mpfr ] + ++ optional (stdenv.platform.kernelTarget == "uImage") ubootTools; hardeningDisable = [ "bindnow" "format" "fortify" "stackprotector" "pic" ]; @@ -244,10 +244,6 @@ stdenv.mkDerivation ((drvAttrs config stdenv.platform (kernelPatches ++ nativeKe karch = cp.kernelArch; - # !!! uboot has messed up cross-compiling, nativeDrv builds arm tools on x86, - # crossDrv builds x86 tools on x86 (but arm uboot). If this is fixed, uboot - # can just go into buildInputs (but not nativeBuildInputs since cp.uboot - # may be different from stdenv.platform.uboot) - buildInputs = optional (cp.uboot != null) ubootTools.crossDrv; + nativeBuildInputs = optional (cp.kernelTarget == "uImage") ubootTools; }; }) -- cgit 1.4.1