M-Labs
/
artiq
mirror of https://github.com/m-labs/artiq.git
2
0
Fork 2
Code Issues Projects Releases Wiki Activity

conda: update misoc.

This commit is contained in:
whitequark 2017-10-30 09:33:02 +00:00
parent 7f32ae31de
commit b03e36e4e9
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
artiq/firmware/runtime/ethmac.rs
View File

@ -96,8 +96,8 @@ impl EthernetStatistics {
pub fn new() -> Self { pub fn new() -> Self {
unsafe { unsafe {
EthernetStatistics { EthernetStatistics {
rx_errors: 0/*csr::ethmac::crc_errors_read()*/, rx_errors: csr::ethmac::crc_errors_read(),
rx_dropped: 0/*csr::ethmac::sram_writer_errors_read()*/, rx_dropped: csr::ethmac::sram_writer_errors_read(),
} }
} }
} }

2
conda/artiq-dev/meta.yaml
View File

@ -15,7 +15,7 @@ requirements:
- python >=3.5.3,<3.6 - python >=3.5.3,<3.6
- setuptools 33.1.1 - setuptools 33.1.1
- migen 0.5 - migen 0.5
- misoc 0.7.dev py35_0+git5764e23f - misoc 0.7.dev py35_0+git72faa2c7
- jesd204b 0.4 - jesd204b 0.4
- binutils-or1k-linux >=2.27 - binutils-or1k-linux >=2.27
- llvm-or1k - llvm-or1k