diff --git a/artiq/firmware/libbsp/ad9154.rs b/artiq/firmware/libboard/ad9154.rs
similarity index 99%
rename from artiq/firmware/libbsp/ad9154.rs
rename to artiq/firmware/libboard/ad9154.rs
index 33af30c6d..de1ce565a 100644
--- a/artiq/firmware/libbsp/ad9154.rs
+++ b/artiq/firmware/libboard/ad9154.rs
@@ -1,5 +1,4 @@
-use std::result;
-use bsp::board::csr;
+use csr;
 use ad9154_reg::reg;
 
 fn spi_setup() {
@@ -94,7 +93,7 @@ fn jesd_checksum(settings: &JESDSettings) -> u8 {
     for field in [
         settings.did,
         settings.bid,
-        settings.l - 1,  
+        settings.l - 1,
         settings.f - 1,
         settings.k - 1,
         settings.m - 1,
diff --git a/artiq/firmware/libbsp/ad9154_reg.rs b/artiq/firmware/libboard/ad9154_reg.rs
similarity index 100%
rename from artiq/firmware/libbsp/ad9154_reg.rs
rename to artiq/firmware/libboard/ad9154_reg.rs
diff --git a/artiq/firmware/libbsp/ad9516.rs b/artiq/firmware/libboard/ad9516.rs
similarity index 99%
rename from artiq/firmware/libbsp/ad9516.rs
rename to artiq/firmware/libboard/ad9516.rs
index 7ff105853..375a2411d 100644
--- a/artiq/firmware/libbsp/ad9516.rs
+++ b/artiq/firmware/libboard/ad9516.rs
@@ -1,5 +1,4 @@
-use std::result;
-use bsp::board::csr;
+use csr;
 use ad9516_reg::reg;
 
 fn spi_setup() {
diff --git a/artiq/firmware/libbsp/ad9516_reg.rs b/artiq/firmware/libboard/ad9516_reg.rs
similarity index 100%
rename from artiq/firmware/libbsp/ad9516_reg.rs
rename to artiq/firmware/libboard/ad9516_reg.rs