Changeset f3776a3 in mainline

Timestamp:

2009-01-29T15:35:01Z (16 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

e5be99a

Parents:

6196dae

Message:

move loader base address to 16 MB
remove debugging output

Location:

boot/arch/ppc32/loader

Files:

• _link.ld.in (modified) (1 diff)
• asm.S (modified) (11 diffs)
• debug.inc (deleted)

boot/arch/ppc32/loader/_link.ld.in

@@ -4 +4 @@
  
 SECTIONS {
-        .boot 0x10000000: AT (0) { 
+        .boot 0x01000000: AT (0) { 
                 *(BOOTSTRAP);
                 *(REALMODE);

boot/arch/ppc32/loader/asm.S

@@ -29 +29 @@
 #include "asm.h"
 #include "regname.h"
-#include "debug.inc"
 
 .text
@@ -141 +140 @@
 real_mode:
         
-        DEBUG_INIT
-        DEBUG_real_mode
-        
         # copy kernel to proper location
         #
@@ -164 +160 @@
                 lwz r29, 0(r5)
                 
-                DEBUG_INIT
-                DEBUG_copy_loop
-                
                 copy_loop:
                         
@@ -181 +174 @@
                         bdnz copy_loop
                         
-                        DEBUG_end_copy_loop
-                
                 addi r5, r5, 4
                 b page_copy
         
         copy_end:
-        
-        DEBUG_segments
         
         # initially fill segment registers
@@ -221 +210 @@
         # invalidate block address translation registers
         
-        DEBUG_bat
-        
         li r30, 0
         
@@ -251 +238 @@
         # create empty Page Hash Table
         # on top of memory, size 64 KB
-        
-        DEBUG_pht
         
         lwz r31, 0(r3)                # r31 = memory size
@@ -283 +268 @@
                 
                 bdnz pht_clear
-
-                DEBUG_end_pht_clear
                 
         clear_end:
@@ -291 +274 @@
         
         # create BAT identity mapping
-        
-        DEBUG_mapping
         
         lwz r31, 0(r3)                # r31 = memory size
@@ -316 +297 @@
                 bdnz bat_mask
         
-        DEBUG_bat_mask
-        
         andi. r31, r31, 0x07ff        # mask = mask & 0x07ff (BAT can map up to 256 MB)
         
@@ -337 +316 @@
         
         no_bat:
-
+        
 #endif
-        
-        DEBUG_tlb
         
         tlbia
         tlbsync
-        
-        DEBUG_prepare
         
         # start the kernel
@@ -374 +349 @@
         sync
         isync
-        
-        DEBUG_rfi
         rfi