diff options
| author | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2010-12-19 10:03:11 +0000 |
|---|---|---|
| committer | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2010-12-19 10:03:11 +0000 |
| commit | f131e4297dc619b3f3148a079c634f2cec0fd687 (patch) | |
| tree | 66164de11b5b76539a1886c9fe58cdb1c9ea86de /os/ports | |
| parent | ada9fb82aac5f1bc2465d4555380c2bef40cb8d3 (diff) | |
| download | ChibiOS-f131e4297dc619b3f3148a079c634f2cec0fd687.tar.gz ChibiOS-f131e4297dc619b3f3148a079c634f2cec0fd687.tar.bz2 ChibiOS-f131e4297dc619b3f3148a079c634f2cec0fd687.zip | |
LPC214x board files and demos updated.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2499 35acf78f-673a-0410-8e92-d51de3d6d3f4
Diffstat (limited to 'os/ports')
| -rw-r--r-- | os/ports/GCC/ARM/crt0.s | 71 | ||||
| -rw-r--r-- | os/ports/GCC/ARMCMx/crt0_v6m.s | 2 | ||||
| -rw-r--r-- | os/ports/GCC/ARMCMx/crt0_v7m.s | 2 |
3 files changed, 28 insertions, 47 deletions
diff --git a/os/ports/GCC/ARM/crt0.s b/os/ports/GCC/ARM/crt0.s index 1ce42ce57..33cbb5600 100644 --- a/os/ports/GCC/ARM/crt0.s +++ b/os/ports/GCC/ARM/crt0.s @@ -27,25 +27,25 @@ #if !defined(__DOXYGEN__)
-.set MODE_USR, 0x10
-.set MODE_FIQ, 0x11
-.set MODE_IRQ, 0x12
-.set MODE_SVC, 0x13
-.set MODE_ABT, 0x17
-.set MODE_UND, 0x1B
-.set MODE_SYS, 0x1F
+ .set MODE_USR, 0x10
+ .set MODE_FIQ, 0x11
+ .set MODE_IRQ, 0x12
+ .set MODE_SVC, 0x13
+ .set MODE_ABT, 0x17
+ .set MODE_UND, 0x1B
+ .set MODE_SYS, 0x1F
-.equ I_BIT, 0x80
-.equ F_BIT, 0x40
+ .set I_BIT, 0x80
+ .set F_BIT, 0x40
-.text
-.code 32
-.balign 4
+ .text
+ .code 32
+ .balign 4
/*
* Reset handler.
*/
-.global ResetHandler
+ .global ResetHandler
ResetHandler:
/*
* Stack pointers initialization.
@@ -85,15 +85,15 @@ ResetHandler: * Early initialization.
*/
#ifndef THUMB_NO_INTERWORKING
- bl hwinit0
+ bl __early_init
#else
add r0, pc, #1
bx r0
-.code 16
- bl hwinit0
+ .code 16
+ bl __early_init
mov r0, pc
bx r0
-.code 32
+ .code 32
#endif
/*
* Data initialization.
@@ -119,21 +119,19 @@ bssloop: strlo r0, [r1], #4
blo bssloop
/*
- * Late initialization.
+ * Main program invocation.
*/
#ifdef THUMB_NO_INTERWORKING
add r0, pc, #1
bx r0
-.code 16
- bl hwinit1
+ .code 16
mov r0, #0
mov r1, r0
bl main
ldr r1, =MainExitHandler
bx r1
-.code 32
+ .code 32
#else
- bl hwinit1
mov r0, #0
mov r1, r0
bl main
@@ -143,10 +141,9 @@ bssloop: /*
* Default main function exit handler.
*/
-.weak MainExitHandler
-.globl MainExitHandler
+ .weak MainExitHandler
+ .global MainExitHandler
MainExitHandler:
-
.loop: b .loop
/*
@@ -156,29 +153,13 @@ MainExitHandler: * segments initialization.
*/
#ifdef THUMB_NO_INTERWORKING
-.thumb_func
-.code 16
+ .thumb_func
+ .code 16
#endif
-.weak hwinit0
+ .weak __early_init
hwinit0:
bx lr
-.code 32
-
-/*
- * Default late initialization code. It is declared weak in order to be
- * replaced by the real initialization code.
- * Late initialization is performed after BSS and DATA segments initialization
- * and before invoking the main() function.
- */
-#ifdef THUMB_NO_INTERWORKING
-.thumb_func
-.code 16
-#endif
-.weak hwinit1
-hwinit1:
- bx lr
-.code 32
-
+ .code 32
#endif
/** @} */
diff --git a/os/ports/GCC/ARMCMx/crt0_v6m.s b/os/ports/GCC/ARMCMx/crt0_v6m.s index 8cfbb7977..fd7e4fca4 100644 --- a/os/ports/GCC/ARMCMx/crt0_v6m.s +++ b/os/ports/GCC/ARMCMx/crt0_v6m.s @@ -100,7 +100,7 @@ endbloop: msr CONTROL, r0
isb
/*
- * Main program invokation.
+ * Main program invocation.
*/
movs r0, #0
mov r1, r0
diff --git a/os/ports/GCC/ARMCMx/crt0_v7m.s b/os/ports/GCC/ARMCMx/crt0_v7m.s index 25aacecc2..fb0d4a137 100644 --- a/os/ports/GCC/ARMCMx/crt0_v7m.s +++ b/os/ports/GCC/ARMCMx/crt0_v7m.s @@ -95,7 +95,7 @@ bloop: msr CONTROL, r0
isb
/*
- * Main program invokation.
+ * Main program invocation.
*/
movs r0, #0
mov r1, r0
|