Changeset 04803bf in mainline for boot/arch/arm32/src/asm.S

Timestamp:

2011-03-21T22:00:17Z (15 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

143932e3

Parents:

b50b5af2 (diff), 7308e84 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes (needs fixes).

File:

• boot/arch/arm32/src/asm.S (moved) (moved from boot/arch/arm32/loader/boot.S ) (2 diffs)

boot/arch/arm32/src/asm.S

@@ -27 +27 @@
 #
 
-
-#include "mm.h"
+#include <arch/arch.h>
 
 .section BOOTSTRAP
 
 .global start
+.global boot_pt
+.global boot_stack
+.global halt
 .global jump_to_kernel
-.global page_table
-.global boot_stack
 
 start:
         ldr sp, =boot_stack
         b bootstrap
+
+.section BOOTPT
+boot_pt:
+        .space PTL0_ENTRIES * PTL0_ENTRY_SIZE
+
+.section BOOTSTACK
+        .space 4096
+boot_stack:
+
+.text
+
+halt:
+        b halt
 
 jump_to_kernel:
@@ -48 +61 @@
         #
         bx r0
-
-#bootloader stack
-.section ST
-        .space 4096
-boot_stack:
-
-# place page_table to PT section
-.section PT
-
-# make place for PTL0 page table
-page_table:
-        .skip PTL0_ENTRIES * PTL0_ENTRY_SIZE