Changeset c6143b4 in mainline

Timestamp:

2006-03-24T19:13:37Z (19 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

730de779

Parents:

7dcde32

Message:

kernel boot API change

Location:

arch/ppc32/loader

Files:

• asm.S (modified) (6 diffs)
• asm.h (modified) (1 diff)
• main.c (modified) (2 diffs)
• main.h (modified) (1 diff)

arch/ppc32/loader/asm.S

@@ -109 +109 @@
 jump_to_kernel:
         
-        # r3 = memmap (pa)
-        # r4 = trans (pa)
-        # r5 = kernel size
-        # r6 = real_mode (pa)
-        
-        mtspr srr0, r6
+        # r3 = bootinfo (pa)
+        # r4 = bootinfo_size
+        # r5 = trans (pa)
+        # r6 = kernel size
+        # r7 = real_mode (pa)
+        
+        mtspr srr0, r7
         
         # jumps to real_mode
@@ -133 +134 @@
         # copy kernel to proper location
         #
-        # r4 = trans (pa)
-        # r5 = kernel size
+        # r5 = trans (pa)
+        # r6 = kernel size
         
         li r31, PAGE_SIZE >> 2
@@ -141 +142 @@
         page_copy:
                 
-                cmpwi r5, 0
+                cmpwi r6, 0
                 beq copy_end
                 
@@ -147 +148 @@
                 
                 mtctr r31
-                lwz r29, 0(r4)
+                lwz r29, 0(r5)
                 
                 copy_loop:
@@ -156 +157 @@
                         addi r29, r29, 4
                         addi r30, r30, 4
-                        subi r5, r5, 4
-                        
-                        cmpwi r5, 0
+                        subi r6, r6, 4
+                        
+                        cmpwi r6, 0
                         beq copy_end
                         
                         bdnz copy_loop
                 
-                addi r4, r4, 4
+                addi r5, r5, 4
                 b page_copy
         
@@ -239 +240 @@
         # start the kernel
         #
-        # r3 = memmap (pa)
+        # r3 = bootinfo (pa)
         
         lis r31, KERNEL_START_ADDR@ha

arch/ppc32/loader/asm.h

@@ -45 +45 @@
 
 extern void halt();
-extern void jump_to_kernel(void *memmap, void *trans, unsigned int kernel_size, void *real_mode) __attribute__((noreturn));
+extern void jump_to_kernel(void *bootinfo, unsigned int bootinfo_size, void *trans, unsigned int kernel_size, void *real_mode) __attribute__((noreturn));
 extern void real_mode();
 

arch/ppc32/loader/main.c

@@ -36 +36 @@
 
 #define HEAP_GAP 1024000
-
-typedef struct {
-        memmap_t memmap;
-        screen_t screen;
-} bootinfo_t;
 
 bootinfo_t bootinfo;
@@ -124 +119 @@
         
         printf("\nBooting the kernel...\n");
-        jump_to_kernel(bootinfo_pa, trans_pa, KERNEL_SIZE, real_mode_pa);
+        jump_to_kernel(bootinfo_pa, sizeof(bootinfo), trans_pa, KERNEL_SIZE, real_mode_pa);
 }

arch/ppc32/loader/main.h

@@ -39 +39 @@
 #define ALIGN_UP(addr, align) (((addr) + ((align) - 1)) & ~((align) - 1))
 
+typedef struct {
+        memmap_t memmap;
+        screen_t screen;
+} bootinfo_t;
+
 extern int _binary_____________kernel_kernel_bin_start;
 extern int _binary_____________kernel_kernel_bin_end;