aboutsummaryrefslogtreecommitdiff
path: root/COPYING
diff options
context:
space:
mode:
authorJohn Rigby <john.rigby@linaro.org>2011-02-07 14:27:19 -0700
committerJohn Rigby <john.rigby@linaro.org>2011-02-07 14:27:19 -0700
commitffe97467376d26511930a14830d8b5dca4678d86 (patch)
tree757aa5ff771aa279c3c3eaad5a297a5731af7910 /COPYING
parent50173be6274a75f0de44d2aa5c93ebf67c6a7830 (diff)
parent42d44f631c4e8e5359775bdc098f2fffde4e5c05 (diff)
Merge commit 'v2011.03-rc1' into linaro-stable
Diffstat (limited to 'COPYING')
-rw-r--r--COPYING10
1 files changed, 9 insertions, 1 deletions
diff --git a/COPYING b/COPYING
index f616ab96c..44d198301 100644
--- a/COPYING
+++ b/COPYING
@@ -1,4 +1,12 @@
- NOTE! This copyright does *not* cover the so-called "standalone"
+ U-Boot is Free Software. It is copyrighted by Wolfgang Denk and
+many others who contributed code (see the actual source code for
+details). You can redistribute U-Boot and/or modify it under the
+terms of version 2 of the GNU General Public License as published by
+the Free Software Foundation. Most of it can also be distributed,
+at your option, under any later version of the GNU General Public
+License -- see individual files for exceptions.
+
+ NOTE! This license does *not* cover the so-called "standalone"
applications that use U-Boot services by means of the jump table
provided by U-Boot exactly for this purpose - this is merely
considered normal use of U-Boot, and does *not* fall under the