From dec245e637c56dcf011b0cd7ab980a6f1e5e7873 Mon Sep 17 00:00:00 2001 From: Sebastien Bourdeauducq Date: Mon, 15 Jun 2020 17:03:27 +0800 Subject: [PATCH] default.nix: also use BIF format to contain bitstream for SZL --- default.nix | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/default.nix b/default.nix index 65dc039..29afc1e 100644 --- a/default.nix +++ b/default.nix @@ -72,24 +72,17 @@ let bifdir=`mktemp -d` cd $bifdir ln -s ${firmware}/szl.elf szl.elf + ln -s ${gateware}/top.bit top.bit cat > boot.bif << EOF the_ROM_image: { [bootloader]szl.elf + top.bit } EOF - mkdir $out + mkdir $out $out/nix-support mkbootimage boot.bif $out/boot.bin - ln -s ${gateware}/top.bit $out - ''; - sd-zip = pkgs.runCommand "zc706-${variant}-sd-zip" - { - buildInputs = [ pkgs.zip ]; - } - '' - mkdir -p $out $out/nix-support - zip -j $out/sd.zip ${sd}/* - echo file binary-dist $out/sd.zip >> $out/nix-support/hydra-build-products + echo file binary-dist $out/boot.bin >> $out/nix-support/hydra-build-products ''; # FSBL startup @@ -121,7 +114,6 @@ let "zc706-${variant}-gateware" = gateware; "zc706-${variant}-jtag" = jtag; "zc706-${variant}-sd" = sd; - "zc706-${variant}-sd-zip" = sd-zip; "zc706-${variant}-fsbl-sd" = fsbl-sd; }; in