From f087368fac347c9f80f3e9e84b587bfbc2350a59 Mon Sep 17 00:00:00 2001
From: lkcl <lkcl@web>
Date: Fri, 14 Feb 2020 22:45:31 +0000
Subject: [PATCH]

---
 HDL_workflow/coriolis2.mdwn | 57 +++++++++++++++++++++----------------
 1 file changed, 33 insertions(+), 24 deletions(-)

diff --git a/HDL_workflow/coriolis2.mdwn b/HDL_workflow/coriolis2.mdwn
index f451c6675..7c547ddd9 100644
--- a/HDL_workflow/coriolis2.mdwn
+++ b/HDL_workflow/coriolis2.mdwn
@@ -267,6 +267,29 @@ You can also tweak the layer display:
 
      coriolis-2.x/Linux.x86_64/Release.Shared/install/share/doc/coriolis2/en/html/index.html
 
+# Installing python3.7 into debian/stretch chroot
+
+python 3.6 is a prerequisite for nmigen however something
+weird is going on, and it can't be installed.  instead,
+python 3.7 has to be installed instead.  we do this by
+adding debian/testing and 
+
+as root, in the
+chroot, add the following to /etc/apt/sources.list
+
+    deb http://ftp.de.debian.org/debian testing main
+
+then, also as root:
+
+    echo 'APT::Default-Release "stretch";' | tee -a /etc/apt/apt.conf.d/00local
+    sudo apt-get update
+    apt-get -t testing install python3.7 python3-setuptools \
+               python3-jinja2 python3-pip
+
+At this point it becomes possible to follow the main
+instructions in [[HDL_workflow]] for installing nmigen,
+ieee754fpu, soc and nmutil.
+
 # Upgrading to latest yosys and nmigen in the chroot
 
 yosys in debian/stretch may not be enough to work with nmigen,
@@ -275,7 +298,16 @@ not a debian/stretch chroot, it would be a simple matter of
 "apt-get install yosys" however it's probably best, here to
 install from source.
 
-add the following to /etc/apt/sources.list:
+**however**.. there is another way: once the instructions
+for installing python3.7 have been carried out.  As root,
+in the chroot:
+
+   apt-get -t testing install yosys
+
+That's all. 
+
+To install instead from source, add the following to
+/etc/apt/sources.list:
 
    deb-src http://ftp.uk.debian.org/debian stretch main
 
@@ -302,29 +334,6 @@ as root, run:
 
     make install
 
-# Installing python3.7 into debian/stretch chroot
-
-python 3.6 is a prerequisite for nmigen however something
-weird is going on, and it can't be installed.  instead,
-python 3.7 has to be installed instead.  we do this by
-adding debian/testing and 
-
-as root, in the
-chroot, add the following to /etc/apt/sources.list
-
-    deb http://ftp.de.debian.org/debian testing main
-
-then, also as root:
-
-    echo 'APT::Default-Release "stretch";' | tee -a /etc/apt/apt.conf.d/00local
-    sudo apt-get update
-    apt-get -t testing install python3.7 python3-setuptools \
-               python3-jinja2 python3-pip
-
-At this point it becomes possible to follow the main
-instructions in [[HDL_workflow]] for installing nmigen,
-ieee754fpu, soc and nmutil.
-
 # Check out the libresoc "soclayout" repository
 
 See [[HDL_workflow]] for git clone instructions
-- 
2.30.2