mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-22 06:53:01 +00:00
Allowing multiplatform uboot (sheevaplug/integratorcp).
svn path=/nixpkgs/trunk/; revision=20079
This commit is contained in:
parent
aca3e65338
commit
7b4529cfc7
@ -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
|
||||
'';
|
||||
|
||||
|
@ -6337,10 +6337,10 @@ let
|
||||
};*/
|
||||
|
||||
uboot = makeOverridable (import ../misc/uboot) {
|
||||
inherit fetchurl stdenv unzip;
|
||||
inherit fetchurl stdenv unzip platform;
|
||||
};
|
||||
|
||||
ubootSheevaplug = makeOverridable (import ../misc/uboot) {
|
||||
ubootSheevaplug = makeOverridable (import ../misc/uboot/sheevaplug.nix) {
|
||||
inherit fetchurl stdenv unzip;
|
||||
};
|
||||
|
||||
|
@ -47,7 +47,9 @@ with pkgs;
|
||||
SCSI_ACARD n
|
||||
BLK_DEV_CMD640_ENHANCED n
|
||||
'';
|
||||
inherit uboot;
|
||||
uboot = ubootSheevaplug;
|
||||
# Only for uboot = uboot :
|
||||
ubootConfig = "sheevaplug_config";
|
||||
};
|
||||
|
||||
versatileARM = assert system == "armv5tel-linux"; {
|
||||
@ -57,4 +59,13 @@ with pkgs;
|
||||
kernelAutoModules = false;
|
||||
uboot = null;
|
||||
};
|
||||
|
||||
integratorCP = {
|
||||
name = "integratorCP";
|
||||
kernelBaseConfig = "integrator_defconfig";
|
||||
kernelArch = "arm";
|
||||
kernelAutoModules = false;
|
||||
uboot = null;
|
||||
ubootConfig = "integratorcp_config";
|
||||
};
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user