From 3b7395683c6c2deeee58432c6a3a383f24b511eb Mon Sep 17 00:00:00 2001 From: Eric Litak Date: Sun, 17 Apr 2016 05:06:10 -0700 Subject: [PATCH] platforms: add scaleway-c1 (armv7 sans NEON) --- lib/systems/platforms.nix | 8 ++++++++ pkgs/stdenv/linux/make-bootstrap-tools-cross.nix | 8 ++++++++ 2 files changed, 16 insertions(+) diff --git a/lib/systems/platforms.nix b/lib/systems/platforms.nix index 4322c8e2ff6..24634f83a49 100644 --- a/lib/systems/platforms.nix +++ b/lib/systems/platforms.nix @@ -307,6 +307,14 @@ rec { uboot = null; }; + scaleway-c1 = armv7l-hf-multiplatform // { + gcc = { + cpu = "cortex-a9"; + fpu = "vfpv3"; + float = "hard"; + }; + }; + guruplug = sheevaplug // { # Define `CONFIG_MACH_GURUPLUG' (see # ) diff --git a/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix b/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix index 613edfafd95..3eb902c890d 100644 --- a/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix +++ b/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix @@ -62,8 +62,15 @@ let }; }; + scaleway-c1-crossSystem.crossSystem = armv7l-hf-multiplatform-crossSystem.crossSystem // rec { + platform = pkgsNoParams.platforms.scaleway-c1; + inherit (platform) gcc; + inherit (gcc) fpu; + }; + selectedCrossSystem = if toolsArch == "armv5tel" then sheevaplugCrossSystem else + if toolsArch == "scaleway" then scaleway-c1-crossSystem else if toolsArch == "armv6l" then raspberrypiCrossSystem else if toolsArch == "armv7l" then armv7l-hf-multiplatform-crossSystem else if toolsArch == "aarch64" then aarch64-multiplatform-crossSystem else null; @@ -277,4 +284,5 @@ rec { armv6l = buildFor "armv6l"; armv7l = buildFor "armv7l"; aarch64 = buildFor "aarch64"; + scaleway = buildFor "scaleway"; }