@@ -32,8 +32,10 @@ let
 
       installPhase = ''
         mkdir -p $out $out/nix-support
+        cp ../build/firmware.bin $out/firmware.bin

@@ -16,2 +17,4 @@
     while core0_tx.is_none() {
         core0_tx = CHANNEL_0TO1.lock().take();
+        // prevent deadlock...
+        // the compiler optimized this routine so fast that it would deadlock

@@ -50,3 +50,3 @@
     {
         __heap0_start = .;
-        . += 0x800000;
+        . += 0x8000000;

@@ -96,0 +57,4 @@
+    ram::init_alloc_core0();
+
+    match slcr::RegisterBlock::unlocked(|slcr| slcr.boot_mode.read().boot_mode_pins()) {
+        slcr::BootModePins::Jtag => netboot::netboot(ddr.ptr()),

@@ -96,0 +73,4 @@
+            let runtime = cfg
+                .read("runtime")
+                .expect("Expected runtime in SD card for SD card boot mode");
+            assert!(runtime.len() < 0x800000, "runtime binary too large");

@@ -97,0 +82,4 @@
+        }
+    };
+
+    info!("Preparing for runtime execution!");

@@ -25,2 +28,3 @@
     fi
-    openocd -f zc706.cfg -c "$load_bitstream_cmd load_image ../build/firmware/armv7-none-eabihf/release/szl; resume 0; exit"
+    openocd -f zc706.cfg -c "load_image ../build/firmware/armv7-none-eabihf/debug/szl; resume 0; exit"
+    artiq_netboot $load_bitstream_cmd -f ../build/runtime.bin -b $board_host

@@ -18,0 +20,4 @@
+        // the compiler optimized this routine so fast that it would deadlock
+        for _ in 0..100 {
+            nop();
+        }

@@ -29,0 +35,4 @@
+        if (slot as usize) < (&__stack1_end as *const u32 as usize) {
+            panic!("Core1 stack overflow")
+        }
+    }

@@ -0,0 +141,4 @@
+) -> Result<(), PlLoadingError> {
+    let size = locate_bitstream(file)?;
+    unsafe {
+        // align to 64 bytes

@@ -75,0 +76,4 @@
+                    }
+                };
+
+                info!("Loading gateware!");

@@ -75,0 +72,4 @@
+                let cfg = match Config::new() {
+                    Ok(cfg) => cfg,
+                    Err(_) => {
+                        panic!("No config for SZL");

@@ -75,0 +80,4 @@
+                load_pl::load_bitstream_from_sd().unwrap();
+
+                info!("Loading runtime");
+                let runtime = cfg.read("runtime");

@@ -48,4 +44,2 @@
 mod irq;
 
-fn init_gateware() {
-    // Set up PS->PL clocks