X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=include%2Fasm-i386%2Fu-boot.h;h=fc5a2ae591207c15c058843a6f9146d9f0f32da1;hb=6a19c46cae43c16c528eddefae3db97134f1915d;hp=dc5dd727c9c083ca65aa0857570b611745827fcd;hpb=7a8e9bed17d7924a9c5c4699b1f6a3a0359524ed;p=oweals%2Fu-boot.git

diff --git a/include/asm-i386/u-boot.h b/include/asm-i386/u-boot.h
index dc5dd727c9..fc5a2ae591 100644
--- a/include/asm-i386/u-boot.h
+++ b/include/asm-i386/u-boot.h
@@ -2,7 +2,7 @@
  * (C) Copyright 2002
  * Sysgo Real-Time Solutions, GmbH <www.elinos.com>
  * Marius Groeger <mgroeger@sysgo.de>
- * 
+ *
  * (C) Copyright 2002
  * Sysgo Real-Time Solutions, GmbH <www.elinos.com>
  * Alex Zuepke <azu@sysgo.de>
@@ -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_
@@ -31,7 +38,7 @@
 
 typedef struct bd_info {
 	unsigned long	bi_memstart;	/* start of DRAM memory */
-	unsigned long	bi_memsize;	/* size	 of DRAM memory in bytes */
+	phys_size_t	bi_memsize;	/* size	 of DRAM memory in bytes */
 	unsigned long	bi_flashstart;	/* start of FLASH memory */
 	unsigned long	bi_flashsize;	/* size	 of FLASH memory */
 	unsigned long	bi_flashoffset; /* reserved area for startup monitor */
@@ -47,7 +54,7 @@ typedef struct bd_info {
 	unsigned long   bi_boot_params;	/* where this board expects params */
 	struct environment_s	       *bi_env;
 	struct				/* RAM configuration */
-	{ 
+	{
 		ulong start;
 		ulong size;
 	}bi_dram[CONFIG_NR_DRAM_BANKS];