Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: m-labs/artiq
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 28a41a2f603a
Choose a base ref
...
head repository: m-labs/artiq
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 15ba6f36bad8
Choose a head ref
  • 5 commits
  • 30 files changed
  • 1 contributor

Commits on Jan 23, 2017

  1. Copy the full SHA
    13a544e View commit details
  2. firmware: increase post-boot UART speed to 921600.

    whitequark committed Jan 23, 2017
    Copy the full SHA
    971e4c3 View commit details
  3. firmware: remove false dependency from runtime to ksupport.

    This significantly speeds up no-change builds.
    whitequark committed Jan 23, 2017
    Copy the full SHA
    0253e0a View commit details
  4. firmware: integrate smoltcp instead of lwip.

    whitequark committed Jan 23, 2017
    Copy the full SHA
    527b1e9 View commit details
  5. runtime: reduce the amount of noise during build.

    whitequark committed Jan 23, 2017
    Copy the full SHA
    15ba6f3 View commit details
4 changes: 0 additions & 4 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,4 +0,0 @@
[submodule "artiq/runtime/lwip"]
path = artiq/runtime/lwip
url = https://github.com/m-labs/lwip
ignore = untracked
35 changes: 20 additions & 15 deletions artiq/firmware/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions artiq/firmware/libboard/lib.rs
Original file line number Diff line number Diff line change
@@ -11,6 +11,7 @@ include!(concat!(env!("BUILDINC_DIRECTORY"), "/generated/csr.rs"));
pub mod spr;
pub mod irq;
pub mod clock;
pub mod uart;

#[cfg(has_i2c)]
pub mod i2c;
8 changes: 8 additions & 0 deletions artiq/firmware/libboard/uart.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
use csr;

pub fn set_speed(rate: u32) {
unsafe {
let tuning_word = (rate as u64) * (1 << 32) / (csr::CONFIG_CLOCK_FREQUENCY as u64);
csr::uart_phy::tuning_word_write(tuning_word as u32);
}
}
2 changes: 1 addition & 1 deletion artiq/firmware/libksupport/Cargo.toml
Original file line number Diff line number Diff line change
@@ -13,4 +13,4 @@ crate-type = ["staticlib"]
alloc_none = { path = "../liballoc_none" }
std_artiq = { path = "../libstd_artiq" }
board = { path = "../libboard" }
byteorder = { version = "0.5", default-features = false }
byteorder = { version = "1.0", default-features = false }
8 changes: 0 additions & 8 deletions artiq/firmware/liblwip-sys/Cargo.toml

This file was deleted.

166 changes: 0 additions & 166 deletions artiq/firmware/liblwip-sys/lib.rs

This file was deleted.

16 changes: 0 additions & 16 deletions artiq/firmware/liblwip/Cargo.toml

This file was deleted.

Loading