Changeset 32573ff in mainline for boot/arch/arm32/src/asm.S

Timestamp:

2016-05-02T20:58:16Z (8 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

7c4b26c

Parents:

6adb775f (diff), 5035ba05 (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, which has dltest and fixes.

File:

• boot/arch/arm32/src/asm.S (modified) (2 diffs)

boot/arch/arm32/src/asm.S

@@ -27 +27 @@
 #
 
+#include <abi/asmtool.h>
 #include <arch/arch.h>
 
 .section BOOTSTRAP
 
-.global start
-.global boot_pt
-.global boot_stack
-.global halt
-.global jump_to_kernel
-
-start:
+SYMBOL(start)
         ldr sp, =boot_stack
         b bootstrap
 
 .section BOOTPT
-boot_pt:
+SYMBOL(boot_pt)
         .space PTL0_ENTRIES * PTL0_ENTRY_SIZE
 
 .section BOOTSTACK
         .space 4096
-boot_stack:
+SYMBOL(boot_stack)
 
 .text
 
-halt:
+FUNCTION_BEGIN(halt)
         b halt
+FUNCTION_END(halt)
 
-jump_to_kernel:
+FUNCTION_BEGIN(jump_to_kernel)
         #
         # Make sure that the I-cache, D-cache and memory are mutually coherent
@@ -108 +104 @@
 #endif
         mov pc, r0
+FUNCTION_END(jump_to_kernel)
+