hantek_6022be.c: Fix build error.

[sigrok-firmware-fx2lafw.git] / README

diff --git a/README b/README
index 7a5e7feeb4eaaddc8bd7fdcc3069524308c94c81..7c1e6e758d601af4faa3462c649731c8bbb0d656 100644 (file)
--- a/README
+++ b/README
@@ -6,12 +6,8 @@ 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), and uses
-additional helper code (fx2lib), 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
@@ -37,7 +33,7 @@ Notes:
 
      $ apt-get install sdcc
 
-   This project has been tested to work with sdcc 2.9, 3.0, 3.1, and 3.2.
+   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.
@@ -73,9 +69,9 @@ 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 SourceForge:
+to build them from source. You can download those from:
 
-  http://sourceforge.net/projects/sigrok/files/binary/sigrok-firmware-fx2lafw/
+  http://sigrok.org/download/binary/sigrok-firmware-fx2lafw/
 
 
 fx2lib
@@ -93,13 +89,26 @@ The following files/directories were removed, as they're not needed
 for our purposes: CHANGELOG, COPYING*, docs/, examples/, fw/, and utils/.
 
 
-Mailing lists
--------------
+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+.
 
-There are two mailing lists for sigrok/sigrok-firmware-fx2lafw:
+Please see the individual source files for the full list of copyright holders.
+
+
+Mailing list
+------------
 
  https://lists.sourceforge.net/lists/listinfo/sigrok-devel
- https://lists.sourceforge.net/lists/listinfo/sigrok-commits
 
 
 IRC