Changeset 03362fbd in mainline for kernel/arch/arm32/src/dummy.S

Timestamp:

2013-02-09T23:14:45Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

22dfd38

Parents:

b5d2e57 (diff), 005b765 (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.

Conflict resulting from bool.h → stdbool.h move and ddf structs turning opaque.
Fails to boot to shell console.

File:

• kernel/arch/arm32/src/dummy.S (modified) (2 diffs)

kernel/arch/arm32/src/dummy.S

@@ -32 +32 @@
 .global asm_delay_loop
 
-.global fpu_context_restore
-.global fpu_context_save
-.global fpu_enable
-.global fpu_init
-
 .global sys_tls_set
 .global dummy
@@ -46 +41 @@
         mov     pc, lr
 
-fpu_context_restore:
-        mov     pc, lr
-    
-fpu_context_save:
-        mov     pc, lr
-    
-fpu_enable:
-        mov     pc, lr
-
-fpu_init:
-        mov     pc, lr
-    
 # not used on ARM
 sys_tls_set: