X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=README;h=7c1e6e758d601af4faa3462c649731c8bbb0d656;hb=189db3d41e4c3d8a4aec5ec605c03df75577d531;hp=a724b02d7c6cc2db361890e749a294406daff59f;hpb=c7e02d8c24b6f89a274b33300dd47925f5ffb69f;p=sigrok-firmware-fx2lafw.git

diff --git a/README b/README
index a724b02d..7c1e6e75 100644
--- a/README
+++ b/README
@@ -1,57 +1,124 @@
-------------------------------------------------------------------------------
-fx2lafw
-------------------------------------------------------------------------------
+-------------------------------------------------------------------------------
+README
+-------------------------------------------------------------------------------
 
-fx2lafw is a free/libre/open-source firmware for logic analyzers based on
-the Cypress EZ-USB FX2(LP) chip.
+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).
 
-It is licensed under the terms of the GNU GPL (version 2 or later), and uses
-additional helper code licensed under the GNU LGPL (version 2.1 or later).
+sigrok-firmware-fx2lafw is a Free/Libre/Open-source firmware for logic
+analyzers based on the Cypress EZ-USB FX2(LP) chip.
+
+
+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.
+ - git
+ - make
+ - autoconf >= 2.63
+ - automake >= 1.11
+ - sdcc (>= 2.9.0)
+
+Notes:
+
+ - In order to build fx2lafw you need the 'sdcc' compiler (>= 2.9.0).
    On Debian you can install it via:
 
      $ apt-get install sdcc
 
+   This project has been tested to work with sdcc 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
---------
+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
+
+For installing sigrok-firmware-fx2lafw:
+
+ $ make install
+
+The generated *.fw files are installed into /usr/local/share/sigrok-firmware.
+
+You can override the install location like this:
+
+ $ ./configure --prefix=/usr
+
+See INSTALL or the following wiki page for more (OS-specific) instructions:
+
+ http://sigrok.org/wiki/Building
+
 
-  $ git clone git://sigrok.git.sourceforge.net/gitroot/sigrok/fx2lafw
-  $ cd fx2lafw
-  $ make
+Pre-built firmware files
+------------------------
 
+There are also pre-built firmware files that can be used without having
+to build them from source. You can download those from:
 
-Usage
------
+  http://sigrok.org/download/binary/sigrok-firmware-fx2lafw/
 
-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/.
+
+
+Copyright and license
+---------------------
+
+sigrok-firmware-fx2lafw is licensed under the terms of the GNU General Public
+License (GPL), version 2 or later.
+
+It uses additional helper code (fx2lib), licensed under the GNU LGPL
+(version 2.1 or later).
+
+While some individual source code files are licensed under the LGPLv2.1+, and
+some files are licensed under the GPLv2+, this doesn't change the fact that
+the firmware as a whole is licensed under the terms of the GPLv2+.
+
+Please see the individual source files for the full list of copyright holders.
+
+
+Mailing list
+------------
+
+ https://lists.sourceforge.net/lists/listinfo/sigrok-devel
+
+
+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