diff options
| author | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2010-02-17 20:53:01 +0000 |
|---|---|---|
| committer | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2010-02-17 20:53:01 +0000 |
| commit | aca3e65338d1e106202adb044a469188ee60c117 (patch) | |
| tree | 1b3370c71137f8adb3e22bf42392817014513b30 /pkgs/misc/uboot | |
| parent | b036ee727a33c55b0818b2c64407187634e7aea6 (diff) | |
| download | nixlib-aca3e65338d1e106202adb044a469188ee60c117.tar nixlib-aca3e65338d1e106202adb044a469188ee60c117.tar.gz nixlib-aca3e65338d1e106202adb044a469188ee60c117.tar.bz2 nixlib-aca3e65338d1e106202adb044a469188ee60c117.tar.lz nixlib-aca3e65338d1e106202adb044a469188ee60c117.tar.xz nixlib-aca3e65338d1e106202adb044a469188ee60c117.tar.zst nixlib-aca3e65338d1e106202adb044a469188ee60c117.zip | |
Adding the mainline uboot.
svn path=/nixpkgs/trunk/; revision=20078
Diffstat (limited to 'pkgs/misc/uboot')
| -rw-r--r-- | pkgs/misc/uboot/default.nix | 23 | ||||
| -rw-r--r-- | pkgs/misc/uboot/sheevaplug.nix | 58 |
2 files changed, 64 insertions, 17 deletions
diff --git a/pkgs/misc/uboot/default.nix b/pkgs/misc/uboot/default.nix index 5c38f1d053bb..bbb1f8acc72d 100644 --- a/pkgs/misc/uboot/default.nix +++ b/pkgs/misc/uboot/default.nix @@ -6,30 +6,19 @@ # All this file is made for the Marvell Sheevaplug stdenv.mkDerivation { - name = "uboot-sheevaplug-3.4.19"; + name = "uboot-2009.11"; src = fetchurl { - url = "ftp://ftp.denx.de/pub/u-boot/u-boot-1.1.4.tar.bz2"; - sha256 = "19vp4rlikz7h72pqsjhgz7nmgjy4c6vabvxkw67wni70vy5ddy8s"; + url = "ftp://ftp.denx.de/pub/u-boot/u-boot-2009.11.tar.bz2"; + sha256 = "1rld7q3ww89si84g80hqskd1z995lni5r5xc4d4322n99wqiarh6"; }; - srcAddon = fetchurl { - url = "http://www.plugcomputer.org/data/uboot/u-boot-3.4.19.zip"; - sha256 = "1wag1l6agr8dbnnfaw6bgcrwynwwgry4ihb3gp438699wmkmy91k"; - }; - - postUnpack = '' - mv u-boot-1.1.4 u-boot-3.4.19 - unzip -o $srcAddon - sourceRoot=u-boot-3.4.19 - ''; - - patches = [ ./gas220.patch ]; + # patches = [ ./gas220.patch ]; # Remove the cross compiler prefix, and add reiserfs support configurePhase = '' make mrproper - make rd88f6281Sheevaplug_config NBOOT=1 LE=1 + make sheevaplug_config NBOOT=1 LE=1 sed -i /CROSS_COMPILE/d include/config.mk ''; @@ -49,7 +38,7 @@ stdenv.mkDerivation { installPhase = '' ensureDir $out - cp u-boot-rd88f6281Sheevaplug_400db_nand.bin $out + cp u-boot.bin $out cp u-boot u-boot.map $out ensureDir $out/bin diff --git a/pkgs/misc/uboot/sheevaplug.nix b/pkgs/misc/uboot/sheevaplug.nix new file mode 100644 index 000000000000..5c38f1d053bb --- /dev/null +++ b/pkgs/misc/uboot/sheevaplug.nix @@ -0,0 +1,58 @@ +{stdenv, fetchurl, unzip}: + +# 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-sheevaplug-3.4.19"; + + src = fetchurl { + url = "ftp://ftp.denx.de/pub/u-boot/u-boot-1.1.4.tar.bz2"; + sha256 = "19vp4rlikz7h72pqsjhgz7nmgjy4c6vabvxkw67wni70vy5ddy8s"; + }; + + srcAddon = fetchurl { + url = "http://www.plugcomputer.org/data/uboot/u-boot-3.4.19.zip"; + sha256 = "1wag1l6agr8dbnnfaw6bgcrwynwwgry4ihb3gp438699wmkmy91k"; + }; + + postUnpack = '' + mv u-boot-1.1.4 u-boot-3.4.19 + unzip -o $srcAddon + sourceRoot=u-boot-3.4.19 + ''; + + patches = [ ./gas220.patch ]; + + # Remove the cross compiler prefix, and add reiserfs support + configurePhase = '' + make mrproper + make rd88f6281Sheevaplug_config NBOOT=1 LE=1 + sed -i /CROSS_COMPILE/d include/config.mk + ''; + + buildPhase = '' + unset src + if test -z "$crossConfig"; then + make clean all + else + make clean all ARCH=arm CROSS_COMPILE=$crossConfig- + fi + ''; + + buildNativeInputs = [ unzip ]; + + dontStrip = true; + NIX_STRIP_DEBUG = false; + + installPhase = '' + ensureDir $out + cp u-boot-rd88f6281Sheevaplug_400db_nand.bin $out + cp u-boot u-boot.map $out + + ensureDir $out/bin + cp tools/{envcrc,mkimage} $out/bin + ''; +} |