From ee4cfdda0a54567735e4c30662afd3f76e1c8a61 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= <cynerd@email.cz>
Date: Mon, 3 Oct 2022 22:21:02 +0200
Subject: crypto-wrapper: add and hopefully integrate the tools

---
 pkgs/default.nix | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

(limited to 'pkgs/default.nix')

diff --git a/pkgs/default.nix b/pkgs/default.nix
index b16795d..41c28c8 100644
--- a/pkgs/default.nix
+++ b/pkgs/default.nix
@@ -16,22 +16,23 @@ let
     # Crypto and certificates
     libatsha204 = callPackage ./libatsha204 { };
     mox-otp = python3Packages.callPackage ./mox-otp { };
-    #crypto-wrapper = callPackage ./crypto-wrapper { };
+    crypto-wrapper = callPackage ./crypto-wrapper { };
     #certgen = python3Packages.callPackage ./certgen { };
 
     # NOR Firmwares
-    ubootTurrisMox = buildUBoot {
-      defconfig = "turris_mox_defconfig";
-      extraMeta.platforms = ["aarch64-linux"];
-      filesToInstall = ["u-boot.bin"];
-      extraPatches = [ ./patches/include-configs-turris_mox-increase-space-for-the-ke.patch ];
-    };
     armTrustedFirmwareTurrisMox = buildArmTrustedFirmware rec {
       platform = "a3700";
       extraMeta.platforms = ["aarch64-linux"];
       extraMakeFlags = ["USE_COHERENT_MEM=0" "CM3_SYSTEM_RESET=1" "FIP_ALIGN=0x100"];
       filesToInstall = ["build/${platform}/release/bl31.bin"];
     };
+    ubootTurrisMox = buildUBoot {
+      defconfig = "turris_mox_defconfig";
+      extraMeta.platforms = ["aarch64-linux"];
+      filesToInstall = ["u-boot.bin"];
+      extraPatches = [ ./patches/include-configs-turris_mox-increase-space-for-the-ke.patch ];
+      BL31 = "${armTrustedFirmwareTurrisMox}/bl31.bin";
+    };
     ubootTurrisOmnia = buildUBoot {
       defconfig = "turris_omnia_defconfig";
       extraMeta.platforms = ["armv7l-linux"];
-- 
cgit v1.2.3