Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)

uboot: buildUBoot: add extraConfig parameter

+6 -3
+6 -3
pkgs/misc/uboot/default.nix
··· 7 buildUBoot = { filesToInstall 8 , installDir ? "$out" 9 , defconfig 10 , extraPatches ? [] 11 , extraMakeFlags ? [] 12 , extraMeta ? {} ··· 50 "CROSS_COMPILE=${stdenv.cc.targetPrefix}" 51 ] ++ extraMakeFlags; 52 53 configurePhase = '' 54 runHook preConfigure 55 56 make ${defconfig} 57 58 runHook postConfigure 59 ''; ··· 242 extraMeta.platforms = ["armv7l-linux"]; 243 filesToInstall = ["u-boot-with-nand-spl.imx"]; 244 buildFlags = "u-boot-with-nand-spl.imx"; 245 - postConfigure = '' 246 - cat >> .config << EOF 247 CONFIG_CMD_SETEXPR=y 248 - EOF 249 ''; 250 # sata init; load sata 0 $loadaddr u-boot-with-nand-spl.imx 251 # sf probe; sf update $loadaddr 0 80000
··· 7 buildUBoot = { filesToInstall 8 , installDir ? "$out" 9 , defconfig 10 + , extraConfig ? "" 11 , extraPatches ? [] 12 , extraMakeFlags ? [] 13 , extraMeta ? {} ··· 51 "CROSS_COMPILE=${stdenv.cc.targetPrefix}" 52 ] ++ extraMakeFlags; 53 54 + passAsFile = [ "extraConfig" ]; 55 + 56 configurePhase = '' 57 runHook preConfigure 58 59 make ${defconfig} 60 + 61 + cat $extraConfigPath >> .config 62 63 runHook postConfigure 64 ''; ··· 247 extraMeta.platforms = ["armv7l-linux"]; 248 filesToInstall = ["u-boot-with-nand-spl.imx"]; 249 buildFlags = "u-boot-with-nand-spl.imx"; 250 + extraConfig = '' 251 CONFIG_CMD_SETEXPR=y 252 ''; 253 # sata init; load sata 0 $loadaddr u-boot-with-nand-spl.imx 254 # sf probe; sf update $loadaddr 0 80000