Changeset 4872160 in mainline for kernel/arch/ia64

Timestamp:

2010-05-04T10:44:55Z (15 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

568db0f

Parents:

bb252ca

Message:

new boot infrastructure

• more code and metadata unification
• import of up-to-date implementations from the kernel
• the boot loaders should behave more similarly on all platforms
• support for deflate compressed (LZ77) boot components
  • this again allows feasible boot images to be created on mips32
• IA64 is still not booting
  • the broken forked GNU EFI library has been removed, a replacement of the functionality is on its way

Location:

kernel/arch/ia64

Files:

• include/bootinfo.h (modified) (3 diffs)
• src/ia64.c (modified) (2 diffs)

kernel/arch/ia64/include/bootinfo.h

@@ -32 +32 @@
 #define BOOTINFO_ADDRESS 0x4401000
 
-#define CONFIG_INIT_TASKS       32
+#define TASKMAP_MAX_RECORDS  32
 
 #define MEMMAP_ITEMS 128
@@ -44 +44 @@
 
 typedef struct {
-        void *addr; 
-        unsigned long size;
+        void *addr;
+        size_t size;
         char name[BOOTINFO_TASK_NAME_BUFLEN];
 } binit_task_t;
         
 typedef struct {
-        unsigned long count;
-        binit_task_t tasks[CONFIG_INIT_TASKS];
+        size_t cnt;
+        binit_task_t tasks[TASKMAP_MAX_RECORDS];
 } binit_t;
 
@@ -58 +58 @@
         unsigned long base;
         unsigned long size;
-}efi_memmap_item_t;
-
+} efi_memmap_item_t;
 
 typedef struct {
         binit_t taskmap;
-
+        
         efi_memmap_item_t memmap[MEMMAP_ITEMS];
         unsigned int memmap_items;
-
+        
         unative_t *sapic;
         unsigned long sys_freq;

kernel/arch/ia64/src/ia64.c

@@ -47 +47 @@
 #include <mm/as.h>
 #include <config.h>
+#include <macros.h>
 #include <userspace.h>
 #include <console/console.h>
@@ -78 +79 @@
 void arch_pre_main(void)
 {
-        /* Setup usermode init tasks. */
-
-        unsigned int i;
-        
-        init.cnt = bootinfo->taskmap.count;
-        
+        init.cnt = min3(bootinfo->taskmap.cnt, TASKMAP_MAX_RECORDS, CONFIG_INIT_TASKS);
+        size_t i;
         for (i = 0; i < init.cnt; i++) {
                 init.tasks[i].addr =