X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=Licenses%2FREADME;h=731d45c190535a5eaee6ec7723ffc334d665cf11;hb=9549867c861fdb186512df7593f543d5fe2020f4;hp=09c5cf5ccfc2ba0fe4df39f29b5403b3c7372e03;hpb=46263f2de4e01ff0b2e4247c2fa76d24027efd65;p=u-boot

diff --git a/Licenses/README b/Licenses/README
index 09c5cf5ccf..731d45c190 100644
--- a/Licenses/README
+++ b/Licenses/README
@@ -37,6 +37,18 @@ replaced by a single line:
 
 	SPDX-License-Identifier:	GPL-2.0+
 
+Ideally, the license terms of all files in the source tree should be
+defined by such License Identifiers; in no case a file can contain
+more than one such License Identifier list.
+
+If a "SPDX-License-Identifier:" line references more than one Unique
+License Identifier, then this means that the respective file can be
+used under the terms of either of these licenses, i. e. with
+
+	SPDX-License-Identifier:	GPL-2.0+	BSD-3-Clause
+
+you can choose between GPL-2.0+ and BSD-3-Clause licensing.
+
 We use the SPDX Unique License Identifiers here; these are available
 at [2].
 
@@ -50,6 +62,9 @@ GNU General Public License v2.0 or later	GPL-2.0+	Y		gpl-2.0.txt		http://www.gnu
 GNU Library General Public License v2 or later	LGPL-2.0+	Y		lgpl-2.0.txt		http://www.gnu.org/licenses/old-licenses/lgpl-2.0.txt
 GNU Lesser General Public License v2.1 or later	LGPL-2.1+	Y		lgpl-2.1.txt		http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt
 eCos license version 2.0			eCos-2.0			eCos-2.0.txt		http://www.gnu.org/licenses/ecos-license.html
-BSD 2-Clause License				BSD-2-Clause	Y		bsd-2-clause.txt	https://spdx.org/licenses/BSD-2-Clause
-IBM PIBS (PowerPC Initialization and		ibm-pibs			ibm-pibs.txt
+BSD 2-Clause License				BSD-2-Clause	Y		bsd-2-clause.txt	http://spdx.org/licenses/BSD-2-Clause
+BSD 3-clause "New" or "Revised" License		BSD-3-Clause	Y		bsd-3-clause.txt	http://spdx.org/licenses/BSD-3-Clause#licenseText
+IBM PIBS (PowerPC Initialization and		IBM-pibs			ibm-pibs.txt
 	Boot Software) license
+ISC License					ISC		Y		isc.txt			https://spdx.org/licenses/ISC
+X11 License					X11				x11.txt			https://spdx.org/licenses/X11.html