diff options
| author | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2010-02-17 21:09:27 +0000 |
|---|---|---|
| committer | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2010-02-17 21:09:27 +0000 |
| commit | 7b4529cfc7b1012fc76280647f64bb8d25c37a03 (patch) | |
| tree | 295a750ae00960bb4b0262fdac5ac00bdf39b308 /pkgs/top-level | |
| parent | aca3e65338d1e106202adb044a469188ee60c117 (diff) | |
| download | nixpkgs-7b4529cfc7b1012fc76280647f64bb8d25c37a03.tar nixpkgs-7b4529cfc7b1012fc76280647f64bb8d25c37a03.tar.gz nixpkgs-7b4529cfc7b1012fc76280647f64bb8d25c37a03.tar.bz2 nixpkgs-7b4529cfc7b1012fc76280647f64bb8d25c37a03.tar.lz nixpkgs-7b4529cfc7b1012fc76280647f64bb8d25c37a03.tar.xz nixpkgs-7b4529cfc7b1012fc76280647f64bb8d25c37a03.tar.zst nixpkgs-7b4529cfc7b1012fc76280647f64bb8d25c37a03.zip | |
Allowing multiplatform uboot (sheevaplug/integratorcp).
svn path=/nixpkgs/trunk/; revision=20079
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 | ||||
| -rw-r--r-- | pkgs/top-level/platforms.nix | 13 |
2 files changed, 14 insertions, 3 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b0b1801e4fb..c434478d5fe 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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; }; diff --git a/pkgs/top-level/platforms.nix b/pkgs/top-level/platforms.nix index 305b4dbd537..1d0d526829c 100644 --- a/pkgs/top-level/platforms.nix +++ b/pkgs/top-level/platforms.nix @@ -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"; + }; } |