about summary refs log tree commit diff
path: root/pkgs/misc/uboot
diff options
context:
space:
mode:
authorLluís Batlle i Rossell <viric@vicerveza.homeunix.net>2010-02-17 21:09:27 +0000
committerLluís Batlle i Rossell <viric@vicerveza.homeunix.net>2010-02-17 21:09:27 +0000
commit7b4529cfc7b1012fc76280647f64bb8d25c37a03 (patch)
tree295a750ae00960bb4b0262fdac5ac00bdf39b308 /pkgs/misc/uboot
parentaca3e65338d1e106202adb044a469188ee60c117 (diff)
downloadnixlib-7b4529cfc7b1012fc76280647f64bb8d25c37a03.tar
nixlib-7b4529cfc7b1012fc76280647f64bb8d25c37a03.tar.gz
nixlib-7b4529cfc7b1012fc76280647f64bb8d25c37a03.tar.bz2
nixlib-7b4529cfc7b1012fc76280647f64bb8d25c37a03.tar.lz
nixlib-7b4529cfc7b1012fc76280647f64bb8d25c37a03.tar.xz
nixlib-7b4529cfc7b1012fc76280647f64bb8d25c37a03.tar.zst
nixlib-7b4529cfc7b1012fc76280647f64bb8d25c37a03.zip
Allowing multiplatform uboot (sheevaplug/integratorcp).
svn path=/nixpkgs/trunk/; revision=20079
Diffstat (limited to 'pkgs/misc/uboot')
-rw-r--r--pkgs/misc/uboot/default.nix11
1 files changed, 3 insertions, 8 deletions
diff --git a/pkgs/misc/uboot/default.nix b/pkgs/misc/uboot/default.nix
index bbb1f8acc72d..262d976730fd 100644
--- a/pkgs/misc/uboot/default.nix
+++ b/pkgs/misc/uboot/default.nix
@@ -1,10 +1,5 @@
-{stdenv, fetchurl, unzip}:
+{stdenv, fetchurl, unzip, platform}:
 
-# We should enable this check once we have the cross target system information
-# assert stdenv.system == "armv5tel-linux" || crossConfig == "armv5tel-linux";
-
-# All this file is made for the Marvell Sheevaplug
-   
 stdenv.mkDerivation {
   name = "uboot-2009.11";
    
@@ -18,7 +13,7 @@ stdenv.mkDerivation {
   # Remove the cross compiler prefix, and add reiserfs support
   configurePhase = ''
     make mrproper
-    make sheevaplug_config NBOOT=1 LE=1
+    make ${platform.ubootConfig} NBOOT=1 LE=1
     sed -i /CROSS_COMPILE/d include/config.mk
   '';
 
@@ -27,7 +22,7 @@ stdenv.mkDerivation {
     if test -z "$crossConfig"; then
         make clean all
     else
-        make clean all ARCH=arm CROSS_COMPILE=$crossConfig-
+        make clean all ARCH=${platform.kernelArch} CROSS_COMPILE=$crossConfig-
     fi
   '';