X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=README;h=ec58838a2ea8df5a0e059257f30a6aa1c2b49708;hb=36074319ac7c80ac0d80334b8664d0bd8e6dee90;hp=e9b8c8dece8024c268de7d869ac2e5c124e60beb;hpb=8b13135e5fd175911ad9d8283b17fc97fe0c7709;p=sigrok-firmware-fx2lafw.git

diff --git a/README b/README
index e9b8c8de..ec58838a 100644
--- a/README
+++ b/README
@@ -1,55 +1,101 @@
-------------------------------------------------------------------------------
-fx2lafw
-------------------------------------------------------------------------------
+-------------------------------------------------------------------------------
+README
+-------------------------------------------------------------------------------
 
-fx2lafw is a free/libre/open-source firmware for logic analyzers based on
+The sigrok project aims at creating a portable, cross-platform,
+Free/Libre/Open-Source signal analysis software suite that supports various
+device types (such as logic analyzers, oscilloscopes, multimeters, and more).
+
+fx2lafw is a Free/Libre/Open-source firmware for logic analyzers based on
 the Cypress EZ-USB FX2(LP) chip.
 
-It is licensed under the terms of the GNU GPL (version 2 or later).
+It is licensed under the terms of the GNU GPL (version 2 or later), and uses
+additional helper code (fx2lib), licensed under the GNU LGPL (version 2.1
+or later).
+
+
+Status
+------
+
+sigrok-firmware-fx2lafw is in a usable state and has had official
+tarball releases.
 
 
 Requirements
 ------------
 
-In order to build fx2lafw you need the 'sdcc' compiler.
+ - In order to build fx2lafw you need the 'sdcc' compiler (>= 2.8.0).
+   On Debian you can install it via:
+
+     $ apt-get install sdcc
+
+   This project has been tested to work with sdcc 2.8, 2.9, and 3.x.
+
+ - You need libsigrok >= 0.1.1 in order to make use of fx2lafw. Earlier
+   versions didn't have support for FX2 devices using this firmware.
+
+
+Building and installing
+-----------------------
+
+In order to get the sigrok-firmware-fx2lafw source code and build it, run:
+
+ $ git clone git://sigrok.org/sigrok-firmware-fx2lafw
+ $ cd sigrok-firmware-fx2lafw
+ $ ./autogen.sh
+ $ ./configure
+ $ make
 
-On Debian you can install it via:
+For installing sigrok-firmware-fx2lafw:
 
-  $ apt-get install sdcc
+ $ make install
 
+The generated *.fw files are installed into /usr/local/share/sigrok-firmware.
 
-Building
---------
+You can override the install location like this:
 
-  $ git clone git://sigrok.git.sourceforge.net/gitroot/sigrok/fx2lafw
-  $ cd fx2lafw
-  $ git clone git://github.com/mulicheng/fx2lib.git
-  $ make
+ $ ./configure --prefix=/usr
 
+Please see the following wiki pages for more detailed instructions:
 
-Usage
------
+ http://sigrok.org/wiki/Linux
+ http://sigrok.org/wiki/Mac_OS_X
+ http://sigrok.org/wiki/Windows
+ http://sigrok.org/wiki/FreeBSD
 
-Copy the generated *.fw file for your device (e.g. fx2lafw-saleae-logic.fw)
-into the $prefix/share/sigrok-firmware directory (create it, if needed).
 
-Replace $prefix with the install prefix of sigrok, e.g. /usr or /usr/local.
+fx2lib
+------
 
-Example (assuming /usr/local as $prefix):
+The fx2lafw code uses a (slightly modified) "fx2lib" helper library.
 
-  $ sudo mkdir /usr/local/share/sigrok-firmware
+It was imported into fx2lafw from
 
-  $ sudo cp hw/saleae-logic/build/fx2lafw-saleae-logic.fw \
-            /usr/local/share/sigrok-firmware
+  git://github.com/ubixum/fx2lib.git
+
+as of Feb 12, 2012 (git hash "416c104cbd").
+
+The following files/directories were removed, as they're not needed
+for our purposes: CHANGELOG, COPYING*, docs/, examples/, fw/, and utils/.
+
+
+Mailing lists
+-------------
+
+There are two mailing lists for sigrok/sigrok-firmware-fx2lafw:
+
+ https://lists.sourceforge.net/lists/listinfo/sigrok-devel
+ https://lists.sourceforge.net/lists/listinfo/sigrok-commits
+
+
+IRC
+---
+
+You can find the sigrok developers in the #sigrok IRC channel on Freenode.
 
-The sigrok frontends (command-line or GUI) will automatically search for
-firmware files there and automatically use/upload them.
-  
 
 Website
 -------
 
-See the fx2lafw website for further information:
-
-  http://sigrok.org/wiki/Fx2lafw
+ http://sigrok.org/wiki/Fx2lafw