From: Wolfgang Denk <wd@pollux.(none)>
Date: Fri, 25 Nov 2005 09:38:43 +0000 (+0100)
Subject: Allow use of include/image.h and include/asm-*/u-boot.h in proprietary code.
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=aa7cfc463ae760be321fbe78eeb9b936e3dde5d8;p=project%2Fbcm63xx%2Fu-boot.git

Allow use of include/image.h and include/asm-*/u-boot.h in proprietary code.
The COPYING file was extended to make clear that these files can be
used in non-GPL code, too.
---

diff --git a/CHANGELOG b/CHANGELOG
index 50396e7a61..5a3e8f17f8 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,10 @@
 Changes for U-Boot 1.1.4:
 ======================================================================
 
+* Allow use of include/image.h and include/asm-*/u-boot.h in proprietary code.
+  The COPYING file was extended to make clear that these files can be
+  used in non-GPL code, too.
+
 * Add support for Prodrive P3P440 board:
   - Added onboard PPC440 DDR autodetection in cpu/ppc/sdram.c
   - CFG_FLASH_QUIET_TEST added to use the common CFI driver
diff --git a/COPYING b/COPYING
index 1a34e3dc0c..f616ab96cc 100644
--- a/COPYING
+++ b/COPYING
@@ -2,10 +2,17 @@
 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
-heading of "derived work". Also note that the GPL below is
-copyrighted by the Free Software Foundation, but the instance of code
-that it refers to (the U-Boot source code) is copyrighted by me and
-others who actually wrote it. -- Wolfgang Denk
+heading of "derived work".
+
+  The header files "include/image.h" and "include/asm-*/u-boot.h"
+define interfaces to U-Boot. Including these (unmodified) header
+files in another file is considered normal use of U-Boot, and does
+*not* fall under the heading of "derived work".
+
+  Also note that the GPL below is copyrighted by the Free Software
+Foundation, but the instance of code that it refers to (the U-Boot
+source code) is copyrighted by me and others who actually wrote it.
+-- Wolfgang Denk
 
 =======================================================================