M-Labs/artiq-zynq
10
1
Fork 19
Code Issues 12 Pull Requests Releases Wiki Activity

default.nix: also use BIF format to contain bitstream for SZL

Browse Source
This commit is contained in:
Sebastien Bourdeauducq 2020-06-15 17:03:27 +08:00
parent e4b17f9473
commit dec245e637
1 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
default.nix
View File

@ -72,24 +72,17 @@ let
bifdir=`mktemp -d` bifdir=`mktemp -d`
cd $bifdir cd $bifdir
ln -s ${firmware}/szl.elf szl.elf ln -s ${firmware}/szl.elf szl.elf
ln -s ${gateware}/top.bit top.bit
cat > boot.bif << EOF cat > boot.bif << EOF
the_ROM_image: the_ROM_image:
{ {
[bootloader]szl.elf [bootloader]szl.elf
top.bit
} }
EOF EOF
mkdir $out mkdir $out $out/nix-support
mkbootimage boot.bif $out/boot.bin mkbootimage boot.bif $out/boot.bin
ln -s ${gateware}/top.bit $out echo file binary-dist $out/boot.bin >> $out/nix-support/hydra-build-products
'';
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
''; '';
# FSBL startup # FSBL startup
@ -121,7 +114,6 @@ let
"zc706-${variant}-gateware" = gateware; "zc706-${variant}-gateware" = gateware;
"zc706-${variant}-jtag" = jtag; "zc706-${variant}-jtag" = jtag;
"zc706-${variant}-sd" = sd; "zc706-${variant}-sd" = sd;
"zc706-${variant}-sd-zip" = sd-zip;
"zc706-${variant}-fsbl-sd" = fsbl-sd; "zc706-${variant}-fsbl-sd" = fsbl-sd;
}; };
in in