firmware: merge libamp into libboard_artiq.

All gateware interfaces live in libboard_artiq, but libamp predates
libboard_artiq.

artiq/firmware/Cargo.lock

@@ -2,13 +2,6 @@
 name = "alloc_list"
 version = "0.0.0"
 
-[[package]]
-name = "amp"
-version = "0.0.0"
-dependencies = [
- "board 0.0.0",
-]
-
 [[package]]
 name = "bitflags"
 version = "1.0.1"
@@ -134,8 +127,8 @@ dependencies = [
 name = "ksupport"
 version = "0.0.0"
 dependencies = [
- "amp 0.0.0",
  "board 0.0.0",
+ "board_artiq 0.0.0",
  "build_misoc 0.0.0",
  "cslice 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "dyld 0.0.0",
@@ -204,7 +197,6 @@ name = "runtime"
 version = "0.0.0"
 dependencies = [
  "alloc_list 0.0.0",
- "amp 0.0.0",
  "board 0.0.0",
  "board_artiq 0.0.0",
  "build_artiq 0.0.0",

artiq/firmware/ksupport/Cargo.toml

@@ -17,5 +17,5 @@ cslice = { version = "0.3" }
 io = { path = "../libio", features = ["byteorder"] }
 dyld = { path = "../libdyld" }
 board = { path = "../libboard" }
+board_artiq = { path = "../libboard_artiq" }
 proto = { path = "../libproto" }
-amp = { path = "../libamp" }

artiq/firmware/ksupport/lib.rs

@@ -8,19 +8,19 @@ extern crate unwind;
 extern crate libc;
 
 extern crate io;
-extern crate board;
 extern crate dyld;
+extern crate board;
+extern crate board_artiq;
 extern crate proto;
-extern crate amp;
 
 use core::{mem, ptr, slice, str};
 use cslice::{CSlice, AsCSlice};
 use io::Cursor;
-use board::csr;
 use dyld::Library;
+use board::csr;
+use board_artiq::{mailbox, rpc_queue};
 use proto::{kernel_proto, rpc_proto};
-use proto::kernel_proto::*;
+use kernel_proto::*;
-use amp::{mailbox, rpc_queue};
 
 fn send(request: &Message) {
     unsafe { mailbox::send(request as *const _ as usize) }

artiq/firmware/libamp/Cargo.toml

@@ -1,11 +0,0 @@
-[package]
-authors = ["M-Labs"]
-name = "amp"
-version = "0.0.0"
-
-[lib]
-name = "amp"
-path = "lib.rs"
-
-[dependencies]
-board = { path = "../libboard" }

artiq/firmware/libamp/lib.rs

@@ -1,6 +0,0 @@
-#![no_std]
-
-extern crate board;
-
-pub mod mailbox;
-pub mod rpc_queue;

artiq/firmware/libboard_artiq/lib.rs

@@ -16,6 +16,9 @@ pub mod pcr;
 pub mod i2c;
 pub mod spi;
 
+pub mod mailbox;
+pub mod rpc_queue;
+
 #[cfg(has_si5324)]
 pub mod si5324;
 

artiq/firmware/runtime/Cargo.toml

@@ -26,7 +26,6 @@ std_artiq = { path = "../libstd_artiq", features = ["alloc", "io_error_alloc"] }
 logger_artiq = { path = "../liblogger_artiq" }
 board_artiq = { path = "../libboard_artiq" }
 proto = { path = "../libproto", features = ["log", "alloc"] }
-amp = { path = "../libamp" }
 
 [dependencies.fringe]
 git = "https://github.com/m-labs/libfringe"

artiq/firmware/runtime/main.rs

@@ -20,7 +20,6 @@ extern crate logger_artiq;
 extern crate board;
 extern crate board_artiq;
 extern crate proto;
-extern crate amp;
 
 use core::convert::TryFrom;
 use smoltcp::wire::{EthernetAddress, IpAddress, IpCidr};
@@ -34,7 +33,7 @@ use board_artiq::drtioaux;
 use proto::{mgmt_proto, moninj_proto, rpc_proto, session_proto,kernel_proto};
 #[cfg(has_rtio_analyzer)]
 use proto::analyzer_proto;
-use amp::{mailbox, rpc_queue};
+use board_artiq::{mailbox, rpc_queue};
 
 #[cfg(has_rtio_core)]
 mod rtio_mgt;