Changeset de1b8b1 in mainline

Timestamp:

2006-05-18T22:07:21Z (19 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

c3b5cdf

Parents:

3eee37d

Message:

remove obsolete BAT framebuffer mapping

Location:

arch/ppc32/loader

Files:

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

arch/ppc32/loader/asm.S

@@ -107 +107 @@
         # r4 = bootinfo_size
         # r5 = trans (pa)
-        # r6 = kernel size
-        # r7 = framebuffer (pa)
-        # r8 = real_mode (pa)
+        # r6 = bytes to copy
+        # r7 = real_mode (pa)
         
         # disable interrupts
@@ -119 +118 @@
         # set real_mode meeting point address
         
-        mtspr srr0, r8
+        mtspr srr0, r7
         
         # jumps to real_mode
@@ -142 +141 @@
         #
         # r5 = trans (pa)
-        # r6 = kernel size
-        # r7 = framebuffer (pa)
+        # r6 = bytes to copy
         
         li r31, PAGE_SIZE >> 2
@@ -234 +232 @@
         mtspr dbat0l, r30
         
-        # FIXME: temporal framebuffer mapping
-        
-        lis r31, 0xf000
-        ori r31, r31, 0x0ffe
-        
-        mr r30, r7
-        ori r30, r30, 0x0002
-        
-        mtspr dbat1u, r31
-        mtspr dbat1l, r30
-        
         tlbia
         

arch/ppc32/loader/asm.h

@@ -45 +45 @@
 
 extern void halt();
-extern void jump_to_kernel(void *bootinfo, unsigned int bootinfo_size, void *trans, unsigned int kernel_size, void *framebuffer, 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

@@ -107 +107 @@
         void *trans_pa = ofw_translate(&trans);
         void *bootinfo_pa = ofw_translate(&bootinfo);
-        void *fb = (void *) (((unsigned int) bootinfo.screen.addr) & ((unsigned int) ~0 << 17));
         
         printf("\nMemory statistics (total %d MB)\n", bootinfo.memmap.total >> 20);
@@ -152 +151 @@
         
         printf("\nBooting the kernel...\n");
-        jump_to_kernel(bootinfo_pa, sizeof(bootinfo), trans_pa, pages << PAGE_WIDTH, fb, real_mode_pa);
+        jump_to_kernel(bootinfo_pa, sizeof(bootinfo), trans_pa, pages << PAGE_WIDTH, real_mode_pa);
 }