Changeset a33f0a6 in mainline for boot/arch/ia64/include/types.h

Timestamp:

2011-08-03T17:34:57Z (14 years ago)

Author:

Oleg Romanenko <romanenko.oleg@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

1940326

Parents:

52a79081 (diff), 3fab770 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge from mainline

File:

• boot/arch/ia64/include/types.h (modified) (3 diffs)

boot/arch/ia64/include/types.h

@@ -30 +30 @@
 #define BOOT_ia64_TYPES_H_
 
+#include <arch/common.h>
+
 #define TASKMAP_MAX_RECORDS             32
 #define BOOTINFO_TASK_NAME_BUFLEN       32
-#define MEMMAP_ITEMS                    128     
+#define MEMMAP_ITEMS                    128
 
 typedef uint64_t size_t;
@@ -53 +55 @@
         unsigned long base;
         unsigned long size;
-} efi_memmap_item_t;
+} memmap_item_t;
 
 typedef struct {
         binit_t taskmap;
 
-        efi_memmap_item_t memmap[MEMMAP_ITEMS];
+        memmap_item_t memmap[MEMMAP_ITEMS];
         unsigned int memmap_items;
 
@@ -65 +67 @@
         unsigned long freq_scale;
         unsigned int wakeup_intno;
-        int hello_configured;
 } bootinfo_t;
 
+/** This is a minimal ELILO-compatible boot parameter structure. */
+typedef struct {
+        uint64_t cmd_line;
+        uint64_t efi_system_table;
+        uint64_t efi_memmap;
+        uint64_t efi_memmap_sz;
+        uint64_t efi_memdesc_sz;
+} boot_param_t;
+
 #endif