Changeset 1e48aca1 in mainline for boot/arch/arm32/loader/main.c

Timestamp:

2009-05-28T09:34:27Z (16 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

0c0b800

Parents:

81b430a

Message:

Allow arbitrarily large boot images on arm32.

File:

• boot/arch/arm32/loader/main.c (modified) (2 diffs)

boot/arch/arm32/loader/main.c

@@ -88 +88 @@
         printf(" %L: boot info structure\n", &bootinfo);
 
+        unsigned int top = 0;
+        bootinfo.cnt = 0;
         unsigned int i, j;
         for (i = 0; i < COMPONENTS; i++) {
                 printf(" %L: %s image (size %d bytes)\n", 
-                        components[i].start, components[i].name, components[i].size);
-        }
-
-        printf("\nCopying components\n");
-
-        unsigned int top = 0;
-        bootinfo.cnt = 0;
-        for (i = 0; i < COMPONENTS; i++) {
-                printf(" %s...", components[i].name);
+                    components[i].start, components[i].name, components[i].size);
                 top = ALIGN_UP(top, KERNEL_PAGE_SIZE);
-                memcpy(((void *) KERNEL_VIRTUAL_ADDRESS) + top, components[i].start, components[i].size);
                 if (i > 0) {
                         bootinfo.tasks[bootinfo.cnt].addr = ((void *) KERNEL_VIRTUAL_ADDRESS) + top;
@@ -110 +103 @@
                 }
                 top += components[i].size;
+        }
+        j = bootinfo.cnt - 1; 
+
+        printf("\nCopying components\n");
+
+        for (i = COMPONENTS - 1; i > 0; i--, j--) {
+                printf(" %s...", components[i].name);
+                memcpy((void *)bootinfo.tasks[j].addr, components[i].start,
+                    components[i].size);
                 printf("done.\n");
         }
         
+        printf("\nCopying kernel...");
+        memcpy((void *)KERNEL_VIRTUAL_ADDRESS, components[0].start,
+            components[0].size);
+        printf("done.\n");
+
         printf("\nBooting the kernel...\n");
         jump_to_kernel((void *) KERNEL_VIRTUAL_ADDRESS, &bootinfo);