From 8e670cc1cd383ac70e807eea3bb8e8869c19ad6f Mon Sep 17 00:00:00 2001
From: Andrey Miroshnikov <andrey@technepisteme.xyz>
Date: Fri, 11 Aug 2023 10:14:26 +0000
Subject: [PATCH] ls2: Fix order of env vars.

---
 HDL_workflow/ls2.mdwn | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/HDL_workflow/ls2.mdwn b/HDL_workflow/ls2.mdwn
index 2df08da17..da65c0cf9 100644
--- a/HDL_workflow/ls2.mdwn
+++ b/HDL_workflow/ls2.mdwn
@@ -24,10 +24,12 @@
     ./hdl-dev-repos
     ./hdl-tools-yosys
     ./nextpnr-xilinx-install
-    export PATH=/usr/local/nextpnr-xilinx/bin:$PATH
-    export XRAY_DIR=/usr/local/nextpnr-xilinx
     ./hdl-dev-ls2
+
+    # if you intend to upload fpga bitstreams in the same chroot, also need
+    # the fpga utilities
     ./fpga-boot-load-prog-install
+
     cd ~/src
 
     # make hello_world.bin from microwatt
@@ -46,6 +48,9 @@
     cd ../ls2
     git checkout 426e2d9585cd4b1fb96a38987f97878285ee5ba7
 
+    export PATH=/usr/local/nextpnr-xilinx/bin:$PATH
+    export XRAY_DIR=/usr/local/nextpnr-xilinx
+
     # plug in FPGA board (Arty A7-100t, VERSA_ECP5, other)
     # run in 2nd terminal "minicom -D /dev/ttyUSB1"
 
-- 
2.30.2