diff --git a/CHANGELOG b/CHANGELOG index 5a3e8f1..2f5fe91 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -2,9 +2,12 @@ Changes for U-Boot 1.1.4: ====================================================================== +* Remove unnnecessary #include 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 c3b0e4a..146934c 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 3466732..1e19f8f 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 3a21fd2..7a6a8c1 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 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 4531e72..e2035bd 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 0de0b4d..d1273a4 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 94007dc..aae4be1 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 b820e4c..3f29962 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 091d06c..f7aa55f 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 typedef struct bd_info { unsigned long bi_memstart; /* start of DRAM memory */ diff --git a/include/image.h b/include/image.h index 4c23f0e..af37bca 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__