Merge with Linux 2.3.21.

1 files changed, 93 insertions, 40 deletions

diff --git a/include/asm-ppc/bootx.h b/include/asm-ppc/bootx.h
index ad69eaa54..5674bd0f9 100644
--- a/include/asm-ppc/bootx.h
+++ b/include/asm-ppc/bootx.h
@@ -11,6 +11,7 @@
 
 #ifdef macintosh
 #include <Types.h>
+#include "linux_type_defs.h"
 #endif
 
 #ifdef macintosh
@@ -18,66 +19,118 @@
 #pragma options align=power
 #endif
 
-/* On boostrap entry:
+/* On kernel entry:
  *
- * r3 = 0x426f6f58	('BooX')
+ * r3 = 0x426f6f58    ('BooX')
  * r4 = pointer to boot_infos
  * r5 = NULL
+ *
+ * Data and instruction translation disabled, interrupts
+ * disabled, kernel loaded at physical 0x00000000 on PCI
+ * machines (will be different on NuBus).
+ */
+
+#define BOOT_INFO_VERSION               5
+#define BOOT_INFO_COMPATIBLE_VERSION    1
+
+/* Bit in the architecture flag mask. More to be defined in
+   future versions. Note that either BOOT_ARCH_PCI or
+   BOOT_ARCH_NUBUS is set. The other BOOT_ARCH_NUBUS_xxx are
+   set additionally when BOOT_ARCH_NUBUS is set.
  */
+#define BOOT_ARCH_PCI                   0x00000001UL
+#define BOOT_ARCH_NUBUS                 0x00000002UL
+#define BOOT_ARCH_NUBUS_PDM             0x00000010UL
+#define BOOT_ARCH_NUBUS_PERFORMA        0x00000020UL
+#define BOOT_ARCH_NUBUS_POWERBOOK       0x00000040UL
+
+/*  Maximum number of ranges in phys memory map */
+#define MAX_MEM_MAP_SIZE				26
+
+/* This is the format of an element in the physical memory map. Note that
+   the map is optional and current BootX will only build it for pre-PCI
+   machines */
+typedef struct boot_info_map_entry
+{
+    __u32       physAddr;                /* Physical starting address */
+    __u32       size;                    /* Size in bytes */
+} boot_info_map_entry_t;
 
-#define BOOT_INFO_VERSION		2
-#define BOOT_INFO_COMPATIBLE_VERSION	1
 
 /* Here are the boot informations that are passed to the bootstrap
  * Note that the kernel arguments and the device tree are appended
  * at the end of this structure. */
 typedef struct boot_infos
 {
-	/* Version of this structure */
-	unsigned long	version;
-	/* backward compatible down to version: */
-	unsigned long	compatible_version;
-	
-	/* NEW (vers. 2) this holds the current _logical_ base addr of
-	   the frame buffer (for use by early boot message) */
-	unsigned char*	logicalDisplayBase;
-
-	/* Set to 0 by current BootX */
-	unsigned long	unused[2];
-	
-	/* The device tree (internal addresses relative to the beginning of the tree,
-	 * device tree offset relative to the beginning of this structure). */
-	unsigned long	deviceTreeOffset;	/* Device tree offset */
-	unsigned long	deviceTreeSize;		/* Size of the device tree */
-		
-	/* Some infos about the current MacOS display */
-	unsigned long	dispDeviceRect[4];	/* left,top,right,bottom */
-	unsigned long	dispDeviceDepth;	/* (8, 16 or 32) */
-	unsigned char*	dispDeviceBase;		/* base address (physical) */
-	unsigned long	dispDeviceRowBytes;	/* rowbytes (in bytes) */
-	unsigned long	dispDeviceColorsOffset;	/* Colormap (8 bits only) or 0 (*) */
-	/* Optional offset in the registry to the current
-	 * MacOS display. (Can be 0 when not detected) */
- 	unsigned long	dispDeviceRegEntryOffset;
-
-	/* Optional pointer to boot ramdisk (offset from this structure) */
-	unsigned long	ramDisk;
-	unsigned long	ramDiskSize;		/* size of ramdisk image */
-	
-	/* Kernel command line arguments (offset from this structure) */
-	unsigned long	kernelParamsOffset;
-		
+    /* Version of this structure */
+    __u32       version;
+    /* backward compatible down to version: */
+    __u32       compatible_version;
+    
+    /* NEW (vers. 2) this holds the current _logical_ base addr of
+       the frame buffer (for use by early boot message) */
+    __u8*       logicalDisplayBase;
+
+    /* NEW (vers. 4) Apple's machine identification */
+    __u32       machineID;
+
+    /* NEW (vers. 4) Detected hw architecture */
+    __u32       architecture;
+    
+    /* The device tree (internal addresses relative to the beginning of the tree,
+     * device tree offset relative to the beginning of this structure).
+     * On pre-PCI macintosh (BOOT_ARCH_PCI bit set to 0 in architecture), this
+     * field is 0.
+     */
+    __u32       deviceTreeOffset;        /* Device tree offset */
+    __u32       deviceTreeSize;          /* Size of the device tree */
+        
+    /* Some infos about the current MacOS display */
+    __u32       dispDeviceRect[4];       /* left,top,right,bottom */
+    __u32       dispDeviceDepth;         /* (8, 16 or 32) */
+    __u8*       dispDeviceBase;          /* base address (physical) */
+    __u32       dispDeviceRowBytes;      /* rowbytes (in bytes) */
+    __u32       dispDeviceColorsOffset;  /* Colormap (8 bits only) or 0 (*) */
+    /* Optional offset in the registry to the current
+     * MacOS display. (Can be 0 when not detected) */
+     __u32      dispDeviceRegEntryOffset;
+
+    /* Optional pointer to boot ramdisk (offset from this structure) */
+    __u32       ramDisk;
+    __u32       ramDiskSize;             /* size of ramdisk image */
+    
+    /* Kernel command line arguments (offset from this structure) */
+    __u32       kernelParamsOffset;
+    
+    /* ALL BELOW NEW (vers. 4) */
+    
+    /* This defines the physical memory. Valid with BOOT_ARCH_NUBUS flag
+       (non-PCI) only. On PCI, memory is contiguous and it's size is in the
+       device-tree. */
+    boot_info_map_entry_t
+    	        physMemoryMap[MAX_MEM_MAP_SIZE]; /* Where the phys memory is */
+    __u32       physMemoryMapSize;               /* How many entries in map */
+    
+				
+    /* The framebuffer size (optional, currently 0) */
+    __u32       frameBufferSize;         /* Represents a max size, can be 0. */
+    
+    /* NEW (vers. 5) */
+
+    /* Total params size (args + colormap + device tree + ramdisk) */
+    __u32       totalParamsSize;
+
 } boot_infos_t;
 
 /* (*) The format of the colormap is 256 * 3 * 2 bytes. Each color index is represented
  * by 3 short words containing a 16 bits (unsigned) color component.
  * Later versions may contain the gamma table for direct-color devices here.
  */
-#define BOOTX_COLORTABLE_SIZE	(256UL*3UL*2UL)
+#define BOOTX_COLORTABLE_SIZE    (256UL*3UL*2UL)
 
 #ifdef macintosh
 #pragma options align=reset
 #endif
 
 #endif
-
+    
\ No newline at end of file