ppc/85xx: Disable all async interrupt sources when we boot

[u-boot] / include / asm-i386 / u-boot.h

diff --git a/include/asm-i386/u-boot.h b/include/asm-i386/u-boot.h
index 554bc85ea942ce918c2c9f296bad96beed95de3e..9a1eec0cd54fbfde4574525b5f0bc6c1adccf1a7 100644 (file)
--- 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 */
@@ -39,14 +46,14 @@ typedef struct bd_info {
        unsigned long   bi_sramsize;    /* size  of SRAM memory */
        unsigned long   bi_bootflags;   /* boot / reboot flag (for LynxOS) */
        unsigned long   bi_ip_addr;     /* IP Address */
-       unsigned char   bi_enetaddr[6]; /* Ethernet adress */
        unsigned short  bi_ethspeed;    /* Ethernet speed in Mbps */
        unsigned long   bi_intfreq;     /* Internal Freq, in MHz */
        unsigned long   bi_busfreq;     /* Bus Freq, in MHz */
-       unsigned long   bi_baudrate;    /* Console Baudrate */
+       unsigned int    bi_baudrate;    /* Console Baudrate */
+       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];