public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ARM: Assume armv7l-hf-multiplatform instead of beaglebone

Browse Source 
Several places in the tree associate the ARMv7 system
with the beaglebone platform. Change them to point to
armv7l-hf-multiplatform as it supports several boards (including the
beaglebone as well)
This commit is contained in:
Tuomas Tynkkynen 2015-05-06 11:15:13 +03:00
parent 0d5e144210
commit a7c4aba896
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/stdenv/linux/make-bootstrap-tools-cross.nix
View File

@ -34,7 +34,7 @@ let
}; };
}; };
beagleboneCrossSystem = { armv7l-hf-multiplatform-crossSystem = {
crossSystem = rec { crossSystem = rec {
config = "armv7l-unknown-linux-gnueabi"; config = "armv7l-unknown-linux-gnueabi";
bigEndian = false; bigEndian = false;
@ -43,7 +43,7 @@ let
fpu = "vfpv3-d16"; fpu = "vfpv3-d16";
withTLS = true; withTLS = true;
libc = "glibc"; libc = "glibc";
platform = pkgsNoParams.platforms.beaglebone; platform = pkgsNoParams.platforms.armv7l-hf-multiplatform;
openssl.system = "linux-generic32"; openssl.system = "linux-generic32";
inherit (platform) gcc; inherit (platform) gcc;
}; };
@ -52,7 +52,7 @@ let
selectedCrossSystem = selectedCrossSystem =
if toolsArch == "armv5tel" then sheevaplugCrossSystem else if toolsArch == "armv5tel" then sheevaplugCrossSystem else
if toolsArch == "armv6l" then raspberrypiCrossSystem else if toolsArch == "armv6l" then raspberrypiCrossSystem else
if toolsArch == "armv7l" then beagleboneCrossSystem else null; if toolsArch == "armv7l" then armv7l-hf-multiplatform-crossSystem else null;
pkgs = pkgsFun ({inherit system;} // selectedCrossSystem); pkgs = pkgsFun ({inherit system;} // selectedCrossSystem);

2
pkgs/top-level/all-packages.nix
View File

@ -72,7 +72,7 @@ let
platforms = (import ./platforms.nix); platforms = (import ./platforms.nix);
in in
if system == "armv6l-linux" then platforms.raspberrypi if system == "armv6l-linux" then platforms.raspberrypi
else if system == "armv7l-linux" then platforms.beaglebone else if system == "armv7l-linux" then platforms.armv7l-hf-multiplatform
else if system == "armv5tel-linux" then platforms.sheevaplug else if system == "armv5tel-linux" then platforms.sheevaplug
else if system == "mips64el-linux" then platforms.fuloong2f_n32 else if system == "mips64el-linux" then platforms.fuloong2f_n32
else if system == "x86_64-linux" then platforms.pc64 else if system == "x86_64-linux" then platforms.pc64