From 1c57d27ae23366b9542d8dc3db04519a20861320 Mon Sep 17 00:00:00 2001
From: Robert Jordens <rj@m-labs.hk>
Date: Thu, 1 Mar 2018 18:32:19 +0100
Subject: [PATCH] slave_fpga: use sayma_rtm magic

---
 artiq/firmware/libboard_artiq/slave_fpga.rs | 31 +++++++++++----------
 artiq/frontend/artiq_flash.py               |  2 +-
 2 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/artiq/firmware/libboard_artiq/slave_fpga.rs b/artiq/firmware/libboard_artiq/slave_fpga.rs
index 1de245ce0..3046fec31 100644
--- a/artiq/firmware/libboard_artiq/slave_fpga.rs
+++ b/artiq/firmware/libboard_artiq/slave_fpga.rs
@@ -28,46 +28,49 @@ pub fn load() -> Result<(), &'static str> {
     info!("Loading slave FPGA gateware...");
 
     let header = unsafe { slice::from_raw_parts(GATEWARE, 8) };
-    let magic = BigEndian::read_u32(&header[0..]);
-    let length = BigEndian::read_u32(&header[4..]) as usize;
 
-    if magic != 0x53415231 {  // "SAR1"
-        return Err("Slave FPGA gateware magic not found");
-    } else if length > 0x220000 {
-        return Err("Slave FPGA gateware too large (corrupted?)");
+    let magic = BigEndian::read_u32(&header[0..]);
+    info!("Magic: 0x{:08x}", magic);
+    if magic != 0x5352544d {  // "SRTM", see sayma_rtm target as well
+        return Err("Bad magic");
+    }
+
+    let length = BigEndian::read_u32(&header[4..]) as usize;
+    info!("Length: 0x{:08x}", length);
+    if length > 0x220000 {
+        return Err("Too large (corrupted?)");
     }
-    info!("Slave FPGA gateware length: 0x{:06x}", length);
 
     unsafe {
         if csr::slave_fpga_cfg::in_read() & DONE_BIT != 0 {
-            info!("Slave FPGA is DONE before loading");
+            info!("DONE before loading");
         }
 
         csr::slave_fpga_cfg::out_write(0);
         csr::slave_fpga_cfg::oe_write(CCLK_BIT | DIN_BIT | PROGRAM_B_BIT);
         clock::spin_us(1_000);  // TPROGRAM=250ns min, be_generous
         if csr::slave_fpga_cfg::in_read() & INIT_B_BIT != 0 {
-            return Err("Slave FPGA did not react to PROGRAM.");
+            return Err("Did not react to PROGRAM");
         }
         csr::slave_fpga_cfg::out_write(PROGRAM_B_BIT);
         clock::spin_us(10_000);  // TPL=5ms max
         if csr::slave_fpga_cfg::in_read() & INIT_B_BIT == 0 {
-            return Err("Slave FPGA did not finish INITialization.");
+            return Err("Did not exit INIT");
         }
 
         for i in slice::from_raw_parts(GATEWARE.offset(8), length) {
             shift_u8(*i);
             if csr::slave_fpga_cfg::in_read() & INIT_B_BIT == 0 {
-                return Err("Slave FPGA error: INIT_B went low.");
+                return Err("INIT asserted during load");
             }
         }
 
         let t = clock::get_ms();
         while csr::slave_fpga_cfg::in_read() & DONE_BIT == 0 {
             if clock::get_ms() > t + 100 {
-                error!("Slave FPGA not DONE after loading");
-                error!("Corrupt gateware? Slave FPGA in slave serial mode?");
-                return Err("Slave FPGA not DONE");
+                error!("Timeout wating for DONE after loading");
+                error!("Boards not populated correctly?");
+                return Err("Not DONE");
             }
             shift_u8(0xff);
         }
diff --git a/artiq/frontend/artiq_flash.py b/artiq/frontend/artiq_flash.py
index bfa71d8f5..2cd673896 100755
--- a/artiq/frontend/artiq_flash.py
+++ b/artiq/frontend/artiq_flash.py
@@ -319,7 +319,7 @@ def main():
                 bin_file.write(b"\x00"*8)
             bit2bin(bit_file, bin_file)
             if header:
-                magic = 0x53415231  # "SAR1"
+                magic = 0x5352544d  # "SRTM", see sayma_rtm target
                 length = bin_file.tell() - 8
                 bin_file.seek(0)
                 bin_file.write(magic.to_bytes(4, byteorder="big"))