update download instructions

diff --git a/README b/README
index 2629061285adb467f930e3b512c0f0b33e2d797e..19fec012dd0c4627df19cd61e8cbdd743c920bb8 100644 (file)
--- a/README
+++ b/README
@@ -76,15 +76,16 @@ Frontend:
 - add support for Xilinx 7-Series GTP/GTH (currently only 7-Series GTX are
   supported)
 - add Zynq Linux drivers.
-- ... See below Support and Consulting :)
+- ... See below Support and consulting :)
 
 If you want to support these features, please contact us at florent [AT]
 enjoy-digital.fr. You can also contact our partner on the public mailing list
 devel [AT] lists.m-labs.hk.
 
+
 [> Getting started
 ------------------
-1. Install Python3 and Xilinx's Vivado software
+1. Install Python3 and your vendor's software
 
 2. Obtain Migen and install it:
   git clone https://github.com/m-labs/migen
@@ -92,16 +93,24 @@ devel [AT] lists.m-labs.hk.
   python3 setup.py install
   cd ..
 
-3. Obtain LiteScope and install it:
+3. Obtain MiSoC and install it:
+  git clone https://github.com/m-labs/misoc --recursive
+  cd misoc
+  python3 setup.py install
+  cd ..
+
+Note: in case you have issues with Migen/MiSoC, please retry
+with our forks at:
+  https://github.com/enjoy-digital/misoc
+  https://github.com/enjoy-digital/migen
+until new features are merged.
+
+4. Obtain LiteScope and install it:
   git clone https://github.com/enjoy-digital/litescope
   cd litescope
   python3 setup.py install
   cd ..
 
-4. Obtain MiSoC:
-  git clone https://github.com/m-labs/misoc --recursive
-  XXX add setup.py to MiSoC for external use of misoclib?
-
 5. Obtain LiteSATA
   git clone https://github.com/enjoy-digital/litesata
 
@@ -154,7 +163,7 @@ do them if possible:
  - send us bug reports when something goes wrong
  - send us the modifications and improvements you have done to LiteSATA.
 
-[> Support and Consulting
+[> Support and consulting
 --------------------------
 We love open-source hardware and like sharing our designs with others.
 

diff --git a/doc/source/docs/getting_started/downloads.rst b/doc/source/docs/getting_started/downloads.rst
index eea23b9f59888533f79de8cce18df981df89816b..99f08e2fb6f69b94acb87cf6981d750455fb845c 100644 (file)
--- a/doc/source/docs/getting_started/downloads.rst
+++ b/doc/source/docs/getting_started/downloads.rst
@@ -3,7 +3,7 @@
 ====================
 Download and install
 ====================
-1. Install Python3 and Xilinx's Vivado software
+1. Install Python3 and your vendor's software
 
 2. Obtain Migen and install it:
   - git clone https://github.com/m-labs/migen
@@ -17,9 +17,17 @@ Download and install
   - python3 setup.py install
   - cd ..
 
-4. Obtain MiSoC:
+4. Obtain MiSoC and install it:
   - git clone https://github.com/m-labs/misoc --recursive
-  XXX add setup.py to MiSoC for external use of misoclib?
+  - cd misoc
+  - python3 setup.py install
+  - cd ..
+
+.. note::
+       In case you have issues with Migen/MiSoC, please retry with our forks at:
+       https://github.com/enjoy-digital/misoc
+       https://github.com/enjoy-digital/migen
+       until new features are merged.
 
 5. Obtain LiteSATA
   - git clone https://github.com/enjoy-digital/litesata