summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGELOG3
-rw-r--r--include/asm-arm/u-boot.h7
-rw-r--r--include/asm-i386/u-boot.h7
-rw-r--r--include/asm-m68k/u-boot.h8
-rw-r--r--include/asm-microblaze/u-boot.h7
-rw-r--r--include/asm-mips/u-boot.h7
-rw-r--r--include/asm-nios/u-boot.h7
-rw-r--r--include/asm-nios2/u-boot.h7
-rw-r--r--include/asm-ppc/u-boot.h8
-rw-r--r--include/image.h9
10 files changed, 67 insertions, 3 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 5a3e8f17f8..2f5fe91bb0 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,9 +2,12 @@
Changes for U-Boot 1.1.4:
======================================================================
+* Remove unnnecessary #include <linux/types.h> from include/asm-*/u-boot.h
+
* 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.
+ Also, a corresponding note was placed in the headers of the affected files.
* Add support for Prodrive P3P440 board:
- Added onboard PPC440 DDR autodetection in cpu/ppc/sdram.c
diff --git a/include/asm-arm/u-boot.h b/include/asm-arm/u-boot.h
index c3b0e4a6ba..146934cf0c 100644
--- a/include/asm-arm/u-boot.h
+++ b/include/asm-arm/u-boot.h
@@ -24,6 +24,13 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston,
* MA 02111-1307 USA
+ *
+ ********************************************************************
+ * NOTE: This header file defines an interface to U-Boot. Including
+ * this (unmodified) header file in another file is considered normal
+ * use of U-Boot, and does *not* fall under the heading of "derived
+ * work".
+ ********************************************************************
*/
#ifndef _U_BOOT_H_
diff --git a/include/asm-i386/u-boot.h b/include/asm-i386/u-boot.h
index 346673228e..1e19f8f3d2 100644
--- a/include/asm-i386/u-boot.h
+++ b/include/asm-i386/u-boot.h
@@ -24,6 +24,13 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston,
* MA 02111-1307 USA
+ *
+ ********************************************************************
+ * NOTE: This header file defines an interface to U-Boot. Including
+ * this (unmodified) header file in another file is considered normal
+ * use of U-Boot, and does *not* fall under the heading of "derived
+ * work".
+ ********************************************************************
*/
#ifndef _U_BOOT_H_
diff --git a/include/asm-m68k/u-boot.h b/include/asm-m68k/u-boot.h
index 3a21fd287e..7a6a8c1ff1 100644
--- a/include/asm-m68k/u-boot.h
+++ b/include/asm-m68k/u-boot.h
@@ -16,6 +16,13 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston,
* MA 02111-1307 USA
+ *
+ ********************************************************************
+ * NOTE: This header file defines an interface to U-Boot. Including
+ * this (unmodified) header file in another file is considered normal
+ * use of U-Boot, and does *not* fall under the heading of "derived
+ * work".
+ ********************************************************************
*/
#ifndef __U_BOOT_H__
@@ -28,7 +35,6 @@
*/
#ifndef __ASSEMBLY__
-#include <linux/types.h>
typedef struct bd_info {
unsigned long bi_memstart; /* start of DRAM memory */
diff --git a/include/asm-microblaze/u-boot.h b/include/asm-microblaze/u-boot.h
index 4531e724f9..e2035bd79c 100644
--- a/include/asm-microblaze/u-boot.h
+++ b/include/asm-microblaze/u-boot.h
@@ -20,6 +20,13 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston,
* MA 02111-1307 USA
+ *
+ ********************************************************************
+ * NOTE: This header file defines an interface to U-Boot. Including
+ * this (unmodified) header file in another file is considered normal
+ * use of U-Boot, and does *not* fall under the heading of "derived
+ * work".
+ ********************************************************************
*/
#ifndef _U_BOOT_H_
diff --git a/include/asm-mips/u-boot.h b/include/asm-mips/u-boot.h
index 0de0b4da8a..d1273a4535 100644
--- a/include/asm-mips/u-boot.h
+++ b/include/asm-mips/u-boot.h
@@ -19,6 +19,13 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston,
* MA 02111-1307 USA
+ *
+ ********************************************************************
+ * NOTE: This header file defines an interface to U-Boot. Including
+ * this (unmodified) header file in another file is considered normal
+ * use of U-Boot, and does *not* fall under the heading of "derived
+ * work".
+ ********************************************************************
*/
#ifndef _U_BOOT_H_
diff --git a/include/asm-nios/u-boot.h b/include/asm-nios/u-boot.h
index 94007dc2ce..aae4be13c4 100644
--- a/include/asm-nios/u-boot.h
+++ b/include/asm-nios/u-boot.h
@@ -20,6 +20,13 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston,
* MA 02111-1307 USA
+ *
+ ********************************************************************
+ * NOTE: This header file defines an interface to U-Boot. Including
+ * this (unmodified) header file in another file is considered normal
+ * use of U-Boot, and does *not* fall under the heading of "derived
+ * work".
+ ********************************************************************
*/
#ifndef _U_BOOT_H_
diff --git a/include/asm-nios2/u-boot.h b/include/asm-nios2/u-boot.h
index b820e4ca81..3f299624ab 100644
--- a/include/asm-nios2/u-boot.h
+++ b/include/asm-nios2/u-boot.h
@@ -19,6 +19,13 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston,
* MA 02111-1307 USA
+ *
+ ********************************************************************
+ * NOTE: This header file defines an interface to U-Boot. Including
+ * this (unmodified) header file in another file is considered normal
+ * use of U-Boot, and does *not* fall under the heading of "derived
+ * work".
+ ********************************************************************
*/
#ifndef __ASM_NIOS2_U_BOOT_H_
diff --git a/include/asm-ppc/u-boot.h b/include/asm-ppc/u-boot.h
index 091d06c268..f7aa55f334 100644
--- a/include/asm-ppc/u-boot.h
+++ b/include/asm-ppc/u-boot.h
@@ -16,6 +16,13 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston,
* MA 02111-1307 USA
+ *
+ ********************************************************************
+ * NOTE: This header file defines an interface to U-Boot. Including
+ * this (unmodified) header file in another file is considered normal
+ * use of U-Boot, and does *not* fall under the heading of "derived
+ * work".
+ ********************************************************************
*/
#ifndef __U_BOOT_H__
@@ -28,7 +35,6 @@
*/
#ifndef __ASSEMBLY__
-#include <linux/types.h>
typedef struct bd_info {
unsigned long bi_memstart; /* start of DRAM memory */
diff --git a/include/image.h b/include/image.h
index 4c23f0e5b5..af37bcad5a 100644
--- a/include/image.h
+++ b/include/image.h
@@ -1,5 +1,5 @@
/*
- * (C) Copyright 2000
+ * (C) Copyright 2000-2005
* Wolfgang Denk, DENX Software Engineering, wd@denx.de.
*
* See file CREDITS for list of people who contributed to this
@@ -19,6 +19,13 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston,
* MA 02111-1307 USA
+ *
+ ********************************************************************
+ * NOTE: This header file defines an interface to U-Boot. Including
+ * this (unmodified) header file in another file is considered normal
+ * use of U-Boot, and does *not* fall under the heading of "derived
+ * work".
+ ********************************************************************
*/
#ifndef __IMAGE_H__