diff options
author | viric <viric@viric.name> | 2015-05-07 20:53:07 +0200 |
---|---|---|
committer | viric <viric@viric.name> | 2015-05-07 20:53:07 +0200 |
commit | 1b982918f5df1ce768041621c4f4d53f126dcf47 (patch) | |
tree | 636ed2a2b0b1008880996b095046ddecfb889465 /pkgs/stdenv/linux | |
parent | 3715dbbb988aabb57de32bc5b32ba098cdf24473 (diff) | |
parent | 9fc72c8ab8dc1e9c9eab9d091068b11f7de9184f (diff) | |
download | nixlib-1b982918f5df1ce768041621c4f4d53f126dcf47.tar nixlib-1b982918f5df1ce768041621c4f4d53f126dcf47.tar.gz nixlib-1b982918f5df1ce768041621c4f4d53f126dcf47.tar.bz2 nixlib-1b982918f5df1ce768041621c4f4d53f126dcf47.tar.lz nixlib-1b982918f5df1ce768041621c4f4d53f126dcf47.tar.xz nixlib-1b982918f5df1ce768041621c4f4d53f126dcf47.tar.zst nixlib-1b982918f5df1ce768041621c4f4d53f126dcf47.zip |
Merge pull request #7740 from dezgeg/arm
ARM changes for the Jetson TK1 (and other multiplatform boards)
Diffstat (limited to 'pkgs/stdenv/linux')
-rw-r--r-- | pkgs/stdenv/linux/make-bootstrap-tools-cross.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix b/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix index 9cc5d4700878..520bdd208e36 100644 --- a/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix +++ b/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix @@ -34,7 +34,7 @@ let }; }; - beagleboneCrossSystem = { + armv7l-hf-multiplatform-crossSystem = { crossSystem = rec { config = "armv7l-unknown-linux-gnueabi"; bigEndian = false; @@ -43,7 +43,7 @@ let fpu = "vfpv3-d16"; withTLS = true; libc = "glibc"; - platform = pkgsNoParams.platforms.beaglebone; + platform = pkgsNoParams.platforms.armv7l-hf-multiplatform; openssl.system = "linux-generic32"; inherit (platform) gcc; }; @@ -52,7 +52,7 @@ let selectedCrossSystem = if toolsArch == "armv5tel" then sheevaplugCrossSystem 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); |