ARM: Assume armv7l-hf-multiplatform instead of beaglebone
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:
parent
0d5e144210
commit
a7c4aba896
@ -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);
|
||||
|
||||
|
@ -72,7 +72,7 @@ let
|
||||
platforms = (import ./platforms.nix);
|
||||
in
|
||||
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 == "mips64el-linux" then platforms.fuloong2f_n32
|
||||
else if system == "x86_64-linux" then platforms.pc64
|
||||
|
Loading…
x
Reference in New Issue
Block a user