From fb3d1c271982b1437243bc1a857f40f93f2e10a3 Mon Sep 17 00:00:00 2001 From: Sebastien Bourdeauducq Date: Wed, 4 Dec 2024 21:59:06 +0800 Subject: [PATCH] mcu: remove OpenMMC build --- hydra/mcu.json | 3 +-- mcu-contrib/default.nix | 26 +------------------------- 2 files changed, 2 insertions(+), 27 deletions(-) diff --git a/hydra/mcu.json b/hydra/mcu.json index ea340cc..7d30514 100644 --- a/hydra/mcu.json +++ b/hydra/mcu.json @@ -14,8 +14,7 @@ "nixpkgs": { "type": "git", "value": "https://github.com/NixOS/nixpkgs.git nixos-24.05", "emailresponsible": false }, "mozillaOverlay": { "type": "git", "value": "https://github.com/mozilla/nixpkgs-mozilla.git", "emailresponsible": false }, "nixScripts": { "type": "git", "value": "https://git.m-labs.hk/M-Labs/nix-scripts.git", "emailresponsible": false }, - "stabilizerSrc": { "type": "git", "value": "https://github.com/quartiq/stabilizer.git main", "emailresponsible": false }, - "saymaMmcSrc": { "type": "git", "value": "https://github.com/sinara-hw/openMMC.git sayma-devel", "emailresponsible": false } + "stabilizerSrc": { "type": "git", "value": "https://github.com/quartiq/stabilizer.git main", "emailresponsible": false } } }, "thermostat": { diff --git a/mcu-contrib/default.nix b/mcu-contrib/default.nix index 8073d86..b670130 100644 --- a/mcu-contrib/default.nix +++ b/mcu-contrib/default.nix @@ -74,28 +74,4 @@ in extraCargoBuildArgs = "--features pounder_v1_0"; }; lockin = {}; - } // - { - # openMMC build system breaks if host compiler is not available, so do not use stdenvNoCC here - sayma-mmc = pkgs.stdenv.mkDerivation { - name = "sayma-mmc"; - src = ; - phases = [ "unpackPhase" "buildPhase" "installPhase" ]; - nativeBuildInputs = [ pkgs.cmake pkgs.gcc-arm-embedded ]; - buildPhase = - '' - mkdir build - cd build - cmake .. -DBOARD=sayma -DBOARD_RTM=sayma -DVERSION= -DTARGET_CONTROLLER=LPC1776 -DCMAKE_BUILD_TYPE=Debug - make - ''; - installPhase = - '' - mkdir $out - cp out/* $out - mkdir -p $out $out/nix-support - echo file binary-dist $out/openMMC.axf >> $out/nix-support/hydra-build-products - echo file binary-dist $out/openMMC.bin >> $out/nix-support/hydra-build-products - ''; - }; - } + }