alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

make-bootstrap-tools-cross.nix: Have more consistency with platforms.nix

Browse source 
E.g. we had `arch = "arm"` in the former and `arch = "armv6"` in the
latter. Try to have some more consistency.
This commit is contained in:
Tuomas Tynkkynen 2016-07-17 00:11:34 +03:00 committed by Tuomas Tynkkynen
parent 9f0dc294da
commit 171c7f0e63
2 changed files with 10 additions and 6 deletions

12
pkgs/stdenv/linux/make-bootstrap-tools-cross.nix
View file

@ -8,9 +8,9 @@ let
sheevaplugCrossSystem = { sheevaplugCrossSystem = {
crossSystem = rec { crossSystem = rec {
config = "armv5tel-unknown-linux-gnueabi"; config = "arm-linux-gnueabi";
bigEndian = false; bigEndian = false;
arch = "arm"; arch = "armv5te";
float = "soft"; float = "soft";
withTLS = true; withTLS = true;
libc = "glibc"; libc = "glibc";
@ -21,9 +21,9 @@ let
raspberrypiCrossSystem = { raspberrypiCrossSystem = {
crossSystem = rec { crossSystem = rec {
config = "armv6l-unknown-linux-gnueabi"; config = "arm-linux-gnueabihf";
bigEndian = false; bigEndian = false;
arch = "arm"; arch = "armv6";
float = "hard"; float = "hard";
fpu = "vfp"; fpu = "vfp";
withTLS = true; withTLS = true;
@ -36,9 +36,9 @@ let
armv7l-hf-multiplatform-crossSystem = { armv7l-hf-multiplatform-crossSystem = {
crossSystem = rec { crossSystem = rec {
config = "armv7l-unknown-linux-gnueabi"; config = "arm-linux-gnueabihf";
bigEndian = false; bigEndian = false;
arch = "arm"; arch = "armv7-a";
float = "hard"; float = "hard";
fpu = "vfpv3-d16"; fpu = "vfpv3-d16";
withTLS = true; withTLS = true;

4
pkgs/top-level/platforms.nix
View file

@ -129,6 +129,10 @@ rec {
# Only for uboot = uboot : # Only for uboot = uboot :
ubootConfig = "sheevaplug_config"; ubootConfig = "sheevaplug_config";
kernelDTB = true; # Beyond 3.10 kernelDTB = true; # Beyond 3.10
gcc = {
arch = "armv5te";
float = "soft";
};
}; };
raspberrypi = { raspberrypi = {