From 26079c4da73172f4d51ceca2ef9a641bcc1e0777 Mon Sep 17 00:00:00 2001
From: Ben Wolsieffer <benwolsieffer@gmail.com>
Date: Tue, 1 Jan 2019 01:05:36 -0500
Subject: uboot: buildUBoot: add extraConfig parameter

---
 pkgs/misc/uboot/default.nix | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'pkgs/misc/uboot')

diff --git a/pkgs/misc/uboot/default.nix b/pkgs/misc/uboot/default.nix
index 44d2bfc4400e..5affd93279c9 100644
--- a/pkgs/misc/uboot/default.nix
+++ b/pkgs/misc/uboot/default.nix
@@ -7,6 +7,7 @@ let
   buildUBoot = { filesToInstall
             , installDir ? "$out"
             , defconfig
+            , extraConfig ? ""
             , extraPatches ? []
             , extraMakeFlags ? []
             , extraMeta ? {}
@@ -50,11 +51,15 @@ let
       "CROSS_COMPILE=${stdenv.cc.targetPrefix}"
     ] ++ extraMakeFlags;
 
+    passAsFile = [ "extraConfig" ];
+
     configurePhase = ''
       runHook preConfigure
 
       make ${defconfig}
 
+      cat $extraConfigPath >> .config
+
       runHook postConfigure
     '';
 
@@ -242,10 +247,8 @@ in rec {
     extraMeta.platforms = ["armv7l-linux"];
     filesToInstall = ["u-boot-with-nand-spl.imx"];
     buildFlags = "u-boot-with-nand-spl.imx";
-    postConfigure = ''
-      cat >> .config << EOF
+    extraConfig = ''
       CONFIG_CMD_SETEXPR=y
-      EOF
     '';
     # sata init; load sata 0 $loadaddr u-boot-with-nand-spl.imx
     # sf probe; sf update $loadaddr 0 80000
-- 
cgit 1.4.1