Adding the mainline uboot.

svn path=/nixpkgs/trunk/; revision=20078
This commit is contained in:
Lluís Batlle i Rossell 2010-02-17 20:53:01 +00:00
parent b036ee727a
commit aca3e65338
3 changed files with 68 additions and 17 deletions

View File

@ -6,30 +6,19 @@
# All this file is made for the Marvell Sheevaplug # All this file is made for the Marvell Sheevaplug
stdenv.mkDerivation { stdenv.mkDerivation {
name = "uboot-sheevaplug-3.4.19"; name = "uboot-2009.11";
src = fetchurl { src = fetchurl {
url = "ftp://ftp.denx.de/pub/u-boot/u-boot-1.1.4.tar.bz2"; url = "ftp://ftp.denx.de/pub/u-boot/u-boot-2009.11.tar.bz2";
sha256 = "19vp4rlikz7h72pqsjhgz7nmgjy4c6vabvxkw67wni70vy5ddy8s"; sha256 = "1rld7q3ww89si84g80hqskd1z995lni5r5xc4d4322n99wqiarh6";
}; };
srcAddon = fetchurl { # patches = [ ./gas220.patch ];
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 # Remove the cross compiler prefix, and add reiserfs support
configurePhase = '' configurePhase = ''
make mrproper make mrproper
make rd88f6281Sheevaplug_config NBOOT=1 LE=1 make sheevaplug_config NBOOT=1 LE=1
sed -i /CROSS_COMPILE/d include/config.mk sed -i /CROSS_COMPILE/d include/config.mk
''; '';
@ -49,7 +38,7 @@ stdenv.mkDerivation {
installPhase = '' installPhase = ''
ensureDir $out ensureDir $out
cp u-boot-rd88f6281Sheevaplug_400db_nand.bin $out cp u-boot.bin $out
cp u-boot u-boot.map $out cp u-boot u-boot.map $out
ensureDir $out/bin ensureDir $out/bin

View File

@ -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
'';
}

View File

@ -6340,6 +6340,10 @@ let
inherit fetchurl stdenv unzip; inherit fetchurl stdenv unzip;
}; };
ubootSheevaplug = makeOverridable (import ../misc/uboot) {
inherit fetchurl stdenv unzip;
};
/* /*
uclibc = import ../os-specific/linux/uclibc { uclibc = import ../os-specific/linux/uclibc {
inherit fetchurl stdenv linuxHeaders; inherit fetchurl stdenv linuxHeaders;