forked from M-Labs/artiq-zynq
temp flake, libunwind, local_run mod
flake: download llvm11 binary instead of compiling local_run: preset cxp zc706 dev board ip addr flake: add pillow for sim libunwind build: suppress libunwind warning
This commit is contained in:
parent
bfa16e0560
commit
cb7210710e
17
flake.lock
17
flake.lock
|
@ -116,10 +116,27 @@
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"nixpkgs_old": {
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1720535198,
|
||||||
|
"narHash": "sha256-zwVvxrdIzralnSbcpghA92tWu2DV2lwv89xZc8MTrbg=",
|
||||||
|
"owner": "nixos",
|
||||||
|
"repo": "nixpkgs",
|
||||||
|
"rev": "205fd4226592cc83fd4c0885a3e4c9c400efabb5",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "nixos",
|
||||||
|
"ref": "nixos-23.11",
|
||||||
|
"repo": "nixpkgs",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
"root": {
|
"root": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"artiq": "artiq",
|
"artiq": "artiq",
|
||||||
"mozilla-overlay": "mozilla-overlay",
|
"mozilla-overlay": "mozilla-overlay",
|
||||||
|
"nixpkgs_old": "nixpkgs_old",
|
||||||
"zynq-rs": "zynq-rs"
|
"zynq-rs": "zynq-rs"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
10
flake.nix
10
flake.nix
|
@ -6,12 +6,16 @@
|
||||||
inputs.zynq-rs.url = git+https://git.m-labs.hk/m-labs/zynq-rs;
|
inputs.zynq-rs.url = git+https://git.m-labs.hk/m-labs/zynq-rs;
|
||||||
inputs.zynq-rs.inputs.nixpkgs.follows = "artiq/nixpkgs";
|
inputs.zynq-rs.inputs.nixpkgs.follows = "artiq/nixpkgs";
|
||||||
|
|
||||||
outputs = { self, mozilla-overlay, zynq-rs, artiq }:
|
inputs.nixpkgs_old.url = "github:nixos/nixpkgs?ref=nixos-23.11";
|
||||||
|
|
||||||
|
outputs = { self, mozilla-overlay, zynq-rs, artiq, nixpkgs_old }:
|
||||||
let
|
let
|
||||||
|
pkgs_old = import nixpkgs_old { system = "x86_64-linux";};
|
||||||
pkgs = import artiq.inputs.nixpkgs { system = "x86_64-linux"; overlays = [ (import mozilla-overlay) ]; };
|
pkgs = import artiq.inputs.nixpkgs { system = "x86_64-linux"; overlays = [ (import mozilla-overlay) ]; };
|
||||||
zynqpkgs = zynq-rs.packages.x86_64-linux;
|
zynqpkgs = zynq-rs.packages.x86_64-linux;
|
||||||
artiqpkgs = artiq.packages.x86_64-linux;
|
artiqpkgs = artiq.packages.x86_64-linux;
|
||||||
llvmPackages_11 = zynq-rs.llvmPackages_11;
|
# llvmPackages_11 = zynq-rs.llvmPackages_11;
|
||||||
|
llvmPackages_11 = pkgs_old.llvmPackages_11;
|
||||||
|
|
||||||
rust = zynq-rs.rust;
|
rust = zynq-rs.rust;
|
||||||
rustPlatform = zynq-rs.rustPlatform;
|
rustPlatform = zynq-rs.rustPlatform;
|
||||||
|
@ -381,7 +385,7 @@
|
||||||
zynqpkgs.mkbootimage
|
zynqpkgs.mkbootimage
|
||||||
openocd
|
openocd
|
||||||
openssh rsync
|
openssh rsync
|
||||||
(python3.withPackages(ps: (with artiqpkgs; [ migen migen-axi misoc artiq artiq-netboot ps.jsonschema ps.pyftdi ])))
|
(python3.withPackages(ps: (with artiqpkgs; [ migen migen-axi misoc artiq artiq-netboot ps.jsonschema ps.pyftdi ps.pillow ])))
|
||||||
artiqpkgs.artiq
|
artiqpkgs.artiq
|
||||||
artiqpkgs.vivado
|
artiqpkgs.vivado
|
||||||
binutils-arm
|
binutils-arm
|
||||||
|
|
|
@ -13,7 +13,7 @@ fi
|
||||||
|
|
||||||
impure=0
|
impure=0
|
||||||
load_bitstream=1
|
load_bitstream=1
|
||||||
board_type="kasli_soc"
|
board_type="zc706"
|
||||||
fw_type="runtime"
|
fw_type="runtime"
|
||||||
|
|
||||||
while getopts "ilb:t:f:" opt; do
|
while getopts "ilb:t:f:" opt; do
|
||||||
|
@ -36,7 +36,7 @@ done
|
||||||
if [ -z "$board_host" ]; then
|
if [ -z "$board_host" ]; then
|
||||||
case $board_type in
|
case $board_type in
|
||||||
kasli_soc) board_host="192.168.1.56";;
|
kasli_soc) board_host="192.168.1.56";;
|
||||||
zc706) board_host="192.168.1.52";;
|
zc706) board_host="192.168.1.14";;
|
||||||
*) echo "Unknown board type"; exit 1;;
|
*) echo "Unknown board type"; exit 1;;
|
||||||
esac
|
esac
|
||||||
fi
|
fi
|
||||||
|
|
|
@ -23,6 +23,7 @@ mod llvm_libunwind {
|
||||||
cfg.flag("--target=armv7-none-eabihf");
|
cfg.flag("--target=armv7-none-eabihf");
|
||||||
cfg.flag("-O2");
|
cfg.flag("-O2");
|
||||||
cfg.flag("-flto");
|
cfg.flag("-flto");
|
||||||
|
cfg.flag("-Wno-everything");
|
||||||
|
|
||||||
cfg.flag("-std=c99");
|
cfg.flag("-std=c99");
|
||||||
cfg.flag("-fstrict-aliasing");
|
cfg.flag("-fstrict-aliasing");
|
||||||
|
|
Loading…
Reference in New Issue